refactor code

FINTLabs · May 29, 2024 · 2c6dc95 · 2c6dc95
1 parent b701034
commit 2c6dc95
Showing 1 changed file with 10 additions and 13 deletions.
diff --git a/src/main/java/no/fintlabs/authorization/adminuser/AdminUserController.java b/src/main/java/no/fintlabs/authorization/adminuser/AdminUserController.java
@@ -1,6 +1,5 @@
 package no.fintlabs.authorization.adminuser;
 
-import lombok.extern.slf4j.Slf4j;
 import no.fintlabs.authorization.user.UserPermission;
 import no.fintlabs.authorization.user.UserPermissionDto;
 import no.fintlabs.authorization.user.UserPermissionRepository;
@@ -20,7 +19,6 @@
 
 @RestController
 @RequestMapping(INTERNAL_API + "/authorization/adminuser")
-@Slf4j
 public class AdminUserController {
 
     private final UserPermissionRepository userPermissionRepository;
@@ -56,7 +54,7 @@ public Mono<ResponseEntity<List<UserPermission>>> getUserPermissions(
     }
 
     @PostMapping("userpermissions")
-    public Mono<ResponseEntity<List<UserPermissionDto>>> setUserPermission(
+    public Mono<ResponseEntity<List<UserPermissionDto>>> setUserPermissions(
             @RequestBody List<UserPermissionDto> userPermissionDtos,
             @AuthenticationPrincipal Mono<Authentication> authenticationMono
     ) {
@@ -73,23 +71,15 @@ public Mono<ResponseEntity<List<UserPermissionDto>>> setUserPermission(
                                                 .getSourceApplicationIds());
                                         userPermissionRepository.save(userPermission);
 
-                                        return UserPermissionDto
-                                                .builder()
-                                                .objectIdentifier(userPermission.getObjectIdentifier())
-                                                .sourceApplicationIds(userPermission.getSourceApplicationIds())
-                                                .build();
+                                        return buildUserPermissionDto(userPermission);
                                     } else {
                                         UserPermission newUserPermission = UserPermission.builder()
                                                 .objectIdentifier(userPermissionDto.getObjectIdentifier())
                                                 .sourceApplicationIds(userPermissionDto.getSourceApplicationIds())
                                                 .build();
                                         userPermissionRepository.save(newUserPermission);
 
-                                        return UserPermissionDto
-                                                .builder()
-                                                .objectIdentifier(newUserPermission.getObjectIdentifier())
-                                                .sourceApplicationIds(newUserPermission.getSourceApplicationIds())
-                                                .build();
+                                        return buildUserPermissionDto(newUserPermission);
                                     }
                                 }).subscribeOn(Schedulers.boundedElastic()))
                                 .collectList()
@@ -100,6 +90,13 @@ public Mono<ResponseEntity<List<UserPermissionDto>>> setUserPermission(
                 });
     }
 
+    private UserPermissionDto buildUserPermissionDto(UserPermission userPermission) {
+        return UserPermissionDto
+                .builder()
+                .objectIdentifier(userPermission.getObjectIdentifier())
+                .sourceApplicationIds(userPermission.getSourceApplicationIds())
+                .build();
+    }
 
     private Mono<Boolean> isAdmin(Mono<Authentication> authenticationMono) {
         return authenticationMono