Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ public GetUserReviewReportStatusRes getUserReviewReportStatus(Long userId) {
// 사용자 검색
User user = findUser(userId);

// TODO: 하나만 조회하는 경우 수정
// 신고 검색
List<Report> reportList = reportRepository.findUniqueReportsForUserReviewReportStatus(user, TargetType.REVIEW, RESOLVED);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

public interface ReviewRepository extends JpaRepository<Review, Long> {

List<Review> findAllByPlaceOrderByCreatedAtDesc(Place place);
List<Review> findAllByPlaceAndIsReportedOrderByCreatedAtDesc(Place place, boolean reported);

/**
* 특정 사용자가 특정 장소에 특정 기간 내 작성한 리뷰 존재 여부 확인
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<>();
Expand Down