Merge pull request #207 from Team-Ampersand/201-data-fetch-timing-change

🔀 :: [#201] 데이터 fetching 시점 변경
Team-Ampersand · Oct 6, 2023 · ea92e33 · ea92e33
2 parents 0dd4a99 + 28c6ebe
commit ea92e33
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 17 deletions.
diff --git a/Projects/Feature/MassageFeature/Sources/Scene/MassageStore.swift b/Projects/Feature/MassageFeature/Sources/Scene/MassageStore.swift
@@ -27,7 +27,7 @@ final class MassageStore: BaseStore {
     }
 
     enum Action {
-        case viewDidLoad
+        case viewWillAppear
         case fetchMassageRankList
     }
 
@@ -40,8 +40,8 @@ final class MassageStore: BaseStore {
 extension MassageStore {
     func mutate(state: State, action: Action) -> SideEffect<Mutation, Never> {
         switch action {
-        case .viewDidLoad:
-            return viewDidLoad()
+        case .viewWillAppear:
+            return viewWillAppear()
 
         case .fetchMassageRankList:
             return fetchMassageRankList()
@@ -66,7 +66,7 @@ extension MassageStore {
 
 // MARK: - Mutate
 private extension MassageStore {
-    func viewDidLoad() -> SideEffect<Mutation, Never> {
+    func viewWillAppear() -> SideEffect<Mutation, Never> {
         return self.fetchMassageRankList()
     }
 

diff --git a/Projects/Feature/MassageFeature/Sources/Scene/MassageViewController.swift b/Projects/Feature/MassageFeature/Sources/Scene/MassageViewController.swift
@@ -11,7 +11,6 @@ final class MassageViewController: BaseStoredViewController<MassageStore> {
     private let massageNavigationBarLabel = DotoriNavigationBarLabel(text: L10n.Massage.massageTitle)
     private let massageTableView = UITableView()
         .set(\.backgroundColor, .clear)
-        .set(\.isHidden, true)
         .set(\.separatorStyle, .none)
         .set(\.sectionHeaderHeight, 0)
         .then {
@@ -63,8 +62,8 @@ final class MassageViewController: BaseStoredViewController<MassageStore> {
     }
 
     override func bindAction() {
-        viewDidLoadPublisher
-            .map { Store.Action.viewDidLoad }
+        viewWillAppearPublisher
+            .map { Store.Action.viewWillAppear }
             .sink(receiveValue: store.send(_:))
             .store(in: &subscription)
 
@@ -96,11 +95,9 @@ final class MassageViewController: BaseStoredViewController<MassageStore> {
         sharedState
             .map(\.massageRankList)
             .map(\.isEmpty)
+            .not()
             .removeDuplicates()
-            .sink(with: self, receiveValue: { owner, massageIsEmpty in
-                owner.massageTableView.isHidden = massageIsEmpty
-                owner.emptySelfStudyStackView.isHidden = !massageIsEmpty
-            })
+            .assign(to: \.isHidden, on: emptySelfStudyStackView)
             .store(in: &subscription)
     }
 }
diff --git a/Projects/Feature/SelfStudyFeature/Sources/Scene/SelfStudyViewController.swift b/Projects/Feature/SelfStudyFeature/Sources/Scene/SelfStudyViewController.swift
@@ -23,7 +23,6 @@ final class SelfStudyViewController: BaseStoredViewController<SelfStudyStore> {
         .set(\.separatorStyle, .none)
         .set(\.sectionHeaderHeight, 0)
         .set(\.sectionFooterHeight, 0)
-        .set(\.isHidden, true)
         .then {
             $0.register(cellType: SelfStudyCell.self)
         }
@@ -77,7 +76,7 @@ final class SelfStudyViewController: BaseStoredViewController<SelfStudyStore> {
     }
 
     override func bindAction() {
-        viewDidLoadPublisher
+        viewWillAppearPublisher
             .merge(with: selfStudyRefreshContorol.controlPublisher(for: .valueChanged).map { _ in })
             .map { Store.Action.fetchSelfStudyRank }
             .sink(receiveValue: store.send(_:))
@@ -103,11 +102,9 @@ final class SelfStudyViewController: BaseStoredViewController<SelfStudyStore> {
         sharedState
             .map(\.selfStudyRankList)
             .map(\.isEmpty)
+            .not()
             .removeDuplicates()
-            .sink(with: self, receiveValue: { owner, selfStudyIsEmpty in
-                owner.selfStudyTableView.isHidden = selfStudyIsEmpty
-                owner.emptySelfStudyStackView.isHidden = !selfStudyIsEmpty
-            })
+            .assign(to: \.isHidden, on: emptySelfStudyStackView)
             .store(in: &subscription)
 
         sharedState

diff --git a/Projects/Shared/CombineUtility/Sources/Publisher/Publisher+not.swift b/Projects/Shared/CombineUtility/Sources/Publisher/Publisher+not.swift
@@ -0,0 +1,7 @@
+import Combine
+
+public extension Publisher where Output == Bool {
+    func not() -> Publishers.Map<Self, Bool> {
+        self.map { !$0 }
+    }
+}