From 25bce04497e217c938789a190148dbcbfd2dbc14 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 3 May 2016 10:29:18 +0200 Subject: [PATCH] Cleanups: - hasUsers/allUsers was redundant - moved isContactFound to admin user controller to avoid redundant lists, too MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../PizzaAdminWebRequestController.java | 2 +- .../helper/PizzaAdminWebRequestHelper.java | 51 ++- .../PizzaUserProfileWebRequestBean.java | 12 +- .../PizzaUserRegisterWebSessionBean.java | 11 +- .../user/PizzaAdminUserWebRequestBean.java | 350 +++++++++++++++++- .../PizzaAdminUserWebRequestController.java | 102 +++++ .../beans/user/PizzaUserWebSessionBean.java | 346 ----------------- .../user/PizzaUserWebSessionController.java | 102 ----- web/admin/user/admin_user_list.xhtml | 2 +- 9 files changed, 489 insertions(+), 489 deletions(-) diff --git a/src/java/org/mxchange/pizzaapplication/beans/helper/PizzaAdminWebRequestController.java b/src/java/org/mxchange/pizzaapplication/beans/helper/PizzaAdminWebRequestController.java index a89e6205..097daf11 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/helper/PizzaAdminWebRequestController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/helper/PizzaAdminWebRequestController.java @@ -55,7 +55,7 @@ public interface PizzaAdminWebRequestController extends Serializable { *

* @return Message key */ - String getUserCustomerUsageMessageKey (final Contact contact); + String getContactUsageMessageKey (final Contact contact); /** * Getter for contact instance diff --git a/src/java/org/mxchange/pizzaapplication/beans/helper/PizzaAdminWebRequestHelper.java b/src/java/org/mxchange/pizzaapplication/beans/helper/PizzaAdminWebRequestHelper.java index b9aac7be..efc3130c 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/helper/PizzaAdminWebRequestHelper.java +++ b/src/java/org/mxchange/pizzaapplication/beans/helper/PizzaAdminWebRequestHelper.java @@ -27,7 +27,6 @@ import org.mxchange.pizzaapplication.beans.contact.PizzaAdminContactWebRequestCo import org.mxchange.pizzaapplication.beans.customer.PizzaAdminCustomerWebRequestController; import org.mxchange.pizzaapplication.beans.customer.PizzaCustomerWebSessionController; import org.mxchange.pizzaapplication.beans.user.PizzaAdminUserWebRequestController; -import org.mxchange.pizzaapplication.beans.user.PizzaUserWebSessionController; /** * A general helper for administrative beans @@ -82,12 +81,6 @@ public class PizzaAdminWebRequestHelper implements PizzaAdminWebRequestControlle */ private User user; - /** - * General user controller - */ - @Inject - private PizzaUserWebSessionController userController; - /** * Default constructor */ @@ -177,27 +170,7 @@ public class PizzaAdminWebRequestHelper implements PizzaAdminWebRequestControlle } @Override - public Customer getCustomer () { - return this.customer; - } - - @Override - public void setCustomer (final Customer customer) { - this.customer = customer; - } - - @Override - public User getUser () { - return this.user; - } - - @Override - public void setUser (final User user) { - this.user = user; - } - - @Override - public String getUserCustomerUsageMessageKey (final Contact contact) { + public String getContactUsageMessageKey (final Contact contact) { // The contact must be valid if (null == contact) { // Throw NPE @@ -214,7 +187,7 @@ public class PizzaAdminWebRequestHelper implements PizzaAdminWebRequestControlle String messageKey = "CONTACT_IS_UNUSED"; //NOI18N // Check user/customer - boolean isUserContact = this.userController.isContactFound(contact); + boolean isUserContact = this.adminUserController.isContactFound(contact); boolean isCustomerContact = this.customerController.isContactFound(contact); // Check user first @@ -233,4 +206,24 @@ public class PizzaAdminWebRequestHelper implements PizzaAdminWebRequestControlle return messageKey; } + @Override + public Customer getCustomer () { + return this.customer; + } + + @Override + public void setCustomer (final Customer customer) { + this.customer = customer; + } + + @Override + public User getUser () { + return this.user; + } + + @Override + public void setUser (final User user) { + this.user = user; + } + } diff --git a/src/java/org/mxchange/pizzaapplication/beans/profile/PizzaUserProfileWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/profile/PizzaUserProfileWebRequestBean.java index 438f252b..19123e6e 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/profile/PizzaUserProfileWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/profile/PizzaUserProfileWebRequestBean.java @@ -25,7 +25,7 @@ import org.mxchange.jusercore.exceptions.UserNotFoundException; import org.mxchange.jusercore.model.user.User; import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; import org.mxchange.pizzaapplication.beans.login.PizzaUserLoginWebSessionController; -import org.mxchange.pizzaapplication.beans.user.PizzaUserWebSessionController; +import org.mxchange.pizzaapplication.beans.user.PizzaAdminUserWebRequestController; /** * A web request bean for user profiles @@ -42,16 +42,16 @@ public class PizzaUserProfileWebRequestBean implements PizzaUserProfileWebReques private static final long serialVersionUID = 187_687_145_286_710L; /** - * Login controller + * User controller */ @Inject - private PizzaUserLoginWebSessionController loginController; + private PizzaAdminUserWebRequestController adminUserController; /** - * User controller + * Login controller */ @Inject - private PizzaUserWebSessionController userController; + private PizzaUserLoginWebSessionController loginController; @Override public boolean isProfileLinkVisibleById (final Long userId) { @@ -60,7 +60,7 @@ public class PizzaUserProfileWebRequestBean implements PizzaUserProfileWebReques try { // Try to get it - u = this.userController.lookupUserById(userId); + u = this.adminUserController.lookupUserById(userId); } catch (final UserNotFoundException ex) { // Throw again throw new FaceletException(ex); diff --git a/src/java/org/mxchange/pizzaapplication/beans/register/PizzaUserRegisterWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/register/PizzaUserRegisterWebSessionBean.java index 2b339ea8..03346915 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/register/PizzaUserRegisterWebSessionBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/register/PizzaUserRegisterWebSessionBean.java @@ -26,7 +26,6 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.pizzaapplication.beans.contact.PizzaContactWebSessionController; import org.mxchange.jusercore.events.registration.RegisteredUserEvent; import org.mxchange.jusercore.events.registration.UserRegisteredEvent; import org.mxchange.jusercore.exceptions.DataRepeatMismatchException; @@ -36,6 +35,8 @@ import org.mxchange.jusercore.model.register.UserRegistrationSessionBeanRemote; import org.mxchange.jusercore.model.user.User; import org.mxchange.jusercore.model.user.UserUtils; import org.mxchange.jusercore.model.user.status.UserAccountStatus; +import org.mxchange.pizzaapplication.beans.contact.PizzaContactWebSessionController; +import org.mxchange.pizzaapplication.beans.user.PizzaAdminUserWebRequestController; import org.mxchange.pizzaapplication.beans.user.PizzaUserWebSessionController; /** @@ -76,6 +77,12 @@ public class PizzaUserRegisterWebSessionBean implements PizzaUserRegisterWebSess @Inject private PizzaUserWebSessionController userController; + /** + * User controller + */ + @Inject + private PizzaAdminUserWebRequestController adminUserController; + /** * Default constructor */ @@ -104,7 +111,7 @@ public class PizzaUserRegisterWebSessionBean implements PizzaUserRegisterWebSess } else if (!this.userController.isRequiredPersonalDataSet()) { // Not all required fields are set throw new FaceletException("Not all required fields are set."); //NOI18N - } else if (this.userController.isUserNameRegistered(user)) { + } else if (this.adminUserController.isUserNameRegistered(user)) { // User name is already used throw new FaceletException(new UserNameAlreadyRegisteredException(user)); } else if (this.contactController.isEmailAddressRegistered(user.getUserContact())) { diff --git a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestBean.java index f1f847e8..b0a3dcaf 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestBean.java @@ -17,10 +17,14 @@ package org.mxchange.pizzaapplication.beans.user; import java.text.MessageFormat; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; 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; @@ -29,13 +33,18 @@ import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; import org.mxchange.jcontacts.contact.Contact; +import org.mxchange.jcontacts.contact.ContactSessionBeanRemote; import org.mxchange.jusercore.container.login.UserLoginContainer; +import org.mxchange.jusercore.events.login.UserLoggedInEvent; +import org.mxchange.jusercore.events.registration.UserRegisteredEvent; import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent; import org.mxchange.jusercore.events.user.add.AdminUserAddedEvent; import org.mxchange.jusercore.events.user.update.AdminUpdatedUserDataEvent; import org.mxchange.jusercore.events.user.update.AdminUserDataUpdatedEvent; +import org.mxchange.jusercore.events.user.update.UpdatedUserPersonalDataEvent; import org.mxchange.jusercore.exceptions.EmailAddressAlreadyRegisteredException; import org.mxchange.jusercore.exceptions.UserNameAlreadyRegisteredException; +import org.mxchange.jusercore.exceptions.UserNotFoundException; import org.mxchange.jusercore.exceptions.UserPasswordRepeatMismatchException; import org.mxchange.jusercore.model.user.LoginUser; import org.mxchange.jusercore.model.user.User; @@ -45,6 +54,7 @@ import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; import org.mxchange.jusercore.model.user.status.UserAccountStatus; import org.mxchange.pizzaapplication.beans.contact.PizzaContactWebSessionController; import org.mxchange.pizzaapplication.beans.helper.PizzaAdminWebRequestController; +import org.mxchange.pizzaapplication.beans.login.PizzaUserLoginWebSessionController; /** * Administrative user bean (controller) @@ -73,12 +83,28 @@ public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestCon @Inject private PizzaAdminWebRequestController adminHelper; + /** + * Remote user bean + */ + private final ContactSessionBeanRemote contactBean; + /** * Regular contact controller */ @Inject private PizzaContactWebSessionController contactController; + /** + * Login bean (controller) + */ + @Inject + private PizzaUserLoginWebSessionController loginController; + + /** + * A list of all selectable contacts + */ + private List selectableContacts; + /** * An event fired when the administrator has updated a new user */ @@ -97,11 +123,21 @@ public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestCon @Inject private PizzaUserWebSessionController userController; + /** + * A list of all user profiles + */ + private List userList; + /** * User name */ private String userName; + /** + * User name list + */ + private List userNameList; + /** * User password (unencrypted from web form) */ @@ -112,6 +148,11 @@ public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestCon */ private String userPasswordRepeat; + /** + * A list of all public user profiles + */ + private List visibleUserList; + /** * Default constructor */ @@ -123,6 +164,9 @@ public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestCon // Try to lookup this.userBean = (UserSessionBeanRemote) context.lookup("java:global/PizzaService-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote"); //NOI18N + + // Try to lookup + this.contactBean = (ContactSessionBeanRemote) context.lookup("java:global/PizzaService-ejb/contact!org.mxchange.jcontacts.contact.ContactSessionBeanRemote"); //NOI18N } catch (final NamingException e) { // Throw again throw new FaceletException(e); @@ -201,7 +245,7 @@ public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestCon // Is the user name or email address used already? // @TODO Add password length check - if (this.userController.isUserNameRegistered(user)) { + if (this.isUserNameRegistered(user)) { // User name is already used throw new FaceletException(new UserNameAlreadyRegisteredException(user)); } else if ((this.adminHelper.getContact() == null) && (this.contactController.isEmailAddressRegistered(user.getUserContact()))) { @@ -255,6 +299,108 @@ public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestCon return "admin_list_user"; //NOI18N } + @Override + public void afterRegistrationEvent (final @Observes UserRegisteredEvent event) { + // Trace message + //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("AdminUserWebBean:afterRegistration: event={0} - CALLED!", event)); //NOI18N + + // event should not be null + if (null == event) { + // Throw NPE + throw new NullPointerException("event is null"); //NOI18N + } else if (event.getRegisteredUser() == null) { + // Throw NPE again + throw new NullPointerException("event.user is null"); //NOI18N + } else if (event.getRegisteredUser().getUserId() == null) { + // userId is null + throw new NullPointerException("event.user.userId is null"); //NOI18N + } else if (event.getRegisteredUser().getUserId() < 1) { + // Not avalid id + throw new IllegalArgumentException(MessageFormat.format("userId of user={0} is not valid: {1}", event.getRegisteredUser(), event.getRegisteredUser().getUserId())); //NOI18N + } + + // Get user instance + User registeredUser = event.getRegisteredUser(); + + // Debug message + //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("AdminUserWebBean:afterRegistration: registeredUser={0}", registeredUser)); //NOI18N + + // Add user to local list + this.userList.add(registeredUser); + + // Is the account public? + if (Objects.equals(registeredUser.getUserProfileMode(), ProfileMode.PUBLIC)) { + // Also add it to this list + this.visibleUserList.add(registeredUser); + } + + // Add user name and email address + this.addUserNameEmailAddress(registeredUser); + + // Trace message + //* NOISY-DEBUG: */ System.out.println("AdminUserWebBean:afterRegistration: EXIT!"); //NOI18N + } + + @Override + public void afterUserLogin (final @Observes UserLoggedInEvent event) { + // Trace message + //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("AdminUserWebBean:afterUserLogin: event={0} - CALLED!", event)); //NOI18N + + // event should not be null + if (null == event) { + // Throw NPE + throw new NullPointerException("event is null"); //NOI18N + } else if (event.getLoggedInUser() == null) { + // Throw NPE again + throw new NullPointerException("event.user is null"); //NOI18N + } else if (event.getLoggedInUser().getUserId() == null) { + // userId is null + throw new NullPointerException("event.user.userId is null"); //NOI18N + } else if (event.getLoggedInUser().getUserId() < 1) { + // Not avalid id + throw new IllegalArgumentException(MessageFormat.format("userId of user={0} is not valid: {1}", event.getLoggedInUser(), event.getLoggedInUser().getUserId())); //NOI18N + } + + // Re-initialize list + this.visibleUserList = this.userBean.allMemberPublicVisibleUsers(); + + // Trace message + //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("AdminUserWebBean:afterUserLogin: this.visibleUserList.size()={0} - EXIT!", this.visibleUserList.size())); //NOI18N + } + + @Override + public void afterUserUpdatedPersonalData (@Observes final UpdatedUserPersonalDataEvent event) { + // Check parameter + if (null == event) { + // Throw NPE + throw new NullPointerException("event is null"); //NOI18N + } else if (event.getUpdatedUser() == null) { + // Throw NPE again + throw new NullPointerException("event.updatedUser is null"); //NOI18N + } else if (event.getUpdatedUser().getUserId() == null) { + // ... and again + throw new NullPointerException("event.updatedUser.userId is null"); //NOI18N + } else if (event.getUpdatedUser().getUserId() < 1) { + // Invalid value + throw new IllegalArgumentException(MessageFormat.format("event.updatedUser.userId={0} is in valid", event.getUpdatedUser().getUserId())); //NOI18N + } + + // All fine, so update list + this.updateList(event.getUpdatedUser()); + } + + @Override + public List allUsers () { + // Return it + return Collections.unmodifiableList(this.userList); + } + + @Override + public List allVisibleUsers () { + // Return it + return Collections.unmodifiableList(this.visibleUserList); + } + @Override public String editUserData () { // Get user instance @@ -313,7 +459,7 @@ public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestCon User updatedUser = this.userBean.updateUserData(user); // Update list - this.userController.updateList(updatedUser); + this.updateList(updatedUser); // Fire event this.updatedUserDataEvent.fire(new AdminUserDataUpdatedEvent(updatedUser)); @@ -352,11 +498,211 @@ public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestCon this.userPasswordRepeat = userPasswordRepeat; } + @Override + public boolean hasUsers () { + return (!this.allUsers().isEmpty()); + } + /** * Post-initialization of this class */ @PostConstruct public void init () { + // Get full user name list for reducing EJB calls + this.userNameList = this.userBean.getUserNameList(); + + // Is the user logged-in? + if (this.loginController.isUserLoggedIn()) { + // Is logged-in, so load also users visible to memebers + this.visibleUserList = this.userBean.allMemberPublicVisibleUsers(); + } else { + // Initialize user list + this.visibleUserList = this.userBean.allPublicUsers(); + } + // Initialize user list + this.userList = this.userBean.allUsers(); + + // Get all contacts + List allContacts = this.contactBean.getAllContacts(); + + // Get iterator + Iterator iterator = allContacts.iterator(); + + // Loop through it + while (iterator.hasNext()) { + // Get next element + Contact next = iterator.next(); + + // Get iterator + Iterator userIterator = this.userList.iterator(); + + // Loop through all users + while (userIterator.hasNext()) { + // Get user instance + User nextUser = userIterator.next(); + + // Is contact same? + if (Objects.equals(next, nextUser.getUserContact())) { + // Found same + iterator.remove(); + break; + } + } + } + + // Set contact list + this.selectableContacts = allContacts; + } + + @Override + public boolean isContactFound (final Contact contact) { + // The contact must be valid + if (null == contact) { + // Throw NPE + throw new NullPointerException("contact is null"); //NOI18N + } else if (contact.getContactId() == null) { + // Throw again ... + throw new NullPointerException("contact.contactId is null"); //NOI18N + } else if (contact.getContactId() < 1) { + // Not valid + throw new IllegalArgumentException(MessageFormat.format("contact.contactId={0} is not valid", contact.getContactId())); //NOI18N + } + + // Default is not found + boolean isFound = false; + + // Get iterator + Iterator iterator = this.allUsers().iterator(); + + // Loop through all entries + while (iterator.hasNext()) { + // Get user + User next = iterator.next(); + + // Compare both objects + if (Objects.equals(contact, next.getUserContact())) { + // Found it + isFound = true; + break; + } + } + + // Return status + return isFound; + } + + @Override + public boolean isUserNameRegistered (final User user) { + return ((this.userNameList instanceof List) && (this.userNameList.contains(user.getUserName()))); + } + + @Override + public boolean isVisibleUserFound () { + return ((this.visibleUserList instanceof List) && (this.visibleUserList.size() > 0)); + } + + @Override + public User lookupUserById (final Long userId) throws UserNotFoundException { + // Parameter must be valid + if (null == userId) { + // Throw NPE + throw new NullPointerException("userId is null"); //NOI18N + } else if (userId < 1) { + // Not valid + throw new IllegalArgumentException(MessageFormat.format("userId={0} is not valid.", userId)); //NOI18N + } + + // Init variable + User user = null; + + // Try to lookup it in visible user list + for (final Iterator iterator = this.userList.iterator(); iterator.hasNext();) { + // Get next user + User next = iterator.next(); + + // Is the user id found? + if (Objects.equals(next.getUserId(), userId)) { + // Copy to other variable + user = next; + break; + } + } + + // Is it still null? + if (null == user) { + // Not visible for the current user + throw new UserNotFoundException(userId); + } + + // Return it + return user; + } + + @Override + public List selectableContacts () { + return Collections.unmodifiableList(this.selectableContacts); + } + + /** + * Updates list with given user instance + *

+ * @param user User instance + */ + @Override + public void updateList (final User user) { + // The user should be valid + if (null == user) { + // Throw NPE + throw new NullPointerException("user is null"); //NOI18N + } else if (user.getUserId() == null) { + // ... again NPE + throw new NullPointerException("user.userId is null"); //NOI18N + } else if (user.getUserId() < 1) { + // Invalid id + throw new IllegalArgumentException(MessageFormat.format("user.userId={0} is invalid", user.getUserId())); //NOI18N + } + + // 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); + } + + /** + * Adds user's name and email address to bean's internal list. It also + * updates the public user list if the user has decided to ha } + *

+ * @param user User instance + */ + private void addUserNameEmailAddress (final User user) { + // Make sure the entry is not added yet + if (this.userNameList.contains(user.getUserName())) { + // Abort here + throw new IllegalArgumentException(MessageFormat.format("User name {0} already added.", user.getUserName())); //NOI18N + } else if (this.contactController.isEmailAddressRegistered(user.getUserContact())) { + // Already added + throw new IllegalArgumentException(MessageFormat.format("Email address {0} already added.", user.getUserContact().getContactEmailAddress())); //NOI18N + } + + // Add user name + this.userNameList.add(user.getUserName()); + + // Add email addres + this.contactController.addEmailAddress(user.getUserContact().getContactEmailAddress()); } /** diff --git a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestController.java b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestController.java index 53741268..c971812a 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestController.java @@ -17,6 +17,13 @@ package org.mxchange.pizzaapplication.beans.user; import java.io.Serializable; +import java.util.List; +import org.mxchange.jcontacts.contact.Contact; +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.exceptions.UserNotFoundException; +import org.mxchange.jusercore.model.user.User; /** * An interface for user beans @@ -25,6 +32,101 @@ import java.io.Serializable; */ public interface PizzaAdminUserWebRequestController extends Serializable { + /** + * Event observer for new user registrations + *

+ * @param event User registration event + */ + void afterRegistrationEvent (final UserRegisteredEvent event); + + /** + * Event observer for logged-in user + *

+ * @param event Event instance + */ + void afterUserLogin (final UserLoggedInEvent event); + + /** + * Listens to fired event when user updated personal data + *

+ * @param event Event being fired + */ + void afterUserUpdatedPersonalData (final UpdatedUserPersonalDataEvent event); + + /** + * All public user profiles + *

+ * @return A list of all public user profiles + */ + List allVisibleUsers (); + + /** + * Returns a list of all selectable contacts for user creation. Contacts + * from already existing users are excluded in this list. + *

+ * @return A list of all selectable contacts + */ + List selectableContacts (); + + /** + * Updates list with given user + *

+ * @param user User to update + */ + void updateList (final User user); + + /** + * Checks whether the given contact is a user + *

+ * @param contact Contact to check + *

+ * @return Whether the contact is a user + */ + boolean isContactFound (final Contact contact); + + /** + * Checks whether given user instance's name is used + *

+ * @param user User instance's name to check + *

+ * @return Whether it is already used + */ + boolean isUserNameRegistered (final User user); + + /** + * Checks whether a public user account is registered. This means that at + * least one user profile has its flag "public user profile" enabled. + *

+ * @return Whether at least one user has a public profile + */ + boolean isVisibleUserFound (); + + /** + * 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. + *

+ * @param userId User id + *

+ * @return User instance + *

+ * @throws UserNotFoundException If the user is not found + */ + User lookupUserById (final Long userId) throws UserNotFoundException; + + /** + * All users + *

+ * @return A list of all public user profiles + */ + List allUsers (); + + /** + * Checks whether users are registered + *

+ * @return Whether users are registered + */ + boolean hasUsers (); + /** * Adds user instance to database by preparing a complete user instance and * sending it to the EJB. The data set in the controller is being verified, diff --git a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebSessionBean.java index 4db5b344..46f1e0cb 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebSessionBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebSessionBean.java @@ -17,9 +17,6 @@ package org.mxchange.pizzaapplication.beans.user; import java.text.MessageFormat; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; import java.util.Objects; import javax.annotation.PostConstruct; import javax.enterprise.context.SessionScoped; @@ -33,17 +30,13 @@ import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; import org.mxchange.jcontacts.contact.Contact; -import org.mxchange.jcontacts.contact.ContactSessionBeanRemote; -import org.mxchange.jcontacts.events.contact.add.AdminAddedContactEvent; import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber; 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.add.AdminAddedUserEvent; 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; import org.mxchange.jusercore.model.user.User; @@ -66,17 +59,6 @@ public class PizzaUserWebSessionBean implements PizzaUserWebSessionController { */ private static final long serialVersionUID = 542_145_347_916L; - /** - * Administrative user controller - */ - @Inject - private PizzaAdminUserWebRequestController adminController; - - /** - * Remote user bean - */ - private final ContactSessionBeanRemote contactBean; - /** * General contact controller */ @@ -89,11 +71,6 @@ public class PizzaUserWebSessionBean implements PizzaUserWebSessionController { @Inject private PizzaUserLoginWebSessionController loginController; - /** - * A list of all selectable contacts - */ - private List selectableContacts; - /** * Event being fired when user updated personal data */ @@ -111,21 +88,11 @@ public class PizzaUserWebSessionBean implements PizzaUserWebSessionController { */ private Long userId; - /** - * A list of all user profiles - */ - private List userList; - /** * User name */ private String userName; - /** - * User name list - */ - private List userNameList; - /** * User password (unencrypted from web form) */ @@ -141,11 +108,6 @@ public class PizzaUserWebSessionBean implements PizzaUserWebSessionController { */ private ProfileMode userProfileMode; - /** - * A list of all public user profiles - */ - private List visibleUserList; - /** * Default constructor */ @@ -157,75 +119,12 @@ public class PizzaUserWebSessionBean implements PizzaUserWebSessionController { // Try to lookup this.userBean = (UserSessionBeanRemote) context.lookup("java:global/PizzaService-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote"); //NOI18N - - // Try to lookup - this.contactBean = (ContactSessionBeanRemote) context.lookup("java:global/PizzaService-ejb/contact!org.mxchange.jcontacts.contact.ContactSessionBeanRemote"); //NOI18N } catch (final NamingException e) { // Throw again throw new FaceletException(e); } } - @Override - public void afterAdminAddedContact (@Observes final AdminAddedContactEvent event) { - // The event must be valid - if (null == event) { - // Throw NPE - throw new NullPointerException("event is null"); //NOI18N - } else if (event.getAddedContact()== null) { - // Throw again ... - throw new NullPointerException("event.addedContact is null"); //NOI18N - } else if (event.getAddedContact().getContactId() == null) { - // ... and again - throw new NullPointerException("event.addedContact.customerId is null"); //NOI18N - } else if (event.getAddedContact().getContactId() < 1) { - // Not valid - throw new IllegalArgumentException(MessageFormat.format("event.addedContact.customerId={0} is not valid", event.getAddedContact().getContactId())); //NOI18N //NOI18N - } - - // Call other method - this.selectableContacts.add(event.getAddedContact()); - } - - @Override - public void afterAdminAddedUserEvent (@Observes final AdminAddedUserEvent event) { - // Trace message - //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("ContactWebBean:afterAdminAddedUserEvent: event={0} - CALLED!", event)); //NOI18N - - // The event must be valid - if (null == event) { - // Throw NPE - throw new NullPointerException("event is null"); //NOI18N - } else if (event.getAddedUser() == null) { - // Throw NPE again - throw new NullPointerException("event.addedUser is null"); //NOI18N - } else if (event.getAddedUser().getUserId() == null) { - // userId is null - throw new NullPointerException("event.addedUser.userId is null"); //NOI18N - } else if (event.getAddedUser().getUserId() < 1) { - // Not avalid id - throw new IllegalArgumentException(MessageFormat.format("userId of user={0} is not valid: {1}", event.getAddedUser(), event.getAddedUser().getUserId())); //NOI18N - } else if (event.getAddedUser().getUserContact() == null) { - // userId is null - throw new NullPointerException("event.addedUser.userContact is null"); //NOI18N - } else if (event.getAddedUser().getUserContact().getContactId() == null) { - // userId is null - throw new NullPointerException("event.addedUser.userContact.contactId is null"); //NOI18N - } else if (event.getAddedUser().getUserContact().getContactId() < 1) { - // userId is null - throw new IllegalArgumentException(MessageFormat.format("event.addedUser.userContact.contactId={0} is not valid", event.getAddedUser().getUserContact().getContactId())); //NOI18N - } else if (!this.selectableContacts.contains(event.getAddedUser().getUserContact())) { - // Contact not in selectable list found - throw new IllegalStateException(MessageFormat.format("event.addedUser.userContact.contactId={0} is not in selectableContacts list.", event.getAddedUser().getUserContact().getContactId())); - } - - // Remove this contact from selectable list - assert (this.selectableContacts.remove(event.getAddedUser().getUserContact())) : "contact was not removed"; //NOI18N - - // Add user to local list - this.userList.add(event.getAddedUser()); - } - @Override public void afterRegistrationEvent (final @Observes UserRegisteredEvent event) { // Trace message @@ -255,24 +154,12 @@ public class PizzaUserWebSessionBean implements PizzaUserWebSessionController { // Copy all data from registered->user this.copyUser(registeredUser); - // Add user name and email address - this.addUserNameEmailAddress(registeredUser); - // Clear all data this.clear(); // Set user id again this.setUserId(registeredUser.getUserId()); - // Add user to local list - this.userList.add(registeredUser); - - // Is the account public? - if (Objects.equals(registeredUser.getUserProfileMode(), ProfileMode.PUBLIC)) { - // Also add it to this list - this.visibleUserList.add(registeredUser); - } - // Trace message //* NOISY-DEBUG: */ System.out.println("UserWebBean:afterRegistration: EXIT!"); //NOI18N } @@ -297,9 +184,6 @@ public class PizzaUserWebSessionBean implements PizzaUserWebSessionController { throw new IllegalArgumentException(MessageFormat.format("userId of user={0} is not valid: {1}", event.getLoggedInUser(), event.getLoggedInUser().getUserId())); //NOI18N } - // Re-initialize list - this.visibleUserList = this.userBean.allMemberPublicVisibleUsers(); - // Copy all data to this bean this.copyUser(event.getLoggedInUser()); @@ -307,39 +191,6 @@ public class PizzaUserWebSessionBean implements PizzaUserWebSessionController { //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("UserWebBean:afterUserLogin: this.visibleUserList.size()={0} - EXIT!", this.visibleUserList.size())); //NOI18N } - @Override - public void afterUserUpdatedPersonalData (@Observes final UpdatedUserPersonalDataEvent event) { - // Check parameter - if (null == event) { - // Throw NPE - throw new NullPointerException("event is null"); //NOI18N - } else if (event.getUpdatedUser() == null) { - // Throw NPE again - throw new NullPointerException("event.updatedUser is null"); //NOI18N - } else if (event.getUpdatedUser().getUserId() == null) { - // ... and again - throw new NullPointerException("event.updatedUser.userId is null"); //NOI18N - } else if (event.getUpdatedUser().getUserId() < 1) { - // Invalid value - throw new IllegalArgumentException(MessageFormat.format("event.updatedUser.userId={0} is in valid", event.getUpdatedUser().getUserId())); //NOI18N - } - - // All fine, so update list - this.updateList(event.getUpdatedUser()); - } - - @Override - public List allUsers () { - // Return it - return Collections.unmodifiableList(this.userList); - } - - @Override - public List allVisibleUsers () { - // Return it - return Collections.unmodifiableList(this.visibleUserList); - } - @Override public User createUserInstance () { // Required personal data must be set @@ -453,97 +304,11 @@ public class PizzaUserWebSessionBean implements PizzaUserWebSessionController { this.userProfileMode = userProfileMode; } - @Override - public boolean hasUsers () { - return (!this.allUsers().isEmpty()); - } - /** * Post-initialization of this class */ @PostConstruct public void init () { - // Get full user name list for reducing EJB calls - this.userNameList = this.userBean.getUserNameList(); - - // Is the user logged-in? - if (this.loginController.isUserLoggedIn()) { - // Is logged-in, so load also users visible to memebers - this.visibleUserList = this.userBean.allMemberPublicVisibleUsers(); - } else { - // Initialize user list - this.visibleUserList = this.userBean.allPublicUsers(); - } - // Initialize user list - this.userList = this.userBean.allUsers(); - - // Get all contacts - List allContacts = this.contactBean.getAllContacts(); - - // Get iterator - Iterator iterator = allContacts.iterator(); - - // Loop through it - while (iterator.hasNext()) { - // Get next element - Contact next = iterator.next(); - - // Get iterator - Iterator userIterator = this.userList.iterator(); - - // Loop through all users - while (userIterator.hasNext()) { - // Get user instance - User nextUser = userIterator.next(); - - // Is contact same? - if (Objects.equals(next, nextUser.getUserContact())) { - // Found same - iterator.remove(); - break; - } - } - } - - // Set contact list - this.selectableContacts = allContacts; - } - - @Override - public boolean isContactFound (final Contact contact) { - // The contact must be valid - if (null == contact) { - // Throw NPE - throw new NullPointerException("contact is null"); //NOI18N - } else if (contact.getContactId() == null) { - // Throw again ... - throw new NullPointerException("contact.contactId is null"); //NOI18N - } else if (contact.getContactId() < 1) { - // Not valid - throw new IllegalArgumentException(MessageFormat.format("contact.contactId={0} is not valid", contact.getContactId())); //NOI18N - } - - // Default is not found - boolean isFound = false; - - // Get iterator - Iterator iterator = this.allUsers().iterator(); - - // Loop through all entries - while (iterator.hasNext()) { - // Get user - User next = iterator.next(); - - // Compare both objects - if (Objects.equals(contact, next.getUserContact())) { - // Found it - isFound = true; - break; - } - } - - // Return status - return isFound; } @Override @@ -572,117 +337,6 @@ public class PizzaUserWebSessionBean implements PizzaUserWebSessionController { return ((this.getUserId() == null) || (this.getUserId() == 0)); } - @Override - public boolean isUserNameRegistered (final User user) { - return ((this.userNameList instanceof List) && (this.userNameList.contains(user.getUserName()))); - } - - @Override - public boolean isVisibleUserFound () { - return ((this.visibleUserList instanceof List) && (this.visibleUserList.size() > 0)); - } - - @Override - public User lookupUserById (final Long userId) throws UserNotFoundException { - // Init variable - User localUser = null; - - // Clear this bean - this.clear(); - - // Try to lookup it in visible user list - for (final Iterator iterator = this.visibleUserList.iterator(); iterator.hasNext();) { - // Get next user - User next = iterator.next(); - - // Is the user id found? - if (Objects.equals(next.getUserId(), userId)) { - // Copy to other variable - localUser = next; - break; - } - } - - // Is it still null? - if (null == localUser) { - // Not visible for the current user - throw new UserNotFoundException(userId); - } - - // Copy all data to this bean - this.copyUser(localUser); - - // Return it - return localUser; - } - - @Override - public List selectableContacts () { - return Collections.unmodifiableList(this.selectableContacts); - } - - /** - * Updates list with given user instance - *

- * @param user User instance - */ - @Override - public void updateList (final User user) { - // The user should be valid - if (null == user) { - // Throw NPE - throw new NullPointerException("user is null"); //NOI18N - } else if (user.getUserId() == null) { - // ... again NPE - throw new NullPointerException("user.userId is null"); //NOI18N - } else if (user.getUserId() < 1) { - // Invalid id - throw new IllegalArgumentException(MessageFormat.format("user.userId={0} is invalid", user.getUserId())); //NOI18N - } - - // 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); - } - - /** - * Adds user's name and email address to bean's internal list. It also - * updates the public user list if the user has decided to ha } - *

- * @param user User instance - */ - private void addUserNameEmailAddress (final User user) { - // Make sure the entry is not added yet - if (this.userNameList.contains(user.getUserName())) { - // Abort here - throw new IllegalArgumentException(MessageFormat.format("User name {0} already added.", user.getUserName())); //NOI18N - } else if (this.contactController.isEmailAddressRegistered(user.getUserContact())) { - // Already added - throw new IllegalArgumentException(MessageFormat.format("Email address {0} already added.", user.getUserContact().getContactEmailAddress())); //NOI18N - } - - // Add user name - this.userNameList.add(user.getUserName()); - - // Add email addres - this.contactController.addEmailAddress(user.getUserContact().getContactEmailAddress()); - } - /** * Clears this bean */ diff --git a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebSessionController.java b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebSessionController.java index 29f0723f..e50851eb 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebSessionController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebSessionController.java @@ -17,14 +17,8 @@ package org.mxchange.pizzaapplication.beans.user; import java.io.Serializable; -import java.util.List; -import org.mxchange.jcontacts.contact.Contact; -import org.mxchange.jcontacts.events.contact.add.AdminAddedContactEvent; import org.mxchange.jusercore.events.login.UserLoggedInEvent; import org.mxchange.jusercore.events.registration.UserRegisteredEvent; -import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent; -import org.mxchange.jusercore.events.user.update.UpdatedUserPersonalDataEvent; -import org.mxchange.jusercore.exceptions.UserNotFoundException; import org.mxchange.jusercore.model.user.User; import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; @@ -40,78 +34,6 @@ public interface PizzaUserWebSessionController extends Serializable { */ public static final Integer MINIMUM_PASSWORD_LENGTH = 5; - /** - * All users - *

- * @return A list of all public user profiles - */ - List allUsers (); - - /** - * Checks whether users are registered - *

- * @return Whether users are registered - */ - boolean hasUsers (); - - /** - * Checks whether the given contact is a user - *

- * @param contact Contact to check - *

- * @return Whether the contact is a user - */ - boolean isContactFound (final Contact contact); - - /** - * Observes events being fired when an administrator has added a new - * contact. - *

- * @param event Event being fired - */ - void afterAdminAddedContact (final AdminAddedContactEvent event); - - /** - * Listens to fired event when user updated personal data - *

- * @param event Event being fired - */ - void afterUserUpdatedPersonalData (final UpdatedUserPersonalDataEvent event); - - /** - * Updates list with given user - *

- * @param user User to update - */ - void updateList (final User user); - - /** - * Returns a list of all selectable contacts for user creation. Contacts - * from already existing users are excluded in this list. - *

- * @return A list of all selectable contacts - */ - List selectableContacts (); - - /** - * 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. - *

- * @param userId User id - *

- * @return User instance - *

- * @throws UserNotFoundException If the user is not found - */ - User lookupUserById (final Long userId) throws UserNotFoundException; - - /** - * Event observer for newly added users by an administrator - *

- * @param event Event being fired - */ - void afterAdminAddedUserEvent (final AdminAddedUserEvent event); - /** * Event observer for new user registrations *

@@ -126,13 +48,6 @@ public interface PizzaUserWebSessionController extends Serializable { */ void afterUserLogin (final UserLoggedInEvent event); - /** - * All public user profiles - *

- * @return A list of all public user profiles - */ - List allVisibleUsers (); - /** * Creates an instance from all properties *

@@ -231,23 +146,6 @@ public interface PizzaUserWebSessionController extends Serializable { */ boolean isSamePasswordEntered (); - /** - * Checks whether given user instance's name is used - *

- * @param user User instance's name to check - *

- * @return Whether it is already used - */ - boolean isUserNameRegistered (final User user); - - /** - * Checks whether a public user account is registered. This means that at - * least one user profile has its flag "public user profile" enabled. - *

- * @return Whether at least one user has a public profile - */ - boolean isVisibleUserFound (); - /** * Checks if the user id is empty *

diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml index 97b1b2c4..6f1b0780 100644 --- a/web/admin/user/admin_user_list.xhtml +++ b/web/admin/user/admin_user_list.xhtml @@ -16,7 +16,7 @@ - + #{msg.ADMIN_USER_ID} -- 2.39.5