From 1dd988a188ae70af5cbc02ac004da2df9d682eff Mon Sep 17 00:00:00 2001 From: MinchoGreenT Date: Sat, 14 Sep 2024 01:14:07 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[fix]=20=EB=AF=B8=EC=85=98=20=EC=9D=B4?= =?UTF-8?q?=EB=AF=B8=EC=A7=80=20=EB=B6=88=EB=9F=AC=EC=98=A4=EB=8A=94=20?= =?UTF-8?q?=EB=A9=94=EC=84=9C=EB=93=9C=EC=97=90=20userId=20=ED=8C=8C?= =?UTF-8?q?=EB=9D=BC=EB=AF=B8=ED=84=B0=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/farmclub/repository/MissionPostRepositoryCustom.java | 2 +- .../farmusspring/domain/farmclub/service/FarmClubService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/modernfarmer/farmusspring/domain/farmclub/repository/MissionPostRepositoryCustom.java b/src/main/java/com/modernfarmer/farmusspring/domain/farmclub/repository/MissionPostRepositoryCustom.java index 3039964..a49e07c 100644 --- a/src/main/java/com/modernfarmer/farmusspring/domain/farmclub/repository/MissionPostRepositoryCustom.java +++ b/src/main/java/com/modernfarmer/farmusspring/domain/farmclub/repository/MissionPostRepositoryCustom.java @@ -11,7 +11,7 @@ public interface MissionPostRepositoryCustom { - List getMissionPostStepNumAndImage(Long farmClubId); + List getMissionPostStepNumAndImage(Long userId, Long farmClubId); GetMissionPostCommentResponseDto getMissionPostComment(Long missionPostId, Long userId); List getMissionPostList(Long userId, Long missionPostId); List getMissionPostHistory(Long missionPostId); diff --git a/src/main/java/com/modernfarmer/farmusspring/domain/farmclub/service/FarmClubService.java b/src/main/java/com/modernfarmer/farmusspring/domain/farmclub/service/FarmClubService.java index 84dcbf7..5195a83 100644 --- a/src/main/java/com/modernfarmer/farmusspring/domain/farmclub/service/FarmClubService.java +++ b/src/main/java/com/modernfarmer/farmusspring/domain/farmclub/service/FarmClubService.java @@ -132,7 +132,7 @@ public GetMyFarmClubResponseDto getMyFarmClub(Long farmClubId, Long userId) { List stepList = veggieInfoHelper.getStepList(veggieInfoId); String randomTip = getRandomTip(stepList, farmClubInfo.currentStep()); List missionList = - missionPostRepository.getMissionPostStepNumAndImage(farmClubId); + missionPostRepository.getMissionPostStepNumAndImage(userId, farmClubId); log.info("missionList: {}", missionList); From 16a6d0e86469071ed8b157ff36e0b15b493b07e5 Mon Sep 17 00:00:00 2001 From: MinchoGreenT Date: Sat, 14 Sep 2024 01:14:40 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[fix]=20=EB=82=B4=20=ED=8C=9C=ED=81=B4?= =?UTF-8?q?=EB=9F=BD=EC=9D=98=20=EC=8A=A4=ED=85=9D=20=EC=9D=B4=EB=AF=B8?= =?UTF-8?q?=EC=A7=80=EB=93=A4=20=EB=B0=8F=20=EB=AF=B8=EC=85=98=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=EC=9D=98=20=EB=8C=93=EA=B8=80=20=EC=88=98=EC=97=90=20?= =?UTF-8?q?=EC=8B=A0=EA=B3=A0=EB=A1=9C=EC=A7=81=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/MissionPostRepositoryImpl.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) 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 316b1f9..abadd02 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 @@ -29,7 +29,13 @@ public class MissionPostRepositoryImpl implements MissionPostRepositoryCustom { private final JPAQueryFactory queryFactory; @Override - public List getMissionPostStepNumAndImage(Long farmClubId) { + public List getMissionPostStepNumAndImage(Long userId, Long farmClubId) { + + List reportMissionPostIds = queryFactory + .select(missionPostReport.missionPost.id) + .from(missionPostReport) + .where(missionPostReport.user.id.eq(userId)) + .fetch(); return queryFactory .select(Projections.constructor( @@ -39,7 +45,7 @@ public List getMissionPostStepNumAndImage(Long farmClubId) .from(missionPost) .join(missionPost.userFarmClub, userFarmClub) .join(userFarmClub.farmClub, farmClub) - .where(farmClub.id.eq(farmClubId)) + .where(farmClub.id.eq(farmClubId).and(missionPost.id.notIn(reportMissionPostIds))) .fetch(); } @@ -75,6 +81,11 @@ public List getMissionPostList(Long userId, Long farmClubId) { .from(missionPostReport) .where(missionPostReport.user.id.eq(userId)) .fetch(); + List reportCommentIds = queryFactory + .select(missionPostCommentReport.missionPostComment.id) + .from(missionPostCommentReport) + .where(missionPostCommentReport.user.id.eq(userId)) + .fetch(); return queryFactory .select(new QMissionPostVo( @@ -85,7 +96,8 @@ public List getMissionPostList(Long userId, Long farmClubId) { .where(missionPostLike.missionPost.eq(missionPost)), JPAExpressions.select(missionPostComment.count()) .from(missionPostComment) - .where(missionPostComment.missionPost.eq(missionPost)), + .where(missionPostComment.missionPost.eq(missionPost) + .and(missionPostComment.id.notIn(reportCommentIds))), JPAExpressions.selectOne() .from(missionPostLike) .where(missionPostLike.missionPost.eq(missionPost)