From 6470a020dc9a44fbcd36aae13c93fa3091106e3a 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: Wed, 20 Dec 2023 22:45:33 +0900 Subject: [PATCH] =?UTF-8?q?fix=20:=20=EB=A6=AC=EB=A7=88=EC=9D=B8=EB=93=9C?= =?UTF-8?q?=20=EC=95=8C=EB=A6=BC=20team.isDeleted.ne(true)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/MissionCustomRepositoryImpl.java | 3 ++- .../MissionArchiveCustomRepositoryImpl.java | 15 ++------------- 2 files changed, 4 insertions(+), 14 deletions(-) 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 0e2db2b2..a585c651 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 @@ -117,7 +117,8 @@ public Optional> findRepeatMissionPeopleByStatus(MissionStatus miss .from(teamMember) .join(mission) .on(teamMember.team.eq(mission.team), - teamMember.member.isDeleted.ne(true)) + teamMember.member.isDeleted.ne(true), + teamMember.team.isDeleted.ne(true)) .where( mission.status.eq(missionStatus), mission.type.eq(MissionType.REPEAT) 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 8d342bf2..f373f849 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 @@ -377,19 +377,12 @@ public Boolean findMyArchivesToday(Long memberId, Long missionId) { } -// .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)))), - private BooleanExpression createRepeatTypeConditionByArchive() { LocalDate now = LocalDate.now(); DayOfWeek firstDayOfWeek = DayOfWeek.MONDAY; LocalDate startOfWeek = now.with(TemporalAdjusters.previousOrSame(firstDayOfWeek)); LocalDate endOfWeek = startOfWeek.plusDays(6); - // MissionType.REPEAT 인 경우의 추가적인 날짜 범위 조건 -// BooleanExpression isRepeatType = missionArchive.mission.type.eq(MissionType.REPEAT); BooleanExpression dateInRange = missionArchive.createdDate.goe(startOfWeek.atStartOfDay()) .and(missionArchive.createdDate.loe(endOfWeek.atStartOfDay().plusDays(1).minusNanos(1))); @@ -403,11 +396,6 @@ private BooleanExpression createRepeatTypeConditionByState() { LocalDate startOfWeek = now.with(TemporalAdjusters.previousOrSame(firstDayOfWeek)); LocalDate endOfWeek = startOfWeek.plusDays(6); - // MissionType.REPEAT 인 경우의 추가적인 날짜 범위 조건 -// BooleanExpression isRepeatType = missionArchive.mission.type.eq(MissionType.REPEAT); -// BooleanExpression dateInRange = missionState.createdDate.goe(startOfWeek.atStartOfDay()) -// .and(missionState.createdDate.loe(endOfWeek.atStartOfDay().plusDays(1).minusNanos(1))); - BooleanExpression dateInRange = missionState.createdDate.goe(startOfWeek.atStartOfDay()) .and(missionState.createdDate.loe(endOfWeek.atStartOfDay().plusDays(1).minusNanos(1))); @@ -450,7 +438,8 @@ public Optional> findHavingRemainMissionsByQuerydsl() { ) .groupBy(teamMember.member,mission,mission.number) .having(missionArchive.count().lt(mission.number), - teamMember.member.isDeleted.ne(true)) + teamMember.member.isDeleted.ne(true), + teamMember.team.isDeleted.ne(true)) .fetch());