#333 fix: 알림 저장 로직 순서 변경

IceButler · Aug 6, 2024 · c613918 · c613918
1 parent 340b697
commit c613918
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/main/java/com/example/icebutler_server/alarm/service/NotificationServiceImpl.java b/src/main/java/com/example/icebutler_server/alarm/service/NotificationServiceImpl.java
@@ -23,27 +23,30 @@ public class NotificationServiceImpl implements NotificationService {
     @Transactional
     @Override
     public void sendWithdrawalAlarm(User user, String fridgeName) {
-        if (user.getFcmToken() == null) return;
         String messageBody = fridgeName + "에서 탈퇴되었습니다.";
-        fcmUtils.sendMessage((user.getFcmToken()), Constant.PushNotification.FRIDGE, messageBody);
+        if (user.getFcmToken() != null) {
+            fcmUtils.sendMessage((user.getFcmToken()), Constant.PushNotification.FRIDGE, messageBody);
+        }
         this.notificationRepository.save(PushNotification.toEntity(Constant.PushNotification.FRIDGE, messageBody, user));
     }
 
     @Transactional
     @Override
     public void sendJoinFridgeAlarm(User user, String fridgeName) {
-        if (user.getFcmToken() == null) return;
         String messageBody = fridgeName + "에서 초대되었습니다.";
-        fcmUtils.sendMessage((user.getFcmToken()), Constant.PushNotification.FRIDGE, messageBody);
+        if (user.getFcmToken() != null) {
+            fcmUtils.sendMessage((user.getFcmToken()), Constant.PushNotification.FRIDGE, messageBody);
+        }
         this.notificationRepository.save(PushNotification.toEntity(Constant.PushNotification.FRIDGE, messageBody, user));
     }
 
     @Transactional
     @Override
     public void sendShelfLifeAlarm(User user, String fridgeName, String foodName) throws IOException {
-        if (user.getFcmToken() == null) return;
         String messageBody = foodName + " 소비기한이 임박해요!";
-        fcmUtils.sendMessage((user.getFcmToken()), fridgeName, messageBody);
+        if (user.getFcmToken() != null) {
+            fcmUtils.sendMessage((user.getFcmToken()), fridgeName, messageBody);
+        }
         this.notificationRepository.save(PushNotification.toEntity(fridgeName, messageBody, user));
     }
 }