From: Roland Häder Date: Thu, 21 Apr 2016 11:55:57 +0000 (+0200) Subject: Contiuned with editing user data/rewrites: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=936c499dd26c66a9460f19785ad09d863782d07c;p=jjobs-war.git Contiuned with editing user data/rewrites: - implemented editUserData() for when admin updates user data - implemented listener for when a user updates personal data - added private method updateList() for updating admin's user list - updateUserPersonalData() now returns updated user instance (detached!) - fired event when user updates personal data Signed-off-by: Roland Häder --- diff --git a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java index 4f6c4643..62979e53 100644 --- a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java @@ -24,6 +24,7 @@ import java.util.Objects; import javax.annotation.PostConstruct; import javax.enterprise.context.RequestScoped; import javax.enterprise.event.Event; +import javax.enterprise.event.Observes; import javax.enterprise.inject.Any; import javax.faces.view.facelets.FaceletException; import javax.inject.Inject; @@ -67,12 +68,25 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr @Any private Event addedUserEvent; + /** + * Admin helper instance + */ + @Inject + private RateCalcAdminWebRequestController adminHelper; + /** * Regular contact controller */ @Inject private JobsContactWebSessionController contactController; + /** + * An event fired when the administrator has updated a new user + */ + @Inject + @Any + private Event updatedUserDataEvent; + /** * Remote user bean */ @@ -187,6 +201,27 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr this.contactController.clear(); } + @Override + public void afterUserUpdatedPersonalData (@Observes final UpdatedUserPersonalDataEvent event) { + // Check parameter + if (null == event) { + // Throw NPE + throw new NullPointerException("event is null"); + } else if (event.getUpdatedUser() == null) { + // Throw NPE again + throw new NullPointerException("event.updatedUser is null"); + } else if (event.getUpdatedUser().getUserId() == null) { + // ... and again + throw new NullPointerException("event.updatedUser.userId is null"); + } else if (event.getUpdatedUser().getUserId() < 1) { + // Invalid value + throw new IllegalArgumentException(MessageFormat.format("event.updatedUser.userId={0} is in valid", event.getUpdatedUser().getUserId())); + } + + // All fine, so update list + this.updateList(event.getUpdatedUser()); + } + @Override public List allUsers () { // Return it @@ -195,7 +230,63 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr @Override public void editUserData () { - throw new UnsupportedOperationException("Not supported yet."); //NOI18N + // Get user instance + User user = this.adminHelper.getUser(); + + // Null password means not setting it + String encryptedPassword = null; + + // Check if user instance is in helper and valid + if (null == user) { + // Throw NPE + throw new NullPointerException("adminHelper.user is null"); + } else if (user.getUserId() == null) { + // Throw NPE again + throw new NullPointerException("adminHelper.user.userId is null"); + } else if (user.getUserId() < 1) { + // Invalid id + throw new IllegalStateException(MessageFormat.format("adminHelper.user.userId={0} is invalid", user.getUserId())); + } else if (this.getUserName() == null) { + // Not all required fields are set + throw new NullPointerException("this.userName is null"); + } else if (this.getUserName().isEmpty()) { + // Not all required fields are set + throw new IllegalArgumentException("this.userName is empty"); + } else if (((!this.getUserPassword().isEmpty()) || (!this.getUserPasswordRepeat().isEmpty())) && (!this.isSamePasswordEntered())) { + // Not same password entered + this.setUserPassword(null); + this.setUserPasswordRepeat(null); + + // Throw exception + throw new FaceletException("Not same password entered"); + } else if (this.isSamePasswordEntered()) { + // Same password entered, create container + if (UserUtils.ifPasswordMatches(new UserLoginContainer(user, this.getUserPassword()))) { + // Same password entered + throw new FaceletException("Same password as stored entered."); + } + + // Encrypt password + encryptedPassword = UserUtils.encryptPassword(this.getUserPassword()); + } + + // Set user name + user.setUserName(this.getUserName()); + + // Is a password set? + if (encryptedPassword != null) { + // Set it as well + user.setUserEncryptedPassword(encryptedPassword); + } + + // Call EJB for updating user data + User updatedUser = this.userBean.updateUserData(user); + + // Update list + this.updateList(updatedUser); + + // Fire event + this.updatedUserDataEvent.fire(new AdminUserDataUpdatedEvent(updatedUser)); } @Override @@ -288,4 +379,42 @@ public class JobsAdminUserWebRequestBean implements JobsAdminUserWebRequestContr return ((!this.getUserPassword().isEmpty()) && (Objects.equals(this.getUserPassword(), this.getUserPasswordRepeat()))); } + /** + * Updates list with given user instance + *

+ * @param user User instance + */ + private void updateList (final User user) { + // The user should be valid + if (null == user) { + // Throw NPE + throw new NullPointerException("user is null"); + } else if (user.getUserId() == null) { + // ... again NPE + throw new NullPointerException("user.userId is null"); + } else if (user.getUserId() < 1) { + // Invalid id + throw new IllegalArgumentException(MessageFormat.format("user.userId={0} is invalid", user.getUserId())); + } + + // Get iterator + Iterator iterator = this.userList.iterator(); + + // Look whole list + while (iterator.hasNext()) { + // Get next element + User next = iterator.next(); + + // Is the same user id? + if (Objects.equals(user.getUserId(), next.getUserId())) { + // Found it, so remove it + this.userList.remove(next); + break; + } + } + + // Re-add item + this.userList.add(user); + } + } diff --git a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestController.java b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestController.java index 0f19a46b..1dba6ca6 100644 --- a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestController.java +++ b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestController.java @@ -18,6 +18,7 @@ package org.mxchange.jjobs.beans.user; import java.io.Serializable; import java.util.List; +import org.mxchange.jusercore.events.user.update.UpdatedUserPersonalDataEvent; import org.mxchange.jusercore.exceptions.UserNotFoundException; import org.mxchange.jusercore.model.user.User; @@ -28,6 +29,13 @@ import org.mxchange.jusercore.model.user.User; */ public interface JobsAdminUserWebRequestController extends Serializable { + /** + * Listens to fired event when user updated personal data + *

+ * @param event Event being fired + */ + void afterUserUpdatedPersonalData (final UpdatedUserPersonalDataEvent event); + /** * Tries to lookup user by given id number. If the user is not found or the * account status is not CONFIRMED proper exceptions are thrown. diff --git a/src/java/org/mxchange/jjobs/beans/user/JobsUserWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/user/JobsUserWebSessionBean.java index ce980b3f..d5ab4926 100644 --- a/src/java/org/mxchange/jjobs/beans/user/JobsUserWebSessionBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/JobsUserWebSessionBean.java @@ -23,7 +23,9 @@ import java.util.List; import java.util.Objects; import javax.annotation.PostConstruct; import javax.enterprise.context.SessionScoped; +import javax.enterprise.event.Event; import javax.enterprise.event.Observes; +import javax.enterprise.inject.Any; import javax.faces.view.facelets.FaceletException; import javax.inject.Inject; import javax.inject.Named; @@ -38,6 +40,8 @@ import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; import org.mxchange.jusercore.events.login.UserLoggedInEvent; import org.mxchange.jusercore.events.registration.UserRegisteredEvent; +import org.mxchange.jusercore.events.user.update.UpdatedUserPersonalDataEvent; +import org.mxchange.jusercore.events.user.update.UserUpdatedPersonalDataEvent; import org.mxchange.jusercore.exceptions.UserNotFoundException; import org.mxchange.jusercore.exceptions.UserPasswordMismatchException; import org.mxchange.jusercore.model.user.LoginUser; @@ -71,6 +75,13 @@ public class JobsUserWebSessionBean implements JobsUserWebSessionController { @Inject private JobsUserLoginWebSessionController loginController; + /** + * Event being fired when user updated personal data + */ + @Inject + @Any + private Event updatedPersonalDataEvent; + /** * Remote user bean */ @@ -271,7 +282,10 @@ public class JobsUserWebSessionBean implements JobsUserWebSessionController { user.setUserProfileMode(this.getUserProfileMode()); // Send it to the EJB - this.userBean.updateUserPersonalData(user); + User updatedUser = this.userBean.updateUserPersonalData(user); + + // Fire event + this.updatedPersonalDataEvent.fire(new UserUpdatedPersonalDataEvent(updatedUser)); // All fine return "user_data_saved"; //NOI18N @@ -348,6 +362,7 @@ public class JobsUserWebSessionBean implements JobsUserWebSessionController { @Override public boolean isRequiredChangePersonalDataSet () { return ((this.getUserProfileMode() != null) && + (this.getUserName() != null) && (!this.getUserName().isEmpty()) && (this.contactController.isRequiredChangePersonalDataSet())); } diff --git a/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl b/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl index ad6c8db7..1b0c1cb8 100644 --- a/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl +++ b/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl @@ -75,9 +75,11 @@ -

  • - -
    • + +
  • + +
    • +