Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MNG-02 알림센터에서 푸시알림을 클릭했을 때 이동하게 수정 #212

Merged
merged 3 commits into from
Jan 30, 2024
Merged

MNG-02 알림센터에서 푸시알림을 클릭했을 때 이동하게 수정 #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d049dc0
MNG-02 fix: 팀 생성 알림 운영 계정에서만 알림 가게 수정
minsu20 Jan 29, 2024
2671376
MNG-02 fix: 알림센터에서 푸시알림을 클릭했을 때 이동하게 수정
minsu20 Jan 29, 2024
fde64d0
MNG-02 refactor: fcm 부분 추상화게 의존하게 수정
minsu20 Jan 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions src/main/java/com/moing/backend/domain/alarm/application/MultiAlarmEventUseCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package com.moing.backend.domain.alarm.application;

import com.moing.backend.domain.history.application.mapper.AlarmHistoryMapper;
import com.moing.backend.domain.history.application.service.SaveMultiAlarmHistoryUseCase;
import com.moing.backend.global.config.fcm.dto.event.MultiFcmEvent;
import com.moing.backend.global.config.fcm.dto.request.MultiRequest;
import com.moing.backend.global.config.fcm.service.MultiMessageSender;
import lombok.RequiredArgsConstructor;
import org.springframework.context.event.EventListener;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;


@Component
@RequiredArgsConstructor
public class MultiAlarmEventUseCase {

private final MultiMessageSender multiMessageSender;
private final SaveMultiAlarmHistoryUseCase saveMultiAlarmHistoryUseCase;

@Async
@EventListener
public void onMultiAlarmEvent(MultiFcmEvent event) {
if (event.getIdAndTokensByPush().isPresent() && !event.getIdAndTokensByPush().get().isEmpty()) {
multiMessageSender.send(new MultiRequest(event.getIdAndTokensByPush().get(), event.getTitle(), event.getBody(), event.getIdInfo(), event.getName(), event.getAlarmType(), event.getPath()));
}
if (event.getIdAndTokensBySave().isPresent() && !event.getIdAndTokensBySave().get().isEmpty()) {
saveMultiAlarmHistoryUseCase.saveAlarmHistories(AlarmHistoryMapper.getMemberIds(event.getIdAndTokensBySave().get()), event.getIdInfo(), event.getTitle(), event.getBody(), event.getName(), event.getAlarmType(), event.getPath());
}
}
}
29 changes: 29 additions & 0 deletions src/main/java/com/moing/backend/domain/alarm/application/SingleAlarmEventUseCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package com.moing.backend.domain.alarm.application;

import com.moing.backend.domain.history.application.service.SaveSingleAlarmHistoryUseCase;
import com.moing.backend.global.config.fcm.dto.event.SingleFcmEvent;
import com.moing.backend.global.config.fcm.dto.request.SingleRequest;
import com.moing.backend.global.config.fcm.service.SingleMessageSender;
import lombok.RequiredArgsConstructor;
import org.springframework.context.event.EventListener;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;


@Component
@RequiredArgsConstructor
public class SingleAlarmEventUseCase {

private final SingleMessageSender singleMessageSender;
private final SaveSingleAlarmHistoryUseCase saveSingleAlarmHistoryUseCase;

@Async
@EventListener
public void onSingleAlarmEvent(SingleFcmEvent event) {
if (event.getMember().isFirePush() && !event.getMember().isSignOut()) { //알림 on, 로그아웃 안함
singleMessageSender.send(new SingleRequest(event.getMember().getFcmToken(), event.getTitle(), event.getBody(), event.getMember().getMemberId(), event.getIdInfo(), event.getName(), event.getAlarmType(), event.getPath()));
}
saveSingleAlarmHistoryUseCase.saveAlarmHistory(event.getMember().getMemberId(), event.getIdInfo(), event.getTitle(), event.getBody(), event.getName(), event.getAlarmType(), event.getPath());
}

}
4 changes: 0 additions & 4 deletions src/main/java/com/moing/backend/domain/fire/application/service/FireThrowAlarmUseCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
import com.moing.backend.domain.mission.domain.entity.Mission;
import com.moing.backend.domain.mission.domain.entity.constant.MissionType;
import com.moing.backend.domain.team.domain.entity.Team;
import com.moing.backend.domain.teamMember.domain.service.TeamMemberGetService;
import com.moing.backend.global.config.fcm.dto.event.SingleFcmEvent;
import com.moing.backend.global.config.fcm.service.FcmService;
import lombok.RequiredArgsConstructor;
import net.minidev.json.JSONObject;
import org.springframework.context.ApplicationEventPublisher;
Expand All @@ -24,9 +22,7 @@
@RequiredArgsConstructor
public class FireThrowAlarmUseCase {

private final FcmService fcmService;
private final ApplicationEventPublisher eventPublisher;
private final TeamMemberGetService teamMemberGetService;

public void sendFireThrowAlarm(Member throwMember, Member receiveMember, Team team, Mission mission) {

Expand Down
14 changes: 5 additions & 9 deletions .../java/com/moing/backend/domain/mission/application/service/MissionRemindAlarmUseCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,12 @@
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;
import com.moing.backend.domain.mission.domain.entity.constant.MissionStatus;
import com.moing.backend.domain.mission.domain.service.MissionQueryService;
import com.moing.backend.domain.missionArchive.domain.service.MissionArchiveScheduleQueryService;
import com.moing.backend.domain.teamMember.domain.service.TeamMemberGetService;
import com.moing.backend.global.config.fcm.dto.event.MultiFcmEvent;
import com.moing.backend.global.config.fcm.dto.request.MultiRequest;
import com.moing.backend.global.config.fcm.service.FcmService;
import com.moing.backend.global.config.fcm.service.MultiMessageSender;
import lombok.RequiredArgsConstructor;
import net.minidev.json.JSONObject;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.stereotype.Service;

Expand All @@ -37,7 +33,7 @@ public class MissionRemindAlarmUseCase {
private final MissionQueryService missionQueryService;
private final ApplicationEventPublisher eventPublisher;

private final FcmService fcmService;
private final MultiMessageSender multiMessageSender;
private final SaveMultiAlarmHistoryUseCase saveMultiAlarmHistoryUseCase;

String REMIND_NAME = "미션 리마인드";
Expand All @@ -58,7 +54,7 @@ public Boolean sendRemindMissionAlarm() {
// "",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()));
multiMessageSender.send(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());
Expand Down Expand Up @@ -108,7 +104,7 @@ public Boolean sendRepeatMissionRemindOnSunday() {
Optional<List<MemberIdAndToken>> pushMemberIdAndToken = isPushMemberIdAndToken(repeatMissionByStatus);

if (pushMemberIdAndToken.isPresent() && !pushMemberIdAndToken.get().isEmpty()) {
fcmService.sendMultipleDevices(new MultiRequest(pushMemberIdAndToken.get(), title,message, "",REMIND_NAME, AlarmType.REMIND, PagePath.MISSION_ALL_PTAH.getValue()));
multiMessageSender.send(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());
Expand All @@ -130,7 +126,7 @@ public Boolean sendRepeatMissionRemindOnMonday() {
Optional<List<MemberIdAndToken>> pushMemberIdAndToken = isPushMemberIdAndToken(repeatMissionByStatus);

if (pushMemberIdAndToken.isPresent() && !pushMemberIdAndToken.get().isEmpty()) {
fcmService.sendMultipleDevices(new MultiRequest(pushMemberIdAndToken.get(), title,message, "",REMIND_NAME, AlarmType.REMIND, PagePath.MISSION_ALL_PTAH.getValue()));
multiMessageSender.send(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());
Expand Down
25 changes: 25 additions & 0 deletions src/main/java/com/moing/backend/global/config/fcm/exception/ExceptionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package com.moing.backend.global.config.fcm.exception;

import com.google.firebase.messaging.FirebaseMessagingException;

public class ExceptionHandler {

public static NotificationException handleFirebaseMessagingException(FirebaseMessagingException e) {
String errorCode = e.getErrorCode().name();
String errorMessage = e.getMessage();

switch (errorCode) {
case "INVALID_ARGUMENT":
return new NotificationException("올바르지 않은 인자 값입니다: " + errorMessage);
case "NOT_FOUND":
return new NotificationException("등록 토큰이 유효하지 않거나, 주제(Topic)가 존재하지 않습니다: " + errorMessage);
case "UNREGISTERED":
return new NotificationException("해당 주제(Topic)의 구독이 해지되었습니다: " + errorMessage);
case "UNAVAILABLE":
return new NotificationException("서비스를 사용할 수 없습니다: " + errorMessage);
default:
return new NotificationException("메시지 전송에 실패했습니다: " + errorMessage);
}
}
}

Loading
Loading