Merge pull request #123 from Mojacknong/feature_120/미션-인증-관련-이슈

Feature 120/미션 인증 관련 이슈
Mojacknong · Sep 14, 2024 · f376ec6 · f376ec6
2 parents 6d26535 + 42c1206
commit f376ec6
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 16 deletions.
diff --git a/.../java/com/modernfarmer/farmusspring/domain/farmclub/dto/res/GetMyFarmClubResponseDto.java b/.../java/com/modernfarmer/farmusspring/domain/farmclub/dto/res/GetMyFarmClubResponseDto.java
@@ -40,7 +40,8 @@ public static List<Step> createSteps(List<StepVo> stepVoList, List<GetMissionPos
             List<String> images = new ArrayList<>();
             for (GetMissionPostListVo mission: missionList) {
                 if (step.num() == mission.stepNum()) {
-                    images.add(mission.image());
+                    if (!mission.isReported())
+                        images.add(mission.image());
                     count++;
                 }
             }

diff --git a/...a/com/modernfarmer/farmusspring/domain/farmclub/repository/MissionPostRepositoryImpl.java b/...a/com/modernfarmer/farmusspring/domain/farmclub/repository/MissionPostRepositoryImpl.java
@@ -41,11 +41,12 @@ public List<GetMissionPostListVo> getMissionPostStepNumAndImage(Long userId, Lon
                 .select(Projections.constructor(
                         GetMissionPostListVo.class,
                         missionPost.stepNum,
-                        missionPost.image))
+                        missionPost.image,
+                        missionPost.id.in(reportMissionPostIds)))
                 .from(missionPost)
                 .join(missionPost.userFarmClub, userFarmClub)
                 .join(userFarmClub.farmClub, farmClub)
-                .where(farmClub.id.eq(farmClubId).and(missionPost.id.notIn(reportMissionPostIds)))
+                .where(farmClub.id.eq(farmClubId))
                 .fetch();
     }
 
@@ -58,10 +59,15 @@ public GetMissionPostCommentResponseDto getMissionPostComment(Long missionPostId
                 .fetch();
 
         List<MissionPostCommentVo> 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
@@ -81,11 +87,6 @@ public List<MissionPostVo> getMissionPostList(Long userId, Long farmClubId) {
                 .from(missionPostReport)
                 .where(missionPostReport.user.id.eq(userId))
                 .fetch();
-        List<Long> reportCommentIds = queryFactory
-                .select(missionPostCommentReport.missionPostComment.id)
-                .from(missionPostCommentReport)
-                .where(missionPostCommentReport.user.id.eq(userId))
-                .fetch();
 
         return queryFactory
                 .select(new QMissionPostVo(
@@ -96,8 +97,7 @@ public List<MissionPostVo> getMissionPostList(Long userId, Long farmClubId) {
                                 .where(missionPostLike.missionPost.eq(missionPost)),
                         JPAExpressions.select(missionPostComment.count())
                                 .from(missionPostComment)
-                                .where(missionPostComment.missionPost.eq(missionPost)
-                                        .and(missionPostComment.id.notIn(reportCommentIds))),
+                                .where(missionPostComment.missionPost.eq(missionPost)),
                         JPAExpressions.selectOne()
                                 .from(missionPostLike)
                                 .where(missionPostLike.missionPost.eq(missionPost)

diff --git a/src/main/java/com/modernfarmer/farmusspring/domain/farmclub/vo/GetMissionPostListVo.java b/src/main/java/com/modernfarmer/farmusspring/domain/farmclub/vo/GetMissionPostListVo.java
@@ -4,7 +4,8 @@
 
 public record GetMissionPostListVo(
         int stepNum,
-        String image
+        String image,
+        Boolean isReported
 ) {
     @QueryProjection
     public GetMissionPostListVo {

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
@@ -11,18 +11,20 @@ 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(),
                 user.getNickname(),
                 user.getProfileImage(),
                 missionPostComment.getCreatedDate().toString(),
                 missionPostComment.getComment(),
-                user.getId().equals(myId)
+                user.getId().equals(myId),
+                isReported
         );
     }
 }