refactor: refreshable fetch 흐름 분리

Author: opficdev

Application/DevLogPresentation/Sources/Home/List/TodoListView.swift

@@ -171,7 +171,7 @@ struct TodoListView: View {
                 }
                 .offset(y: headerOffset)
             }
-            .refreshable { store.send(.view(.refresh)) }
+            .refreshable { await store.send(.view(.refresh)).finish() }
             .scrollDisabled(visibleTodos.isEmpty || store.state.isLoading)
 
             if store.state.isLoading {

Application/DevLogPresentation/Sources/PushNotification/PushNotificationListFeature.swift

@@ -58,6 +58,7 @@ struct PushNotificationListFeature {
         case loading(LoadingFeature.Action)
 
         enum ViewAction: Equatable {
+            case refresh
             case fetchNotifications
             case loadNextPage
             case deleteNotification(PushNotificationItem)
@@ -83,7 +84,6 @@ struct PushNotificationListFeature {
             case syncNotifications([PushNotificationItem], nextCursor: PushNotificationCursor?, hasMore: Bool)
             case setNotificationHidden(String, Bool)
             case setNotificationRead(String, Bool)
-            case observeNotifications(PushNotificationQuery, Int)
         }
     }
 
@@ -151,6 +151,9 @@ private extension PushNotificationListFeature {
         state: inout State
     ) -> Effect<Action> {
         switch action {
+        case .refresh:
+            state.nextCursor = nil
+            return fetchNotificationsPageEffect(query: state.query, cursor: nil)
         case .fetchNotifications:
             state.nextCursor = nil
             return fetchNotificationsEffect(query: state.query, cursor: nil, existingCount: 0)
@@ -252,8 +255,6 @@ private extension PushNotificationListFeature {
             if let index = state.notifications.firstIndex(where: { $0.id == notificationId }) {
                 state.notifications[index].isRead = isRead
             }
-        case .observeNotifications(let query, let limit):
-            return observeNotificationsEffect(query: query, limit: limit)
         }
 
         return .none
@@ -272,7 +273,28 @@ private extension PushNotificationListFeature {
         existingCount: Int
     ) -> Effect<Action> {
         let limit = max(query.pageSize, existingCount)
-        let fetchEffect: Effect<Action> = .run { [fetchPushNotificationsUseCase] send in
+        let fetchEffect = fetchNotificationsPageEffect(query: query, cursor: cursor)
+        let observeEffect = observeNotificationsEffect(
+            query: query,
+            limit: max(limit, existingCount + query.pageSize)
+        )
+
+        if cursor == nil {
+            return .concatenate(
+                .cancel(id: CancelID.observeNotifications),
+                fetchEffect,
+                observeEffect
+            )
+        }
+
+        return fetchEffect
+    }
+
+    func fetchNotificationsPageEffect(
+        query: PushNotificationQuery,
+        cursor: PushNotificationCursor?
+    ) -> Effect<Action> {
+        .run { [fetchPushNotificationsUseCase] send in
             await send(.loading(.begin(target: .default, mode: .delayed)))
             do {
                 let page = try await fetchPushNotificationsUseCase.execute(query, cursor: cursor)
@@ -286,23 +308,13 @@ private extension PushNotificationListFeature {
                     ))
                 )
                 await send(.store(.setHasMore(page.items.count == query.pageSize && page.nextCursor != nil)))
-                await send(.store(.observeNotifications(query, max(limit, existingCount + page.items.count))))
                 await send(.loading(.end(target: .default, mode: .delayed)))
             } catch {
                 await send(.loading(.end(target: .default, mode: .delayed)))
                 await send(.store(.setAlert))
             }
         }
         .cancellable(id: CancelID.fetchNotifications, cancelInFlight: true)
-
-        if cursor == nil {
-            return .concatenate(
-                .cancel(id: CancelID.observeNotifications),
-                fetchEffect
-            )
-        }
-
-        return fetchEffect
     }
 
     func observeNotificationsEffect(

Application/DevLogPresentation/Sources/PushNotification/PushNotificationListView.swift

@@ -38,7 +38,7 @@ struct PushNotificationListView: View {
                     headerOffset = max(0, -offset)
                 }
                 .safeAreaInset(edge: .top) { safeAreaHeader }
-                .refreshable { store.send(.view(.fetchNotifications)) }
+                .refreshable { await store.send(.view(.refresh)).finish() }
                 .navigationTitle(String(localized: "nav_push_notifications"))
                 .listStyle(.plain)
         }

Application/DevLogPresentation/Sources/Today/TodayView.swift

@@ -39,7 +39,7 @@ struct TodayView: View {
         .navigationTitle(String(localized: "nav_today"))
         .toolbar { toolbarContent }
         .background(NavigationBarConfigurator())
-        .refreshable { store.send(.refresh) }
+        .refreshable { await store.send(.refresh).finish() }
         .alert($store.scope(state: \.alert, action: \.alert))
         .overlay {
             if store.isLoading {