Merge pull request #126 from Modagbul/feat/mission-alarm

fix : 인증완료한 반복미션 보드
Modagbul · Dec 10, 2023 · 5edc09e · 5edc09e
2 parents 1632922 + 4768a20
commit 5edc09e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/.../java/com/moing/backend/domain/mission/domain/repository/MissionCustomRepositoryImpl.java b/.../java/com/moing/backend/domain/mission/domain/repository/MissionCustomRepositoryImpl.java
@@ -53,24 +53,23 @@ public Optional<List<GatherRepeatMissionRes>> findRepeatMissionByMemberId(Long m
                         mission.team.name,
                         mission.title,
                         mission.number.stringValue(),
-                        missionArchive.count().stringValue()
+                        missionState.count().stringValue()
 
                 ))
                 .from(mission)
-                        .leftJoin(missionArchive)
-                        .on(missionArchive.mission.eq(mission),
-                                missionArchive.member.memberId.eq(memberId)
+                        .leftJoin(missionState)
+                        .on(missionState.mission.eq(mission),
+                                missionState.member.memberId.eq(memberId)
                         )
                 .where(
                         mission.team.teamId.in(teams),
-                        mission.status.eq(MissionStatus.ONGOING),
+                        mission.status.eq(MissionStatus.ONGOING).or(mission.status.eq(MissionStatus.WAIT)),
                         mission.type.eq(MissionType.REPEAT)
 
                 )
                 .groupBy(mission.id,mission.number)
-                .having(missionArchive.count().lt(mission.number)) // HAVING 절을 사용하여 조건 적용
-
-                .orderBy(missionArchive.count().desc())
+                .having(missionState.count().lt(mission.number)) // HAVING 절을 사용하여 조건 적용
+                .orderBy(missionState.count().desc())
                 .fetch());
     }
 

diff --git a/src/main/java/com/moing/backend/domain/mission/domain/service/MissionQueryService.java b/src/main/java/com/moing/backend/domain/mission/domain/service/MissionQueryService.java
@@ -39,6 +39,7 @@ public Long findMissionsCountByTeam(Long teamId) {
 
     public List<GatherRepeatMissionRes> findAllRepeatMission(Long memberId) {
         List<Long> teams = teamGetService.getTeamIdByMemberId(memberId);
+        System.out.println(teams);
         return missionRepository.findRepeatMissionByMemberId(memberId,teams).orElseThrow(NotFoundMissionException::new);
     }
 

diff --git a/...g/backend/domain/missionArchive/domain/repository/MissionArchiveCustomRepositoryImpl.java b/...g/backend/domain/missionArchive/domain/repository/MissionArchiveCustomRepositoryImpl.java
@@ -199,20 +199,25 @@ public Optional<List<RepeatMissionBoardRes>> findRepeatMissionArchivesByMemberId
                 .select(Projections.constructor(RepeatMissionBoardRes.class,
                                 mission.id,
                                 mission.title,
-                                missionArchive.count.max().coalesce(0L).as("done"),
+//                                missionState.count().coalesce(0L).as("done"),
+                                missionState.count(),
                                 mission.number,
                                 mission.way.stringValue(),
                                 mission.status.stringValue()
                         ))
                 .from(mission)
-                .leftJoin(mission.missionArchiveList,missionArchive)
-                        .on( missionArchive.member.memberId.eq(memberId))
+                .leftJoin(missionState)
+                .on(missionState.mission.eq(mission),
+                        missionState.member.memberId.eq(memberId)
+                )
                 .where(
                         mission.team.teamId.eq(teamId),
                         mission.type.eq(MissionType.REPEAT),
                         mission.status.eq(MissionStatus.ONGOING).or(mission.status.eq(MissionStatus.WAIT))
                 )
-                .groupBy(mission)
+                .groupBy(mission.id,mission.number)
+                .having(missionState.count().lt(mission.number)) // HAVING 절을 사용하여 조건 적용
+                .orderBy(missionState.count().desc())
                 .fetch());
 
     }