From e045478698e196ff1700e98559e27854475c5ee5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=95=20=EC=8A=B9=20=EC=97=B0?= <53565255+seungyeonnnnnni@users.noreply.github.com> Date: Fri, 1 Dec 2023 04:03:32 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix=20:=20=EC=86=8C=EB=AA=A8=EC=9E=84=20?= =?UTF-8?q?=EB=A9=94=EC=9D=B8=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=9D=B8?= =?UTF-8?q?=EC=A6=9D=20=EC=82=AC=EC=A7=84=20=EC=A1=B0=ED=9A=8C=20=EB=A1=9C?= =?UTF-8?q?=EC=A7=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/MissionArchiveCustomRepositoryImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/moing/backend/domain/missionArchive/domain/repository/MissionArchiveCustomRepositoryImpl.java b/src/main/java/com/moing/backend/domain/missionArchive/domain/repository/MissionArchiveCustomRepositoryImpl.java index 82837681..7f8d8f95 100644 --- a/src/main/java/com/moing/backend/domain/missionArchive/domain/repository/MissionArchiveCustomRepositoryImpl.java +++ b/src/main/java/com/moing/backend/domain/missionArchive/domain/repository/MissionArchiveCustomRepositoryImpl.java @@ -227,8 +227,9 @@ public Optional> findTop5ArchivesByTeam(List List queryResults = queryFactory .select(missionArchive.mission.team.teamId, missionArchive.archive) .from(missionArchive) - .where(missionArchive.member.memberId.in(teamIds), - missionArchive.mission.way.eq(MissionWay.PHOTO)) + .where(missionArchive.mission.team.teamId.in(teamIds), + missionArchive.mission.way.eq(MissionWay.PHOTO), + missionArchive.status.eq(MissionArchiveStatus.COMPLETE)) .orderBy(missionArchive.createdDate.desc()) .limit(14) .fetch(); From 7ac6681f275101461b613682cf09018f39b96242 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=95=20=EC=8A=B9=20=EC=97=B0?= <53565255+seungyeonnnnnni@users.noreply.github.com> Date: Mon, 4 Dec 2023 21:44:15 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix=20:=20=EB=AF=B8=EC=85=98=20=EB=AA=A8?= =?UTF-8?q?=EC=95=84=EB=B3=B4=EA=B8=B0=20=EC=A0=95=EB=A0=AC=20=EA=B8=B0?= =?UTF-8?q?=EC=A4=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mission/domain/repository/MissionCustomRepositoryImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/moing/backend/domain/mission/domain/repository/MissionCustomRepositoryImpl.java b/src/main/java/com/moing/backend/domain/mission/domain/repository/MissionCustomRepositoryImpl.java index 1a6987e7..f8834e6f 100644 --- a/src/main/java/com/moing/backend/domain/mission/domain/repository/MissionCustomRepositoryImpl.java +++ b/src/main/java/com/moing/backend/domain/mission/domain/repository/MissionCustomRepositoryImpl.java @@ -64,6 +64,7 @@ public Optional> findRepeatMissionByMemberId(Long m mission.type.eq(MissionType.REPEAT) ) .groupBy(mission.id) + .orderBy(missionArchive.count().desc()) .fetch()); } @@ -122,7 +123,7 @@ public Optional> findSingleMissionByMemberId(Long m mission.type.eq(MissionType.ONCE), missionState.id.isNull() ) - .orderBy(mission.dueTo.desc()) + .orderBy(mission.dueTo.asc()) .fetch()); }