Merge pull request #166 from Modagbul/feat/mission

Feat/mission

Author: seungueonn

src/main/java/com/moing/backend/domain/mission/application/service/MissionRemindAlarmUseCase.java

@@ -1,6 +1,8 @@
 package com.moing.backend.domain.mission.application.service;
 
 import com.moing.backend.domain.history.application.dto.response.MemberIdAndToken;
+import com.moing.backend.domain.history.application.mapper.AlarmHistoryMapper;
+import com.moing.backend.domain.history.application.service.SaveMultiAlarmHistoryUseCase;
 import com.moing.backend.domain.history.domain.entity.AlarmType;
 import com.moing.backend.domain.history.domain.entity.PagePath;
 import com.moing.backend.domain.member.domain.entity.Member;
@@ -35,6 +37,9 @@ public class MissionRemindAlarmUseCase {
     private final MissionQueryService missionQueryService;
     private final ApplicationEventPublisher eventPublisher;
 
+    private final FcmService fcmService;
+    private final SaveMultiAlarmHistoryUseCase saveMultiAlarmHistoryUseCase;
+
     String REMIND_NAME = "미션 리마인드";
 
 
@@ -49,8 +54,15 @@ public Boolean sendRemindMissionAlarm() {
         Optional<List<MemberIdAndToken>> memberIdAndTokens = mapToMemberAndToken(remainMissionPeople);
         Optional<List<MemberIdAndToken>> pushMemberIdAndToken = isPushMemberIdAndToken(remainMissionPeople);
 
-        eventPublisher.publishEvent(new MultiFcmEvent(title, message, pushMemberIdAndToken, memberIdAndTokens,
-                "",REMIND_NAME, AlarmType.REMIND, PagePath.MISSION_ALL_PTAH.getValue()));
+//        eventPublisher.publishEvent(new MultiFcmEvent(title, message, pushMemberIdAndToken, memberIdAndTokens,
+//                "",REMIND_NAME, AlarmType.REMIND, PagePath.MISSION_ALL_PTAH.getValue()));
+
+        if (pushMemberIdAndToken.isPresent() && !pushMemberIdAndToken.get().isEmpty()) {
+            fcmService.sendMultipleDevices(new MultiRequest(pushMemberIdAndToken.get(), title,message,  "",REMIND_NAME, AlarmType.REMIND, PagePath.MISSION_ALL_PTAH.getValue()));
+        }
+        if (memberIdAndTokens.isPresent() && !memberIdAndTokens.get().isEmpty()) {
+            saveMultiAlarmHistoryUseCase.saveAlarmHistories(AlarmHistoryMapper.getMemberIds(memberIdAndTokens.get()),"",title,message,REMIND_NAME, AlarmType.REMIND, PagePath.MISSION_ALL_PTAH.getValue());
+        }
         return true;
     }
 

src/main/java/com/moing/backend/domain/missionArchive/domain/repository/MissionArchiveCustomRepositoryImpl.java

@@ -426,6 +426,7 @@ public Optional<List<Member>> findHavingRemainMissionsByQuerydsl() {
                 .from(teamMember)
                 .join(mission)
                 .on(teamMember.team.eq(mission.team),
+                        teamMember.team.isDeleted.ne(true),
                         ((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)))
@@ -438,8 +439,7 @@ public Optional<List<Member>> findHavingRemainMissionsByQuerydsl() {
                 )
                 .groupBy(teamMember.member,mission,mission.number)
                         .having(missionArchive.count().lt(mission.number),
-                                teamMember.member.isDeleted.ne(true),
-                                teamMember.team.isDeleted.ne(true))
+                                teamMember.member.isDeleted.ne(true))
                 .fetch());
 
 

src/main/java/com/moing/backend/domain/missionState/application/service/MissionStateScheduleUseCase.java

@@ -83,7 +83,8 @@ public void RepeatMissionStart() {
     }
 
 
-    @Scheduled(cron = "0 0 8 * * *")
+//    @Scheduled(cron = "0 0 8 * * *")
+    @Scheduled(cron = "0 0/10 * * * *")
     public void MissionRemindAlarm() {
         missionRemindAlarmUseCase.sendRemindMissionAlarm();
     }

src/main/java/com/moing/backend/domain/report/application/service/ReportCreateUseCase.java

@@ -8,6 +8,7 @@
 import com.moing.backend.domain.mission.domain.entity.constant.MissionWay;
 import com.moing.backend.domain.missionArchive.application.dto.req.MissionArchiveReq;
 import com.moing.backend.domain.missionArchive.domain.entity.MissionArchive;
+import com.moing.backend.domain.missionArchive.domain.entity.MissionArchiveStatus;
 import com.moing.backend.domain.missionArchive.domain.service.MissionArchiveQueryService;
 import com.moing.backend.domain.missionState.domain.entity.MissionState;
 import com.moing.backend.domain.report.application.mapper.ReportMapper;
@@ -56,7 +57,7 @@ public Long createReport(String socialId, Long targetId, String reportType) {
 
             targetMemberNickName = missionArchive.getMember().getNickName();
 
-            if (mission.getWay().equals(MissionWay.PHOTO)) {
+            if (mission.getWay().equals(MissionWay.PHOTO) && missionArchive.getStatus().equals(MissionArchiveStatus.COMPLETE)) {
                 missionArchive.updateArchive(MissionArchiveReq.builder()
                         .archive(REPORT_MISSION_PHOTO)
                         .status(missionArchive.getStatus().name())