From 76234750794a90f9bb56936169d3978a4537e21b 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, 11 Dec 2023 14:09:45 +0900 Subject: [PATCH 1/4] =?UTF-8?q?fix=20:=20=EB=B0=98=EB=B3=B5=EB=AF=B8?= =?UTF-8?q?=EC=85=98=20=ED=8C=80=EB=8B=B9=202=EA=B0=9C=EA=B9=8C=EC=A7=80?= =?UTF-8?q?=20=EC=83=9D=EC=84=B1=20=EA=B0=80=EB=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mission/domain/repository/MissionCustomRepositoryImpl.java | 2 +- 1 file changed, 1 insertion(+), 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 bdb8a444..935d59c4 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 @@ -148,7 +148,7 @@ public boolean findRepeatMissionsByTeamId(Long teamId) { mission.team.teamId.eq(teamId), mission.type.eq(MissionType.REPEAT), mission.status.eq(MissionStatus.ONGOING) - ).fetchCount() > 2; + ).fetchCount() < 2; } @Override From ff4ed43a1dd420869484a0c502e3b8197a8f4664 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, 11 Dec 2023 14:16:47 +0900 Subject: [PATCH 2/4] =?UTF-8?q?fix=20:=20=EC=86=8C=EB=AA=A8=EC=9E=84=20?= =?UTF-8?q?=ED=87=B4=EC=9E=A5=ED=95=9C=20=EC=82=AC=EB=9E=8C=20=EB=B6=88?= =?UTF-8?q?=EB=8D=98=EC=A7=80=EA=B8=B0=20=EB=AA=A9=EB=A1=9D=EC=97=90=20?= =?UTF-8?q?=EB=9C=A8=EC=A7=80=20=EC=95=8A=EA=B2=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/fire/domain/repository/FireCustomRepositoryImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/moing/backend/domain/fire/domain/repository/FireCustomRepositoryImpl.java b/src/main/java/com/moing/backend/domain/fire/domain/repository/FireCustomRepositoryImpl.java index b865a2a9..0383d08d 100644 --- a/src/main/java/com/moing/backend/domain/fire/domain/repository/FireCustomRepositoryImpl.java +++ b/src/main/java/com/moing/backend/domain/fire/domain/repository/FireCustomRepositoryImpl.java @@ -93,7 +93,7 @@ public Optional> getFireReceivers(Long teamId, Long mission teamMember.team.teamId.eq(teamId), teamMember.member.memberId.ne(memberId), teamMember.member.memberId.notIn(missionDonePeople), - teamMember.member.isDeleted.ne(Boolean.TRUE) + teamMember.isDeleted.ne(Boolean.TRUE) ) .fetch()); From 29968138f18167e926414ea5393a744107801440 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, 11 Dec 2023 20:52:05 +0900 Subject: [PATCH 3/4] =?UTF-8?q?fix=20:=20=EC=A7=84=ED=96=89=EC=A4=91=20?= =?UTF-8?q?=EB=AF=B8=EC=85=98=EC=97=90=20WAIT=20=EC=9D=B8=20=EB=B0=98?= =?UTF-8?q?=EB=B3=B5=EB=AF=B8=EC=85=98=20=EB=9C=A8=EC=A7=80=20=EC=95=8A?= =?UTF-8?q?=EA=B2=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mission/domain/repository/MissionCustomRepositoryImpl.java | 2 +- 1 file changed, 1 insertion(+), 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 935d59c4..28d5ba91 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 @@ -70,7 +70,7 @@ public Optional> findRepeatMissionByMemberId(Long m ) .where( mission.team.teamId.in(teams), - mission.status.eq(MissionStatus.ONGOING).or(mission.status.eq(MissionStatus.WAIT)), + mission.status.eq(MissionStatus.ONGOING), mission.type.eq(MissionType.REPEAT) ) From 8acb0a9884f12858ce4e0969b38f460208f9c3c4 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, 11 Dec 2023 20:52:15 +0900 Subject: [PATCH 4/4] =?UTF-8?q?fix=20:=20=EB=AF=B8=EC=85=98=20=EB=A6=AC?= =?UTF-8?q?=EB=A7=88=EC=9D=B8=EB=93=9C=20=EC=95=8C=EB=A6=BC=20=EB=B0=9C?= =?UTF-8?q?=EC=86=A1=20=EA=B5=AC=ED=98=84=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MissionArchiveCustomRepositoryImpl.java | 12 ++++++++++-- 1 file changed, 10 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 6b75c97d..0fe57dc1 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 @@ -349,12 +349,20 @@ public Optional> findPeopleRemainMission() { .join(teamMember.team, team) .join(team.missions, mission) .join(mission.missionStateList,missionState) - .where(missionState.isNull()) - .fetch()); + .on( + mission.eq(missionState.mission), + teamMember.member.eq(missionState.member), + mission.number.loe(missionState.count())) +// .on(missionState.isNull()) + .where( + mission.status.eq(MissionStatus.END).or(mission.status.eq(MissionStatus.SUCCESS)).not() +// missionState.isNull()) + ).fetch()); // .where( // // active 한 미션 필터링 // (((mission.status.eq(MissionStatus.ONGOING).or(mission.status.eq(MissionStatus.WAIT))).and(mission.type.eq(MissionType.ONCE))) // .or((mission.status.eq(MissionStatus.ONGOING)).and(mission.type.eq(MissionType.REPEAT)))), + // // 인증하지 않은값 // missionState.id.isNull()