implement: NetwokUseCase 구현

Author: okstring

Podfile

@@ -13,4 +13,19 @@ target 'RxSidedish' do
   pod 'RxDataSources'
   pod 'RxViewController'
   pod 'Alamofire'
+  pod 'RxBlocking'
+end
+
+
+target 'RxSidedishTests' do
+  use_frameworks!
+
+  pod 'RxSwift'
+  pod 'RxCocoa'
+  pod 'Action'
+  pod 'NSObject+Rx'
+  pod 'RxDataSources'
+  pod 'RxViewController'
+  pod 'Alamofire'
+  pod 'RxBlocking'
 end

Podfile.lock

@@ -4,8 +4,10 @@ PODS:
     - RxSwift (~> 6.0)
   - Alamofire (5.4.3)
   - Differentiator (5.0.0)
-  - "NSObject+Rx (5.2.1)":
-    - RxSwift (~> 6.0)
+  - "NSObject+Rx (5.2.2)":
+    - RxSwift (~> 6.2)
+  - RxBlocking (6.2.0):
+    - RxSwift (= 6.2.0)
   - RxCocoa (6.2.0):
     - RxRelay (= 6.2.0)
     - RxSwift (= 6.2.0)
@@ -24,6 +26,7 @@ DEPENDENCIES:
   - Action
   - Alamofire
   - "NSObject+Rx"
+  - RxBlocking
   - RxCocoa
   - RxDataSources
   - RxSwift
@@ -35,6 +38,7 @@ SPEC REPOS:
     - Alamofire
     - Differentiator
     - "NSObject+Rx"
+    - RxBlocking
     - RxCocoa
     - RxDataSources
     - RxRelay
@@ -45,13 +49,14 @@ SPEC CHECKSUMS:
   Action: 47f1825511907b4fcd79dd7a7db9526c20f78018
   Alamofire: e447a2774a40c996748296fa2c55112fdbbc42f9
   Differentiator: e8497ceab83c1b10ca233716d547b9af21b9344d
-  "NSObject+Rx": 49ffbf55ad0bbc29a44547db63a9e33caf0c5d60
+  "NSObject+Rx": 61cf1f7306a73dcef8b36649198af0813ec18dfd
+  RxBlocking: 0b29f7d2079109a8de49c411381bed7c33ef1eeb
   RxCocoa: 4baf94bb35f2c0ab31bc0cb9f1900155f646ba42
   RxDataSources: aa47cc1ed6c500fa0dfecac5c979b723542d79cf
   RxRelay: e72dbfd157807478401ef1982e1c61c945c94b2f
   RxSwift: d356ab7bee873611322f134c5f9ef379fa183d8f
   RxViewController: 56486fa0afd629a1d6b5ba077f3b8cd9dc31b5d2
 
-PODFILE CHECKSUM: 8bb17836f1718029e16369a36a6cad324b08fed9
+PODFILE CHECKSUM: e70a84f31488d179909b2e157f18fed7bebd5fe2
 
 COCOAPODS: 1.10.1

RxSidedish.xcodeproj/project.pbxproj

@@ -8,6 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		220AADC426EB5716008DB9ED /* ViewDetailSidedishItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 220AADC326EB5716008DB9ED /* ViewDetailSidedishItem.swift */; };
+		220AADC926EB8817008DB9ED /* NetworkUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 220AADC826EB8817008DB9ED /* NetworkUseCase.swift */; };
 		220E095E26DD1A30003C72AE /* NetworkManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 220E095D26DD1A30003C72AE /* NetworkManager.swift */; };
 		221E9B1726DDCEA200FCF81C /* SidedishItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 221E9B1626DDCEA200FCF81C /* SidedishItem.swift */; };
 		221E9B2526DDD77A00FCF81C /* MainBody.swift in Sources */ = {isa = PBXBuildFile; fileRef = 221E9B2426DDD77A00FCF81C /* MainBody.swift */; };
@@ -61,6 +62,7 @@
 
 /* Begin PBXFileReference section */
 		220AADC326EB5716008DB9ED /* ViewDetailSidedishItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewDetailSidedishItem.swift; sourceTree = "<group>"; };
+		220AADC826EB8817008DB9ED /* NetworkUseCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkUseCase.swift; sourceTree = "<group>"; };
 		220E095D26DD1A30003C72AE /* NetworkManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkManager.swift; sourceTree = "<group>"; };
 		221E9B1626DDCEA200FCF81C /* SidedishItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SidedishItem.swift; sourceTree = "<group>"; };
 		221E9B2426DDD77A00FCF81C /* MainBody.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainBody.swift; sourceTree = "<group>"; };
@@ -130,6 +132,14 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		220AADC726EB8803008DB9ED /* UseCase */ = {
+			isa = PBXGroup;
+			children = (
+				220AADC826EB8817008DB9ED /* NetworkUseCase.swift */,
+			);
+			path = UseCase;
+			sourceTree = "<group>";
+		};
 		221E9B1526DDCD7300FCF81C /* Entity */ = {
 			isa = PBXGroup;
 			children = (
@@ -180,8 +190,8 @@
 			children = (
 				223F3F8C26DE0023005AFBB0 /* MainViewModel.swift */,
 				223F3F8F26DE002B005AFBB0 /* DetailViewModel.swift */,
-				222E078A26E0C1F000F53227 /* CommonViewModel.swift */,
 				220AADC326EB5716008DB9ED /* ViewDetailSidedishItem.swift */,
+				222E078A26E0C1F000F53227 /* CommonViewModel.swift */,
 			);
 			name = ViewModel;
 			sourceTree = "<group>";
@@ -243,9 +253,10 @@
 				229E7E1826DE8BD50091BE43 /* Service */,
 				222E078E26E0C40900F53227 /* View */,
 				226B8BC126E6627B00F79865 /* Delegate */,
-				223F3F9626DE6FFE005AFBB0 /* ViewController */,
 				223F3F8426DDFDEE005AFBB0 /* Scene */,
+				223F3F9626DE6FFE005AFBB0 /* ViewController */,
 				223F3F8B26DE0009005AFBB0 /* ViewModel */,
+				220AADC726EB8803008DB9ED /* UseCase */,
 				223F3F7C26DDF211005AFBB0 /* extension */,
 				221E9B1526DDCD7300FCF81C /* Entity */,
 				22BF2B2726DD18FF009A8B51 /* Network */,
@@ -501,6 +512,7 @@
 				224BE9CF26E622ED00EC99C6 /* RoundImageView.swift in Sources */,
 				22BF2B0C26DD13AF009A8B51 /* MainViewController.swift in Sources */,
 				223F3F7626DDE60B005AFBB0 /* ServerAPI.swift in Sources */,
+				220AADC926EB8817008DB9ED /* NetworkUseCase.swift in Sources */,
 				223F3F8D26DE0023005AFBB0 /* MainViewModel.swift in Sources */,
 				221E9B1726DDCEA200FCF81C /* SidedishItem.swift in Sources */,
 				224BE9CB26E61A8400EC99C6 /* MainTableViewHeaderView.swift in Sources */,

RxSidedish/AppDelegate.swift

@@ -16,8 +16,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
         let sceneCoordinator = SceneCoordinator(window: window!)
         let storage = SidedishStorage()
-        let networkManager = NetworkManager()
-        let mainViewModel = MainViewModel(title: "", sceneCoordinator: sceneCoordinator, storage: storage, networkManager: networkManager)
+        let networkUseCase = NetworkUseCase()
+        let mainViewModel = MainViewModel(title: "", sceneCoordinator: sceneCoordinator, storage: storage, networkUseCase: networkUseCase)
+        
         let mainScene = Scene.main(mainViewModel)
 
         sceneCoordinator.transition(to: mainScene, using: .root, animated: false)

RxSidedish/CommonViewModel.swift

@@ -13,12 +13,12 @@ class CommonViewModel: NSObject {
     let title: Driver<String>
     let sceneCoordinator: SceneCoordinatorType
     let storage: SidedishStorageType
-    let networkManager: Networkable
+    let networkUseCase: NetworkUseCase
 
-    init(title: String, sceneCoordinator: SceneCoordinatorType, storage: SidedishStorageType, networkManager: Networkable) {
+    init(title: String, sceneCoordinator: SceneCoordinatorType, storage: SidedishStorageType, networkUseCase: NetworkUseCase) {
         self.title = Observable.just(title).asDriver(onErrorJustReturn: "")
         self.sceneCoordinator = sceneCoordinator
         self.storage = storage
-        self.networkManager = networkManager
+        self.networkUseCase = networkUseCase
     }
 }

RxSidedish/DetailViewModel.swift

@@ -18,7 +18,7 @@ class DetailViewModel: CommonViewModel {
     var thumbnailImagesURL: Observable<String>
     var detailSectionImageURL: Observable<String>
 
-    init(title: String, sceneCoordinator: SceneCoordinatorType, storage: SidedishStorageType, networkManager: Networkable, detailHash: String) {
+    init(title: String, sceneCoordinator: SceneCoordinatorType, storage: SidedishStorageType, networkUseCase: NetworkUseCase, detailHash: String) {
 
         let fetching = PublishSubject<Void>()
 
@@ -29,8 +29,8 @@ class DetailViewModel: CommonViewModel {
         fetching
             .asObservable()
             .debug()
-            .flatMap{ networkManager.get(type: DetailBody.self, endpoint: .detail(detailHash)) }
-            .map({ ViewDetailSidedishItem(title: title, item: $0.data) })
+            .flatMap{ networkUseCase.getDetailSideDishItem(hash: detailHash) }
+            .map({ ViewDetailSidedishItem(title: title, item: $0) })
             .subscribe(onNext: item.onNext)
             .disposed(by: disposeBag)
 
@@ -44,6 +44,6 @@ class DetailViewModel: CommonViewModel {
             .map({ $0.detailSectionImagesURL })
             .flatMap({ Observable.from($0) })
 
-        super.init(title: title, sceneCoordinator: sceneCoordinator, storage: storage, networkManager: networkManager)
+        super.init(title: title, sceneCoordinator: sceneCoordinator, storage: storage, networkUseCase: networkUseCase)
     }
 }

RxSidedish/MainViewModel.swift

@@ -51,7 +51,7 @@ class MainViewModel: CommonViewModel {
     lazy var detailAction: Action<SidedishItem, Void> = {
         return Action { item in
 
-            let detailViewModel = DetailViewModel(title: item.title, sceneCoordinator: self.sceneCoordinator, storage: self.storage, networkManager: self.networkManager, detailHash: item.detailHash)
+            let detailViewModel = DetailViewModel(title: item.title, sceneCoordinator: self.sceneCoordinator, storage: self.storage, networkUseCase: self.networkUseCase, detailHash: item.detailHash)
 
             let detailScene = Scene.detail(detailViewModel)
 
@@ -60,11 +60,8 @@ class MainViewModel: CommonViewModel {
     }()
 
     func fetchSidedishes() -> Observable<[MainSection]> {
-        Observable.zip(
-            ServerAPI.mainCategories.map {
-                networkManager.get(type: MainBody.self, endpoint: $0)
-            })
-            .map({ $0.map{ $0.mainItems } })
+        
+        networkUseCase.getSidedishItems()
             .flatMap(storage.allUpdateSidedish)
             .asObservable()
     }

RxSidedish/UseCase/NetworkUseCase.swift

@@ -0,0 +1,32 @@
+//
+//  NetworkUseCase.swift
+//  RxSidedish
+//
+//  Created by Issac on 2021/09/10.
+//
+
+import Foundation
+import RxSwift
+
+class NetworkUseCase {
+    let networkManager: Networkable
+    
+    init(networkManager: Networkable = NetworkManager()) {
+        self.networkManager = networkManager
+    }
+    
+    func getSidedishItems() -> Observable<[[SidedishItem]]> {
+        
+        return Observable.zip(
+            ServerAPI.mainCategories.map {
+                networkManager.get(type: MainBody.self, endpoint: $0)
+            })
+            .map({ $0.map{ $0.mainItems } })
+    }
+    
+    func getDetailSideDishItem(hash: String) -> Observable<DetailSidedishItem> {
+        
+        return networkManager.get(type: DetailBody.self, endpoint: .detail(hash))
+            .map({ $0.data })
+    }
+}

RxSidedish/ViewController/MainViewController.swift

@@ -41,7 +41,7 @@ class MainViewController: UIViewController, ViewModelBindableType {
             .bind(to: viewModel.detailAction.inputs)
             .disposed(by: rx.disposeBag)
 
-        //TODO: -
+        //MARK: -
         viewModel.fetchSidedishes()
             .subscribe{ _ in }
             .disposed(by: rx.disposeBag)

RxSidedish/ViewDetailSidedishItem.swift

@@ -7,7 +7,7 @@
 
 import Foundation
 
-struct ViewDetailSidedishItem {
+struct ViewDetailSidedishItem: Equatable {
     var title: String
     var thumbnailImagesURL: [String]
     let productDescription: String