fix: invalidateTokenForCurrentMember메서드 추가 및 수정 (#146)

depromeet · Aug 17, 2024 · a749bf8 · a749bf8
1 parent 5337054
commit a749bf8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/src/main/java/com/depromeet/stonebed/domain/fcm/api/FcmController.java b/src/main/java/com/depromeet/stonebed/domain/fcm/api/FcmController.java
@@ -46,9 +46,8 @@ public ResponseEntity<Void> storeToken(
 
     @Operation(summary = "FCM 토큰 삭제", description = "로그아웃 시 FCM 토큰을 삭제합니다.")
     @DeleteMapping("/token")
-    public ResponseEntity<Void> deleteToken(
-            @RequestBody @Validated FcmTokenRequest fcmTokenRequest) {
-        fcmTokenService.invalidateToken(fcmTokenRequest.token());
+    public ResponseEntity<Void> deleteToken() {
+        fcmTokenService.invalidateTokenForCurrentMember();
         return ResponseEntity.ok().build();
     }
 }
diff --git a/src/main/java/com/depromeet/stonebed/domain/fcm/application/FcmService.java b/src/main/java/com/depromeet/stonebed/domain/fcm/application/FcmService.java
@@ -72,6 +72,7 @@ private void handleBatchResponse(BatchResponse response, List<String> tokens) {
                                     tokens.get(response.getResponses().indexOf(sendResponse));
                             if (isInvalidOrNotRegistered(sendResponse)) {
                                 fcmTokenService.invalidateToken(token);
+                                log.warn("FCM 토큰 {}이(가) 유효하지 않거나 등록되지 않았습니다. 토큰을 무효화합니다.", token);
                             }
                         });
     }

diff --git a/src/main/java/com/depromeet/stonebed/domain/fcm/application/FcmTokenService.java b/src/main/java/com/depromeet/stonebed/domain/fcm/application/FcmTokenService.java
@@ -27,6 +27,18 @@ public List<String> getAllTokens() {
                 .toList();
     }
 
+    @Transactional
+    public void invalidateTokenForCurrentMember() {
+        Member currentMember = memberUtil.getCurrentMember();
+        fcmRepository
+                .findByMember(currentMember)
+                .ifPresentOrElse(
+                        fcmToken -> updateToken(fcmToken, ""),
+                        () -> {
+                            throw new CustomException(ErrorCode.FAILED_TO_FIND_FCM_TOKEN);
+                        });
+    }
+
     @Transactional
     public void invalidateToken(String token) {
         fcmRepository