From e5c861a7c78ce13a3acbe691e7a3afc23c93ddcc Mon Sep 17 00:00:00 2001
From: si-zero <snm306@naver.com>
Date: Mon, 17 Aug 2026 11:03:24 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20FCM=20=EB=A7=8C=EB=A3=8C=EB=90=9C=20?=
 =?UTF-8?q?=EB=94=94=EB=B0=94=EC=9D=B4=EC=8A=A4=20=ED=86=A0=ED=81=B0?=
 =?UTF-8?q?=EC=9D=B4=20=EC=A0=95=EB=A6=AC=EB=90=98=EC=A7=80=20=EC=95=8A?=
 =?UTF-8?q?=EC=95=84=20=EB=B0=98=EB=B3=B5=20=EB=B0=9C=EC=86=A1=20=EC=8B=A4?=
 =?UTF-8?q?=ED=8C=A8=20=EB=A1=9C=EA=B7=B8=EA=B0=80=20=EC=8C=93=EC=9D=B4?=
 =?UTF-8?q?=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../infra/fcm/service/FcmPushService.java     |  6 +++
 .../infra/fcm/service/FcmPushServiceTest.java | 40 ++++++++++++++++++-
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/swyp/picke/global/infra/fcm/service/FcmPushService.java b/src/main/java/com/swyp/picke/global/infra/fcm/service/FcmPushService.java
index 34601a3..06308f3 100644
--- a/src/main/java/com/swyp/picke/global/infra/fcm/service/FcmPushService.java
+++ b/src/main/java/com/swyp/picke/global/infra/fcm/service/FcmPushService.java
@@ -4,7 +4,9 @@
 import com.google.firebase.messaging.FirebaseMessaging;
 import com.google.firebase.messaging.FirebaseMessagingException;
 import com.google.firebase.messaging.Message;
+import com.google.firebase.messaging.MessagingErrorCode;
 import com.swyp.picke.domain.notification.entity.UserDevice;
+import com.swyp.picke.domain.notification.repository.UserDeviceRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -18,6 +20,7 @@
 public class FcmPushService {
 
     private final FirebaseMessaging firebaseMessaging;
+    private final UserDeviceRepository userDeviceRepository;
 
     /**
      * Android 디바이스에 FCM data-only 메시지를 발송한다.
@@ -40,6 +43,9 @@ public void send(UserDevice device, String title, String body, Map<String, Strin
             firebaseMessaging.send(message);
         } catch (FirebaseMessagingException e) {
             log.warn("FCM 푸시 전송 실패. deviceId={}, error={}", device.getId(), e.getMessage());
+            if (e.getMessagingErrorCode() == MessagingErrorCode.UNREGISTERED) {
+                userDeviceRepository.deleteById(device.getId());
+            }
         }
     }
 }
diff --git a/src/test/java/com/swyp/picke/global/infra/fcm/service/FcmPushServiceTest.java b/src/test/java/com/swyp/picke/global/infra/fcm/service/FcmPushServiceTest.java
index 3b0f818..9fadb84 100644
--- a/src/test/java/com/swyp/picke/global/infra/fcm/service/FcmPushServiceTest.java
+++ b/src/test/java/com/swyp/picke/global/infra/fcm/service/FcmPushServiceTest.java
@@ -1,9 +1,12 @@
 package com.swyp.picke.global.infra.fcm.service;
 
 import com.google.firebase.messaging.FirebaseMessaging;
+import com.google.firebase.messaging.FirebaseMessagingException;
 import com.google.firebase.messaging.Message;
+import com.google.firebase.messaging.MessagingErrorCode;
 import com.swyp.picke.domain.notification.entity.UserDevice;
 import com.swyp.picke.domain.notification.enums.DevicePlatform;
+import com.swyp.picke.domain.notification.repository.UserDeviceRepository;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
@@ -15,6 +18,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.lenient;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 
 @ExtendWith(MockitoExtension.class)
@@ -23,9 +30,12 @@ class FcmPushServiceTest {
     @Mock
     private FirebaseMessaging firebaseMessaging;
 
+    @Mock
+    private UserDeviceRepository userDeviceRepository;
+
     @Test
     void send_includes_title_and_body_in_data_payload() throws Exception {
-        FcmPushService fcmPushService = new FcmPushService(firebaseMessaging);
+        FcmPushService fcmPushService = new FcmPushService(firebaseMessaging, userDeviceRepository);
         UserDevice device = buildDevice();
 
         fcmPushService.send(device, "제목", "본문", Map.of("type", "TEST"));
@@ -39,6 +49,34 @@ void send_includes_title_and_body_in_data_payload() throws Exception {
         assertThat(data).containsEntry("type", "TEST");
     }
 
+    @Test
+    void send_deletes_device_when_token_is_unregistered() throws Exception {
+        FcmPushService fcmPushService = new FcmPushService(firebaseMessaging, userDeviceRepository);
+        UserDevice device = buildDevice();
+
+        FirebaseMessagingException exception = mock(FirebaseMessagingException.class);
+        lenient().when(exception.getMessagingErrorCode()).thenReturn(MessagingErrorCode.UNREGISTERED);
+        doThrow(exception).when(firebaseMessaging).send(any(Message.class));
+
+        fcmPushService.send(device, "제목", "본문", Map.of("type", "TEST"));
+
+        verify(userDeviceRepository).deleteById(device.getId());
+    }
+
+    @Test
+    void send_keeps_device_when_error_is_not_unregistered() throws Exception {
+        FcmPushService fcmPushService = new FcmPushService(firebaseMessaging, userDeviceRepository);
+        UserDevice device = buildDevice();
+
+        FirebaseMessagingException exception = mock(FirebaseMessagingException.class);
+        lenient().when(exception.getMessagingErrorCode()).thenReturn(MessagingErrorCode.UNAVAILABLE);
+        doThrow(exception).when(firebaseMessaging).send(any(Message.class));
+
+        fcmPushService.send(device, "제목", "본문", Map.of("type", "TEST"));
+
+        verify(userDeviceRepository, never()).deleteById(any());
+    }
+
     @SuppressWarnings("unchecked")
     private Map<String, String> extractData(Message message) throws Exception {
         Field dataField = Message.class.getDeclaredField("data");