#1 - Fix: Update Privacies

route-master · Jul 18, 2023 · 4300e8e · 4300e8e
1 parent 1b27ba5
commit 4300e8e
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 49 deletions.
diff --git a/src/main/java/org/routemaster/api/auth/domain/user/info/privacy/impl/data/Privacy.java b/src/main/java/org/routemaster/api/auth/domain/user/info/privacy/impl/data/Privacy.java
@@ -20,7 +20,6 @@
 @Builder
 @Getter
 @ToString
-@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
 public class Privacy {
 
     @Id

diff --git a/src/main/java/org/routemaster/api/auth/domain/user/info/privacy/impl/data/PrivacyGroup.java b/src/main/java/org/routemaster/api/auth/domain/user/info/privacy/impl/data/PrivacyGroup.java
@@ -21,7 +21,6 @@
 @Builder
 @Getter
 @ToString
-@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
 public class PrivacyGroup {
 
     @Id

diff --git a/src/main/java/org/routemaster/api/auth/domain/user/info/privacy/impl/data/UserPrivacy.java b/src/main/java/org/routemaster/api/auth/domain/user/info/privacy/impl/data/UserPrivacy.java
@@ -19,7 +19,6 @@
 @Builder
 @Getter
 @ToString
-@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
 public class UserPrivacy {
 
     @Id

diff --git a/...routemaster/api/auth/domain/user/info/privacy/impl/persistence/UserPrivacyRepository.java b/...routemaster/api/auth/domain/user/info/privacy/impl/persistence/UserPrivacyRepository.java
@@ -11,4 +11,5 @@ public interface UserPrivacyRepository extends MongoRepository<UserPrivacy, Stri
     Optional<UserPrivacy> findByBaseUserIdAndPrivacyGroupId(String baseUserId, String privacyGroupId);
     List<UserPrivacy> findAllByBaseUserId(String baseUserId);
     Boolean existsAllById(Iterable<String> ids);
+    void deleteAllByBaseUserId(String baseUserId);
 }
diff --git a/...va/org/routemaster/api/auth/domain/user/info/privacy/impl/service/UserPrivacyService.java b/...va/org/routemaster/api/auth/domain/user/info/privacy/impl/service/UserPrivacyService.java
@@ -12,4 +12,5 @@ public interface UserPrivacyService {
     List<UserPrivacy> saveAll(Iterable<UserPrivacy> userPrivacies);
     void delete(String id);
     void deleteAll(Iterable<String> ids);
+    void deleteAllByBaseUserId(String baseUserId);
 }
diff --git a/...master/api/auth/domain/user/info/privacy/impl/service/impl/DefaultUserPrivacyService.java b/...master/api/auth/domain/user/info/privacy/impl/service/impl/DefaultUserPrivacyService.java
@@ -79,4 +79,9 @@ public void deleteAll(Iterable<String> ids) {
         }
         userPrivacyRepository.deleteAllById(ids);
     }
+
+    @Override
+    public void deleteAllByBaseUserId(String baseUserId) {
+        userPrivacyRepository.deleteAllByBaseUserId(baseUserId);
+    }
 }
diff --git a/...master/api/auth/domain/user/info/profile/impl/service/impl/DefaultUserProfileService.java b/...master/api/auth/domain/user/info/profile/impl/service/impl/DefaultUserProfileService.java
@@ -22,13 +22,13 @@ public class DefaultUserProfileService implements UserProfileService {
     private final ROEFactory roeFactory;
 
     @Override
-    public List<UserProfile> list(Iterable<String> ids) {
+    public List<UserProfile> list(List<String> ids) {
         return userProfileRepository.findAllById(ids);
     }
 
     @Override
-    public List<UserProfile> listByBaseUserId(Iterable<String> baseUserIds) {
-        return userProfileRepository.findAllByBaseUserId(baseUserIds);
+    public List<UserProfile> listByBaseUserId(List<String> baseUserIds) {
+        return userProfileRepository.findAllByBaseUserIdIn(baseUserIds);
     }
 
     @Override
@@ -70,13 +70,6 @@ public void delete(String id) {
 
     @Override
     public void deleteByBaseUserId(String baseUserId) {
-        if (!userProfileRepository.existsById(baseUserId)) {
-            throw roeFactory.get(
-                InfoErrorCode.ROE_111,
-                UserProfileErrorDescription.USER_PROFILE_NOT_FOUND,
-                HttpStatus.NOT_FOUND
-            );
-        }
         userProfileRepository.deleteByBaseUserId(baseUserId);
     }
 }
diff --git a/...java/org/routemaster/api/auth/endpoint/privacy/impl/controller/PrivacyRestController.java b/...java/org/routemaster/api/auth/endpoint/privacy/impl/controller/PrivacyRestController.java
@@ -39,18 +39,4 @@ public ResponseEntity<PrivacyGroupListResponse> list() {
         }
         return new ResponseEntity<>(response, HttpStatus.OK);
     }
-
-    @PostMapping("/all")
-    @PreAuthorize("permitAll()")
-    public ResponseEntity<List<Privacy>> saveAll(@RequestBody List<Privacy> privacies) {
-        List<Privacy> response = privacyService.saveAll(privacies);
-        return new ResponseEntity<>(response, HttpStatus.OK);
-    }
-
-    @PostMapping("/group")
-    @PreAuthorize("permitAll()")
-    public ResponseEntity<PrivacyGroup> saveGroup(@RequestBody PrivacyGroup privacyGroup) {
-        PrivacyGroup response = privacyGroupService.save(privacyGroup);
-        return new ResponseEntity<>(response, HttpStatus.OK);
-    }
 }
diff --git a/...master/api/auth/endpoint/user/info/privacy/impl/controller/UserPrivacyRestController.java b/...master/api/auth/endpoint/user/info/privacy/impl/controller/UserPrivacyRestController.java
@@ -1,5 +1,6 @@
 package org.routemaster.api.auth.endpoint.user.info.privacy.impl.controller;
 
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -22,6 +23,7 @@
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestAttribute;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -35,6 +37,7 @@ public class UserPrivacyRestController {
     private final UserPrivacyEndpointService userPrivacyEndpointService;
 
     @GetMapping("/me")
+    @SecurityRequirement(name = "Bearer Authentication")
     @PreAuthorize("hasRole('ROLE_USER')")
     public ResponseEntity<UserPrivacyListResponse> details(
         @RequestAttribute(UserJwtAuthenticationFilter.USER_PAYLOAD) UserJwtPayload payload) {
@@ -43,6 +46,7 @@ public ResponseEntity<UserPrivacyListResponse> details(
     }
 
     @PostMapping
+    @SecurityRequirement(name = "Bearer Authentication")
     @PreAuthorize("hasRole('ROLE_USER')")
     public ResponseEntity<UserPrivacySaveResponse> save(
         @RequestAttribute(UserJwtAuthenticationFilter.USER_PAYLOAD) UserJwtPayload payload,
@@ -51,28 +55,31 @@ public ResponseEntity<UserPrivacySaveResponse> save(
         return new ResponseEntity<>(response, HttpStatus.OK);
     }
 
-    @PostMapping("/list")
-    @PreAuthorize("hasRole('ROLE_USER')")
-    public ResponseEntity<UserPrivacySaveResponse> saveAll(
-        @RequestAttribute(UserJwtAuthenticationFilter.USER_PAYLOAD) UserJwtPayload payload,
-        @RequestBody UserPrivacySaveAllRequest request) {
-        UserPrivacySaveResponse response = userPrivacyEndpointService.saveAll(payload, request);
-        return new ResponseEntity<>(response, HttpStatus.OK);
-    }
+//    @PostMapping("/list")
+//    @SecurityRequirement(name = "Bearer Authentication")
+//    @PreAuthorize("hasRole('ROLE_USER')")
+//    public ResponseEntity<UserPrivacySaveResponse> saveAll(
+//        @RequestAttribute(UserJwtAuthenticationFilter.USER_PAYLOAD) UserJwtPayload payload,
+//        @RequestBody UserPrivacySaveAllRequest request) {
+//        UserPrivacySaveResponse response = userPrivacyEndpointService.saveAll(payload, request);
+//        return new ResponseEntity<>(response, HttpStatus.OK);
+//    }
 
-    @DeleteMapping("/{id}")
-    @PreAuthorize("hasRole('ROLE_USER')")
-    public ResponseEntity<UserPrivacyDeleteResponse> delete(@PathVariable String id,
-        @RequestAttribute(UserJwtAuthenticationFilter.USER_PAYLOAD) UserJwtPayload payload) {
-        UserPrivacyDeleteResponse response = userPrivacyEndpointService.delete(id, payload);
-        return new ResponseEntity<>(response, HttpStatus.OK);
-    }
+//    @DeleteMapping("/{id}")
+//    @SecurityRequirement(name = "Bearer Authentication")
+//    @PreAuthorize("hasRole('ROLE_USER')")
+//    public ResponseEntity<UserPrivacyDeleteResponse> delete(@PathVariable String id,
+//        @RequestAttribute(UserJwtAuthenticationFilter.USER_PAYLOAD) UserJwtPayload payload) {
+//        UserPrivacyDeleteResponse response = userPrivacyEndpointService.delete(id, payload);
+//        return new ResponseEntity<>(response, HttpStatus.OK);
+//    }
 
-    @DeleteMapping("/list")
-    @PreAuthorize("hasRole('ROLE_USER')")
-    public ResponseEntity<UserPrivacyDeleteResponse> deleteAll(@RequestParam List<String> ids,
-        @RequestAttribute(UserJwtAuthenticationFilter.USER_PAYLOAD) UserJwtPayload payload) {
-        UserPrivacyDeleteResponse response = userPrivacyEndpointService.deleteAll(ids, payload);
-        return new ResponseEntity<>(response, HttpStatus.OK);
-    }
+//    @DeleteMapping("/list")
+//    @SecurityRequirement(name = "Bearer Authentication")
+//    @PreAuthorize("hasRole('ROLE_USER')")
+//    public ResponseEntity<UserPrivacyDeleteResponse> deleteAll(@RequestParam List<String> ids,
+//        @RequestAttribute(UserJwtAuthenticationFilter.USER_PAYLOAD) UserJwtPayload payload) {
+//        UserPrivacyDeleteResponse response = userPrivacyEndpointService.deleteAll(ids, payload);
+//        return new ResponseEntity<>(response, HttpStatus.OK);
+//    }
 }