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

Feat/mission alarm
Modagbul · Dec 14, 2023 · 79f3b03 · 79f3b03
2 parents 2e4eb51 + 2119f91
commit 79f3b03
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 9 deletions.
diff --git a/...n/java/com/moing/backend/domain/missionArchive/application/dto/res/MissionArchiveRes.java b/...n/java/com/moing/backend/domain/missionArchive/application/dto/res/MissionArchiveRes.java
@@ -19,5 +19,9 @@ public class MissionArchiveRes {
     private String heartStatus;
     private Long hearts;
 
+    public void updateCount(Long count) {
+        this.count = count;
+    }
+
 
 }
diff --git a/.../moing/backend/domain/missionArchive/application/service/MissionArchiveCreateUseCase.java b/.../moing/backend/domain/missionArchive/application/service/MissionArchiveCreateUseCase.java
@@ -62,6 +62,8 @@ public MissionArchiveRes createArchive(String userSocialId, Long missionId, Miss
             throw new NoMoreMissionArchiveException();
         }
 
+        MissionArchiveRes missionArchiveRes;
+
         // 반복 미션일 경우
         if (mission.getType() == MissionType.REPEAT) {
             // 예정된 반복미션 접근 제한
@@ -74,12 +76,21 @@ public MissionArchiveRes createArchive(String userSocialId, Long missionId, Miss
             else
                 throw new NoMoreMissionArchiveException();
 
-        }else {
+            missionStateUseCase.updateMissionState(member, mission, newArchive);
+            missionArchiveRes = MissionArchiveMapper.mapToMissionArchiveRes(missionArchiveSaveService.save(newArchive), memberId);
+
+
+        } else {
             newArchive.updateCount(missionArchiveQueryService.findMyDoneArchives(memberId, missionId)+1);
+
+            missionStateUseCase.updateMissionState(member, mission, newArchive);
+            missionArchiveRes = MissionArchiveMapper.mapToMissionArchiveRes(missionArchiveSaveService.save(newArchive), memberId);
+            missionArchiveRes.updateCount(missionArchiveQueryService.findDoneSingleArchives(missionId));
         }
 
-        missionStateUseCase.updateMissionState(member, mission, newArchive);
-        return MissionArchiveMapper.mapToMissionArchiveRes(missionArchiveSaveService.save(newArchive),memberId);
+//        missionStateUseCase.updateMissionState(member, mission, newArchive);
+//        missionArchiveRes = MissionArchiveMapper.mapToMissionArchiveRes(missionArchiveSaveService.save(newArchive), memberId);
+        return missionArchiveRes;
 
     }
 

diff --git a/...om/moing/backend/domain/missionArchive/application/service/MissionArchiveReadUseCase.java b/...om/moing/backend/domain/missionArchive/application/service/MissionArchiveReadUseCase.java
@@ -3,6 +3,7 @@
 import com.moing.backend.domain.member.domain.entity.Member;
 import com.moing.backend.domain.member.domain.service.MemberGetService;
 import com.moing.backend.domain.mission.domain.entity.Mission;
+import com.moing.backend.domain.mission.domain.entity.constant.MissionType;
 import com.moing.backend.domain.mission.domain.service.MissionQueryService;
 import com.moing.backend.domain.missionArchive.application.dto.res.*;
 import com.moing.backend.domain.missionArchive.application.mapper.MissionArchiveMapper;
@@ -58,9 +59,17 @@ public MissionArchiveStatusRes getMissionDoneStatus(Long missionId) {
         Mission mission = missionQueryService.findMissionById(missionId);
         Team team = mission.getTeam();
 
+        String done = "0";
+
+        if (mission.getType().equals(MissionType.ONCE)) {
+            done = missionArchiveQueryService.findDoneSingleArchives(missionId).toString();
+        } else {
+            done = missionArchiveQueryService.findDoneRepeatArchives(missionId).toString();
+        }
+
         return MissionArchiveStatusRes.builder()
                 .total(team.getNumOfMember().toString())
-                .done(missionArchiveQueryService.findDoneArchives(missionId).toString())
+                .done(done)
                 .build();
 
     }

diff --git a/...moing/backend/domain/missionArchive/domain/repository/MissionArchiveCustomRepository.java b/...moing/backend/domain/missionArchive/domain/repository/MissionArchiveCustomRepository.java
@@ -22,6 +22,7 @@ public interface MissionArchiveCustomRepository {
     Optional<List<MissionArchive>> findOthersArchives(Long memberId, Long missionId) ;
 
     Optional<Long> findDonePeopleByMissionId(Long missionId);
+    Optional<Long> findDonePeopleByRepeatMissionId(Long missionId);
     Optional<Long> findMyDoneCountByMissionId(Long missionId,Long memberId);
 
     Optional<List<RepeatMissionBoardRes>> findRepeatMissionArchivesByMemberId(Long memberId, Long teamId, MissionStatus status);

diff --git a/...g/backend/domain/missionArchive/domain/repository/MissionArchiveCustomRepositoryImpl.java b/...g/backend/domain/missionArchive/domain/repository/MissionArchiveCustomRepositoryImpl.java
@@ -208,6 +208,26 @@ public Optional<Long> findDonePeopleByMissionId(Long missionId) {
 
         );
     }
+    @Override
+    public Optional<Long> findDonePeopleByRepeatMissionId(Long missionId) {
+
+        BooleanExpression dateInRange = createRepeatTypeConditionByArchive();
+
+        return Optional.of(queryFactory
+                .select(missionArchive)
+                .from(missionArchive)
+                .where(
+                        missionArchive.mission.id.eq(missionId),
+
+                        missionArchive.mission.type.eq(MissionType.REPEAT).and(dateInRange)
+                                .or(missionArchive.mission.type.eq(MissionType.ONCE))
+                )
+                .groupBy(missionArchive.member,missionArchive.mission.number)
+                .having(missionArchive.count().goe(missionArchive.mission.number))
+                .fetchCount()
+
+        );
+    }
 
     @Override
     public Optional<Long> findMyDoneCountByMissionId(Long missionId, Long memberId) {

diff --git a/...va/com/moing/backend/domain/missionArchive/domain/service/MissionArchiveQueryService.java b/...va/com/moing/backend/domain/missionArchive/domain/service/MissionArchiveQueryService.java
@@ -1,7 +1,6 @@
 package com.moing.backend.domain.missionArchive.domain.service;
 
 import com.moing.backend.domain.mission.application.dto.res.FinishMissionBoardRes;
-import com.moing.backend.domain.mission.application.dto.res.GatherSingleMissionRes;
 import com.moing.backend.domain.mission.application.dto.res.RepeatMissionBoardRes;
 import com.moing.backend.domain.mission.application.dto.res.SingleMissionBoardRes;
 import com.moing.backend.domain.mission.domain.entity.constant.MissionStatus;
@@ -18,9 +17,6 @@
 
 import java.util.*;
 
-import static com.moing.backend.domain.missionArchive.domain.entity.MissionArchiveStatus.*;
-import static com.moing.backend.domain.missionArchive.domain.entity.MissionArchiveStatus.INCOMPLETE;
-
 @DomainService
 @Transactional
 @RequiredArgsConstructor
@@ -109,9 +105,12 @@ public List<RepeatMissionBoardRes> findMyRepeatMissionArchives(Long memberId, Lo
     }
 
 
-    public Long findDoneArchives(Long missionId) {
+    public Long findDoneSingleArchives(Long missionId) {
         return missionArchiveRepository.findDonePeopleByMissionId(missionId).orElseThrow(NotFoundMissionArchiveException::new);
     }
+    public Long findDoneRepeatArchives(Long missionId) {
+        return missionArchiveRepository.findDonePeopleByRepeatMissionId(missionId).orElseThrow(NotFoundMissionArchiveException::new);
+    }
 
     public Long findMyDoneArchives(Long memberId, Long missionId) {
         return missionArchiveRepository.findMyDoneCountByMissionId(missionId, memberId).orElseThrow(NotFoundMissionArchiveException::new);