Merge pull request #107 from Team-2m4t/refactor/#104

[refactor] 리뷰 신고 API 리팩토링
Team-2m4t · May 6, 2022 · bc169e5 · bc169e5
2 parents 1d441c6 + e92e4ee
commit bc169e5
Show file tree

Hide file tree

Showing 8 changed files with 68 additions and 107 deletions.
diff --git a/src/main/java/hyangyu/server/api/ReviewApi.java b/src/main/java/hyangyu/server/api/ReviewApi.java
@@ -4,16 +4,17 @@
 import hyangyu.server.dto.*;
 import hyangyu.server.dto.review.*;
 import hyangyu.server.dto.user.UserDto;
+import hyangyu.server.exception.CustomException;
 import hyangyu.server.service.*;
 import lombok.RequiredArgsConstructor;
-import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Optional;
 
+import static hyangyu.server.constants.ExceptionCode.EVENT_NOT_FOUND;
 import static hyangyu.server.constants.SuccessCode.*;
 
 @RestController
@@ -93,65 +94,21 @@ public ResponseEntity<ReviewResponse> deleteFestivalReview(@PathVariable Long fe
     }
 
     @PostMapping("/review/accuse/{event}/{reviewId}")
-    public ResponseEntity accuseReview(@PathVariable Long reviewId, @PathVariable String event) throws Exception {
-        //사용자 검색
-        UserDto user = userService.getMyUserWithAuthorities();
-        if (user == null) {
-            return new ResponseEntity(new ErrorDto(401, "유효하지 않은 사용자입니다."), HttpStatus.BAD_REQUEST);
-        }
-
+    public ResponseEntity<ReviewResponse> accuseReview(@PathVariable Long reviewId, @PathVariable String event) throws Exception {
         if (event.equals("display")) {
-            //리뷰 검색
-            Optional<DisplayReview> displayReview = displayReviewService.findReview(reviewId);
-            if (displayReview.isEmpty()) {
-                return new ResponseEntity(new ErrorDto(404, "신고할 리뷰가 없습니다."), HttpStatus.BAD_REQUEST);
-            } else {
-                String message = displayReviewService.accuseDisplayReview(displayReview.get(), user.getUserId());
-                if (message.equals("내가 쓴 리뷰는 신고할 수 없습니다.")) {
-                    return new ResponseEntity(new ErrorDto(404, message), HttpStatus.BAD_REQUEST);
-                }
-                if (message.equals("이미 신고한 리뷰입니다.")) {
-                    return new ResponseEntity(new ErrorDto(404, message), HttpStatus.BAD_REQUEST);
-                }
-                ResponseDto responseDto = new ResponseDto(200, message);
-                return new ResponseEntity(responseDto, HttpStatus.OK);
-            }
+            displayReviewService.accuseDisplayReview(reviewId);
 
+            return ReviewResponse.newResponse(REVIEW_WARN_SUCCESS);
         } else if (event.equals("fair")) {
-            //리뷰 검색
-            Optional<FairReview> fairReview = fairReviewService.findReview(reviewId);
-            if (fairReview.isEmpty()) {
-                return new ResponseEntity(new ErrorDto(404, "신고할 리뷰가 없습니다."), HttpStatus.BAD_REQUEST);
-            } else {
-                String message = fairReviewService.accuseFairReview(fairReview.get(), user.getUserId());
-                if (message.equals("내가 쓴 리뷰는 신고할 수 없습니다.")) {
-                    return new ResponseEntity(new ErrorDto(404, message), HttpStatus.BAD_REQUEST);
-                }
-                if (message.equals("이미 신고한 리뷰입니다.")) {
-                    return new ResponseEntity(new ErrorDto(404, message), HttpStatus.BAD_REQUEST);
-                }
-                ResponseDto responseDto = new ResponseDto(200, message);
-                return new ResponseEntity(responseDto, HttpStatus.OK);
-            }
+            fairReviewService.accuseFairReview(reviewId);
 
+            return ReviewResponse.newResponse(REVIEW_WARN_SUCCESS);
         } else if (event.equals("festival")) {
-            //리뷰 검색
-            Optional<FestivalReview> festivalReview = festivalReviewService.findReview(reviewId);
-            if (festivalReview.isEmpty()) {
-                return new ResponseEntity(new ErrorDto(404, "신고할 리뷰가 없습니다."), HttpStatus.BAD_REQUEST);
-            } else {
-                String message = festivalReviewService.accuseFestivalReview(festivalReview.get(), user.getUserId());
-                if (message.equals("내가 쓴 리뷰는 신고할 수 없습니다.")) {
-                    return new ResponseEntity(new ErrorDto(404, message), HttpStatus.BAD_REQUEST);
-                }
-                if (message.equals("이미 신고한 리뷰입니다.")) {
-                    return new ResponseEntity(new ErrorDto(404, message), HttpStatus.BAD_REQUEST);
-                }
-                ResponseDto responseDto = new ResponseDto(200, message);
-                return new ResponseEntity(responseDto, HttpStatus.OK);
-            }
+            festivalReviewService.accuseFestivalReview(reviewId);
+
+            return ReviewResponse.newResponse(REVIEW_WARN_SUCCESS);
         } else {
-            return new ResponseEntity(new ErrorDto(404, "이벤트명이 잘못되었습니다."), HttpStatus.BAD_REQUEST);
+            throw new CustomException(EVENT_NOT_FOUND);
         }
     }
 

diff --git a/src/main/java/hyangyu/server/constants/ExceptionCode.java b/src/main/java/hyangyu/server/constants/ExceptionCode.java
@@ -20,13 +20,17 @@ public enum ExceptionCode {
     UNSUPPORTED_TOKEN(UNAUTHORIZED, "지원되지 않는 JWT 토큰입니다."),
     WRONG_TOKEN(UNAUTHORIZED, "JWT 토큰이 잘못되었습니다."),
     UNKNOWN_ERROR(UNAUTHORIZED, "알 수 없는 요청 인증 에러! 헤더에 토큰을 넣어 보냈는지 다시 한 번 확인해보세요."),
-    ACCESS_DENIED(UNAUTHORIZED, "접근이 거절되었습니다.")
+    ACCESS_DENIED(UNAUTHORIZED, "접근이 거절되었습니다."),
 
-    /* 404 - 찾을 수 없는 리소스 */,
+    /* 403 - 허용되지 않은 접근 */
+    ACCUSE_DENIED(FORBIDDEN, "내가 쓴 리뷰는 신고할 수 없습니다."),
+
+    /* 404 - 찾을 수 없는 리소스 */
     USER_NOT_FOUND(NOT_FOUND, "유효하지 않은 사용자입니다."),
     DISPLAY_NOT_FOUND(NOT_FOUND, "잘못된 전시 id입니다."),
     FAIR_NOT_FOUND(NOT_FOUND, "잘못된 박람회 id입니다."),
     FESTIVAL_NOT_FOUND(NOT_FOUND, "잘못된 페스티벌 id입니다."),
+    EVENT_NOT_FOUND(NOT_FOUND, "잘못된 이벤트명입니다."),
     REVIEW_NOT_FOUND(NOT_FOUND, "작성한 리뷰가 없습니다."),
 
 

diff --git a/src/main/java/hyangyu/server/repository/DisplayWarnRepository.java b/src/main/java/hyangyu/server/repository/DisplayWarnRepository.java
@@ -6,13 +6,15 @@
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Optional;
+
 public interface DisplayWarnRepository extends JpaRepository<DisplayWarn, Long> {
 
     @Query("select w from DisplayWarn w where w.displayReview.reviewId=?1 and w.user.userId=?2")
-    public DisplayWarn getDisplayWarn(Long reviewId, Long userId);
+    Optional<DisplayWarn> getDisplayWarn(Long reviewId, Long userId);
 
     @Modifying
     @Transactional
     @Query("delete from DisplayWarn w where w.displayReview.reviewId=?1")
-    public void deleteDisplayWarns(Long reviewId);
+    void deleteDisplayWarns(Long reviewId);
 }
diff --git a/src/main/java/hyangyu/server/repository/FairWarnRepository.java b/src/main/java/hyangyu/server/repository/FairWarnRepository.java
@@ -6,13 +6,15 @@
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Optional;
+
 public interface FairWarnRepository extends JpaRepository<FairWarn, Long> {
 
     @Query("select w from FairWarn w where w.fairReview.reviewId=?1 and w.user.userId=?2")
-    public FairWarn getFairWarn(Long reviewId, Long userId);
+    Optional<FairWarn> getFairWarn(Long reviewId, Long userId);
 
     @Modifying
     @Transactional
     @Query("delete from FairWarn w where w.fairReview.reviewId=?1")
-    public void deleteFairWarns(Long reviewId);
+    void deleteFairWarns(Long reviewId);
 }
diff --git a/src/main/java/hyangyu/server/repository/FestivalWarnRepository.java b/src/main/java/hyangyu/server/repository/FestivalWarnRepository.java
@@ -6,13 +6,15 @@
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Optional;
+
 public interface FestivalWarnRepository extends JpaRepository<FestivalWarn, Long> {
 
     @Query("select w from FestivalWarn w where w.festivalReview.reviewId=?1 and w.user.userId=?2")
-    public FestivalWarn getFestivalWarn(Long reviewId, Long userId);
+    Optional<FestivalWarn> getFestivalWarn(Long reviewId, Long userId);
 
     @Modifying
     @Transactional
     @Query("delete from FestivalWarn w where w.festivalReview.reviewId=?1")
-    public void deleteFestivalWarns(Long reviewId);
+    void deleteFestivalWarns(Long reviewId);
 }
diff --git a/src/main/java/hyangyu/server/service/DisplayReviewService.java b/src/main/java/hyangyu/server/service/DisplayReviewService.java
@@ -84,32 +84,30 @@ public void deleteDisplayReview(Long displayId) {
         displayReview.ifPresent(displayReviewRepository::delete);
     }
 
-    public Optional<DisplayReview> findReview(Long reviewId) {
-        return displayReviewRepository.findById(reviewId);
-    }
+    public void accuseDisplayReview(Long reviewId) {
+        User user = getUser();
+
+        DisplayReview displayReview = displayReviewRepository.findById(reviewId)
+                .orElseThrow(() -> new CustomException(REVIEW_NOT_FOUND));
 
-    public String accuseDisplayReview(DisplayReview displayReview, Long userId) {
-        Optional<User> user = userRepository.findById(userId);
-        if (userId.equals(displayReview.getUser().getUserId())) {
-            return "내가 쓴 리뷰는 신고할 수 없습니다.";
+        if (user.equals(displayReview.getUser())) {
+            throw new CustomException(ACCUSE_DENIED);
         }
 
-        Optional<DisplayWarn> displayWarn = Optional.ofNullable(displayWarnRepository.getDisplayWarn(displayReview.getReviewId(), userId));
-        if (displayWarn.isEmpty() && user.isPresent()) {
-            DisplayWarn warn = DisplayWarn.createDisplayWarn(displayReview, user.get());
+        Optional<DisplayWarn> displayWarn = displayWarnRepository.getDisplayWarn(reviewId, user.getUserId());
+        if (displayWarn.isEmpty()) {
+            DisplayWarn warn = DisplayWarn.createDisplayWarn(displayReview, user);
             displayWarnRepository.save(warn);
 
             displayReview.increaseWarn();
             if (displayReview.getWarn() == 3) {
                 displayWarnRepository.deleteDisplayWarns(displayReview.getReviewId());
                 displayReviewRepository.delete(displayReview);
-                return "신고 3번이 누적되어 자동 삭제되었습니다.";
             }
-        } else if (displayWarn.isPresent()) {
-            return "이미 신고한 리뷰입니다.";
         }
-
-        return "신고가 완료되었습니다.";
+        if (displayWarn.isPresent()) {
+            throw new CustomException(ALREADY_WARN_REVIEW);
+        }
     }
 
     public List<ReviewDto> getDisplayReviews(Long displayId) {

diff --git a/src/main/java/hyangyu/server/service/FairReviewService.java b/src/main/java/hyangyu/server/service/FairReviewService.java
@@ -81,32 +81,30 @@ public void deleteFairReview(Long fairId) {
         fairReview.ifPresent(fairReviewRepository::delete);
     }
 
-    public Optional<FairReview> findReview(Long reviewId) {
-        return fairReviewRepository.findById(reviewId);
-    }
+    public void accuseFairReview(Long reviewId) {
+        User user = getUser();
+
+        FairReview fairReview = fairReviewRepository.findById(reviewId)
+                .orElseThrow(() -> new CustomException(REVIEW_NOT_FOUND));
 
-    public String accuseFairReview(FairReview fairReview, Long userId) {
-        Optional<User> user = userRepository.findById(userId);
-        if (userId.equals(fairReview.getUser().getUserId())) {
-            return "내가 쓴 리뷰는 신고할 수 없습니다.";
+        if (user.equals(fairReview.getUser())) {
+            throw new CustomException(ACCUSE_DENIED);
         }
 
-        Optional<FairWarn> fairWarn = Optional.ofNullable(fairWarnRepository.getFairWarn(fairReview.getReviewId(), userId));
-        if (fairWarn.isEmpty() && user.isPresent()) {
-            FairWarn warn = FairWarn.createFairWarn(fairReview, user.get());
+        Optional<FairWarn> fairWarn = fairWarnRepository.getFairWarn(reviewId, user.getUserId());
+        if (fairWarn.isEmpty()) {
+            FairWarn warn = FairWarn.createFairWarn(fairReview, user);
             fairWarnRepository.save(warn);
 
             fairReview.increaseWarn();
             if (fairReview.getWarn() == 3) {
                 fairWarnRepository.deleteFairWarns(fairReview.getReviewId());
                 fairReviewRepository.delete(fairReview);
-                return "신고 3번이 누적되어 자동 삭제되었습니다.";
             }
-        } else if (fairWarn.isPresent()) {
-            return "이미 신고한 리뷰입니다.";
         }
-
-        return "신고가 완료되었습니다.";
+        if (fairWarn.isPresent()) {
+            throw new CustomException(ALREADY_WARN_REVIEW);
+        }
     }
 
     public List<MyReviewDto> getMyFairReviews(Long userId) {

diff --git a/src/main/java/hyangyu/server/service/FestivalReviewService.java b/src/main/java/hyangyu/server/service/FestivalReviewService.java
@@ -81,32 +81,30 @@ public void deleteFestivalReview(Long festivalId) {
         festivalReview.ifPresent(festivalReviewRepository::delete);
     }
 
-    public Optional<FestivalReview> findReview(Long reviewId) {
-        return festivalReviewRepository.findById(reviewId);
-    }
+    public void accuseFestivalReview(Long reviewId) {
+        User user = getUser();
+
+        FestivalReview festivalReview = festivalReviewRepository.findById(reviewId)
+                .orElseThrow(() -> new CustomException(REVIEW_NOT_FOUND));
 
-    public String accuseFestivalReview(FestivalReview festivalReview, Long userId) {
-        Optional<User> user = userRepository.findById(userId);
-        if (userId.equals(festivalReview.getUser().getUserId())) {
-            return "내가 쓴 리뷰는 신고할 수 없습니다.";
+        if (user.equals(festivalReview.getUser())) {
+            throw new CustomException(ACCUSE_DENIED);
         }
 
-        Optional<FestivalWarn> festivalWarn = Optional.ofNullable(festivalWarnRepository.getFestivalWarn(festivalReview.getReviewId(), userId));
-        if (festivalWarn.isEmpty() && user.isPresent()) {
-            FestivalWarn warn = FestivalWarn.createFestivalWarn(festivalReview, user.get());
+        Optional<FestivalWarn> festivalWarn = festivalWarnRepository.getFestivalWarn(reviewId, user.getUserId());
+        if (festivalWarn.isEmpty()) {
+            FestivalWarn warn = FestivalWarn.createFestivalWarn(festivalReview, user);
             festivalWarnRepository.save(warn);
 
             festivalReview.increaseWarn();
             if (festivalReview.getWarn() == 3) {
                 festivalWarnRepository.deleteFestivalWarns(festivalReview.getReviewId());
                 festivalReviewRepository.delete(festivalReview);
-                return "신고 3번이 누적되어 자동 삭제되었습니다.";
             }
-        } else if (festivalWarn.isPresent()) {
-            return "이미 신고한 리뷰입니다.";
         }
-
-        return "신고가 완료되었습니다.";
+        if (festivalWarn.isPresent()) {
+            throw new CustomException(ALREADY_WARN_REVIEW);
+        }
     }
 
     public List<ReviewDto> getFestivalReviews(Long festivalId) {