diff --git a/BackEnd/src/main/java/springwebsocket/webchat/fcm/service/FCMNotificationService.java b/BackEnd/src/main/java/springwebsocket/webchat/fcm/service/FCMNotificationService.java index 3e0c475..9d59b96 100644 --- a/BackEnd/src/main/java/springwebsocket/webchat/fcm/service/FCMNotificationService.java +++ b/BackEnd/src/main/java/springwebsocket/webchat/fcm/service/FCMNotificationService.java @@ -10,6 +10,8 @@ import springwebsocket.webchat.member.entity.Member; import springwebsocket.webchat.member.repository.springdata.SpringDataJpaMemberRepository; +import java.util.HashMap; +import java.util.Map; import java.util.Optional; @RequiredArgsConstructor @@ -23,28 +25,27 @@ public String sendNotificationByToken(FCMNotificationRequestDto requestDto) { Optional member = jpaMemberRepository.findByEmail(requestDto.getTargetUserEmail()); if (member.isPresent()) { if (member.get().getFirebaseToken() != null) { - Notification notification = Notification.builder() - .setTitle(requestDto.getTitle()) - .setBody(requestDto.getBody()) - .build(); + Map data = new HashMap<>(); + data.put("title", requestDto.getTitle()); + data.put("body", requestDto.getBody()); Message message = Message.builder() .setToken(member.get().getFirebaseToken()) - .setNotification(notification) + .putAllData(data) .build(); try { firebaseMessaging.send(message); - return "알림을 성공적으로 전송했습니다. targetUserId = " + requestDto.getTargetUserEmail(); + return "알림을 성공적으로 전송했습니다. targetUserEmail = " + requestDto.getTargetUserEmail(); } catch (FirebaseMessagingException e) { e.printStackTrace(); - return "알림 보내기를 실패하였습니다. targeetUserId = " + requestDto.getTargetUserEmail(); + return "알림 보내기를 실패하였습니다. targetUserEmail = " + requestDto.getTargetUserEmail(); } }else { - return "서버에 저장된 해당 유저의 FirebaseToken이 존재하지 않습니다. targetUserId = " + requestDto.getTargetUserEmail(); + return "서버에 저장된 해당 유저의 FirebaseToken이 존재하지 않습니다. targetUserEmail = " + requestDto.getTargetUserEmail(); } }else { - return "해당 유저가 존재하지 않습니다. targetUserId = " + requestDto.getTargetUserEmail(); + return "해당 유저가 존재하지 않습니다. targetUserEmail = " + requestDto.getTargetUserEmail(); } } }