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

fix : 오전 8시 미션 리마인드 알림 로직 고도화

Author: seungueonn

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

@@ -44,10 +44,12 @@ public Boolean sendRemindMissionAlarm() {
         String title = getTitle(random.nextInt(4));
         String message = getMessage(random.nextInt(4));
 
+        List<Member> remainMissionPeople = missionArchiveScheduleQueryService.getRemainMissionPeople();
 
-        Optional<List<MemberIdAndToken>> remainMissionPeople = missionArchiveScheduleQueryService.getRemainMissionPeople();
+        Optional<List<MemberIdAndToken>> memberIdAndTokens = mapToMemberAndToken(remainMissionPeople);
+        Optional<List<MemberIdAndToken>> pushMemberIdAndToken = isPushMemberIdAndToken(remainMissionPeople);
 
-        eventPublisher.publishEvent(new MultiFcmEvent(title, message, remainMissionPeople, remainMissionPeople,
+        eventPublisher.publishEvent(new MultiFcmEvent(title, message, pushMemberIdAndToken, memberIdAndTokens,
                 "",REMIND_NAME, AlarmType.REMIND, PagePath.MISSION_ALL_PTAH.getValue()));
         return true;
     }

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

@@ -33,4 +33,6 @@ public interface MissionArchiveCustomRepository {
 
     Boolean findMyArchivesToday(Long memberId,Long missionId);
 
+    Optional<List<Member>> findHavingRemainMissionsByQuerydsl() ;
+
     }

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

@@ -44,6 +44,7 @@
 import static com.moing.backend.domain.team.domain.entity.QTeam.team;
 import static com.moing.backend.domain.teamMember.domain.entity.QTeamMember.teamMember;
 import static javax.swing.Spring.constant;
+import static org.springframework.data.jpa.domain.Specification.not;
 import static org.springframework.data.jpa.domain.Specification.where;
 
 @Slf4j
@@ -406,6 +407,66 @@ private BooleanExpression createRepeatTypeConditionByState() {
         return dateInRange.and(dateInRange);
     }
 
+//
+//    @Query(value = "SELECT distinct COALESCE(tmSub.fcm_token,'undef') as fcmToken, tmSub.member_id as memberId " +
+//            "FROM (SELECT distinct COALESCE(tm.member_id, 0) AS member_id, t.team_id, me.fcm_token " +
+//            "FROM mission m " +
+//            "LEFT JOIN team t ON m.team_id = t.team_id " +
+//            "LEFT JOIN team_member tm ON t.team_id = tm.team_id AND tm.is_deleted = 'False' " +
+//            "LEFT JOIN member me on tm.member_id = me.member_id) tmSub " +
+//            "LEFT JOIN mission m ON NOT (m.status = 'END' OR m.status = 'SUCCESS') and m.team_id = tmSub.team_id " +
+//            "LEFT JOIN mission_archive ms ON m.mission_id = ms.mission_id and ms.member_id = tmSub.member_id " +
+//            "GROUP BY tmSub.member_id, m.mission_id, m.number " +
+//            "HAVING COUNT(ms.mission_archive_id) < m.number", nativeQuery = true
+//    )
+
+    @Override
+    public Optional<List<Member>> findHavingRemainMissionsByQuerydsl() {
+
+        BooleanExpression dateInRange = createRepeatTypeConditionByArchive();
+
+        return Optional.ofNullable(queryFactory
+                .select(teamMember.member).distinct()
+                .from(teamMember)
+                .join(mission)
+                .on(teamMember.team.eq(mission.team),
+                        ((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)))
+                )
+                .leftJoin(missionArchive)
+                .on(missionArchive.mission.eq(mission),
+                        missionArchive.member.eq(teamMember.member),
+                        ((mission.type.eq(MissionType.REPEAT).and(dateInRange))
+                                .or(mission.type.eq(MissionType.ONCE)))
+                )
+                .groupBy(teamMember.member,mission,mission.number)
+                        .having(missionArchive.count().lt(mission.number))
+                .fetch());
+
+
+
+//        return Optional.ofNullable(queryFactory
+//                        .select(teamMember.member).distinct()
+//                        .from(teamMember)
+//                        .join(mission)
+//                        .on(
+//                                teamMember.team.eq(mission.team),
+//                                ((((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)))))
+//                        )
+//                        .join(missionArchive)
+//                        .on(
+//                                missionArchive.mission.eq(mission),
+//                                missionArchive.member.eq(teamMember.member),
+//                                (missionArchive.mission.type.eq(MissionType.REPEAT).and(dateInRange)).or(missionArchive.mission.type.eq(MissionType.ONCE))
+//                        )
+//                        .groupBy(teamMember.member,mission,mission.number)
+//                        .having(missionArchive.count().loe(mission.number))
+//                        .fetch()
+//        );
+    }
+
 
 
 }

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

@@ -1,6 +1,7 @@
 package com.moing.backend.domain.missionArchive.domain.repository;
 
 import com.moing.backend.domain.history.application.dto.response.MemberIdAndToken;
+import com.moing.backend.domain.member.domain.entity.Member;
 import com.moing.backend.domain.mission.domain.entity.constant.MissionStatus;
 import com.moing.backend.domain.missionArchive.domain.entity.MissionArchive;
 import com.moing.backend.domain.missionArchive.domain.entity.MissionArchiveStatus;
@@ -78,4 +79,7 @@ public interface MissionArchiveRepository extends JpaRepository<MissionArchive,
 //    )
 //    Optional<List<MemberIdAndToken>> findHavingRemainMissions();
 
-}
+
+
+
+    }

src/main/java/com/moing/backend/domain/missionArchive/domain/service/MissionArchiveScheduleQueryService.java

@@ -22,23 +22,23 @@ public class MissionArchiveScheduleQueryService {
 
     private final MissionArchiveRepository missionArchiveRepository;
 
-    public Optional<List<MemberIdAndToken>> getRemainMissionPeople() {
-        List<Map<String, Long>> maps = missionArchiveRepository.findHavingRemainMissions().orElseThrow();
-
-        return Optional.of(maps.stream()
-                .map(map -> {
-                    Object memberIdObject = map.get("memberId");
-                    Long memberId = ((BigInteger) memberIdObject).longValue();
-
-                    Object fcmObject = map.get("fcmToken");
-                    String fcmToken = fcmObject.toString();
-
-                    return MemberIdAndToken.builder()
-                            .fcmToken(fcmToken)
-                            .memberId(memberId)
-                            .build();
-                })
-                .collect(Collectors.toList()));
+    public List<Member> getRemainMissionPeople() {
+        return missionArchiveRepository.findHavingRemainMissionsByQuerydsl().orElseThrow();
+
+//        return Optional.of(maps.stream()
+//                .map(map -> {
+//                    Object memberIdObject = map.get("memberId");
+//                    Long memberId = ((BigInteger) memberIdObject).longValue();
+//
+//                    Object fcmObject = map.get("fcmToken");
+//                    String fcmToken = fcmObject.toString();
+//
+//                    return MemberIdAndToken.builder()
+//                            .fcmToken(fcmToken)
+//                            .memberId(memberId)
+//                            .build();
+//                })
+//                .collect(Collectors.toList()));
 
 //        return null;