Merge pull request #29 from Team-Wable/fix/#28

[FIX] comment push alarm
Team-Wable · Oct 1, 2024 · cb85d27 · cb85d27
2 parents 8e39d96 + e84b0f1
commit cb85d27
Showing 1 changed file with 22 additions and 23 deletions.
diff --git a/...er/src/main/java/com/wable/www/WableServer/api/comment/service/CommentCommendService.java b/...er/src/main/java/com/wable/www/WableServer/api/comment/service/CommentCommendService.java
@@ -55,7 +55,7 @@ public void postComment(Long memberId, Long contentId, CommentPostRequestDto com
         //답글 작성 시 게시물 작상자에게 알림 발생
         Member contentWritingMember = memberRepository.findMemberByIdOrThrow(content.getMember().getId());
 
-        if(usingMember != contentWritingMember){  ////자신 게시물에 대한 좋아요 누르면 알림 발생 x
+        if(usingMember != contentWritingMember) {  ////자신 게시물에 대한 좋아요 누르면 알림 발생 x
             //노티 엔티티와 연결
             Notification notification = Notification.builder()
                     .notificationTargetMember(contentWritingMember)
@@ -66,29 +66,29 @@ public void postComment(Long memberId, Long contentId, CommentPostRequestDto com
                     .notificationText(comment.getCommentText())
                     .build();
             Notification savedNotification = notificationRepository.save(notification);
-        }
 
-        if (Boolean.TRUE.equals(contentWritingMember.getIsPushAlarmAllowed())) {
-            String FcmMessageTitle = usingMember.getNickname() + "님이 답글을 작성했습니다.";
-            contentWritingMember.increaseFcmBadge();
-            FcmMessageDto commentFcmMessage = FcmMessageDto.builder()
-                    .validateOnly(false)
-                    .message(FcmMessageDto.Message.builder()
-                            .notificationDetails(FcmMessageDto.NotificationDetails.builder()
-                                    .title(FcmMessageTitle)
-                                    .body(commentPostRequestDto.commentText())
-                                    .build())
-                            .token(contentWritingMember.getFcmToken())
-                            .data(FcmMessageDto.Data.builder()
-                                    .name("comment")
-                                    .description("답글 푸시 알림")
-                                    .relateContentId(String.valueOf(contentId))
-                                    .build())
-                            .badge(contentWritingMember.getFcmBadge())
-                            .build())
-                    .build();
+            if (Boolean.TRUE.equals(contentWritingMember.getIsPushAlarmAllowed())) {
+                String FcmMessageTitle = usingMember.getNickname() + "님이 답글을 작성했습니다.";
+                contentWritingMember.increaseFcmBadge();
+                FcmMessageDto commentFcmMessage = FcmMessageDto.builder()
+                        .validateOnly(false)
+                        .message(FcmMessageDto.Message.builder()
+                                .notificationDetails(FcmMessageDto.NotificationDetails.builder()
+                                        .title(FcmMessageTitle)
+                                        .body(commentPostRequestDto.commentText())
+                                        .build())
+                                .token(contentWritingMember.getFcmToken())
+                                .data(FcmMessageDto.Data.builder()
+                                        .name("comment")
+                                        .description("답글 푸시 알림")
+                                        .relateContentId(String.valueOf(contentId))
+                                        .build())
+                                .badge(contentWritingMember.getFcmBadge())
+                                .build())
+                        .build();
 
-            fcmService.sendMessage(commentFcmMessage);
+                fcmService.sendMessage(commentFcmMessage);
+            }
         }
     }
 
@@ -132,7 +132,6 @@ public void postCommentVer2(Long memberId, Long contentId, MultipartFile comment
                     .build();
             Notification savedNotification = notificationRepository.save(notification);
 
-
             if (Boolean.TRUE.equals(contentWritingMember.getIsPushAlarmAllowed())) {
                 String FcmMessageTitle = usingMember.getNickname() + "님이 답글을 작성했습니다.";
                 contentWritingMember.increaseFcmBadge();