#100 Edit user profiles

Author: tktong

admin/src/main/java/org/dcsc/admin/constants/ViewNames.java

@@ -8,7 +8,7 @@ public class ViewNames {
     public static final String ADMIN_EVENT_FORM = "admin/event";
     public static final String ADMIN_EVENT_EDIT = "admin/event-edit";
     public static final String ADMIN_PROFILE = "admin/profile";
-    public static final String ADMIN_PROFILE_CREATE = "admin/user-create";
+    public static final String ADMIN_USER_CREATE = "admin/user-create";
     public static final String ADMIN_PROFILE_EDIT = "admin/profile-edit";
     public static final String LOGIN = "admin/login";
 }

admin/src/main/java/org/dcsc/admin/controllers/AdminDirectoryController.java

@@ -2,21 +2,54 @@
 
 import org.dcsc.admin.constants.AttributeNames;
 import org.dcsc.admin.constants.ViewNames;
+import org.dcsc.admin.profile.ProfileCreateForm;
+import org.dcsc.admin.user.AdminUserService;
+import org.dcsc.core.activity.ActivityService;
 import org.dcsc.core.user.DcscUserService;
+import org.dcsc.core.user.permission.RolePermissionService;
+import org.dcsc.core.user.role.DcscRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 
 @Controller
 public class AdminDirectoryController {
+    @Autowired
+    private ActivityService activityService;
     @Autowired
     private DcscUserService userService;
+    @Autowired
+    private RolePermissionService rolePermissionService;
+    @Autowired
+    private AdminUserService adminUserService;
+    @Autowired
+    private DcscRoleService roleService;
 
     @RequestMapping("/admin/directory")
     public String directoryPage(Model model) {
         model.addAttribute(AttributeNames.USERS, userService.getAllUsers());
 
         return ViewNames.ADMIN_DIRECTORY;
     }
+
+    @RequestMapping(value = "/admin/user/create", method = RequestMethod.GET)
+    @PreAuthorize("hasPermission('user','create')")
+    public String userCreatePage(Model model) {
+        model.addAttribute("form", new ProfileCreateForm());
+        model.addAttribute("roles", roleService.getAllRoles());
+
+        return ViewNames.ADMIN_USER_CREATE;
+    }
+
+    @RequestMapping(value = "/admin/user/{user_id}/edit", method = RequestMethod.GET)
+    public String userEditPage(@PathVariable("user_id") long id, Model model) {
+        model.addAttribute("form", adminUserService.getAccountForm(id));
+        model.addAttribute("roles", roleService.getAllRoles());
+
+        return "admin/user-edit";
+    }
 }

admin/src/main/java/org/dcsc/admin/controllers/AdminProfileController.java

@@ -2,7 +2,6 @@
 
 import org.dcsc.admin.constants.AttributeNames;
 import org.dcsc.admin.constants.ViewNames;
-import org.dcsc.admin.profile.ProfileCreateForm;
 import org.dcsc.admin.profile.ProfileForm;
 import org.dcsc.core.activity.Activity;
 import org.dcsc.core.activity.ActivityService;
@@ -22,17 +21,18 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 
 import java.util.List;
+import java.util.Optional;
 
 @Controller
 public class AdminProfileController {
     @Autowired
     private ActivityService activityService;
     @Autowired
-    private DcscUserService dcscUserService;
+    private DcscUserService userService;
     @Autowired
     private RolePermissionService rolePermissionService;
 
-    @RequestMapping(value = "/admin/profile", method = RequestMethod.GET)
+    @RequestMapping(value = "/admin/user", method = RequestMethod.GET)
     public String profile(Authentication authentication, Model model) {
         DcscUserDetails userDetails = ((DcscUserDetails) authentication.getPrincipal());
         DcscUser user = userDetails.getUser();
@@ -46,17 +46,16 @@ public String profile(Authentication authentication, Model model) {
         return ViewNames.ADMIN_PROFILE;
     }
 
-    @RequestMapping(value = "/admin/profile/edit", method = RequestMethod.GET)
-    public String profileEdit(Model model) {
-        model.addAttribute("profileForm", new ProfileForm());
-
-        return ViewNames.ADMIN_PROFILE_EDIT;
-    }
-
     @RequestMapping(value = "/admin/user/{user_id}", method = RequestMethod.GET)
     @PreAuthorize("hasPermission('user','read')")
     public String profileView(@PathVariable("user_id") long id, Model model) {
-        DcscUser user = dcscUserService.getUserById(id).get();
+        Optional<DcscUser> dcscUser = userService.getUserById(id);
+
+        if (!dcscUser.isPresent()) {
+            return "redirect:/admin/user";
+        }
+
+        DcscUser user = dcscUser.get();
 
         List<Activity> list = activityService.getAllActivities(user.getId());
 
@@ -67,18 +66,13 @@ public String profileView(@PathVariable("user_id") long id, Model model) {
         return ViewNames.ADMIN_PROFILE;
     }
 
-    @RequestMapping(value = "/admin/user/create", method = RequestMethod.GET)
-    @PreAuthorize("hasPermission('user','create')")
-    public String userCreatePage(Model model) {
-        model.addAttribute("profileForm", new ProfileCreateForm());
-
-        return ViewNames.ADMIN_PROFILE_CREATE;
-    }
 
-    @RequestMapping(value = "/admin/user/{user_id}/edit", method = RequestMethod.GET)
-    public String userEditPage(@PathVariable("user_id") long id, Model model) {
+    @RequestMapping(value = "/admin/user/edit", method = RequestMethod.GET)
+    @PreAuthorize("hasPermission('user','update')")
+    public String profileEdit(Model model) {
+        model.addAttribute("profileForm", new ProfileForm());
 
-        return ViewNames.ADMIN_PROFILE_CREATE;
+        return ViewNames.ADMIN_PROFILE_EDIT;
     }
 
     @ExceptionHandler(TypeMismatchException.class)

admin/src/main/java/org/dcsc/admin/user/AdminUserService.java

@@ -4,26 +4,36 @@
 import org.dcsc.core.user.DcscUser;
 import org.dcsc.core.user.DcscUserService;
 import org.dcsc.core.user.profile.UserProfile;
+import org.dcsc.core.user.role.DcscRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Optional;
+
 @Service
 public class AdminUserService {
     @Autowired
     private DcscUserService userService;
+    @Autowired
+    private DcscRoleService dcscRoleService;
 
     public AccountForm getAccountForm(long id) {
-        DcscUser dcscUser = userService.getUserById(id).get();
-        UserProfile userProfile = dcscUser.getUserProfile();
         AccountForm form = new AccountForm();
 
-        form.setUsername(dcscUser.getUsername());
-        form.setIsActive(dcscUser.isEnabled());
-        form.setIsUnlocked(!dcscUser.isLocked());
+        Optional<DcscUser> userWrapper = userService.getUserById(id);
+
+        if (userWrapper.isPresent()) {
+            DcscUser user = userWrapper.get();
+            UserProfile userProfile = user.getUserProfile();
 
-        form.setName(userProfile.getName());
-        form.setTitle(userProfile.getTitle());
+            form.setUsername(user.getUsername());
+            form.setIsActive(user.isEnabled());
+            form.setIsUnlocked(!user.isLocked());
 
+            form.setName(userProfile.getName());
+            form.setRole(dcscRoleService.getRole(user.getRoleId()).getName());
+            form.setTitle(userProfile.getTitle());
+        }
 
         return form;
     }