diff --git a/src/main/java/devkor/com/teamcback/domain/report/dto/response/GetUserReviewReportStatusRes.java b/src/main/java/devkor/com/teamcback/domain/report/dto/response/GetUserReviewReportStatusRes.java index 467deb47..04072949 100644 --- a/src/main/java/devkor/com/teamcback/domain/report/dto/response/GetUserReviewReportStatusRes.java +++ b/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 reviewList; + private List reportReasons; public GetUserReviewReportStatusRes(User user, List reviewList) { this.userId = user.getUserId(); this.userName = user.getUsername(); this.isReported = !reviewList.isEmpty(); this.reviewList = reviewList; + this.reportReasons = reviewList.stream().map(GetReportedReviewRes::getReasonCategory).toList(); } } diff --git a/src/main/java/devkor/com/teamcback/domain/report/repository/CustomReportRepositoryImpl.java b/src/main/java/devkor/com/teamcback/domain/report/repository/CustomReportRepositoryImpl.java index 3bd8af45..1f27dc56 100644 --- a/src/main/java/devkor/com/teamcback/domain/report/repository/CustomReportRepositoryImpl.java +++ b/src/main/java/devkor/com/teamcback/domain/report/repository/CustomReportRepositoryImpl.java @@ -35,8 +35,7 @@ public List 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) diff --git a/src/main/java/devkor/com/teamcback/domain/report/service/ReportService.java b/src/main/java/devkor/com/teamcback/domain/report/service/ReportService.java index 46950ffa..5d26e058 100644 --- a/src/main/java/devkor/com/teamcback/domain/report/service/ReportService.java +++ b/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 reportList = reportRepository.findUniqueReportsForUserReviewReportStatus(user, TargetType.REVIEW, RESOLVED); diff --git a/src/main/java/devkor/com/teamcback/domain/review/repository/ReviewRepository.java b/src/main/java/devkor/com/teamcback/domain/review/repository/ReviewRepository.java index eaeaaadd..c1172621 100644 --- a/src/main/java/devkor/com/teamcback/domain/review/repository/ReviewRepository.java +++ b/src/main/java/devkor/com/teamcback/domain/review/repository/ReviewRepository.java @@ -10,7 +10,7 @@ public interface ReviewRepository extends JpaRepository { - List findAllByPlaceOrderByCreatedAtDesc(Place place); + List findAllByPlaceAndIsReportedOrderByCreatedAtDesc(Place place, boolean reported); /** * 특정 사용자가 특정 장소에 특정 기간 내 작성한 리뷰 존재 여부 확인 diff --git a/src/main/java/devkor/com/teamcback/domain/review/service/ReviewService.java b/src/main/java/devkor/com/teamcback/domain/review/service/ReviewService.java index 753f6b91..19e5df9a 100644 --- a/src/main/java/devkor/com/teamcback/domain/review/service/ReviewService.java +++ b/src/main/java/devkor/com/teamcback/domain/review/service/ReviewService.java @@ -86,7 +86,7 @@ public GetReviewPlaceDetailRes getReviewPlaceDetail(Long placeId) { List reviewTagList = findPlaceReviewTagList(place); // 리뷰 최신순 조회 - List reviewList = reviewRepository.findAllByPlaceOrderByCreatedAtDesc(place); + List reviewList = reviewRepository.findAllByPlaceAndIsReportedOrderByCreatedAtDesc(place, false); // 리뷰별 이미지 조회(썸네일) List reviewImageList = new ArrayList<>();