Merge pull request #303 from Modagbul/MNG-28

MNG-28 feat: 푸시 알림 보낼 떼 idInfo에 type 추가
Modagbul · Aug 9, 2024 · 75c31fa · 75c31fa
2 parents 29dc9f3 + 9b3a081
commit 75c31fa
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/src/main/java/com/moing/backend/domain/board/application/service/SendBoardAlarmUseCase.java b/src/main/java/com/moing/backend/domain/board/application/service/SendBoardAlarmUseCase.java
@@ -4,7 +4,6 @@
 import com.moing.backend.domain.history.application.dto.response.MemberIdAndToken;
 import com.moing.backend.domain.history.application.dto.response.NewUploadInfo;
 import com.moing.backend.domain.history.application.mapper.AlarmHistoryMapper;
-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;
 import com.moing.backend.domain.team.domain.entity.Team;
@@ -20,6 +19,7 @@
 import java.util.List;
 import java.util.Optional;
 
+import static com.moing.backend.domain.history.domain.entity.AlarmType.NEW_UPLOAD;
 import static com.moing.backend.global.config.fcm.constant.NewNoticeUploadMessage.NEW_NOTICE_UPLOAD_MESSAGE;
 
 @Service
@@ -41,14 +41,15 @@ public void sendNewUploadAlarm(BaseServiceResponse baseServiceResponse, Board bo
             Optional<List<MemberIdAndToken>> memberIdAndTokensByPush = AlarmHistoryMapper.getNewUploadPushInfo(newUploadInfos);
             Optional<List<MemberIdAndToken>> memberIdAndTokensBySave = AlarmHistoryMapper.getNewUploadSaveInfo(newUploadInfos);
             // 알림 보내기
-            eventPublisher.publishEvent(new MultiFcmEvent(title, body, memberIdAndTokensByPush, memberIdAndTokensBySave, createIdInfo(team.getTeamId(), board.getBoardId()), team.getName(), AlarmType.NEW_UPLOAD, PagePath.NOTICE_PATH.getValue()));
+            eventPublisher.publishEvent(new MultiFcmEvent(title, body, memberIdAndTokensByPush, memberIdAndTokensBySave, createIdInfo(team.getTeamId(), board.getBoardId()), team.getName(), NEW_UPLOAD, PagePath.NOTICE_PATH.getValue()));
         }
     }
 
     private String createIdInfo(Long teamId, Long boardId) {
         JSONObject jo = new JSONObject();
         jo.put("teamId", teamId);
         jo.put("boardId", boardId);
+        jo.put("type", "NEW_UPLOAD_BOARD");
         return jo.toJSONString();
     }
 

diff --git a/...m/moing/backend/domain/boardComment/application/service/SendBoardCommentAlarmUseCase.java b/...m/moing/backend/domain/boardComment/application/service/SendBoardCommentAlarmUseCase.java
@@ -65,6 +65,7 @@ private String createIdInfo(Long teamId, Long boardId) {
         JSONObject jo = new JSONObject();
         jo.put("teamId", teamId);
         jo.put("boardId", boardId);
+        jo.put("type", "COMMENT");
         return jo.toJSONString();
     }
 

diff --git a/src/main/java/com/moing/backend/domain/fire/application/service/FireThrowAlarmUseCase.java b/src/main/java/com/moing/backend/domain/fire/application/service/FireThrowAlarmUseCase.java
@@ -1,7 +1,6 @@
 package com.moing.backend.domain.fire.application.service;
 
 import com.moing.backend.domain.fire.application.dto.req.FireThrowReq;
-import com.moing.backend.domain.history.domain.entity.AlarmType;
 import com.moing.backend.domain.member.domain.entity.Member;
 import com.moing.backend.domain.mission.domain.entity.Mission;
 import com.moing.backend.domain.mission.domain.entity.constant.MissionType;
@@ -15,6 +14,7 @@
 import javax.transaction.Transactional;
 import java.util.Random;
 
+import static com.moing.backend.domain.history.domain.entity.AlarmType.FIRE;
 import static com.moing.backend.domain.history.domain.entity.PagePath.MISSION_PATH;
 import static com.moing.backend.global.config.fcm.constant.FireThrowMessage.*;
 
@@ -35,7 +35,7 @@ public void sendFireThrowAlarm(Member throwMember, Member receiveMember, Team te
                 : getRandomMessage(throwMember.getNickName(), receiveMember.getNickName(), randomNum);
         String idInfo = createIdInfo(mission.getType() == MissionType.REPEAT, mission.getTeam().getTeamId(), mission.getId());
 
-        eventPublisher.publishEvent(new SingleFcmEvent(receiveMember, title, message, idInfo, team.getName(), AlarmType.FIRE, MISSION_PATH.getValue(), receiveMember.isFirePush()));
+        eventPublisher.publishEvent(new SingleFcmEvent(receiveMember, title, message, idInfo, team.getName(), FIRE, MISSION_PATH.getValue(), receiveMember.isFirePush()));
     }
 
     public String getRandomMessage(String pusher, String receiver, int num) {
@@ -65,6 +65,7 @@ private String createIdInfo(boolean isRepeated, Long teamId, Long missionId) {
         jo.put("isRepeated", isRepeated);
         jo.put("teamId", teamId);
         jo.put("missionId", missionId);
+        jo.put("type", "FIRE");
         return jo.toJSONString();
     }
 

diff --git a/...a/com/moing/backend/domain/mission/application/service/SendMissionCreateAlarmUseCase.java b/...a/com/moing/backend/domain/mission/application/service/SendMissionCreateAlarmUseCase.java
@@ -3,7 +3,6 @@
 import com.moing.backend.domain.history.application.dto.response.MemberIdAndToken;
 import com.moing.backend.domain.history.application.dto.response.NewUploadInfo;
 import com.moing.backend.domain.history.application.mapper.AlarmHistoryMapper;
-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;
 import com.moing.backend.domain.mission.domain.entity.Mission;
@@ -21,6 +20,7 @@
 import java.util.List;
 import java.util.Optional;
 
+import static com.moing.backend.domain.history.domain.entity.AlarmType.NEW_UPLOAD;
 import static com.moing.backend.global.config.fcm.constant.NewMissionTitle.NEW_SINGLE_MISSION_COMING;
 
 @Service
@@ -43,7 +43,7 @@ public void sendNewMissionUploadAlarm(Member member, Mission mission) {
         Optional<List<MemberIdAndToken>> memberIdAndTokensByPush = AlarmHistoryMapper.getNewUploadPushInfo(newUploadInfos);
         Optional<List<MemberIdAndToken>> memberIdAndTokensBySave = AlarmHistoryMapper.getNewUploadSaveInfo(newUploadInfos);
         // 알림 보내기
-        eventPublisher.publishEvent(new MultiFcmEvent(title, message, memberIdAndTokensByPush, memberIdAndTokensBySave, createIdInfo(team.getTeamId(), mission.getId(),mission.getType(),mission.getStatus()), team.getName(), AlarmType.NEW_UPLOAD, PagePath.MISSION_PATH.getValue()));
+        eventPublisher.publishEvent(new MultiFcmEvent(title, message, memberIdAndTokensByPush, memberIdAndTokensBySave, createIdInfo(team.getTeamId(), mission.getId(),mission.getType(),mission.getStatus()), team.getName(), NEW_UPLOAD, PagePath.MISSION_PATH.getValue()));
     }
 
     private String createIdInfo(Long teamId, Long missionId,MissionType type, MissionStatus status) {
@@ -52,6 +52,7 @@ private String createIdInfo(Long teamId, Long missionId,MissionType type, Missio
         jo.put("teamId", teamId);
         jo.put("missionId", missionId);
         jo.put("status", status.name());
+        jo.put("type", "NEW_UPLOAD_MISSION");
         return jo.toJSONString();
     }
 }