Merge pull request #113 from Team-Shaka/feat/104

🐛 푸시 알림 동의 여부 확인 대상 변경

Author: HyoBN

src/main/java/treehouse/server/api/notification/business/NotificationService.java

@@ -48,8 +48,10 @@ public void createNotification(User user, Long treehouseId, NotificationRequestD
         Member sender = memberQueryAdapter.findByUserAndTreehouse(user, treeHouse);
         User receiver = userQueryAdapter.findByIdOptional(request.getReceiverId()).orElse(null);
         Notification notification = NotificationMapper.toNotification(sender, receiver, request, reactionName);
-        if(user.isPushAgree() && receiver != null) {
-            fcmService.sendFcmMessage(receiver, notification.getTitle(), notification.getBody());
+
+        if(receiver.getUser().isPushAgree()) {
+            fcmService.sendFcmMessage(receiver.getUser(), notification.getTitle(), notification.getBody());
+
         }
         notificationCommandAdapter.createNotification(notification);
     }

src/main/java/treehouse/server/global/fcm/service/FcmService.java

@@ -66,9 +66,6 @@ public UserResponseDTO.saveFcmToken saveFcmToken(User user, FCMDto.saveFcmTokenD
 
 
     public void sendFcmMessage(User receiver, String title, String body) {
-        if (receiver.isPushAgree() == false) {
-            return;
-        }
 
         List<FcmToken> fcmTokenList = fcmTokenRepository.findAllByUser(receiver);
         if (fcmTokenList.isEmpty()) {