fix: fcm 토큰이 빈 값이라면 푸시 알림을 보내지 않도록 설정 (#279)

depromeet · Feb 6, 2024 · 434f2a4 · 434f2a4
1 parent 232871f
commit 434f2a4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/src/main/java/com/depromeet/domain/follow/api/FollowController.java b/src/main/java/com/depromeet/domain/follow/api/FollowController.java
@@ -58,7 +58,6 @@ public List<MemberFollowedResponse> followedUserFindAll() {
         return followService.findAllFollowedMember();
     }
 
-    // 팔로잉, 팔로워 리스트 응답
     @GetMapping("/{targetId}/list")
     @Operation(summary = "팔로잉, 팔로워 유저 리스트를 반환합니다", description = "팔로잉, 팔로워 유저들을 반환합니다.")
     public FollowListResponse followList(@PathVariable Long targetId) {

diff --git a/src/main/java/com/depromeet/domain/member/domain/FcmInfo.java b/src/main/java/com/depromeet/domain/member/domain/FcmInfo.java
@@ -21,7 +21,7 @@ private FcmInfo(String fcmToken, Boolean appAlarm) {
     }
 
     public static FcmInfo createFcmInfo() {
-        return FcmInfo.builder().fcmToken("").appAlarm(true).build();
+        return FcmInfo.builder().appAlarm(true).build();
     }
 
     public static FcmInfo toggleAlarm(FcmInfo fcmState) {

diff --git a/src/main/java/com/depromeet/domain/member/domain/Member.java b/src/main/java/com/depromeet/domain/member/domain/Member.java
@@ -36,7 +36,7 @@ public class Member extends BaseTimeEntity {
 
     @Embedded private OauthInfo oauthInfo;
 
-    @Embedded private FcmInfo fcmInfo = FcmInfo.createFcmInfo();
+    @Embedded private FcmInfo fcmInfo;
 
     @Enumerated(EnumType.STRING)
     private MemberStatus status;

diff --git a/src/main/java/com/depromeet/global/config/fcm/FcmService.java b/src/main/java/com/depromeet/global/config/fcm/FcmService.java
@@ -29,6 +29,9 @@ public ApiFuture<BatchResponse> sendGroupMessageAsync(
     }
 
     public ApiFuture<String> sendMessageSync(String token, String title, String content) {
+        if (token == null || token.isEmpty()) {
+            return null;
+        }
         Message message =
                 Message.builder()
                         .setToken(token)