fix: 신고 중복처리

Central-MakeUs · Jan 30, 2024 · 5196298 · 5196298
1 parent b695ca9
commit 5196298
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/Api/src/main/java/com/example/api/Popcorn/controller/PopcornController.java b/Api/src/main/java/com/example/api/Popcorn/controller/PopcornController.java
@@ -71,7 +71,7 @@ public List<PopcornReviewResponse> reviewResponseList(@PathVariable("popcornId")
 
     //TODO 팝콘작 리뷰
     @Operation(summary = "팝콘작 리뷰 신고하기", description = "팝콘작 리뷰 신고하기")
-    @GetMapping("/review/complain/{popcornUserId}")
+    @PostMapping("/review/complain/{popcornUserId}")
     public void reviewsFromPopcorn(@PathVariable("popcornUserId") Long popcornUserId)
     {
         postPopcornReviewComplainUseCase.execute(popcornUserId);

diff --git a/Domain/src/main/java/com/example/domains/block/adaptor/BlockAdaptor.java b/Domain/src/main/java/com/example/domains/block/adaptor/BlockAdaptor.java
@@ -17,8 +17,16 @@ public void save(Long userId,Long reportedUserId, Long reviewId,Long popcornRevi
     }
 
     private void validateUser(Long userId, Long reviewId,Long popcornReviewId) {
-        if(blockRepository.existsByUserIdAndScreeningReviewId(userId,reviewId)||blockRepository.existsByUserIdAndPopcornReviewId(userId,popcornReviewId)) {
-            throw DuplicateBlockRequest.EXCEPTION;
+        System.out.println(blockRepository.existsByUserIdAndPopcornReviewId(userId,popcornReviewId));;
+        if (reviewId == null) {
+            if(blockRepository.existsByUserIdAndPopcornReviewId(userId,popcornReviewId)) {
+                throw DuplicateBlockRequest.EXCEPTION;
+            }
+        } else if(popcornReviewId==null) {
+            if(blockRepository.existsByUserIdAndScreeningReviewId(userId,reviewId)) {
+                throw DuplicateBlockRequest.EXCEPTION;
+            }
         }
+
     }
 }