Refactor Item of viewModel to make them equitable

Author: kudoleh

ExampleMVVM.xcodeproj/project.pbxproj

@@ -34,6 +34,7 @@
 		1F57F8D423C656F600981E09 /* AccessibilityIdentifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F57F8D123C656F600981E09 /* AccessibilityIdentifier.swift */; };
 		1F6B521323630016002FCDE9 /* RepositoryTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F6B521223630016002FCDE9 /* RepositoryTask.swift */; };
 		1F77930F222C0DF2004E034C /* StoryboardInstantiable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F77930E222C0DF2004E034C /* StoryboardInstantiable.swift */; };
+		1F7C1D19242117910014F011 /* Movie+Stub.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F7C1D17242117790014F011 /* Movie+Stub.swift */; };
 		1F84DECE2300677B00139F73 /* Observable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FEE31612218B17E00C160B9 /* Observable.swift */; };
 		1F84DED023006BDA00139F73 /* FetchRecentMovieQueriesUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F84DECF23006BDA00139F73 /* FetchRecentMovieQueriesUseCase.swift */; };
 		1F8D09312301C2F20061FB6F /* Movie+Decodable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F8D092F2301C2F20061FB6F /* Movie+Decodable.swift */; };
@@ -132,6 +133,7 @@
 		1F57F8D123C656F600981E09 /* AccessibilityIdentifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccessibilityIdentifier.swift; sourceTree = "<group>"; };
 		1F6B521223630016002FCDE9 /* RepositoryTask.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RepositoryTask.swift; sourceTree = "<group>"; };
 		1F77930E222C0DF2004E034C /* StoryboardInstantiable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoryboardInstantiable.swift; sourceTree = "<group>"; };
+		1F7C1D17242117790014F011 /* Movie+Stub.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Movie+Stub.swift"; sourceTree = "<group>"; };
 		1F84DECF23006BDA00139F73 /* FetchRecentMovieQueriesUseCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FetchRecentMovieQueriesUseCase.swift; sourceTree = "<group>"; };
 		1F8D092F2301C2F20061FB6F /* Movie+Decodable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Movie+Decodable.swift"; sourceTree = "<group>"; };
 		1F9034C32306FDFE00DEA4BD /* NetworkServiceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkServiceTests.swift; sourceTree = "<group>"; };
@@ -288,6 +290,14 @@
 			path = Utils;
 			sourceTree = "<group>";
 		};
+		1F7C1D1A242117D30014F011 /* Mocks */ = {
+			isa = PBXGroup;
+			children = (
+				1F7C1D17242117790014F011 /* Movie+Stub.swift */,
+			);
+			path = Mocks;
+			sourceTree = "<group>";
+		};
 		1F84DECD2300673A00139F73 /* DIContainer */ = {
 			isa = PBXGroup;
 			children = (
@@ -436,6 +446,7 @@
 				1FA53A3622F45C4F009A104C /* Domain */,
 				1F9034D52307231000DEA4BD /* Presentation */,
 				1F9034CB2307138400DEA4BD /* Infrastructure */,
+				1F7C1D1A242117D30014F011 /* Mocks */,
 				1FFFC83D221B02BA007D99D2 /* Info.plist */,
 			);
 			name = ExampleMVVMTests;
@@ -943,6 +954,7 @@
 				1FE49D9A230AEC4F00D1D42E /* MoviesListItemViewModel.swift in Sources */,
 				1F9034DC2307291800DEA4BD /* FetchRecentMovieQueriesUseCase.swift in Sources */,
 				1FE49D9B230AEC4F00D1D42E /* MoviesListViewModel.swift in Sources */,
+				1F7C1D19242117910014F011 /* Movie+Stub.swift in Sources */,
 				1F90353A2307716300DEA4BD /* MoviesListViewModelTests.swift in Sources */,
 				1F9034C72306FF2D00DEA4BD /* Endpoint.swift in Sources */,
 				1F9034CE230713FC00DEA4BD /* DataTransferServiceTests.swift in Sources */,

ExampleMVVM/Application/DIContainer/MoviesSceneDIContainer.swift

@@ -53,33 +53,22 @@ final class MoviesSceneDIContainer {
 
     // MARK: - Movies List
     func makeMoviesListViewController() -> UIViewController {
-        return MoviesListViewController.create(with: makeMoviesListViewModel(), moviesListViewControllersFactory: self)
+        return MoviesListViewController.create(with: makeMoviesListViewModel(),
+                                               moviesListViewControllersFactory: self,
+                                               posterImagesRepository: makePosterImagesRepository())
     }
 
     func makeMoviesListViewModel() -> MoviesListViewModel {
-        return DefaultMoviesListViewModel(searchMoviesUseCase: makeSearchMoviesUseCase(),
-                                          posterImagesRepository: makePosterImagesRepository())
+        return DefaultMoviesListViewModel(searchMoviesUseCase: makeSearchMoviesUseCase())
     }
 
     // MARK: - Movie Details
-    func makeMoviesDetailsViewController(title: String,
-                                         overview: String,
-                                         posterPlaceholderImage: Data?,
-                                         posterPath: String?) -> UIViewController {
-        return MovieDetailsViewController.create(with: makeMoviesDetailsViewModel(title: title,
-                                                                                  overview: overview,
-                                                                                  posterPlaceholderImage: posterPlaceholderImage,
-                                                                                  posterPath: posterPath))
+    func makeMoviesDetailsViewController(movie: Movie) -> UIViewController {
+        return MovieDetailsViewController.create(with: makeMoviesDetailsViewModel(movie: movie))
     }
 
-    func makeMoviesDetailsViewModel(title: String,
-                                    overview: String,
-                                    posterPlaceholderImage: Data?,
-                                    posterPath: String?) -> MovieDetailsViewModel {
-        return DefaultMovieDetailsViewModel(title: title,
-                                            overview: overview,
-                                            posterPlaceholderImage: posterPlaceholderImage,
-                                            posterPath: posterPath,
+    func makeMoviesDetailsViewModel(movie: Movie) -> MovieDetailsViewModel {
+        return DefaultMovieDetailsViewModel(movie: movie,
                                             posterImagesRepository: makePosterImagesRepository())
     }
 

ExampleMVVM/Data/PersistentStorages/CoreDataStorage/CoreDataStorage.swift

@@ -57,14 +57,11 @@ extension CoreDataStorage: MoviesQueriesStorage {
                 request.sortDescriptors = [NSSortDescriptor(key: #keyPath(MovieQueryEntity.createdAt),
                                                             ascending: false)]
                 request.fetchLimit = number
-                let resut = try context.fetch(request).map ( MovieQuery.init )
-                DispatchQueue.global(qos: .background).async {
-                    completion(.success(resut))
-                }
+                let resut = try context.fetch(request).map(MovieQuery.init)
+
+                completion(.success(resut))
             } catch {
-                DispatchQueue.global(qos: .background).async {
-                    completion(.failure(CoreDataStorageError.readError(error)))
-                }
+                completion(.failure(CoreDataStorageError.readError(error)))
                 print(error)
             }
         }
@@ -78,13 +75,10 @@ extension CoreDataStorage: MoviesQueriesStorage {
                 try strongSelf.cleanUpQueries(for: query, inContext: context)
                 let entity = MovieQueryEntity(movieQuery: query, insertInto: context)
                 try context.save()
-                DispatchQueue.global(qos: .background).async {
-                    completion(.success(MovieQuery(movieQueryEntity: entity)))
-                }
+
+                completion(.success(MovieQuery(movieQueryEntity: entity)))
             } catch {
-                DispatchQueue.global(qos: .background).async {
-                    completion(.failure(CoreDataStorageError.writeError(error)))
-                }
+                completion(.failure(CoreDataStorageError.writeError(error)))
                 print(error)
             }
         }

ExampleMVVM/Data/PersistentStorages/UserDefaultsStorage/UserDefaultsStorage.swift

@@ -17,14 +17,14 @@ final class UserDefaultsStorage {
             if let queriesData = userDefaults.object(forKey: recentsMoviesQueriesKey) as? Data {
                 let decoder = JSONDecoder()
                 if let movieQueryList = try? decoder.decode(MovieQueriesListUDS.self, from: queriesData) {
-                    return movieQueryList.list.map ( MovieQuery.init )
+                    return movieQueryList.list.map(MovieQuery.init)
                 }
             }
             return []
         }
         set {
             let encoder = JSONEncoder()
-            if let encoded = try? encoder.encode(MovieQueriesListUDS(list: newValue.map ( MovieQueryUDS.init ))) {
+            if let encoded = try? encoder.encode(MovieQueriesListUDS(list: newValue.map(MovieQueryUDS.init))) {
                 userDefaults.set(encoded, forKey: recentsMoviesQueriesKey)
             }
         }

ExampleMVVM/Domain/Entities/Movie.swift

@@ -7,18 +7,18 @@
 
 import Foundation
 
-struct MoviesPage {
-    let page: Int
-    let totalPages: Int
-    let movies: [Movie]
-}
-
 typealias MovieId = String
 
-struct Movie {
+struct Movie: Equatable, Identifiable {
     let id: MovieId
     let title: String
     let posterPath: String?
     let overview: String
     let releaseDate: Date?
 }
+
+struct MoviesPage: Equatable {
+    let page: Int
+    let totalPages: Int
+    let movies: [Movie]
+}

ExampleMVVM/Domain/Entities/MovieQuery.swift

@@ -7,8 +7,6 @@
 
 import Foundation
 
-struct MovieQuery {
+struct MovieQuery: Equatable {
     let query: String
 }
-
-extension MovieQuery: Equatable {}

ExampleMVVM/Mocks/Movie+Stub.swift

@@ -0,0 +1,22 @@
+//
+//  Movie+Stub.swift
+//  ExampleMVVM
+//
+//  Created by Oleh Kudinov on 17/03/2020.
+//
+
+import Foundation
+
+extension Movie {
+    static func stub(id: MovieId = "id1",
+                title: String = "title1" ,
+                posterPath: String? = "/1",
+                overview: String = "overview1",
+                releaseDate: Date? = nil) -> Self {
+        Movie(id: id,
+              title: title,
+              posterPath: posterPath,
+              overview: overview,
+              releaseDate: releaseDate)
+    }
+}