diff --git a/src/main/java/com/modernfarmer/farmusspring/domain/farmclub/repository/MissionPostRepositoryImpl.java b/src/main/java/com/modernfarmer/farmusspring/domain/farmclub/repository/MissionPostRepositoryImpl.java index 65aa9a3..5207e67 100644 --- a/src/main/java/com/modernfarmer/farmusspring/domain/farmclub/repository/MissionPostRepositoryImpl.java +++ b/src/main/java/com/modernfarmer/farmusspring/domain/farmclub/repository/MissionPostRepositoryImpl.java @@ -58,10 +58,15 @@ public GetMissionPostCommentResponseDto getMissionPostComment(Long missionPostId .fetch(); List comments = queryFactory - .select(new QMissionPostCommentVo(missionPostComment, user, Expressions.constant(userId))) + .select(new QMissionPostCommentVo( + missionPostComment, + user, + Expressions.constant(userId), + missionPostComment.id.in(reportCommentIds) + )) .from(missionPostComment) .join(missionPostComment.missionPost, missionPost) - .where(missionPost.id.eq(missionPostId).and(missionPostComment.id.notIn(reportCommentIds))) + .where(missionPost.id.eq(missionPostId)) .fetch(); Boolean isMyPost = queryFactory diff --git a/src/main/java/com/modernfarmer/farmusspring/domain/farmclub/vo/MissionPostCommentVo.java b/src/main/java/com/modernfarmer/farmusspring/domain/farmclub/vo/MissionPostCommentVo.java index 524ab2e..96b0ac2 100644 --- a/src/main/java/com/modernfarmer/farmusspring/domain/farmclub/vo/MissionPostCommentVo.java +++ b/src/main/java/com/modernfarmer/farmusspring/domain/farmclub/vo/MissionPostCommentVo.java @@ -11,10 +11,11 @@ public record MissionPostCommentVo( String profileImage, String date, String content, - Boolean isMyComment + Boolean isMyComment, + Boolean isReported ) { @QueryProjection - public MissionPostCommentVo(MissionPostComment missionPostComment, User user, Long myId) + public MissionPostCommentVo(MissionPostComment missionPostComment, User user, Long myId, Boolean isReported) { this( missionPostComment.getId(), @@ -22,7 +23,8 @@ public MissionPostCommentVo(MissionPostComment missionPostComment, User user, Lo user.getProfileImage(), missionPostComment.getCreatedDate().toString(), missionPostComment.getComment(), - user.getId().equals(myId) + user.getId().equals(myId), + isReported ); } }