[BOOK-364] refactor: 코드 리뷰 반영

Author: seoyoon513

app/src/main/kotlin/com/ninecraft/booket/ReedFirebaseMessagingService.kt

@@ -67,8 +67,8 @@ class ReedFirebaseMessagingService : FirebaseMessagingService() {
     }
 
     override fun onDestroy() {
-        super.onDestroy()
         scope.cancel()
+        super.onDestroy()
     }
 
     companion object {

core/data/impl/src/main/kotlin/com/ninecraft/booket/core/data/impl/di/FirebaseModule.kt

@@ -2,6 +2,7 @@ package com.ninecraft.booket.core.data.impl.di
 
 import com.google.firebase.Firebase
 import com.google.firebase.messaging.FirebaseMessaging
+import com.google.firebase.messaging.messaging
 import com.google.firebase.remoteconfig.FirebaseRemoteConfig
 import com.google.firebase.remoteconfig.remoteConfig
 import com.google.firebase.remoteconfig.remoteConfigSettings
@@ -30,5 +31,5 @@ internal object FirebaseModule {
 
     @Singleton
     @Provides
-    fun provideFirebaseMessaging(): FirebaseMessaging = FirebaseMessaging.getInstance()
+    fun provideFirebaseMessaging(): FirebaseMessaging = Firebase.messaging
 }

core/data/impl/src/main/kotlin/com/ninecraft/booket/core/data/impl/repository/DefaultUserRepository.kt

@@ -13,10 +13,8 @@ import com.ninecraft.booket.core.network.service.ReedService
 import com.orhanobut.logger.Logger
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.firstOrNull
-import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.tasks.await
 import javax.inject.Inject
-import kotlin.coroutines.resume
-import kotlin.coroutines.resumeWithException
 
 internal class DefaultUserRepository @Inject constructor(
     private val service: ReedService,
@@ -75,17 +73,12 @@ internal class DefaultUserRepository @Inject constructor(
         service.updateNotificationSettings(NotificationSettingsRequest(notificationEnabled)).toModel()
     }
 
-    private suspend fun getRemoteFcmToken(): String = suspendCancellableCoroutine { continuation ->
-        firebaseMessaging.token.addOnCompleteListener { task ->
-            if (task.isSuccessful) {
-                continuation.resume(task.result)
-            } else {
-                task.exception?.let { exception ->
-                    continuation.resumeWithException(exception)
-                } ?: continuation.resumeWithException(
-                    Exception("Unknown error occurred while fetching FCM token"),
-                )
-            }
+    private suspend fun getRemoteFcmToken(): String {
+        return try {
+            firebaseMessaging.token.await()
+        } catch (e: Exception) {
+            Logger.e("Failed to fetch FCM token: ${e.message}")
+            throw e
         }
     }