diff --git a/src/main/java/com/moing/backend/domain/boardComment/application/service/SendBoardCommentAlarmUseCase.java b/src/main/java/com/moing/backend/domain/boardComment/application/service/SendBoardCommentAlarmUseCase.java index 974060ed..7b6ae5e3 100644 --- a/src/main/java/com/moing/backend/domain/boardComment/application/service/SendBoardCommentAlarmUseCase.java +++ b/src/main/java/com/moing/backend/domain/boardComment/application/service/SendBoardCommentAlarmUseCase.java @@ -65,7 +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"); + jo.put("type", "COMMENT_BOARD"); 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 index b2451d61..0566dea0 100644 --- 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 @@ -33,7 +33,7 @@ public void sendFireThrowAlarm(Member throwMember, Member receiveMember, Team te : getRandomTitle(throwMember.getNickName(), receiveMember.getNickName(), randomNum); String message = fireThrowReq != null ? fireThrowReq.getMessage() : getRandomMessage(throwMember.getNickName(), receiveMember.getNickName(), randomNum); - String idInfo = createIdInfo(mission.getType() == MissionType.REPEAT, mission.getTeam().getTeamId(), mission.getId()); + String idInfo = createIdInfo(mission.getType() == MissionType.REPEAT, mission.getTeam().getTeamId(), mission.getId(), fireThrowReq == null); eventPublisher.publishEvent(new SingleFcmEvent(receiveMember, title, message, idInfo, team.getName(), FIRE, MISSION_PATH.getValue(), receiveMember.isFirePush())); } @@ -60,14 +60,20 @@ public String getRandomTitle(String pusher, String receiver, int num) { return NEW_FIRE_THROW_TITLE1.getMessage(); } - private String createIdInfo(boolean isRepeated, Long teamId, Long missionId) { + private String createIdInfo(boolean isRepeated, Long teamId, Long missionId, boolean isMessageNull) { JSONObject jo = new JSONObject(); jo.put("isRepeated", isRepeated); jo.put("teamId", teamId); jo.put("missionId", missionId); - jo.put("type", "FIRE"); + jo.put("type", getType(isMessageNull)); return jo.toJSONString(); } + private String getType(boolean isMessageNull){ + if(isMessageNull) + return "FIRE_MESSAGE_NULL"; + return "FIRE_MESSAGE_EXIST"; + } + } diff --git a/src/main/java/com/moing/backend/domain/missionArchive/application/service/SendMissionArchiveCreateAlarmUseCase.java b/src/main/java/com/moing/backend/domain/missionArchive/application/service/SendMissionArchiveCreateAlarmUseCase.java index 303ccc6b..fdba87a2 100644 --- a/src/main/java/com/moing/backend/domain/missionArchive/application/service/SendMissionArchiveCreateAlarmUseCase.java +++ b/src/main/java/com/moing/backend/domain/missionArchive/application/service/SendMissionArchiveCreateAlarmUseCase.java @@ -23,7 +23,6 @@ import static com.moing.backend.domain.missionArchive.application.service.MissionArchiveCreateMessage.CREATOR_CREATE_MISSION_ARCHIVE; import static com.moing.backend.domain.missionArchive.application.service.MissionArchiveCreateMessage.TEAM_AND_TITLE; -import static com.moing.backend.global.config.fcm.constant.NewMissionTitle.NEW_SINGLE_MISSION_COMING; @Service @Transactional @@ -54,6 +53,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", "COMPLETE_MISSION"); return jo.toJSONString(); } } diff --git a/src/main/java/com/moing/backend/domain/missionComment/application/service/SendMissionCommentAlarmUseCase.java b/src/main/java/com/moing/backend/domain/missionComment/application/service/SendMissionCommentAlarmUseCase.java index 7a14209b..2237fa11 100644 --- a/src/main/java/com/moing/backend/domain/missionComment/application/service/SendMissionCommentAlarmUseCase.java +++ b/src/main/java/com/moing/backend/domain/missionComment/application/service/SendMissionCommentAlarmUseCase.java @@ -85,6 +85,7 @@ private String createIdInfo(Long teamId, Long missionId, Long missionArchiveId) jo.put("missionArchiveId", missionArchiveId); jo.put("teamId", teamId); jo.put("missionId", missionId); + jo.put("type", "COMMENT_MISSION"); return jo.toJSONString(); } } \ No newline at end of file