Merge pull request #267 from DevKor-github/fix/review

Fix: 리뷰, 신고 오류 수정

Author: dlwls423

src/main/java/devkor/com/teamcback/domain/report/dto/response/GetUserReviewReportStatusRes.java

@@ -11,11 +11,13 @@ public class GetUserReviewReportStatusRes {
     private String userName;
     private boolean isReported;
     private List<GetReportedReviewRes> reviewList;
+    private List<String> reportReasons;
 
     public GetUserReviewReportStatusRes(User user, List<GetReportedReviewRes> reviewList) {
         this.userId = user.getUserId();
         this.userName = user.getUsername();
         this.isReported = !reviewList.isEmpty();
         this.reviewList = reviewList;
+        this.reportReasons = reviewList.stream().map(GetReportedReviewRes::getReasonCategory).toList();
     }
 }

src/main/java/devkor/com/teamcback/domain/report/repository/CustomReportRepositoryImpl.java

@@ -35,8 +35,7 @@ public List<Report> findUniqueReportsForUserReviewReportStatus(User user, Target
                                 .and(report.targetType.eq(type))
                                 .and(report.status.eq(status))
                 )
-                .groupBy(report.targetId, report.reasonCategory)
-                .where();
+                .groupBy(report.targetId, report.reasonCategory);
 
         return jpaQueryFactory
                 .selectFrom(report)

src/main/java/devkor/com/teamcback/domain/report/service/ReportService.java

@@ -61,7 +61,6 @@ public GetUserReviewReportStatusRes getUserReviewReportStatus(Long userId) {
         // 사용자 검색
         User user = findUser(userId);
 
-        // TODO: 하나만 조회하는 경우 수정
         // 신고 검색
         List<Report> reportList = reportRepository.findUniqueReportsForUserReviewReportStatus(user, TargetType.REVIEW, RESOLVED);
 

src/main/java/devkor/com/teamcback/domain/review/repository/ReviewRepository.java

@@ -10,7 +10,7 @@
 
 public interface ReviewRepository extends JpaRepository<Review, Long> {
 
-    List<Review> findAllByPlaceOrderByCreatedAtDesc(Place place);
+    List<Review> findAllByPlaceAndIsReportedOrderByCreatedAtDesc(Place place, boolean reported);
 
     /**
      * 특정 사용자가 특정 장소에 특정 기간 내 작성한 리뷰 존재 여부 확인

src/main/java/devkor/com/teamcback/domain/review/service/ReviewService.java

@@ -86,7 +86,7 @@ public GetReviewPlaceDetailRes getReviewPlaceDetail(Long placeId) {
         List<SearchPlaceReviewTagRes> reviewTagList = findPlaceReviewTagList(place);
 
         // 리뷰 최신순 조회
-        List<Review> reviewList = reviewRepository.findAllByPlaceOrderByCreatedAtDesc(place);
+        List<Review> reviewList = reviewRepository.findAllByPlaceAndIsReportedOrderByCreatedAtDesc(place, false);
 
         // 리뷰별 이미지 조회(썸네일)
         List<SearchPlaceReviewRes> reviewImageList = new ArrayList<>();