Merge pull request #120 from billilge/fix/#117

fix: FCM 만료 토큰 미삭제로 인한 알림 유실 처리

Author: tnals0924

src/main/kotlin/site/billilge/api/backend/domain/member/entity/Member.kt

@@ -65,4 +65,8 @@ class Member(
     fun updateFCMToken(fcmToken: String) {
         this.fcmToken = fcmToken
     }
+
+    fun clearFCMToken() {
+        this.fcmToken = null
+    }
 }

src/main/kotlin/site/billilge/api/backend/domain/member/service/MemberService.kt

@@ -64,6 +64,7 @@ class MemberService(
             pageableCondition.pageNo,
             pageableCondition.size,
             Sort.by(Sort.Direction.ASC, "studentId")
+                .and(Sort.by(Sort.Direction.ASC, "id"))
         )
         val adminRoles = listOf(Role.ADMIN, Role.WORKER, Role.GA)
         return memberRepository.findAllByRoleInAndNameContaining(adminRoles, searchCondition.search, pageRequest)
@@ -101,6 +102,7 @@ class MemberService(
             pageableCondition.pageNo,
             pageableCondition.size,
             Sort.by(Sort.Direction.ASC, "studentId")
+                .and(Sort.by(Sort.Direction.ASC, "id"))
         )
 
         return if (searchCondition.search.isEmpty()) {
@@ -118,6 +120,12 @@ class MemberService(
         member.updateFCMToken(token)
     }
 
+    @Transactional
+    fun clearFcmToken(memberId: Long) {
+        val member = memberRepository.findByIdOrNull(memberId) ?: return
+        member.clearFCMToken()
+    }
+
     fun findById(memberId: Long): Member {
         return memberRepository.findByIdOrNull(memberId)
             ?: throw ApiException(MemberErrorCode.MEMBER_NOT_FOUND)

src/main/kotlin/site/billilge/api/backend/domain/notification/service/NotificationService.kt

@@ -76,13 +76,17 @@ class NotificationService(
             return
         }
 
-        fcmService.sendPushNotification(
+        val isTokenValid = fcmService.sendPushNotification(
             member.fcmToken!!,
             status.title,
             status.formattedMessage(*formatValues.toTypedArray()),
             status.link,
             studentId
         )
+
+        if (!isTokenValid) {
+            memberService.clearFcmToken(member.id!!)
+        }
     }
 
     @Transactional

src/main/kotlin/site/billilge/api/backend/global/external/fcm/FCMService.kt

@@ -8,7 +8,7 @@ import site.billilge.api.backend.global.logging.log
 class FCMService(
     private val firebaseMessaging: FirebaseMessaging,
 ) {
-    fun sendPushNotification(fcmToken: String, title: String, body: String, link: String, studentId: String = "20000000") {
+    fun sendPushNotification(fcmToken: String, title: String, body: String, link: String, studentId: String = "20000000"): Boolean {
         val fcmMessage = Message.builder()
             .putData("title", title)
             .putData("body", body.replace("\n", " "))
@@ -21,14 +21,17 @@ class FCMService(
             .setToken(fcmToken)
             .build()
 
-        try {
+        return try {
             firebaseMessaging.send(fcmMessage)
             log.info { "(studentId=$studentId) FCM Message sent." }
+            true
         } catch (e: FirebaseMessagingException) {
             if (e.messagingErrorCode == MessagingErrorCode.UNREGISTERED) {
-                log.error { "(studentId=$studentId) FCM token is unregistered." }
+                log.warn { "(studentId=$studentId) FCM token is unregistered. Clearing token." }
+                false
             } else {
                 log.error { "(studentId=$studentId) FCM send failed: ${e.message}" }
+                true
             }
         }
     }