]> git.mxchange.org Git - pizzaservice-war.git/commitdiff
No, putting these methods into admin (request-scoped) controller is not good as no...
authorRoland Häder <roland@mxchange.org>
Fri, 6 May 2016 10:27:44 +0000 (12:27 +0200)
committerRoland Haeder <roland@mxchange.org>
Sat, 7 May 2016 14:24:46 +0000 (16:24 +0200)
Signed-off-by: Roland Häder <roland@mxchange.org>
13 files changed:
src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestBean.java
src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestController.java
src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionBean.java
src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionController.java
src/java/org/mxchange/pizzaapplication/beans/helper/PizzaAdminWebRequestHelper.java
src/java/org/mxchange/pizzaapplication/beans/profile/PizzaUserProfileWebRequestBean.java
src/java/org/mxchange/pizzaapplication/beans/register/PizzaUserRegisterWebSessionBean.java
src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestBean.java
src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestController.java
src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebSessionBean.java
src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebSessionController.java
web/admin/contact/admin_contact_list.xhtml
web/admin/user/admin_user_list.xhtml

index 492051b284fd38b6f5bd20f78bbf9c59614d9f36..dccf55e738c7aca4430bd038d2f92c9cf725f514 100644 (file)
@@ -19,7 +19,6 @@ package org.mxchange.pizzaapplication.beans.contact;
 import java.text.MessageFormat;
 import java.util.Date;
 import java.util.Iterator;
-import java.util.List;
 import javax.annotation.PostConstruct;
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.event.Event;
@@ -229,9 +228,6 @@ public class PizzaAdminContactWebRequestBean implements PizzaAdminContactWebRequ
         * Default constructor
         */
        public PizzaAdminContactWebRequestBean () {
-               // Set gender to UNKNOWN
-               this.gender = Gender.UNKNOWN;
-
                // Try it
                try {
                        // Get initial context
@@ -278,11 +274,6 @@ public class PizzaAdminContactWebRequestBean implements PizzaAdminContactWebRequ
                return "admin_list_contact"; //NOI18N
        }
 
-       @Override
-       public List<Contact> allContacts () {
-               return this.contactController.allContacts();
-       }
-
        @Override
        public void copyContactToController (final Contact contact) {
                // Log message
@@ -712,11 +703,6 @@ public class PizzaAdminContactWebRequestBean implements PizzaAdminContactWebRequ
                this.zipCode = zipCode;
        }
 
-       @Override
-       public boolean hasContacts () {
-               return (!this.allContacts().isEmpty());
-       }
-
        /**
         * Post-initialization of this class
         */
@@ -767,7 +753,7 @@ public class PizzaAdminContactWebRequestBean implements PizzaAdminContactWebRequ
                boolean IsFound = false;
 
                // Get iterator
-               Iterator<Contact> iterator = this.allContacts().iterator();
+               Iterator<Contact> iterator = this.contactController.allContacts().iterator();
 
                // Loop through all
                while (iterator.hasNext()) {
index c9c16b67801d0978fcd5d01a60763ffba6bfabb0..8a379d9bef4758ffb1ecac9dfdd84820a1471a19 100644 (file)
@@ -18,7 +18,6 @@ package org.mxchange.pizzaapplication.beans.contact;
 
 import java.io.Serializable;
 import java.util.Date;
-import java.util.List;
 import org.mxchange.jcontacts.contact.Contact;
 import org.mxchange.jcontacts.contact.gender.Gender;
 import org.mxchange.jcountry.data.Country;
@@ -39,20 +38,6 @@ public interface PizzaAdminContactWebRequestController extends Serializable {
         */
        String addContact ();
 
-       /**
-        * Returns a list of all found contacts
-        * <p>
-        * @return A list of all contacts.
-        */
-       List<Contact> allContacts ();
-
-       /**
-        * Checks whether there are contacts.
-        * <p>
-        * @return Whether contacts are there
-        */
-       boolean hasContacts ();
-
        /**
         * Creates an instance from contact data
         * <p>
index 66e252ba4c04a3267b400ec7aeb17cd7424a4918..0b5ad4e504d1cfdec21ae59b9530e445b754f711 100644 (file)
@@ -207,9 +207,6 @@ public class PizzaContactWebSessionBean implements PizzaContactWebSessionControl
         * Default constructor
         */
        public PizzaContactWebSessionBean () {
-               // Set gender to UNKNOWN
-               this.gender = Gender.UNKNOWN;
-
                // Try it
                try {
                        // Get initial context
@@ -235,7 +232,7 @@ public class PizzaContactWebSessionBean implements PizzaContactWebSessionControl
                if (null == event) {
                        // Throw NPE
                        throw new NullPointerException("event is null"); //NOI18N
-               } else if (event.getAddedContact()== null) {
+               } else if (event.getAddedContact() == null) {
                        // Throw again ...
                        throw new NullPointerException("event.addedContact is null"); //NOI18N
                } else if (event.getAddedContact().getContactId() == null) {
@@ -279,7 +276,10 @@ public class PizzaContactWebSessionBean implements PizzaContactWebSessionControl
 
        @Override
        public void afterAdminAddedUserEvent (@Observes final AdminAddedUserEvent event) {
-               // The event must be valid
+               // Trace message
+               //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("UserWebBean:afterAdminAddedUserEvent: event={0} - CALLED!", event)); //NOI18N
+
+               // event should not be null
                if (null == event) {
                        // Throw NPE
                        throw new NullPointerException("event is null"); //NOI18N
@@ -292,19 +292,13 @@ public class PizzaContactWebSessionBean implements PizzaContactWebSessionControl
                } 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
                }
 
-               // Add user to local list
-               this.contactList.add(event.getAddedUser().getUserContact());
+               // Clear all data
+               this.clear();
+
+               // Trace message
+               //* NOISY-DEBUG: */ System.out.println("UserWebBean:afterAdminAddedUserEvent: EXIT!"); //NOI18N
        }
 
        @Override
@@ -316,7 +310,7 @@ public class PizzaContactWebSessionBean implements PizzaContactWebSessionControl
                if (null == event) {
                        // Throw NPE
                        throw new NullPointerException("event is null"); //NOI18N
-               } else if (event.getUpdatedContact()== null) {
+               } else if (event.getUpdatedContact() == null) {
                        // Throw NPE again
                        throw new NullPointerException("event.updatedUser is null"); //NOI18N
                } else if (event.getUpdatedContact().getContactId() == null) {
@@ -426,6 +420,15 @@ public class PizzaContactWebSessionBean implements PizzaContactWebSessionControl
 
        @Override
        public Contact createContactInstance () {
+               // User message
+               //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("{0}.createContactInstance: CALLED!", this.getClass().getSimpleName()));
+
+               // Is all required data set?
+               if (!this.isRequiredPersonalDataSet()) {
+                       // No, then abort here
+                       throw new FaceletException(new IllegalArgumentException("Not all personal data is set, but createContactInstance() is called.")); //NOI18N
+               }
+
                // Required personal data must be set
                assert (this.isRequiredPersonalDataSet()) : "not all personal data is set"; //NOI18N
 
@@ -445,9 +448,8 @@ public class PizzaContactWebSessionBean implements PizzaContactWebSessionControl
                contact.setContactBirthday(this.getBirthday());
                contact.setContactComment(this.getComment());
 
-               // Set ownContact
-               contact.setContactOwnContact(Boolean.TRUE);
-
+               // Debug message
+               //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("{0}.createContactInstance: this.emailAddress={1}", this.getClass().getSimpleName(), this.getEmailAddress()));
                // Don't set null or wrong references
                if ((phone instanceof DialableLandLineNumber) && (phone.getPhoneCountry() instanceof Country) && (this.getPhoneAreaCode() != null) && (this.getPhoneNumber() != null) && (this.getPhoneAreaCode() > 0) && (this.getPhoneNumber() > 0)) {
                        // Now the number must be given
@@ -759,6 +761,11 @@ public class PizzaContactWebSessionBean implements PizzaContactWebSessionControl
                this.zipCode = zipCode;
        }
 
+       @Override
+       public boolean hasContacts () {
+               return (!this.allContacts().isEmpty());
+       }
+
        /**
         * Post-initialization of this class
         */
index 0888affa3d1a7d15297e00959e8315269f5e3590..ece29023b729248c12e827ff016843075f53d3e6 100644 (file)
@@ -50,6 +50,20 @@ public interface PizzaContactWebSessionController extends Serializable {
         */
        List<Contact> allContacts();
 
+       /**
+        * Checks whether there are contacts.
+        * <p>
+        * @return Whether contacts are there
+        */
+       boolean hasContacts ();
+
+       /**
+        * Event observer for newly added users by adminstrator
+        * <p>
+        * @param event Event being fired
+        */
+       void afterAdminAddedUserEvent (final AdminAddedUserEvent event);
+
        /**
         * Updates all data from bean in given contact instance
         * <p>
@@ -99,13 +113,6 @@ public interface PizzaContactWebSessionController extends Serializable {
         */
        void afterAdminAddedContact (final AdminAddedContactEvent event);
 
-       /**
-        * Event observer for newly added users by an administrator
-        * <p>
-        * @param event Event being fired
-        */
-       void afterAdminAddedUserEvent (final AdminAddedUserEvent event);
-
        /**
         * Event observer for updated contact data by admins
         * <p>
index efc3130c53530dec60a8b5db72ee19b2320bbe33..f06c3c537b9f9e4d6e00dae2dc8f03d217d2f13a 100644 (file)
@@ -26,7 +26,7 @@ import org.mxchange.jusercore.model.user.User;
 import org.mxchange.pizzaapplication.beans.contact.PizzaAdminContactWebRequestController;
 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
@@ -43,7 +43,7 @@ public class PizzaAdminWebRequestHelper implements PizzaAdminWebRequestControlle
        private static final long serialVersionUID = 17_258_793_567_145_701L;
 
        /**
-        * Administrative contact controller
+        * Regular contact controller
         */
        @Inject
        private PizzaAdminContactWebRequestController adminContactController;
@@ -54,12 +54,6 @@ public class PizzaAdminWebRequestHelper implements PizzaAdminWebRequestControlle
        @Inject
        private PizzaAdminCustomerWebRequestController adminCustomerController;
 
-       /**
-        * Administrative user controller
-        */
-       @Inject
-       private PizzaAdminUserWebRequestController adminUserController;
-
        /**
         * Contact instance
         */
@@ -81,6 +75,12 @@ public class PizzaAdminWebRequestHelper implements PizzaAdminWebRequestControlle
         */
        private User user;
 
+       /**
+        * Regular user controller
+        */
+       @Inject
+       private PizzaUserWebSessionController userController;
+
        /**
         * Default constructor
         */
@@ -153,7 +153,7 @@ public class PizzaAdminWebRequestHelper implements PizzaAdminWebRequestControlle
                }
 
                // Set all fields: user
-               this.adminUserController.setUserName(this.getUser().getUserName());
+               this.userController.setUserName(this.getUser().getUserName());
 
                // Log message
                //* NOISY-DEBUG: */ System.out.println("AdminHelper::copyUserToController - EXIT!"); //NOI18N
@@ -187,7 +187,7 @@ public class PizzaAdminWebRequestHelper implements PizzaAdminWebRequestControlle
                String messageKey = "CONTACT_IS_UNUSED"; //NOI18N
 
                // Check user/customer
-               boolean isUserContact = this.adminUserController.isContactFound(contact);
+               boolean isUserContact = this.userController.isContactFound(contact);
                boolean isCustomerContact = this.customerController.isContactFound(contact);
 
                // Check user first
index 912fe1db35d8159533dcec8c963c2e3d78f8471e..64133a6f7d2a80d81e6f594b4fb03bc9f58024b3 100644 (file)
@@ -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.PizzaAdminUserWebRequestController;
+import org.mxchange.pizzaapplication.beans.user.PizzaUserWebSessionController;
 
 /**
  * A web request bean for user profiles
@@ -42,10 +42,10 @@ public class PizzaUserProfileWebRequestBean implements PizzaUserProfileWebReques
        private static final long serialVersionUID = 187_687_145_286_710L;
 
        /**
-        * Administrative user controller
+        * User controller
         */
        @Inject
-       private PizzaAdminUserWebRequestController adminUserController;
+       private PizzaUserWebSessionController userController;
 
        /**
         * Login controller
@@ -60,7 +60,7 @@ public class PizzaUserProfileWebRequestBean implements PizzaUserProfileWebReques
 
                try {
                        // Try to get it
-                       u = this.adminUserController.lookupUserById(userId);
+                       u = this.userController.lookupUserById(userId);
                } catch (final UserNotFoundException ex) {
                        // Throw again
                        throw new FaceletException(ex);
index b53734e0172de85ae0c039bdb6f8f3186bbcc74a..c0fc0af88eb6206c6a6110a8a3953bedec3462bd 100644 (file)
@@ -111,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.adminUserController.isUserNameRegistered(user)) {
+               } else if (this.userController.isUserNameRegistered(user)) {
                        // User name is already used
                        throw new FaceletException(new UserNameAlreadyRegisteredException(user));
                } else if (this.contactController.isEmailAddressRegistered(user.getUserContact())) {
@@ -138,6 +138,9 @@ public class PizzaUserRegisterWebSessionBean implements PizzaUserRegisterWebSess
                        // Call bean
                        User registeredUser = this.registerBean.registerUser(user);
 
+                       // The id number should be set
+                       assert (registeredUser.getUserId() instanceof Long) : "registerUser.userId is null after registerUser() was called."; //NOI18N
+
                        // Fire event
                        this.registeredEvent.fire(new RegisteredUserEvent(registeredUser));
 
index 8a498d806afd32645783544e41d86abf50ca354e..be5eac664fcda9d41eb1d27f18fb04787dd29d9a 100644 (file)
@@ -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.RequestScoped;
@@ -35,16 +32,13 @@ 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;
@@ -94,11 +88,6 @@ public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestCon
        @Inject
        private PizzaContactWebSessionController contactController;
 
-       /**
-        * A list of all selectable contacts
-        */
-       private List<Contact> selectableContacts;
-
        /**
         * An event fired when the administrator has updated a new user
         */
@@ -117,11 +106,6 @@ public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestCon
        @Inject
        private PizzaUserWebSessionController userController;
 
-       /**
-        * A list of all user profiles
-        */
-       private List<User> userList;
-
        /**
         * Login bean (controller)
         */
@@ -133,11 +117,6 @@ public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestCon
         */
        private String userName;
 
-       /**
-        * User name list
-        */
-       private List<String> userNameList;
-
        /**
         * User password (unencrypted from web form)
         */
@@ -148,11 +127,6 @@ public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestCon
         */
        private String userPasswordRepeat;
 
-       /**
-        * A list of all public user profiles
-        */
-       private List<User> visibleUserList;
-
        /**
         * Default constructor
         */
@@ -245,7 +219,7 @@ public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestCon
 
                // Is the user name or email address used already?
                // @TODO Add password length check
-               if (this.isUserNameRegistered(user)) {
+               if (this.userController.isUserNameRegistered(user)) {
                        // User name is already used
                        throw new FaceletException(new UserNameAlreadyRegisteredException(user));
                } else if ((this.adminHelper.getContact() == null) && (this.contactController.isEmailAddressRegistered(user.getUserContact()))) {
@@ -323,18 +297,7 @@ public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestCon
                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);
+               //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("UserWebBean:afterRegistration: registeredUser={0}", registeredUser)); //NOI18N
 
                // Clear all data
                this.clear();
@@ -343,66 +306,6 @@ public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestCon
                //* 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<User> allUsers () {
-               // Return it
-               return Collections.unmodifiableList(this.userList);
-       }
-
-       @Override
-       public List<User> allVisibleUsers () {
-               // Return it
-               return Collections.unmodifiableList(this.visibleUserList);
-       }
-
        @Override
        public String editUserData () {
                // Get user instance
@@ -460,9 +363,6 @@ public class PizzaAdminUserWebRequestBean implements PizzaAdminUserWebRequestCon
                // 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));
 
@@ -500,224 +400,11 @@ 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.userLoginController.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 full user name list for reducing EJB calls
-               this.userNameList = this.userBean.getUserNameList();
-
-               // Is the user logged-in?
-               if (this.userLoginController.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();
-               }
-
-               // Get all contacts
-               List<Contact> allContacts = this.contactController.allContacts();
-
-               // Get iterator
-               Iterator<Contact> iterator = allContacts.iterator();
-
-               // Loop through it
-               while (iterator.hasNext()) {
-                       // Get next element
-                       Contact next = iterator.next();
-
-                       // Get iterator
-                       Iterator<User> 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<User> 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<User> 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<Contact> selectableContacts () {
-               return Collections.unmodifiableList(this.selectableContacts);
-       }
-
-       /**
-        * Updates list with given user instance
-        * <p>
-        * @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<User> 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   }
-        * <p>
-        * @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());
        }
 
        /**
index 268e154f13a0cb3d55d6f2c16a2b157101eb8977..68ca7f5c4219a99583c404ce802f35d16cf5d3f7 100644 (file)
 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
@@ -39,94 +33,6 @@ public interface PizzaAdminUserWebRequestController extends Serializable {
         */
        void afterRegistrationEvent (final UserRegisteredEvent event);
 
-       /**
-        * Event observer for logged-in user
-        * <p>
-        * @param event Event instance
-        */
-       void afterUserLogin (final UserLoggedInEvent event);
-
-       /**
-        * Listens to fired event when user updated personal data
-        * <p>
-        * @param event Event being fired
-        */
-       void afterUserUpdatedPersonalData (final UpdatedUserPersonalDataEvent event);
-
-       /**
-        * All public user profiles
-        * <p>
-        * @return A list of all public user profiles
-        */
-       List<User> allVisibleUsers ();
-
-       /**
-        * Returns a list of all selectable contacts for user creation. Contacts
-        * from already existing users are excluded in this list.
-        * <p>
-        * @return A list of all selectable contacts
-        */
-       List<Contact> selectableContacts ();
-
-       /**
-        * Updates list with given user
-        * <p>
-        * @param user User to update
-        */
-       void updateList (final User user);
-
-       /**
-        * Checks whether the given contact is a user
-        * <p>
-        * @param contact Contact to check
-        * <p>
-        * @return Whether the contact is a user
-        */
-       boolean isContactFound (final Contact contact);
-
-       /**
-        * Checks whether a public user account is registered. This means that at
-        * least one user profile has its flag "public user profile" enabled.
-        * <p>
-        * @return Whether at least one user has a public profile
-        */
-       boolean isVisibleUserFound ();
-
-       /**
-        * Checks whether given user instance's name is used
-        * <p>
-        * @param user User instance's name to check
-        * <p>
-        * @return Whether it is already used
-        */
-       boolean isUserNameRegistered (final User user);
-
-       /**
-        * 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.
-        * <p>
-        * @param userId User id
-        * <p>
-        * @return User instance
-        * <p>
-        * @throws UserNotFoundException If the user is not found
-        */
-       User lookupUserById (final Long userId) throws UserNotFoundException;
-
-       /**
-        * All users
-        * <p>
-        * @return A list of all public user profiles
-        */
-       List<User> allUsers ();
-
-       /**
-        * Checks whether users are registered
-        * <p>
-        * @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,
index a214fc52c4e13b3ada974ba6a1fff34c92a7768e..483c13143d0cc39d3f047164f55f39afd6687651 100644 (file)
@@ -17,6 +17,9 @@
 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;
@@ -35,8 +38,11 @@ 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.AdminUpdatedUserDataEvent;
 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;
@@ -71,6 +77,11 @@ public class PizzaUserWebSessionBean implements PizzaUserWebSessionController {
        @Inject
        private PizzaUserLoginWebSessionController loginController;
 
+       /**
+        * A list of all selectable contacts
+        */
+       private List<Contact> selectableContacts;
+
        /**
         * Event being fired when user updated personal data
         */
@@ -88,11 +99,27 @@ public class PizzaUserWebSessionBean implements PizzaUserWebSessionController {
         */
        private Long userId;
 
+       /**
+        * A list of all user profiles
+        */
+       private List<User> userList;
+
+       /**
+        * Login bean (controller)
+        */
+       @Inject
+       private PizzaUserLoginWebSessionController userLoginController;
+
        /**
         * User name
         */
        private String userName;
 
+       /**
+        * User name list
+        */
+       private List<String> userNameList;
+
        /**
         * User password (unencrypted from web form)
         */
@@ -108,6 +135,11 @@ public class PizzaUserWebSessionBean implements PizzaUserWebSessionController {
         */
        private ProfileMode userProfileMode;
 
+       /**
+        * A list of all public user profiles
+        */
+       private List<User> visibleUserList;
+
        /**
         * Default constructor
         */
@@ -126,7 +158,70 @@ public class PizzaUserWebSessionBean implements PizzaUserWebSessionController {
        }
 
        @Override
-       public void afterRegistrationEvent (final @Observes UserRegisteredEvent event) {
+       public void afterAdminAddedUserEvent (@Observes final AdminAddedUserEvent event) {
+               // Trace message
+               //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("UserWebBean:afterAdminAddedUserEvent: 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.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
+               }
+
+               // Add user to local list
+               this.userList.add(event.getAddedUser());
+
+               // Clear all data
+               this.clear();
+
+               // Set user id again
+               this.setUserId(event.getAddedUser().getUserId());
+
+               // Trace message
+               //* NOISY-DEBUG: */ System.out.println("UserWebBean:afterAdminAddedUserEvent: EXIT!"); //NOI18N
+       }
+
+       @Override
+       public void afterAdminUpdatedUserDataEvent (@Observes final AdminUpdatedUserDataEvent event) {
+               // Trace message
+               //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("UserWebBean:afterAdminUpdatedUserEvent: 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.getUpdatedUser() == null) {
+                       // Throw NPE again
+                       throw new NullPointerException("event.updatedUser is null"); //NOI18N
+               } else if (event.getUpdatedUser().getUserId() == null) {
+                       // userId is null
+                       throw new NullPointerException("event.updatedUser.userId is null"); //NOI18N
+               } else if (event.getUpdatedUser().getUserId() < 1) {
+                       // Not avalid id
+                       throw new IllegalArgumentException(MessageFormat.format("userId of user={0} is not valid: {1}", event.getUpdatedUser(), event.getUpdatedUser().getUserId())); //NOI18N
+               }
+
+               // Update list
+               this.updateList(event.getUpdatedUser());
+
+               // Clear all data
+               this.clear();
+
+               // Trace message
+               //* NOISY-DEBUG: */ System.out.println("UserWebBean:afterAdminUpdatedUserEvent: EXIT!"); //NOI18N
+       }
+
+       @Override
+       public void afterRegistrationEvent (@Observes final UserRegisteredEvent event) {
                // Trace message
                //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("UserWebBean:afterRegistration: event={0} - CALLED!", event)); //NOI18N
 
@@ -136,10 +231,10 @@ public class PizzaUserWebSessionBean implements PizzaUserWebSessionController {
                        throw new NullPointerException("event is null"); //NOI18N
                } else if (event.getRegisteredUser() == null) {
                        // Throw NPE again
-                       throw new NullPointerException("event.user is null"); //NOI18N
+                       throw new NullPointerException("event.registeredUser is null"); //NOI18N
                } else if (event.getRegisteredUser().getUserId() == null) {
                        // userId is null
-                       throw new NullPointerException("event.user.userId is null"); //NOI18N
+                       throw new NullPointerException("event.registeredUser.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
@@ -150,12 +245,25 @@ public class PizzaUserWebSessionBean implements PizzaUserWebSessionController {
 
                // Debug message
                //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("UserWebBean:afterRegistration: registeredUser={0}", registeredUser)); //NOI18N
+
                // Copy all data from registered->user
                this.copyUser(registeredUser);
 
                // Clear all data
                this.clear();
 
+               // Add user to local list
+               this.userList.add(registeredUser);
+
+               // Add user name
+               this.addUserName(registeredUser);
+
+               // Is the account public?
+               if (Objects.equals(registeredUser.getUserProfileMode(), ProfileMode.PUBLIC)) {
+                       // Also add it to this list
+                       this.visibleUserList.add(registeredUser);
+               }
+
                // Set user id again
                this.setUserId(registeredUser.getUserId());
 
@@ -174,10 +282,10 @@ public class PizzaUserWebSessionBean implements PizzaUserWebSessionController {
                        throw new NullPointerException("event is null"); //NOI18N
                } else if (event.getLoggedInUser() == null) {
                        // Throw NPE again
-                       throw new NullPointerException("event.user is null"); //NOI18N
+                       throw new NullPointerException("event.registeredUser is null"); //NOI18N
                } else if (event.getLoggedInUser().getUserId() == null) {
                        // userId is null
-                       throw new NullPointerException("event.user.userId is null"); //NOI18N
+                       throw new NullPointerException("event.registeredUser.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
@@ -186,12 +294,51 @@ public class PizzaUserWebSessionBean implements PizzaUserWebSessionController {
                // Copy all data to this bean
                this.copyUser(event.getLoggedInUser());
 
+               // Re-initialize list
+               this.visibleUserList = this.userBean.allMemberPublicVisibleUsers();
+
                // Trace message
                //* 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<User> allUsers () {
+               // Return it
+               return Collections.unmodifiableList(this.userList);
+       }
+
+       @Override
+       public List<User> allVisibleUsers () {
+               // Return it
+               return Collections.unmodifiableList(this.visibleUserList);
+       }
+
        @Override
        public User createUserInstance () {
+               // Trace message
+               //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("{0}.createUserInstance: CALLED!", this.getClass().getSimpleName()));
+
                // Required personal data must be set
                assert (this.isRequiredPersonalDataSet()) : "not all personal data is set"; //NOI18N
 
@@ -205,9 +352,15 @@ public class PizzaUserWebSessionBean implements PizzaUserWebSessionController {
                // Create contact instance
                Contact contact = this.contactController.createContactInstance();
 
+               // Debug message
+               //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("{0}.createUserInstance: contact={1}", this.getClass().getSimpleName(), contact));
+
                // Set contact in user
                localUser.setUserContact(contact);
 
+               // Trace message
+               //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("{0}.createUserInstance: user={1} - EXIT!", this.getClass().getSimpleName(), user));
+
                // Return it
                return localUser;
        }
@@ -303,11 +456,101 @@ 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 () {
+               // Initialize user list
+               this.userList = this.userBean.allUsers();
+
+               // Get full user name list for reducing EJB calls
+               this.userNameList = this.userBean.getUserNameList();
+
+               // Is the user logged-in?
+               if (this.userLoginController.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();
+               }
+
+               // Get all users
+               List<User> allUsers = this.allUsers();
+
+               // Get all contacts
+               List<Contact> allContacts = this.contactController.allContacts();
+
+               // Get iterator
+               Iterator<Contact> iterator = allContacts.iterator();
+
+               // Loop through it
+               while (iterator.hasNext()) {
+                       // Get next element
+                       Contact next = iterator.next();
+
+                       // Get iterator
+                       Iterator<User> userIterator = allUsers.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<User> 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
@@ -336,6 +579,78 @@ 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 {
+               // 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<User> 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<Contact> selectableContacts () {
+               return Collections.unmodifiableList(this.selectableContacts);
+       }
+
+       /**
+        * Adds user's name to bean's internal list. It also updates the public user
+        * list if the user has decided to have a public account,
+        * <p>
+        * @param user User instance
+        */
+       private void addUserName (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());
+       }
+
        /**
         * Clears this bean
         */
@@ -368,4 +683,42 @@ public class PizzaUserWebSessionBean implements PizzaUserWebSessionController {
                DialableLandLineNumber phone = user.getUserContact().getContactLandLineNumber();
        }
 
+       /**
+        * Updates list with given user instance
+        * <p>
+        * @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"); //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<User> 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);
+       }
+
 }
index e50851eb41e6dfe764285515883b134310f0f71e..4edcd87aecdb992a4e13763d008374d654c91ef9 100644 (file)
 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.add.AdminAddedUserEvent;
+import org.mxchange.jusercore.events.user.update.AdminUpdatedUserDataEvent;
+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;
 
@@ -34,6 +40,27 @@ public interface PizzaUserWebSessionController extends Serializable {
         */
        public static final Integer MINIMUM_PASSWORD_LENGTH = 5;
 
+       /**
+        * Event observer for newly added users by adminstrator
+        * <p>
+        * @param event Event being fired
+        */
+       void afterAdminAddedUserEvent (final AdminAddedUserEvent event);
+
+       /**
+        * Event observer for updated user data by administrator
+        * <p>
+        * @param event Event being updated
+        */
+       void afterAdminUpdatedUserDataEvent (final AdminUpdatedUserDataEvent event);
+
+       /**
+        * Listens to fired event when user updated personal data
+        * <p>
+        * @param event Event being fired
+        */
+       void afterUserUpdatedPersonalData (final UpdatedUserPersonalDataEvent event);
+
        /**
         * Event observer for new user registrations
         * <p>
@@ -48,6 +75,73 @@ public interface PizzaUserWebSessionController extends Serializable {
         */
        void afterUserLogin (final UserLoggedInEvent event);
 
+       /**
+        * All users
+        * <p>
+        * @return A list of all public user profiles
+        */
+       List<User> allUsers ();
+
+       /**
+        * All public user profiles
+        * <p>
+        * @return A list of all public user profiles
+        */
+       List<User> allVisibleUsers ();
+
+       /**
+        * Checks whether users are registered
+        * <p>
+        * @return Whether users are registered
+        */
+       boolean hasUsers ();
+
+       /**
+        * Checks whether the given contact is a user
+        * <p>
+        * @param contact Contact to check
+        * <p>
+        * @return Whether the contact is a user
+        */
+       boolean isContactFound (final Contact contact);
+
+       /**
+        * Checks whether a public user account is registered. This means that at
+        * least one user profile has its flag "public user profile" enabled.
+        * <p>
+        * @return Whether at least one user has a public profile
+        */
+       boolean isVisibleUserFound ();
+
+       /**
+        * Checks whether given user instance's name is used
+        * <p>
+        * @param user User instance's name to check
+        * <p>
+        * @return Whether it is already used
+        */
+       boolean isUserNameRegistered (final User user);
+
+       /**
+        * 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.
+        * <p>
+        * @param userId User id
+        * <p>
+        * @return User instance
+        * <p>
+        * @throws UserNotFoundException If the user is not found
+        */
+       User lookupUserById (final Long userId) throws UserNotFoundException;
+
+       /**
+        * Returns a list of all selectable contacts for user creation. Contacts
+        * from already existing users are excluded in this list.
+        * <p>
+        * @return A list of all selectable contacts
+        */
+       List<Contact> selectableContacts ();
+
        /**
         * Creates an instance from all properties
         * <p>
index 1c2b214f189d1e749b9c55a9af0c3d3a55afdd04..a139d35f9eff32242abf2ae3766991c918e0f9d1 100644 (file)
@@ -16,7 +16,7 @@
                </ui:define>
 
                <ui:define name="content">
-                       <h:dataTable id="table_list_contacts" var="contact" value="#{adminContactController.allContacts()}" styleClass="table_big" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_CONTACT}" rendered="#{adminContactController.hasContacts()}">
+                       <h:dataTable id="table_list_contacts" var="contact" value="#{contactController.allContacts()}" styleClass="table_big" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_CONTACT}" rendered="#{contactController.hasContacts()}">
                                <h:column>
                                        <f:facet name="header">#{msg.ADMIN_CONTACT_ID}</f:facet>
 
index 76ae94c3cda91adb6d3956e3ff779b2bb7670566..093521ff2b3eb67f9a98984a8714afaf11655ca4 100644 (file)
@@ -16,7 +16,7 @@
                </ui:define>
 
                <ui:define name="content">
-                       <h:dataTable id="table_list_users" var="user" value="#{adminUserController.allUsers()}" styleClass="table_big" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USERS}" rendered="#{adminUserController.hasUsers()}">
+                       <h:dataTable id="table_list_users" var="user" value="#{userController.allUsers()}" styleClass="table_big" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USERS}" rendered="#{userController.hasUsers()}">
                                <h:column>
                                        <f:facet name="header">#{msg.ADMIN_USER_ID}</f:facet>