Please cherry-pick:

[jjobs-war.git] / src / java / org / mxchange / jjobs / beans / user / JobsAdminUserWebRequestBean.java

diff --git a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java
index 80d1848d6d6eefa1f357c3c1c50e9081823a5e7d..1776e0e50a5d28add8bdad1de36bbd61d080ff3e 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java
@@ -34,11 +34,14 @@ import org.mxchange.jcoreee.utils.FacesUtils;
 import org.mxchange.jjobs.beans.BaseJobsController;
 import org.mxchange.jjobs.beans.contact.JobsAdminContactWebRequestController;
 import org.mxchange.jjobs.beans.contact.JobsContactWebSessionController;
-import org.mxchange.jjobs.beans.helper.JobsWebViewController;
+import org.mxchange.jjobs.beans.helper.JobsWebViewHelperController;
+import org.mxchange.jjobs.beans.localization.JobsLocalizationSessionController;
 import org.mxchange.jusercore.container.login.UserLoginContainer;
 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.delete.AdminDeletedUserEvent;
+import org.mxchange.jusercore.events.user.delete.AdminUserDeletedEvent;
 import org.mxchange.jusercore.events.user.linked.AdminLinkedUserEvent;
 import org.mxchange.jusercore.events.user.linked.AdminUserLinkedEvent;
 import org.mxchange.jusercore.events.user.locked.AdminLockedUserEvent;
@@ -95,10 +98,10 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
        private final AdminUserSessionBeanRemote adminUserBean;
 
        /**
-        * Admin helper instance
+        * Bean helper
         */
        @Inject
-       private JobsWebViewController beanHelper;
+       private JobsWebViewHelperController beanHelper;
 
        /**
         * Regular contact controller
@@ -106,6 +109,19 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
        @Inject
        private JobsContactWebSessionController contactController;
 
+       /**
+        * Event being fired when admin has deleted user
+        */
+       @Inject
+       @Any
+       private Event<AdminDeletedUserEvent> deleteUserEvent;
+
+       /**
+        * Localization controller
+        */
+       @Inject
+       private JobsLocalizationSessionController localizationController;
+
        /**
         * An event fired when the administrator has updated a new user
         */
@@ -124,6 +140,11 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
        @Inject
        private JobsUserWebSessionController userController;
 
+       /**
+        * Delete reason
+        */
+       private String userDeleteReason;
+
        /**
         * An event fired when the administrator has linked a user with existing
         * contact data.
@@ -310,10 +331,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
        }
 
        @Override
-       public void afterRegistrationEvent (@Observes final UserRegisteredEvent event) {
-               // Trace message
-               //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("UserWebBean:afterRegistration: event={0} - CALLED!", event)); //NOI18N
-
+       public void afterUserRegistrationEvent (@Observes final UserRegisteredEvent event) {
                // event should not be null
                if (null == event) {
                        // Throw NPE
@@ -341,6 +359,35 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
                //* NOISY-DEBUG: */ System.out.println("UserWebBean:afterRegistration: EXIT!"); //NOI18N
        }
 
+       @Override
+       public String deleteUserData (final User user) {
+               // Is the user instance valid and CONFIRMED?
+               if (null == user) {
+                       // Throw NPE
+                       throw new NullPointerException("user is null"); //NOI18N
+               } else if (user.getUserId() == null) {
+                       // Throw again
+                       throw new NullPointerException("user.userId is null"); //NOI18N
+               } else if (user.getUserId() < 1) {
+                       // Invalid id number
+                       throw new IllegalArgumentException(MessageFormat.format("user.userId={0} is not valid", user.getUserId())); //NOI18N
+               }
+
+               try {
+                       // All fine, delete it
+                       this.adminUserBean.deleteUser(user, this.getUserDeleteReason());
+               } catch (final UserNotFoundException ex) {
+                       // Should not happen, so throw again
+                       throw new FaceletException(ex);
+               }
+
+               // Fire event
+               this.deleteUserEvent.fire(new AdminUserDeletedEvent(user, this.getUserDeleteReason()));
+
+               // Redirect
+               return "admin_list_user"; //NOI18N
+       }
+
        @Override
        public String editUserData () {
                // Get user instance
@@ -372,7 +419,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
 
                        // Throw exception
                        throw new FaceletException("Not same password entered"); //NOI18N
-               } else if (this.userBean.ifUserNameExists(this.getUserName())) {
+               } else if ((!Objects.equals(user.getUserName(), this.getUserName())) && (this.userBean.ifUserNameExists(this.getUserName()))) {
                        // User name already exists
                        throw new FaceletException(new UserNameAlreadyRegisteredException(this.getUserName()));
                } else if (this.isSamePasswordEntered()) {
@@ -406,6 +453,16 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
                return "admin_list_user"; //NOI18N
        }
 
+       @Override
+       public String getUserDeleteReason () {
+               return this.userDeleteReason;
+       }
+
+       @Override
+       public void setUserDeleteReason (final String userDeleteReason) {
+               this.userDeleteReason = userDeleteReason;
+       }
+
        @Override
        public String getUserLockReason () {
                return this.userLockReason;