refactor: view / store 간 액션 분리

Author: opficdev

Application/DevLogPresentation/Sources/Home/Home/HomeFeature+Effects.swift

@@ -21,7 +21,7 @@ extension HomeFeature {
         .publisher { [networkConnectivityUseCase] in
             networkConnectivityUseCase.observe()
                 .receive(on: DispatchQueue.main)
-                .map(Action.networkStatusChanged)
+                .map { .store(.networkStatusChanged($0)) }
         }
         .cancellable(id: CancelID.networkConnectivity, cancelInFlight: true)
     }
@@ -33,7 +33,7 @@ extension HomeFeature {
                 let preferences = try await fetchPreferencesUseCase.execute()
                 await send(.store(.setTodoCategory(preferences.map(TodoCategoryItem.init(from:)))))
             } catch {
-                await send(.setAlert(isPresented: true, type: .error))
+                await send(.store(.setAlert(isPresented: true, type: .error)))
             }
             await send(.loading(.end(target: LoadingTarget.preferences.target, mode: .immediate)))
         }
@@ -50,7 +50,7 @@ extension HomeFeature {
                     .compactMap(RecentTodoItem.init(from:))
                 await send(.store(.updateRecentTodos(Array(items))))
             } catch {
-                await send(.setAlert(isPresented: true, type: .error))
+                await send(.store(.setAlert(isPresented: true, type: .error)))
             }
             await send(.loading(.end(target: LoadingTarget.recentTodos.target, mode: .immediate)))
         }
@@ -63,7 +63,7 @@ extension HomeFeature {
                 let pages = try await fetchWebPagesUseCase.execute("")
                 await send(.store(.updateWebPages(pages.map(WebPageItem.init(from:)))))
             } catch {
-                await send(.setAlert(isPresented: true, type: .error))
+                await send(.store(.setAlert(isPresented: true, type: .error)))
             }
             await send(.loading(.end(target: LoadingTarget.webPage.target, mode: .immediate)))
         }
@@ -78,7 +78,7 @@ extension HomeFeature {
                 let pages = try await fetchWebPagesUseCase.execute("")
                 await send(.store(.updateWebPages(pages.map(WebPageItem.init(from:)))))
             } catch {
-                await send(.setAlert(isPresented: true, type: .error))
+                await send(.store(.setAlert(isPresented: true, type: .error)))
             }
             await send(.loading(.end(target: LoadingTarget.overlay.target, mode: .delayed)))
         }
@@ -89,8 +89,8 @@ extension HomeFeature {
             do {
                 try await deleteWebPageUseCase.execute(page.url.absoluteString)
             } catch {
-                await send(.handleWebPageDeleteFailure(page.id))
-                await send(.setAlert(isPresented: true, type: .error))
+                await send(.store(.handleWebPageDeleteFailure(page.id)))
+                await send(.store(.setAlert(isPresented: true, type: .error)))
             }
         }
     }
@@ -102,9 +102,9 @@ extension HomeFeature {
                 try await addWebPageUseCase.execute(urlString)
             } catch {
                 if let webPageURL = URL(string: urlString) {
-                    await send(.setWebPageHidden(webPageURL, true))
+                    await send(.store(.setWebPageHidden(webPageURL, true)))
                 }
-                await send(.setAlert(isPresented: true, type: .error))
+                await send(.store(.setAlert(isPresented: true, type: .error)))
             }
         }
     }
@@ -114,7 +114,7 @@ extension HomeFeature {
             do {
                 try await updatePreferencesUseCase.execute(items.map(\.preference))
             } catch {
-                await send(.setAlert(isPresented: true, type: .error))
+                await send(.store(.setAlert(isPresented: true, type: .error)))
             }
         }
     }
@@ -123,7 +123,7 @@ extension HomeFeature {
         .run { [clock] send in
             // iOS 17에서 시트 dismiss 직후 fullScreenCover를 바로 올리지 않도록 하기 위해서 0.1초 딜레이
             try await clock.sleep(for: .seconds(0.1))
-            await send(.setPresentation(.todoEditor, true))
+            await send(.store(.setPresentation(.todoEditor, true)))
         }
         .cancellable(id: CancelID.delayedTodoEditor, cancelInFlight: true)
     }

Application/DevLogPresentation/Sources/Home/Home/HomeFeature.swift

@@ -50,27 +50,31 @@ struct HomeFeature {
         case alert(PresentationAction<Never>)
         case sheet(PresentationAction<Sheet>)
         case fullScreenCover(PresentationAction<Never>)
-        case startObserving
-        case fetchData
-        case refreshRecentTodos
-        case networkStatusChanged(Bool)
-        case setSheet(SheetState?)
-        case setPresentation(Presentation, Bool)
-        case setAlert(isPresented: Bool, type: AlertType? = nil)
-        case refreshWebPages
-        case setWebPageHidden(URL, Bool)
-        case handleWebPageDeleteFailure(URL)
-        case finishDeleteWebPageToast(String)
-        case tapTodoCategory(TodoCategory)
-        case orderTodoCategory([TodoCategoryItem])
-        case updateWebPageURLInput(String)
-        case addWebPage
-        case deleteWebPage(WebPageItem)
-        case undoDeleteWebPage
+        case view(ViewAction)
         case store(StoreAction)
         case loading(LoadingFeature.Action)
 
+        enum ViewAction: Equatable {
+            case startObserving
+            case fetchData
+            case refreshRecentTodos
+            case refreshWebPages
+            case finishDeleteWebPageToast(String)
+            case tapTodoCategory(TodoCategory)
+            case orderTodoCategory([TodoCategoryItem])
+            case updateWebPageURLInput(String)
+            case addWebPage
+            case deleteWebPage(WebPageItem)
+            case undoDeleteWebPage
+        }
+
         enum StoreAction: Equatable {
+            case networkStatusChanged(Bool)
+            case setSheet(SheetState?)
+            case setPresentation(Presentation, Bool)
+            case setAlert(isPresented: Bool, type: AlertType? = nil)
+            case setWebPageHidden(URL, Bool)
+            case handleWebPageDeleteFailure(URL)
             case setTodoCategory([TodoCategoryItem])
             case updateRecentTodos([RecentTodoItem])
             case updateWebPages([WebPageItem])
@@ -193,82 +197,10 @@ struct HomeFeature {
                 state.sheet = nil
             case .sheet:
                 break
-            case .startObserving:
-                return observeNetworkConnectivityEffect()
-            case .fetchData:
-                return .merge(
-                    fetchTodoCategoryPreferencesEffect(),
-                    fetchRecentTodosEffect(),
-                    fetchWebPagesEffect()
-                )
-            case .refreshRecentTodos:
-                return fetchRecentTodosEffect()
-            case .networkStatusChanged(let isConnected):
-                state.isNetworkConnected = isConnected
-            case .setSheet(let sheet):
-                state.sheet = sheet
-            case .setPresentation(let presentation, let isPresented):
-                Self.setPresentation(&state, presentation: presentation, isPresented: isPresented)
-            case .setAlert(let isPresented, let type):
-                Self.setAlert(&state, isPresented: isPresented, type: type)
-            case .refreshWebPages:
-                return fetchWebPagesEffect()
-            case .setWebPageHidden(let webPageURL, let isHidden):
-                if let index = state.webPages.firstIndex(where: { $0.id == webPageURL }) {
-                    state.webPages[index].isHidden = isHidden
-                }
-            case .handleWebPageDeleteFailure(let webPageURL):
-                if let index = state.webPages.firstIndex(where: { $0.id == webPageURL }) {
-                    state.webPages[index].isHidden = false
-                } else {
-                    state.needsWebPageRefresh = true
-                }
-            case .finishDeleteWebPageToast(let urlString):
-                state.webPages.removeAll { $0.url.absoluteString == urlString && $0.isHidden }
-                if state.deletedWebPageURLString == urlString {
-                    state.deletedWebPageURLString = nil
-                }
-            case .tapTodoCategory(let category):
-                state.selectedTodoCategory = category
-                state.sheet = nil
-                return delayedTodoEditorEffect()
-            case .orderTodoCategory(let preferences):
-                state.preferences = preferences
-                state.recentTodos = Self.syncRecentTodos(state.recentTodos, preferences: preferences)
-                state.sheet = nil
-                return updateTodoCategoryPreferencesEffect(preferences)
-            case .updateWebPageURLInput(let text):
-                state.webPageURLInput = text
-            case .addWebPage:
-                guard let normalizedURL = Self.normalizedWebPageURL(state.webPageURLInput) else {
-                    Self.setAlert(&state, isPresented: true, type: .invalidURL)
-                    return .none
-                }
-                state.sheet = nil
-                Self.setAlert(&state, isPresented: false, type: nil)
-                return addWebPageEffect(normalizedURL)
-            case .deleteWebPage(let page):
-                guard let index = state.webPages.firstIndex(where: { $0.id == page.id }) else {
-                    return .none
-                }
-                state.deletedWebPageURLString = page.url.absoluteString
-                state.webPages[index].isHidden = true
-                return deleteWebPageEffect(page)
-            case .undoDeleteWebPage:
-                guard let urlString = state.deletedWebPageURLString else { return .none }
-                if let index = state.webPages.firstIndex(where: { $0.url.absoluteString == urlString }) {
-                    state.webPages[index].isHidden = false
-                }
-                state.deletedWebPageURLString = nil
-                return undoDeleteWebPageEffect(urlString)
-            case .store(.setTodoCategory(let preferences)):
-                state.preferences = preferences
-                state.recentTodos = Self.syncRecentTodos(state.recentTodos, preferences: preferences)
-            case .store(.updateRecentTodos(let todos)):
-                state.recentTodos = todos
-            case .store(.updateWebPages(let pages)):
-                state.webPages = pages
-                state.needsWebPageRefresh = false
+            case .view(let action):
+                return reduce(action, state: &state)
+            case .store(let action):
+                return reduce(action, state: &state)
             case .loading:
                 break
             }
@@ -282,6 +214,104 @@ struct HomeFeature {
     }
 }
 
+private extension HomeFeature {
+    func reduce(
+        _ action: Action.ViewAction,
+        state: inout State
+    ) -> Effect<Action> {
+        switch action {
+        case .startObserving:
+            return observeNetworkConnectivityEffect()
+        case .fetchData:
+            return .merge(
+                fetchTodoCategoryPreferencesEffect(),
+                fetchRecentTodosEffect(),
+                fetchWebPagesEffect()
+            )
+        case .refreshRecentTodos:
+            return fetchRecentTodosEffect()
+        case .refreshWebPages:
+            return fetchWebPagesEffect()
+        case .finishDeleteWebPageToast(let urlString):
+            state.webPages.removeAll { $0.url.absoluteString == urlString && $0.isHidden }
+            if state.deletedWebPageURLString == urlString {
+                state.deletedWebPageURLString = nil
+            }
+        case .tapTodoCategory(let category):
+            state.selectedTodoCategory = category
+            state.sheet = nil
+            return delayedTodoEditorEffect()
+        case .orderTodoCategory(let preferences):
+            state.preferences = preferences
+            state.recentTodos = Self.syncRecentTodos(state.recentTodos, preferences: preferences)
+            state.sheet = nil
+            return updateTodoCategoryPreferencesEffect(preferences)
+        case .updateWebPageURLInput(let text):
+            state.webPageURLInput = text
+        case .addWebPage:
+            guard let normalizedURL = Self.normalizedWebPageURL(state.webPageURLInput) else {
+                Self.setAlert(&state, isPresented: true, type: .invalidURL)
+                return .none
+            }
+            state.sheet = nil
+            Self.setAlert(&state, isPresented: false, type: nil)
+            return addWebPageEffect(normalizedURL)
+        case .deleteWebPage(let page):
+            guard let index = state.webPages.firstIndex(where: { $0.id == page.id }) else {
+                return .none
+            }
+            state.deletedWebPageURLString = page.url.absoluteString
+            state.webPages[index].isHidden = true
+            return deleteWebPageEffect(page)
+        case .undoDeleteWebPage:
+            guard let urlString = state.deletedWebPageURLString else { return .none }
+            if let index = state.webPages.firstIndex(where: { $0.url.absoluteString == urlString }) {
+                state.webPages[index].isHidden = false
+            }
+            state.deletedWebPageURLString = nil
+            return undoDeleteWebPageEffect(urlString)
+        }
+
+        return .none
+    }
+
+    func reduce(
+        _ action: Action.StoreAction,
+        state: inout State
+    ) -> Effect<Action> {
+        switch action {
+        case .networkStatusChanged(let isConnected):
+            state.isNetworkConnected = isConnected
+        case .setSheet(let sheet):
+            state.sheet = sheet
+        case .setPresentation(let presentation, let isPresented):
+            Self.setPresentation(&state, presentation: presentation, isPresented: isPresented)
+        case .setAlert(let isPresented, let type):
+            Self.setAlert(&state, isPresented: isPresented, type: type)
+        case .setWebPageHidden(let webPageURL, let isHidden):
+            if let index = state.webPages.firstIndex(where: { $0.id == webPageURL }) {
+                state.webPages[index].isHidden = isHidden
+            }
+        case .handleWebPageDeleteFailure(let webPageURL):
+            if let index = state.webPages.firstIndex(where: { $0.id == webPageURL }) {
+                state.webPages[index].isHidden = false
+            } else {
+                state.needsWebPageRefresh = true
+            }
+        case .setTodoCategory(let preferences):
+            state.preferences = preferences
+            state.recentTodos = Self.syncRecentTodos(state.recentTodos, preferences: preferences)
+        case .updateRecentTodos(let todos):
+            state.recentTodos = todos
+        case .updateWebPages(let pages):
+            state.webPages = pages
+            state.needsWebPageRefresh = false
+        }
+
+        return .none
+    }
+}
+
 private struct HomeSheetFeature: Reducer {
     typealias State = HomeFeature.SheetState
     typealias Action = HomeFeature.Sheet