Refactor

kudoleh · kudoleh · commit aacaad6b71a0 · 2020-03-24T18:52:18.000Z
diff --git a/ExampleMVVM.xcodeproj/project.pbxproj b/ExampleMVVM.xcodeproj/project.pbxproj
@@ -11,7 +11,7 @@
 		1F05A6CC2220A2CB001E2801 /* SearchMoviesUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F05A6CB2220A2CB001E2801 /* SearchMoviesUseCase.swift */; };
 		1F0CEFCF23436B67004141FA /* ConnectionError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F0CEFCE23436B67004141FA /* ConnectionError.swift */; };
 		1F0CEFD023436B8B004141FA /* ConnectionError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F0CEFCE23436B67004141FA /* ConnectionError.swift */; };
-		1F16031D2426919300C173C6 /* AppMainFlowCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F16031C2426919300C173C6 /* AppMainFlowCoordinator.swift */; };
+		1F16031D2426919300C173C6 /* AppFlowCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F16031C2426919300C173C6 /* AppFlowCoordinator.swift */; };
 		1F160324242693DD00C173C6 /* MoviesSearchFlowCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F160323242693DD00C173C6 /* MoviesSearchFlowCoordinator.swift */; };
 		1F1CD656222368CA00B0143C /* AppConfigurations.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F1CD655222368CA00B0143C /* AppConfigurations.swift */; };
 		1F1FC48922E3693100BCBA8D /* NetworkService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F1FC48522E3693100BCBA8D /* NetworkService.swift */; };
@@ -126,7 +126,7 @@
 		1F02DE3622F8507500E40C3A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		1F05A6CB2220A2CB001E2801 /* SearchMoviesUseCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchMoviesUseCase.swift; sourceTree = "<group>"; };
 		1F0CEFCE23436B67004141FA /* ConnectionError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConnectionError.swift; sourceTree = "<group>"; };
-		1F16031C2426919300C173C6 /* AppMainFlowCoordinator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppMainFlowCoordinator.swift; sourceTree = "<group>"; };
+		1F16031C2426919300C173C6 /* AppFlowCoordinator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppFlowCoordinator.swift; sourceTree = "<group>"; };
 		1F160323242693DD00C173C6 /* MoviesSearchFlowCoordinator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MoviesSearchFlowCoordinator.swift; sourceTree = "<group>"; };
 		1F1CD655222368CA00B0143C /* AppConfigurations.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppConfigurations.swift; sourceTree = "<group>"; };
 		1F1FC48522E3693100BCBA8D /* NetworkService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetworkService.swift; sourceTree = "<group>"; };
@@ -508,7 +508,7 @@
 				1FA5338C201E1FDE00747E55 /* AppDelegate.swift */,
 				FC2B715B2156FF93002BD59E /* AppAppearance.swift */,
 				1F1CD655222368CA00B0143C /* AppConfigurations.swift */,
-				1F16031C2426919300C173C6 /* AppMainFlowCoordinator.swift */,
+				1F16031C2426919300C173C6 /* AppFlowCoordinator.swift */,
 				1F84DECD2300673A00139F73 /* DIContainer */,
 			);
 			path = Application;
@@ -920,7 +920,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				1FEED0F02023576A000F4EAA /* Alertable.swift in Sources */,
-				1F16031D2426919300C173C6 /* AppMainFlowCoordinator.swift in Sources */,
+				1F16031D2426919300C173C6 /* AppFlowCoordinator.swift in Sources */,
 				1F53E2B823125F71008D6A05 /* MoviesQueryListItemViewModel.swift in Sources */,
 				FC2B715C2156FF93002BD59E /* AppAppearance.swift in Sources */,
 				1F1FC48922E3693100BCBA8D /* NetworkService.swift in Sources */,
diff --git a/ExampleMVVM/Application/AppDelegate.swift b/ExampleMVVM/Application/AppDelegate.swift
@@ -11,7 +11,7 @@ import UIKit
 class AppDelegate: UIResponder, UIApplicationDelegate {
 
     let appDIContainer = AppDIContainer()
-    var appFlowCoordinator: AppMainFlowCoordinator?
+    var appFlowCoordinator: AppFlowCoordinator?
     var window: UIWindow?
     
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
@@ -22,8 +22,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         let navigationController = UINavigationController()
 
         window?.rootViewController = navigationController
-        appFlowCoordinator = AppMainFlowCoordinator(navigationController: navigationController,
-                                                    appDIContainer: appDIContainer)
+        appFlowCoordinator = AppFlowCoordinator(navigationController: navigationController,
+                                                appDIContainer: appDIContainer)
         appFlowCoordinator?.startMoviesSearchFlow()
         window?.makeKeyAndVisible()
     
diff --git a/ExampleMVVM/Application/AppFlowCoordinator.swift b/ExampleMVVM/Application/AppFlowCoordinator.swift
@@ -7,7 +7,7 @@
 
 import UIKit
 
-class AppMainFlowCoordinator {
+class AppFlowCoordinator {
 
     var navigationController: UINavigationController
     private let appDIContainer: AppDIContainer
diff --git a/ExampleMVVM/Presentation/MoviesScene/FlowCoordinator/MoviesSearchFlowCoordinator.swift b/ExampleMVVM/Presentation/MoviesScene/FlowCoordinator/MoviesSearchFlowCoordinator.swift
@@ -18,8 +18,8 @@ class MoviesSearchFlowCoordinator {
     private let navigationController: UINavigationController
     private let dependencies: MoviesSearchFlowCoordinatorDependencies
 
-    private weak var moviesListViewController: MoviesListViewController?
-    private weak var moviesQueriesSuggestionsView: UIViewController?
+    private weak var moviesListVC: MoviesListViewController?
+    private weak var moviesQueriesSuggestionsVC: UIViewController?
 
     init(navigationController: UINavigationController,
          dependencies: MoviesSearchFlowCoordinatorDependencies) {
@@ -35,28 +35,30 @@ class MoviesSearchFlowCoordinator {
         let vc = dependencies.makeMoviesListViewController(closures: closures)
 
         navigationController.pushViewController(vc, animated: false)
-        moviesListViewController = vc
+        moviesListVC = vc
     }
 
     private func showMovieDetails(movie: Movie) {
         let vc = dependencies.makeMoviesDetailsViewController(movie: movie)
         navigationController.pushViewController(vc, animated: true)
     }
 
-    private func showMovieQueriesSuggestions(selectMovieQuery: @escaping (MovieQuery) -> Void) {
-        guard let moviesListViewController = moviesListViewController,
+    private func showMovieQueriesSuggestions(didSelect: @escaping (MovieQuery) -> Void) {
+        guard let moviesListViewController = moviesListVC, moviesQueriesSuggestionsVC == nil,
             let container = moviesListViewController.suggestionsListContainer else { return }
-        let closures = MoviesQueryListViewModelClosures(selectMovieQuery: selectMovieQuery)
-        let vc = dependencies.makeMoviesQueriesSuggestionsListViewController(closures: closures)
+
+        let vc = dependencies.makeMoviesQueriesSuggestionsListViewController(closures:
+            MoviesQueryListViewModelClosures(didSelect: didSelect)
+        )
+
         moviesListViewController.add(child: vc, container: container)
-        vc.view.frame = moviesListViewController.view.bounds
-        moviesQueriesSuggestionsView = vc
+        moviesQueriesSuggestionsVC = vc
         container.isHidden = false
     }
 
     private func closeMovieQueriesSuggestions() {
-        moviesQueriesSuggestionsView?.remove()
-        moviesQueriesSuggestionsView = nil
-        moviesListViewController?.suggestionsListContainer.isHidden = true
+        moviesQueriesSuggestionsVC?.remove()
+        moviesQueriesSuggestionsVC = nil
+        moviesListVC?.suggestionsListContainer.isHidden = true
     }
 }
diff --git a/ExampleMVVM/Presentation/MoviesScene/MoviesList/ViewModel/MoviesListViewModel.swift b/ExampleMVVM/Presentation/MoviesScene/MoviesList/ViewModel/MoviesListViewModel.swift
@@ -140,9 +140,7 @@ extension DefaultMoviesListViewModel {
     }
 
     func showQueriesSuggestions() {
-        closures?.showMovieQueriesSuggestions { [weak self] query in
-            self?.update(movieQuery: query)
-        }
+        closures?.showMovieQueriesSuggestions(update(movieQuery:))
     }
     
     func closeQueriesSuggestions() {
diff --git a/ExampleMVVM/Presentation/MoviesScene/MoviesQueriesList/ViewModel/MoviesQueryListViewModel.swift b/ExampleMVVM/Presentation/MoviesScene/MoviesQueriesList/ViewModel/MoviesQueryListViewModel.swift
@@ -8,7 +8,7 @@
 import Foundation
 
 struct MoviesQueryListViewModelClosures {
-    var selectMovieQuery: (MovieQuery) -> Void
+    var didSelect: (MovieQuery) -> Void
 }
 
 protocol MoviesQueryListViewModelInput {
@@ -67,6 +67,6 @@ extension DefaultMoviesQueryListViewModel {
     }
     
     func didSelect(item: MoviesQueryListItemViewModel) {
-        closures?.selectMovieQuery(MovieQuery(query: item.query))
+        closures?.didSelect(MovieQuery(query: item.query))
     }
 }
diff --git a/ExampleMVVM/Presentation/Utils/Extensions/UIViewController+AddChild.swift b/ExampleMVVM/Presentation/Utils/Extensions/UIViewController+AddChild.swift
@@ -11,6 +11,7 @@ extension UIViewController {
     
     func add(child: UIViewController, container: UIView) {
         addChild(child)
+        child.view.frame = container.bounds
         container.addSubview(child.view)
         child.didMove(toParent: self)
     }
diff --git a/ExampleMVVMTests/Presentation/MoviesScene/MoviesQueriesListViewModelTests.swift b/ExampleMVVMTests/Presentation/MoviesScene/MoviesQueriesListViewModelTests.swift
@@ -77,12 +77,12 @@ class MoviesQueriesListViewModelTests: XCTestCase {
         XCTAssertTrue(viewModel.items.value.isEmpty)
     }
     
-    func test_whenDidSelectQueryEventIsReceived_thenCallAction() {
+    func test_whenDidSelectQueryEventIsReceived_thenCallDidSelectClosure() {
         // given
         let selectedQueryItem = MovieQuery(query: "query1")
         var actionMovieQuery: MovieQuery?
         let expectation = self.expectation(description: "Delegate notified")
-        let closures = MoviesQueryListViewModelClosures(selectMovieQuery: { movieQuery in
+        let closures = MoviesQueryListViewModelClosures(didSelect: { movieQuery in
             actionMovieQuery = movieQuery
             expectation.fulfill()
         })

Original file line number	Diff line number	Diff line change
`@@ -140,9 +140,7 @@ extension DefaultMoviesListViewModel {`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`func showQueriesSuggestions() {`
`143`		`- closures?.showMovieQueriesSuggestions { [weak self] query in`
`144`		`- self?.update(movieQuery: query)`
`145`		`- }`
	`143`	`+ closures?.showMovieQueriesSuggestions(update(movieQuery:))`
`146`	`144`	`}`
`147`	`145`
`148`	`146`	`func closeQueriesSuggestions() {`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`import Foundation`
`9`	`9`
`10`	`10`	`struct MoviesQueryListViewModelClosures {`
`11`		`- var selectMovieQuery: (MovieQuery) -> Void`
	`11`	`+ var didSelect: (MovieQuery) -> Void`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`protocol MoviesQueryListViewModelInput {`
`@@ -67,6 +67,6 @@ extension DefaultMoviesQueryListViewModel {`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`func didSelect(item: MoviesQueryListItemViewModel) {`
`70`		`- closures?.selectMovieQuery(MovieQuery(query: item.query))`
	`70`	`+ closures?.didSelect(MovieQuery(query: item.query))`
`71`	`71`	`}`
`72`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ extension UIViewController {`
`11`	`11`
`12`	`12`	`func add(child: UIViewController, container: UIView) {`
`13`	`13`	`addChild(child)`
	`14`	`+ child.view.frame = container.bounds`
`14`	`15`	`container.addSubview(child.view)`
`15`	`16`	`child.didMove(toParent: self)`
`16`	`17`	`}`