fix: 푸시 알람을 탭해서 앱에 들어와도 푸시알림 데이터가 최신화되지 않는 현상 해결

opficdev · opficdev · commit fc1b992edb4c · 2026-03-08T21:10:49.000+09:00
diff --git a/DevLog/Data/Repository/PushNotificationRepositoryImpl.swift b/DevLog/Data/Repository/PushNotificationRepositoryImpl.swift
@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import Combine
 
 final class PushNotificationRepositoryImpl: PushNotificationRepository {
     private let service: PushNotificationService
@@ -41,6 +42,15 @@ final class PushNotificationRepositoryImpl: PushNotificationRepository {
         return try response.toDomain()
     }
 
+    func observeNotifications(
+        _ query: PushNotificationQuery,
+        limit: Int
+    ) throws -> AnyPublisher<PushNotificationPage, Error> {
+        try service.observeNotifications(query, limit: limit)
+            .tryMap { try $0.toDomain() }
+            .eraseToAnyPublisher()
+    }
+
     // 푸시 알림 기록 삭제
     func deleteNotification(_ notificationID: String) async throws {
         try await service.deleteNotification(notificationID)
diff --git a/DevLog/Domain/Protocol/PushNotificationRepository.swift b/DevLog/Domain/Protocol/PushNotificationRepository.swift
@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import Combine
 
 protocol PushNotificationRepository {
     func fetchPushNotificationEnabled() async throws -> Bool
@@ -15,6 +16,10 @@ protocol PushNotificationRepository {
         _ query: PushNotificationQuery,
         cursor: PushNotificationCursor?
     ) async throws -> PushNotificationPage
+    func observeNotifications(
+        _ query: PushNotificationQuery,
+        limit: Int
+    ) throws -> AnyPublisher<PushNotificationPage, Error>
     func deleteNotification(_ notificationID: String) async throws
     func toggleNotificationRead(_ todoId: String) async throws
 }
diff --git a/DevLog/Domain/UseCase/PushNotification/Fetch/FetchPushNotificationsUseCase.swift b/DevLog/Domain/UseCase/PushNotification/Fetch/FetchPushNotificationsUseCase.swift
@@ -5,9 +5,16 @@
 //  Created by 최윤진 on 2/10/26.
 //
 
+import Combine
+
 protocol FetchPushNotificationsUseCase {
     func execute(
         _ query: PushNotificationQuery,
         cursor: PushNotificationCursor?
     ) async throws -> PushNotificationPage
+
+    func observe(
+        _ query: PushNotificationQuery,
+        limit: Int
+    ) throws -> AnyPublisher<PushNotificationPage, Error>
 }
diff --git a/DevLog/Domain/UseCase/PushNotification/Fetch/FetchPushNotificationsUseCaseImpl.swift b/DevLog/Domain/UseCase/PushNotification/Fetch/FetchPushNotificationsUseCaseImpl.swift
@@ -5,6 +5,8 @@
 //  Created by 최윤진 on 2/10/26.
 //
 
+import Combine
+
 final class FetchPushNotificationsUseCaseImpl: FetchPushNotificationsUseCase {
     private let repository: PushNotificationRepository
 
@@ -18,4 +20,13 @@ final class FetchPushNotificationsUseCaseImpl: FetchPushNotificationsUseCase {
     ) async throws -> PushNotificationPage {
         try await repository.requestNotifications(query, cursor: cursor)
     }
+
+    func observe(
+        _ query: PushNotificationQuery,
+        limit: Int
+    ) throws -> AnyPublisher<PushNotificationPage, Error> {
+        try repository.observeNotifications(query, limit: limit)
+            .removeDuplicates()
+            .eraseToAnyPublisher()
+    }
 }
diff --git a/DevLog/Infra/Service/PushNotificationService.swift b/DevLog/Infra/Service/PushNotificationService.swift
@@ -6,6 +6,7 @@
 //
 
 import FirebaseAuth
+import Combine
 import FirebaseFirestore
 
 final class PushNotificationService {
@@ -90,28 +91,12 @@ final class PushNotificationService {
 
     /// 푸시 알림 기록 요청
     func requestNotifications(
-        _ query: PushNotificationQuery,
+        _ notificationQuery: PushNotificationQuery,
         cursor: PushNotificationCursorDTO?
     ) async throws -> PushNotificationPageResponse {
         guard let uid = Auth.auth().currentUser?.uid else { throw AuthError.notAuthenticated }
 
-        var firestoreQuery: Query = store.collection("users/\(uid)/notifications")
-
-        if let thresholdDate = query.timeFilter.thresholdDate {
-            firestoreQuery = firestoreQuery.whereField(
-                "receivedAt",
-                isGreaterThanOrEqualTo: Timestamp(date: thresholdDate)
-            )
-        }
-
-        if query.unreadOnly {
-            firestoreQuery = firestoreQuery.whereField("isRead", isEqualTo: false)
-        }
-
-        let isDescending = query.sortOrder == .latest
-        firestoreQuery = firestoreQuery
-            .order(by: "receivedAt", descending: isDescending)
-            .order(by: FieldPath.documentID())
+        var firestoreQuery = makeQuery(uid: uid, query: notificationQuery)
 
         if let cursor {
             firestoreQuery = firestoreQuery.start(after: [
@@ -121,13 +106,13 @@ final class PushNotificationService {
         }
 
         let snapshot = try await firestoreQuery
-            .limit(to: query.pageSize)
+            .limit(to: notificationQuery.pageSize)
             .getDocuments()
 
         let items = snapshot.documents.compactMap { makeResponse(from: $0) }
 
         let nextCursor: PushNotificationCursorDTO? = snapshot.documents.last.map { document in
-            guard let receivedAt = document.data()[NotificationFieldKey.receivedAt.rawValue] as? Timestamp else {
+            guard let receivedAt = document.data()[Key.receivedAt.rawValue] as? Timestamp else {
                 return nil
             }
 
@@ -140,6 +125,39 @@ final class PushNotificationService {
         return PushNotificationPageResponse(items: items, nextCursor: nextCursor)
     }
 
+    func observeNotifications(
+        _ query: PushNotificationQuery,
+        limit: Int
+    ) throws -> AnyPublisher<PushNotificationPageResponse, Error> {
+        guard let uid = Auth.auth().currentUser?.uid else { throw AuthError.notAuthenticated }
+
+        let subject = PassthroughSubject<PushNotificationPageResponse, Error>()
+        let pageLimit = max(query.pageSize, limit)
+        let listener = makeQuery(uid: uid, query: query)
+            .limit(to: pageLimit)
+            .addSnapshotListener { [weak self] snapshot, error in
+                if let error {
+                    subject.send(completion: .failure(error))
+                    return
+                }
+
+                guard let self, let snapshot else { return }
+
+                let items = snapshot.documents.compactMap { self.makeResponse(from: $0) }
+                let nextCursor = self.makeNextCursor(from: snapshot.documents.last)
+                subject.send(
+                    PushNotificationPageResponse(
+                        items: items,
+                        nextCursor: nextCursor
+                    )
+                )
+            }
+
+        return subject
+            .handleEvents(receiveCancel: { listener.remove() })
+            .eraseToAnyPublisher()
+    }
+
     /// 푸시 알림 기록 삭제
     func deleteNotification(_ notificationID: String) async throws {
         guard let uid = Auth.auth().currentUser?.uid else { throw AuthError.notAuthenticated }
@@ -177,15 +195,51 @@ final class PushNotificationService {
 }
 
 private extension PushNotificationService {
+    func makeQuery(
+        uid: String,
+        query: PushNotificationQuery
+    ) -> Query {
+        var firestoreQuery: Query = store.collection("users/\(uid)/notifications")
+
+        if let thresholdDate = query.timeFilter.thresholdDate {
+            firestoreQuery = firestoreQuery.whereField(
+                "receivedAt",
+                isGreaterThanOrEqualTo: Timestamp(date: thresholdDate)
+            )
+        }
+
+        if query.unreadOnly {
+            firestoreQuery = firestoreQuery.whereField("isRead", isEqualTo: false)
+        }
+
+        let isDescending = query.sortOrder == .latest
+        return firestoreQuery
+            .order(by: "receivedAt", descending: isDescending)
+            .order(by: FieldPath.documentID())
+    }
+
+    func makeNextCursor(from document: QueryDocumentSnapshot?) -> PushNotificationCursorDTO? {
+        guard
+            let document,
+            let receivedAt = document.data()[Key.receivedAt.rawValue] as? Timestamp else {
+            return nil
+        }
+
+        return PushNotificationCursorDTO(
+            receivedAt: receivedAt.dateValue(),
+            documentID: document.documentID
+        )
+    }
+
     func makeResponse(from snapshot: QueryDocumentSnapshot) -> PushNotificationResponse? {
         let data = snapshot.data()
         guard
-            let title = data[NotificationFieldKey.title.rawValue] as? String,
-            let body = data[NotificationFieldKey.body.rawValue] as? String,
-            let receivedAt = data[NotificationFieldKey.receivedAt.rawValue] as? Timestamp,
-            let isRead = data[NotificationFieldKey.isRead.rawValue] as? Bool,
-            let todoId = data[NotificationFieldKey.todoId.rawValue] as? String,
-            let todoKind = data[NotificationFieldKey.todoKind.rawValue] as? String else {
+            let title = data[Key.title.rawValue] as? String,
+            let body = data[Key.body.rawValue] as? String,
+            let receivedAt = data[Key.receivedAt.rawValue] as? Timestamp,
+            let isRead = data[Key.isRead.rawValue] as? Bool,
+            let todoId = data[Key.todoId.rawValue] as? String,
+            let todoKind = data[Key.todoKind.rawValue] as? String else {
             return nil
         }
 
@@ -200,7 +254,7 @@ private extension PushNotificationService {
         )
     }
 
-    enum NotificationFieldKey: String {
+    enum Key: String {
         case title
         case body
         case receivedAt
diff --git a/DevLog/Infra/Service/TodoService.swift b/DevLog/Infra/Service/TodoService.swift
@@ -37,7 +37,7 @@ final class TodoService {
         ]
         logger.info("Fetching todo page: \(logComponents.compactMap { $0 }.joined(separator: ", "))")
 
-        var firestoreQuery: Query = makeOrderedQuery(uid: uid, query: query)
+        var firestoreQuery = makeQuery(uid: uid, query: query)
 
         if let kind = query.kind {
             firestoreQuery = firestoreQuery.whereField("kind", isEqualTo: kind.rawValue)
@@ -209,7 +209,7 @@ final class TodoService {
 }
 
 private extension TodoService {
-    func makeOrderedQuery(uid: String, query: TodoQuery) -> Query {
+    func makeQuery(uid: String, query: TodoQuery) -> Query {
         let collection = store.collection("users/\(uid)/todoLists/")
 
         switch query.sortTarget {
diff --git a/DevLog/Presentation/ViewModel/PushNotificationListViewModel.swift b/DevLog/Presentation/ViewModel/PushNotificationListViewModel.swift
@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import Combine
 
 @Observable
 final class PushNotificationListViewModel: Store {
@@ -36,6 +37,7 @@ final class PushNotificationListViewModel: Store {
         case appendNotifications([PushNotificationItem], nextCursor: PushNotificationCursor?)
         case resetPagination
         case setHasMore(Bool)
+        case syncNotifications([PushNotificationItem], nextCursor: PushNotificationCursor?, hasMore: Bool)
         case toggleSortOption
         case setTimeFilter(PushNotificationQuery.TimeFilter)
         case toggleUnreadOnly
@@ -57,6 +59,7 @@ final class PushNotificationListViewModel: Store {
     private let fetchQueryUseCase: FetchPushNotificationQueryUseCase
     private let updateQueryUseCase: UpdatePushNotificationQueryUseCase
     private var pendingTask: (PushNotificationItem, Int)?
+    private var cancellable: AnyCancellable?
 
     init(
         fetchUseCase: FetchPushNotificationsUseCase,
@@ -95,7 +98,7 @@ final class PushNotificationListViewModel: Store {
         case .fetchNotifications, .confirmDelete, .setToast, .setSelectedTodoId, .loadNextPage:
             effects = reduceByView(action, state: &state)
 
-        case .setLoading, .appendNotifications, .resetPagination, .setHasMore:
+        case .setLoading, .appendNotifications, .resetPagination, .setHasMore, .syncNotifications:
             effects = reduceByRun(action, state: &state)
         }
 
@@ -106,10 +109,14 @@ final class PushNotificationListViewModel: Store {
     func run(_ effect: SideEffect) {
         switch effect {
         case .fetchNotifications(let query, let cursor):
+            if cursor == nil {
+                stopObservingNotifications()
+            }
             Task {
                 do {
                     defer { send(.setLoading(false)) }
                     send(.setLoading(true))
+                    let existingCount = cursor == nil ? 0 : self.state.notifications.count
 
                     let page = try await fetchUseCase.execute(query, cursor: cursor)
 
@@ -123,6 +130,10 @@ final class PushNotificationListViewModel: Store {
 
                     let hasMore = page.items.count == query.pageSize && page.nextCursor != nil
                     send(.setHasMore(hasMore))
+                    startObservingNotifications(
+                        query: query,
+                        limit: max(query.pageSize, existingCount + page.items.count)
+                    )
                 } catch {
                     send(.setAlert(isPresented: true))
                 }
@@ -252,6 +263,16 @@ private extension PushNotificationListViewModel {
             }
             state.notifications.append(contentsOf: filteredNotifications)
             state.nextCursor = nextCursor
+        case .syncNotifications(let notifications, let nextCursor, let hasMore):
+            let filteredNotifications: [PushNotificationItem]
+            if let (pendingItem, _) = pendingTask {
+                filteredNotifications = notifications.filter { $0.id != pendingItem.id }
+            } else {
+                filteredNotifications = notifications
+            }
+            state.notifications = filteredNotifications
+            state.nextCursor = nextCursor
+            state.hasMore = hasMore
         default:
             break
         }
@@ -276,6 +297,33 @@ private extension PushNotificationListViewModel {
         state.toastMessage = "실행 취소"
         state.showToast = isPresented
     }
+
+    func startObservingNotifications(
+        query: PushNotificationQuery,
+        limit: Int
+    ) {
+        cancellable = try? fetchUseCase.observe(query, limit: limit)
+            .receive(on: DispatchQueue.main)
+            .sink(
+                receiveCompletion: { [weak self] completion in
+                    guard let self else { return }
+                    if case .failure = completion {
+                        self.send(.setAlert(isPresented: true))
+                    }
+                },
+                receiveValue: { [weak self] page in
+                    guard let self else { return }
+                    let items = page.items.map { PushNotificationItem(from: $0) }
+                    let hasMore = items.count == max(query.pageSize, limit) && page.nextCursor != nil
+                    self.send(.syncNotifications(items, nextCursor: page.nextCursor, hasMore: hasMore))
+                }
+            )
+    }
+
+    func stopObservingNotifications() {
+        cancellable?.cancel()
+        cancellable = nil
+    }
 }
 
 extension PushNotificationQuery.SortOrder {

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ final class TodoService {`
`37`	`37`	`]`
`38`	`38`	`logger.info("Fetching todo page: \(logComponents.compactMap { $0 }.joined(separator: ", "))")`
`39`	`39`
`40`		`- var firestoreQuery: Query = makeOrderedQuery(uid: uid, query: query)`
	`40`	`+ var firestoreQuery = makeQuery(uid: uid, query: query)`
`41`	`41`
`42`	`42`	`if let kind = query.kind {`
`43`	`43`	`firestoreQuery = firestoreQuery.whereField("kind", isEqualTo: kind.rawValue)`
`@@ -209,7 +209,7 @@ final class TodoService {`
`209`	`209`	`}`
`210`	`210`
`211`	`211`	`private extension TodoService {`
`212`		`- func makeOrderedQuery(uid: String, query: TodoQuery) -> Query {`
	`212`	`+ func makeQuery(uid: String, query: TodoQuery) -> Query {`
`213`	`213`	`let collection = store.collection("users/\(uid)/todoLists/")`
`214`	`214`
`215`	`215`	`switch query.sortTarget {`