Improve UseCase

sergdort · sergdort · commit 035d2eb0be53 · 2017-09-21T21:59:20.000+01:00
diff --git a/CleanArchitectureRxSwift.xcodeproj/project.pbxproj b/CleanArchitectureRxSwift.xcodeproj/project.pbxproj
diff --git a/CleanArchitectureRxSwift/Scenes/AllPosts/PostsNavigator.swift b/CleanArchitectureRxSwift/Scenes/AllPosts/PostsNavigator.swift
@@ -22,14 +22,14 @@ class DefaultPostsNavigator: PostsNavigator {
     
     func toPosts() {
         let vc = storyBoard.instantiateViewController(ofType: PostsViewController.self)
-        vc.viewModel = PostsViewModel(useCase: services.makeAllPostsUseCase(),
+        vc.viewModel = PostsViewModel(useCase: services.makePostsUseCase(),
                                       navigator: self)
         navigationController.pushViewController(vc, animated: true)
     }
 
     func toCreatePost() {
         let navigator = DefaultCreatePostNavigator(navigationController: navigationController)
-        let viewModel = CreatePostViewModel(createPostUseCase: services.makeCreatePostUseCase(),
+        let viewModel = CreatePostViewModel(createPostUseCase: services.makePostsUseCase(),
                 navigator: navigator)
         let vc = storyBoard.instantiateViewController(ofType: CreatePostViewController.self)
         vc.viewModel = viewModel
@@ -39,7 +39,7 @@ class DefaultPostsNavigator: PostsNavigator {
     
     func toPost(_ post: Post) {
         let vc = storyBoard.instantiateViewController(ofType: EditPostViewController.self)
-        let viewModel = EditPostViewModel(post: post, useCase: services.makeCreatePostUseCase())
+        let viewModel = EditPostViewModel(post: post, useCase: services.makePostsUseCase())
         vc.viewModel = viewModel
         navigationController.pushViewController(vc, animated: true)
     }
diff --git a/CleanArchitectureRxSwift/Scenes/AllPosts/PostsViewModel.swift b/CleanArchitectureRxSwift/Scenes/AllPosts/PostsViewModel.swift
@@ -18,10 +18,10 @@ final class PostsViewModel: ViewModelType {
         let error: Driver<Error>
     }
 
-    private let useCase: AllPostsUseCase
+    private let useCase: PostsUseCase
     private let navigator: PostsNavigator
     
-    init(useCase: AllPostsUseCase, navigator: PostsNavigator) {
+    init(useCase: PostsUseCase, navigator: PostsNavigator) {
         self.useCase = useCase
         self.navigator = navigator
     }
diff --git a/CleanArchitectureRxSwift/Scenes/CreatePost/CreatePostViewModel.swift b/CleanArchitectureRxSwift/Scenes/CreatePost/CreatePostViewModel.swift
@@ -10,10 +10,10 @@ import RxCocoa
 import Domain
 
 final class CreatePostViewModel: ViewModelType {
-    private let createPostUseCase: SavePostUseCase
+    private let createPostUseCase: PostsUseCase
     private let navigator: CreatePostNavigator
 
-    init(createPostUseCase: SavePostUseCase, navigator: CreatePostNavigator) {
+    init(createPostUseCase: PostsUseCase, navigator: CreatePostNavigator) {
         self.createPostUseCase = createPostUseCase
         self.navigator = navigator
     }
diff --git a/CleanArchitectureRxSwift/Scenes/EditPost/EditPostViewModel.swift b/CleanArchitectureRxSwift/Scenes/EditPost/EditPostViewModel.swift
@@ -4,9 +4,9 @@ import RxCocoa
 
 final class EditPostViewModel: ViewModelType {
     private let post: Post
-    private let useCase: SavePostUseCase
+    private let useCase: PostsUseCase
 
-    init(post: Post, useCase: SavePostUseCase) {
+    init(post: Post, useCase: PostsUseCase) {
         self.post = post
         self.useCase = useCase
     }
diff --git a/CoreDataPlatform/UseCases/PostsUseCase.swift b/CoreDataPlatform/UseCases/PostsUseCase.swift
@@ -2,7 +2,8 @@ import Foundation
 import Domain
 import RxSwift
 
-final class CDAllPostsUseCase: AllPostsUseCase {
+final class PostsUseCase: Domain.PostsUseCase {
+    
     private let repository: AbstractRepository<Post>
 
     init(repository: AbstractRepository<Post>) {
@@ -12,4 +13,8 @@ final class CDAllPostsUseCase: AllPostsUseCase {
     func posts() -> Observable<[Post]> {
         return repository.query(sortDescriptors: [Post.CoreDataType.uid.descending()])
     }
+    
+    func save(post: Post) -> Observable<Void> {
+        return repository.save(entity: post)
+    }
 }
diff --git a/CoreDataPlatform/UseCases/SavePostUseCase.swift b/CoreDataPlatform/UseCases/SavePostUseCase.swift
diff --git a/CoreDataPlatform/UseCases/UseCaseProvider.swift b/CoreDataPlatform/UseCases/UseCaseProvider.swift
@@ -9,11 +9,7 @@ public final class UseCaseProvider: Domain.UseCaseProvider {
         postRepository = Repository<Post>(context: coreDataStack.context)
     }
 
-    public func makeAllPostsUseCase() -> AllPostsUseCase {
-        return CDAllPostsUseCase(repository: postRepository)
-    }
-
-    public func makeCreatePostUseCase() -> SavePostUseCase {
-        return CDSavePostUseCase(repository: postRepository)
+    public func makePostsUseCase() -> Domain.PostsUseCase {
+        return PostsUseCase(repository: postRepository)
     }
 }
diff --git a/Domain/UseCases/AllPostsUseCase.swift b/Domain/UseCases/AllPostsUseCase.swift
diff --git a/Domain/UseCases/PostsUseCase.swift b/Domain/UseCases/PostsUseCase.swift
@@ -1,6 +1,7 @@
 import Foundation
 import RxSwift
 
-public protocol SavePostUseCase {
+public protocol PostsUseCase {
+    func posts() -> Observable<[Post]>
     func save(post: Post) -> Observable<Void>
 }
diff --git a/Domain/UseCases/UseCaseProvider.swift b/Domain/UseCases/UseCaseProvider.swift
@@ -10,7 +10,5 @@ import Foundation
 
 public protocol UseCaseProvider {
     
-    func makeAllPostsUseCase() -> AllPostsUseCase
-    
-    func makeCreatePostUseCase() -> SavePostUseCase
+    func makePostsUseCase() -> PostsUseCase
 }
diff --git a/Network/UseCases/PostsUseCase.swift b/Network/UseCases/PostsUseCase.swift
@@ -2,7 +2,7 @@ import Foundation
 import Domain
 import RxSwift
 
-final class AllPostsUseCase: Domain.AllPostsUseCase {
+final class PostsUseCase: Domain.PostsUseCase {
     private let network: PostsNetwork
     private let cache: AbstractCache<Post>
 
@@ -23,6 +23,11 @@ final class AllPostsUseCase: Domain.AllPostsUseCase {
         
         return fetchPosts.concat(stored)
     }
+    
+    func save(post: Post) -> Observable<Void> {
+        return network.createPost(post: post)
+            .map { _ in }
+    }
 }
 
 struct MapFromNever: Error {}
diff --git a/Network/UseCases/SavePostUseCase.swift b/Network/UseCases/SavePostUseCase.swift
diff --git a/Network/UseCases/UseCaseProvider.swift b/Network/UseCases/UseCaseProvider.swift
@@ -8,12 +8,8 @@ public final class UseCaseProvider: Domain.UseCaseProvider {
         networkProvider = NetworkProvider()
     }
 
-    public func makeAllPostsUseCase() -> Domain.AllPostsUseCase {
-        return AllPostsUseCase(network: networkProvider.makePostsNetwork(),
+    public func makePostsUseCase() -> Domain.PostsUseCase {
+        return PostsUseCase(network: networkProvider.makePostsNetwork(),
                                cache: Cache<Post>(path: "allPosts"))
     }
-
-    public func makeCreatePostUseCase() -> Domain.SavePostUseCase {
-        return SavePostUseCase(network: networkProvider.makePostsNetwork())
-    }
 }
diff --git a/RealmPlatform/UseCases/PostsUseCase.swift b/RealmPlatform/UseCases/PostsUseCase.swift
@@ -4,7 +4,7 @@ import RxSwift
 import Realm
 import RealmSwift
 
-final class AllPostsUseCase: Domain.AllPostsUseCase {
+final class PostsUseCase: Domain.PostsUseCase {
     private let repository: AbstractRepository<Post>
 
     init(repository: AbstractRepository<Post>) {
@@ -14,4 +14,8 @@ final class AllPostsUseCase: Domain.AllPostsUseCase {
     func posts() -> Observable<[Post]> {
         return repository.queryAll()
     }
+    
+    func save(post: Post) -> Observable<Void> {
+        return repository.save(entity: post)
+    }
 }
diff --git a/RealmPlatform/UseCases/SavePostUseCase.swift b/RealmPlatform/UseCases/SavePostUseCase.swift
diff --git a/RealmPlatform/UseCases/UseCaseProvider.swift b/RealmPlatform/UseCases/UseCaseProvider.swift
@@ -10,14 +10,8 @@ public final class UseCaseProvider: Domain.UseCaseProvider {
         self.configuration = configuration
     }
 
-    public func makeAllPostsUseCase() -> Domain.AllPostsUseCase {
+    public func makePostsUseCase() -> Domain.PostsUseCase {
         let repository = Repository<Post>(configuration: configuration)
-        return AllPostsUseCase(repository: repository)
+        return PostsUseCase(repository: repository)
     }
-
-    public func makeCreatePostUseCase() -> Domain.SavePostUseCase {
-        let repository = Repository<Post>(configuration: configuration)
-        return SavePostUseCase(repository: repository)
-    }
-
 }

Original file line number	Diff line number	Diff line change
`@@ -18,10 +18,10 @@ final class PostsViewModel: ViewModelType {`
`18`	`18`	`let error: Driver<Error>`
`19`	`19`	`}`
`20`	`20`
`21`		`- private let useCase: AllPostsUseCase`
	`21`	`+ private let useCase: PostsUseCase`
`22`	`22`	`private let navigator: PostsNavigator`
`23`	`23`
`24`		`- init(useCase: AllPostsUseCase, navigator: PostsNavigator) {`
	`24`	`+ init(useCase: PostsUseCase, navigator: PostsNavigator) {`
`25`	`25`	`self.useCase = useCase`
`26`	`26`	`self.navigator = navigator`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,7 @@ public final class UseCaseProvider: Domain.UseCaseProvider {`
`9`	`9`	`postRepository = Repository<Post>(context: coreDataStack.context)`
`10`	`10`	`}`
`11`	`11`
`12`		`- public func makeAllPostsUseCase() -> AllPostsUseCase {`
`13`		`- return CDAllPostsUseCase(repository: postRepository)`
`14`		`- }`
`15`		`-`
`16`		`- public func makeCreatePostUseCase() -> SavePostUseCase {`
`17`		`- return CDSavePostUseCase(repository: postRepository)`
	`12`	`+ public func makePostsUseCase() -> Domain.PostsUseCase {`
	`13`	`+ return PostsUseCase(repository: postRepository)`
`18`	`14`	`}`
`19`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`import Foundation`
`2`	`2`	`import RxSwift`
`3`	`3`
`4`		`-public protocol SavePostUseCase {`
	`4`	`+public protocol PostsUseCase {`
	`5`	`+ func posts() -> Observable<[Post]>`
`5`	`6`	`func save(post: Post) -> Observable<Void>`
`6`	`7`	`}`