Merge pull request #66 from tukcomCD2024/RINGO-146

fix : FCM Notification -> data 방식으로 변환
tukcomCD2024 · Jun 19, 2024 · 2f5eb62 · 2f5eb62
2 parents 8532fbc + cb5f591
commit 2f5eb62
Showing 1 changed file with 10 additions and 9 deletions.
diff --git 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> 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<String, String> 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();
         }
     }
 }