Merge branch 'feature/GAP-1850-spadmin' of github.com:cabinetoffice/g…

…ap-user-service into feature/GAP-1850-spadmin

src/main/java/gov/cabinetofice/gapuserservice/dto/ChangeDepartmentPageDto.java

@@ -0,0 +1,14 @@
+package gov.cabinetofice.gapuserservice.dto;
+
+import gov.cabinetofice.gapuserservice.model.User;
+import lombok.Builder;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@Builder
+public class ChangeDepartmentPageDto {
+    private User user;
+    private List<DepartmentDto> departments;
+}

src/main/java/gov/cabinetofice/gapuserservice/security/WebSecurityConfig.java

@@ -51,10 +51,7 @@ public WebSecurityCustomizer webSecurityCustomizer() {
                 "/redirect-after-cola-login",
                 "/error/**",
                 "/.well-known/jwks.json",
-                "/logout",
-                "/super-admin-dashboard",
-                "/user/**",
-                "/user/**/department"
+                "/logout"
                 );
     }
 

src/main/java/gov/cabinetofice/gapuserservice/web/UserController.java

@@ -1,6 +1,9 @@
 package gov.cabinetofice.gapuserservice.web;
 
+import gov.cabinetofice.gapuserservice.dto.ChangeDepartmentPageDto;
+import gov.cabinetofice.gapuserservice.dto.DepartmentDto;
 import gov.cabinetofice.gapuserservice.model.User;
+import gov.cabinetofice.gapuserservice.service.DepartmentService;
 import gov.cabinetofice.gapuserservice.service.user.OneLoginUserService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -11,13 +14,16 @@
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+
 
 @RequiredArgsConstructor
 @Controller
 @ConditionalOnProperty(value = "feature.onelogin.enabled", havingValue = "true")
 public class UserController {
 
     private final OneLoginUserService oneLoginUserService;
+    private final DepartmentService departmentService;
 
 
     @GetMapping("/user/{id}")
@@ -32,4 +38,14 @@ public ResponseEntity<User> updateDepartment(@PathVariable("id") Integer id,
         return ResponseEntity.ok(user);
     }
 
+    @GetMapping("/page/user/{userId}/change-department")
+    public ResponseEntity<ChangeDepartmentPageDto> getChangeDepartmentPage(@PathVariable("userId") Integer userId) {
+        final User user = oneLoginUserService.getUserById(userId);
+        final List<DepartmentDto> departments = departmentService.getAllDepartments();
+        return ResponseEntity.ok(ChangeDepartmentPageDto.builder()
+                .departments(departments)
+                .user(user)
+                .build());
+    }
+
 }