[#204] 업데이트 된 FCM 토큰이 Firestore에 남아있는 이슈를 해결한다

DevLog/App/Assembler/AppLayerAssembler.swift

@@ -0,0 +1,21 @@
+//
+//  AppLayerAssembler.swift
+//  DevLog
+//
+//  Created by opfic on 3/19/26.
+//
+
+final class AppLayerAssembler: Assembler {
+    func assemble(_ container: any DIContainer) {
+        container.register(FCMTokenSyncHandler.self) {
+            FCMTokenSyncHandler(
+                repository: container.resolve(UserDataRepository.self)
+            )
+        }
+        container.register(UserTimeZoneSyncHandler.self) {
+            UserTimeZoneSyncHandler(
+                repository: container.resolve(UserDataRepository.self)
+            )
+        }
+    }
+}

DevLog/App/Assembler/Assembler.swift

@@ -14,7 +14,8 @@ final class AppAssembler: Assembler {
         PersistenceAssembler(),
         InfraAssembler(),
         DataAssembler(),
-        DomainAssembler()
+        DomainAssembler(),
+        AppLayerAssembler()
     ]
 
     func assemble(_ container: any DIContainer) {

DevLog/App/Delegate/AppDelegate.swift

@@ -7,11 +7,11 @@
 
 import UIKit
 import Firebase
-import FirebaseAuth
 import GoogleSignIn
 
 class AppDelegate: UIResponder, UIApplicationDelegate, MessagingDelegate {
     private let logger = Logger(category: "AppDelegate")
+    private let container = AppDIContainer.shared
 
     func application(
         _ app: UIApplication,
@@ -26,7 +26,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate, MessagingDelegate {
         didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil
     ) -> Bool {
         FirebaseApp.configure()
-
+        _ = container.resolve(FCMTokenSyncHandler.self)
+        _ = container.resolve(UserTimeZoneSyncHandler.self)
+
         // 알림 권한 요청
         UNUserNotificationCenter.current().delegate = self
         UNUserNotificationCenter.current().requestAuthorization(options: [.alert, .badge, .sound]) { granted, error in
@@ -41,7 +43,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, MessagingDelegate {
         }
 
         // 앱이 온그라운드로 되었을 때, 로그인 세션이 존재한다면 현재 유저의 timeZone 저장
-        updateUserTimeZone()
+        NotificationCenter.default.post(name: .didRequestUserTimeZoneSync, object: nil)
 
         // Firebase Messaging 설정
         Messaging.messaging().delegate = self
@@ -78,21 +80,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate, MessagingDelegate {
     ) {
         if let fcmToken = fcmToken {
             logger.info("FCM token: \(fcmToken)")
-        }
-    }
-}
-
-private extension AppDelegate {
-    func updateUserTimeZone() {
-        Task {
-            do {
-                guard let uid = Auth.auth().currentUser?.uid else { return }
-                let settingsRef = Firestore.firestore().document("users/\(uid)/userData/settings")
-
-                try await settingsRef.setData(["timeZone": TimeZone.autoupdatingCurrent.identifier], merge: true)
-            } catch {
-                logger.error("Failed to update timeZone", error: error)
-            }
+            NotificationCenter.default.post(
+                name: .didRefreshFCMToken,
+                object: nil,
+                userInfo: ["fcmToken": fcmToken]
+            )
         }
     }
 }

DevLog/App/Handler/FCMTokenSyncHandler.swift

@@ -0,0 +1,35 @@
+//
+//  FCMTokenSyncHandler.swift
+//  DevLog
+//
+//  Created by opfic on 3/19/26.
+//
+
+import Combine
+import Foundation
+
+final class FCMTokenSyncHandler {
+    private let repository: UserDataRepository
+    private let logger = Logger(category: "FCMTokenSyncHandler")
+    private var cancellables = Set<AnyCancellable>()
+
+    init(
+        repository: UserDataRepository,
+        notificationCenter: NotificationCenter = .default
+    ) {
+        self.repository = repository
+
+        notificationCenter.publisher(for: .didRefreshFCMToken)
+            .compactMap { $0.userInfo?["fcmToken"] as? String }
+            .sink { [weak self] fcmToken in
+                Task {
+                    do {
+                        try await self?.repository.updateFCMToken(fcmToken)
+                    } catch {
+                        self?.logger.error("Failed to sync refreshed FCM token", error: error)
+                    }
+                }
+            }
+            .store(in: &cancellables)
+    }
+}

DevLog/App/Handler/UserTimeZoneSyncHandler.swift

@@ -0,0 +1,34 @@
+//
+//  UserTimeZoneSyncHandler.swift
+//  DevLog
+//
+//  Created by opfic on 3/19/26.
+//
+
+import Combine
+import Foundation
+
+final class UserTimeZoneSyncHandler {
+    private let repository: UserDataRepository
+    private let logger = Logger(category: "UserTimeZoneSyncHandler")
+    private var cancellables = Set<AnyCancellable>()
+
+    init(
+        repository: UserDataRepository,
+        notificationCenter: NotificationCenter = .default
+    ) {
+        self.repository = repository
+
+        notificationCenter.publisher(for: .didRequestUserTimeZoneSync)
+            .sink { [weak self] _ in
+                Task {
+                    do {
+                        try await self?.repository.updateUserTimeZone()
+                    } catch {
+                        self?.logger.error("Failed to sync user timeZone", error: error)
+                    }
+                }
+            }
+            .store(in: &cancellables)
+    }
+}

DevLog/App/Notification/NotificationName+.swift

@@ -0,0 +1,13 @@
+//
+//  NotificationName+.swift
+//  DevLog
+//
+//  Created by opfic on 3/19/26.
+//
+
+import Foundation
+
+extension Notification.Name {
+    static let didRefreshFCMToken = Notification.Name("didRefreshFCMToken")
+    static let didRequestUserTimeZoneSync = Notification.Name("didRequestUserTimeZoneSync")
+}

DevLog/Data/Repository/UserDataRepositoryImpl.swift

@@ -19,6 +19,14 @@ final class UserDataRepositoryImpl: UserDataRepository {
     }
 
     func upsertStatusMessage(_ message: String) async throws {
-        try await  self.userService.upsertStatusMessage(message)
+        try await userService.upsertStatusMessage(message)
+    }
+
+    func updateFCMToken(_ fcmToken: String) async throws {
+        try await userService.updateFCMToken(fcmToken)
+    }
+
+    func updateUserTimeZone() async throws {
+        try await userService.updateUserTimeZone()
     }
 }

DevLog/Domain/Protocol/UserDataRepository.swift

@@ -8,4 +8,6 @@
 protocol UserDataRepository {
     func fetch() async throws -> UserProfile
     func upsertStatusMessage(_ message: String) async throws
+    func updateFCMToken(_ fcmToken: String) async throws
+    func updateUserTimeZone() async throws
 }

DevLog/Infra/Service/UserService.swift

@@ -145,7 +145,12 @@ final class UserService {
         }
     }
 
-    func updateFCMToken(_ userId: String, fcmToken: String) async throws {
+    func updateFCMToken(_ fcmToken: String) async throws {
+        guard let userId = Auth.auth().currentUser?.uid else {
+            logger.info("Skipping FCM token update because no authenticated user exists")
+            return
+        }
+
         logger.info("Updating FCM token for user: \(userId)")
 
         do {
@@ -157,4 +162,25 @@ final class UserService {
             throw error
         }
     }
+
+    func updateUserTimeZone() async throws {
+        guard let userId = Auth.auth().currentUser?.uid else {
+            logger.info("Skipping timeZone update because no authenticated user exists")
+            return
+        }
+
+        logger.info("Updating timeZone for user: \(userId)")
+
+        do {
+            let settingsRef = store.document("users/\(userId)/userData/settings")
+            try await settingsRef.setData(
+                ["timeZone": TimeZone.autoupdatingCurrent.identifier],
+                merge: true
+            )
+            logger.info("Successfully updated timeZone")
+        } catch {
+            logger.error("Failed to update timeZone", error: error)
+            throw error
+        }
+    }
 }