Fix Search

iOSDesignPatternSamples/Sources/UI/Search/SearchViewController.swift

@@ -16,18 +16,24 @@ final class SearchViewController: UIViewController {
     @IBOutlet private(set) weak var tableView: UITableView!
     @IBOutlet private(set) weak var tableViewBottomConstraint: NSLayoutConstraint!
 
-
     let searchBar = UISearchBar(frame: .zero)
     let loadingView = LoadingView()
 
-    let viewModel: SearchViewModel
+    let viewModel: SearchViewModelType
     let dataSource: SearchViewDataSource
 
+    private let makeRepositoryViewModel: (Repository) -> RepositoryViewModelType
+    private let makeUserRepositoryViewModel: (User) -> UserRepositoryViewModelType
     private var cancellables = Set<AnyCancellable>()
 
-    init(favoritesInput: @escaping ([Repository]) -> Void,
-         favoritesOutput: AnyPublisher<[Repository], Never>) {
-        self.viewModel = SearchViewModel(favoritesOutput: favoritesOutput, favoritesInput: favoritesInput)
+    init(
+        viewModel: SearchViewModelType,
+        makeUserRepositoryViewModel: @escaping (User) -> UserRepositoryViewModelType,
+        makeRepositoryViewModel: @escaping (Repository) -> RepositoryViewModelType
+    ) {
+        self.makeRepositoryViewModel = makeRepositoryViewModel
+        self.makeUserRepositoryViewModel = makeUserRepositoryViewModel
+        self.viewModel = viewModel
         self.dataSource = SearchViewDataSource(viewModel: viewModel)
         super.init(nibName: SearchViewController.className, bundle: nil)
     }
@@ -45,10 +51,6 @@ final class SearchViewController: UIViewController {
 
         dataSource.configure(with: tableView)
 
-//        searchBar.rx.text
-//            .bind(to: viewModel.input.searchText)
-//            .disposed(by: disposeBag)
-
         // observe viewModel
         viewModel.output.accessTokenAlert
             .receive(on: DispatchQueue.main)
@@ -154,9 +156,11 @@ final class SearchViewController: UIViewController {
             guard let me = self else {
                 return
             }
-            let vc = UserRepositoryViewController(user: user,
-                                                  favoritesOutput: me.viewModel.output.favorites,
-                                                  favoritesInput: me.viewModel.input.favorites)
+            let vm = me.makeUserRepositoryViewModel(user)
+            let vc = UserRepositoryViewController(
+                viewModel: vm,
+                makeRepositoryViewModel: me.makeRepositoryViewModel
+            )
             me.navigationController?.pushViewController(vc, animated: true)
         }
     }
@@ -187,4 +191,8 @@ extension SearchViewController: UISearchBarDelegate {
         searchBar.resignFirstResponder()
         searchBar.showsCancelButton = false
     }
+
+    func searchBar(_ searchBar: UISearchBar, textDidChange searchText: String) {
+        viewModel.input.searchText(searchBar.text)
+    }
 }

iOSDesignPatternSamples/Sources/UI/Search/SearchViewDataSource.swift

@@ -12,9 +12,9 @@ import UIKit
 
 final class SearchViewDataSource: NSObject {
 
-    private let viewModel: SearchViewModel
+    private let viewModel: SearchViewModelType
 
-    init(viewModel: SearchViewModel) {
+    init(viewModel: SearchViewModelType) {
         self.viewModel = viewModel
     }
 
@@ -30,12 +30,12 @@ final class SearchViewDataSource: NSObject {
 
 extension SearchViewDataSource: UITableViewDataSource {
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return viewModel.users.count
+        return viewModel.output.users.count
     }
 
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeue(UserViewCell.self, for: indexPath)
-        let user = viewModel.users[indexPath.row]
+        let user = viewModel.output.users[indexPath.row]
         cell.configure(with: user)
         return cell
     }
@@ -60,7 +60,7 @@ extension SearchViewDataSource: UITableViewDelegate {
     }
 
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        let user = viewModel.users[indexPath.row]
+        let user = viewModel.output.users[indexPath.row]
         return UserViewCell.calculateHeight(with: user, and: tableView)
     }
 
@@ -69,7 +69,7 @@ extension SearchViewDataSource: UITableViewDelegate {
     }
 
     func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
-        return viewModel.isFetchingUsers ? LoadingView.defaultHeight : .leastNormalMagnitude
+        return viewModel.output.isFetchingUsers ? LoadingView.defaultHeight : .leastNormalMagnitude
     }
 
     func scrollViewDidScroll(_ scrollView: UIScrollView) {

iOSDesignPatternSamples/Sources/UI/Search/SearchViewModel.swift

@@ -11,61 +11,53 @@ import Foundation
 import GithubKit
 import UIKit
 
-final class SearchViewModel {
+protocol SearchViewModelType: AnyObject {
+    var input: SearchViewModel.Input { get }
+    var output: SearchViewModel.Output { get }
+}
+
+final class SearchViewModel: SearchViewModelType{
     let output: Output
     let input: Input
 
-    var users: [User] {
-        model.users
-    }
-
-    var isFetchingUsers: Bool {
-        model.isFetchingUsers
-    }
-
-    private let model: SearchModel
     private var cancellables = Set<AnyCancellable>()
 
-    init(favoritesOutput: AnyPublisher<[Repository], Never>,
-         favoritesInput: @escaping ([Repository]) -> Void) {
-        let model = SearchModel()
-        self.model = model
-
+    init(
+        searchModel: SearchModelType
+    ) {
         let viewDidAppear = PassthroughSubject<Void, Never>()
         let viewDidDisappear = PassthroughSubject<Void, Never>()
         let searchText = PassthroughSubject<String?, Never>()
         let isReachedBottom = PassthroughSubject<Bool, Never>()
         let selectedIndexPath = PassthroughSubject<IndexPath, Never>()
         let headerFooterView = PassthroughSubject<UIView, Never>()
 
-        self.input = Input(viewDidAppear: viewDidAppear.send,
-                           viewDidDisappear: viewDidDisappear.send,
-                           searchText: searchText.send,
-                           isReachedBottom: isReachedBottom.send,
-                           selectedIndexPath: selectedIndexPath.send,
-                           headerFooterView: headerFooterView.send,
-                           favorites: favoritesInput)
+        self.input = Input(
+            viewDidAppear: viewDidAppear.send,
+            viewDidDisappear: viewDidDisappear.send,
+            searchText: searchText.send,
+            isReachedBottom: isReachedBottom.send,
+            selectedIndexPath: selectedIndexPath.send,
+            headerFooterView: headerFooterView.send
+        )
 
         do {
             let selectedUser = selectedIndexPath
-                .map { model.users[$0.row] }
+                .map { searchModel.users[$0.row] }
                 .eraseToAnyPublisher()
 
             let updateLoadingView = headerFooterView
-                .combineLatest(model.isFetchingUsersPublisher)
+                .combineLatest(searchModel.isFetchingUsersPublisher)
                 .eraseToAnyPublisher()
 
-            let countString = model.totalCountPublisher
-                .combineLatest(model.usersPublisher)
+            let countString = searchModel.totalCountPublisher
+                .combineLatest(searchModel.usersPublisher)
                 .map { "\($1.count) / \($0)" }
                 .eraseToAnyPublisher()
 
-            let reloadData = model.usersPublisher.map { _ in }
-                .merge(
-                    with:
-                        model.totalCountPublisher.map { _ in },
-                        model.isFetchingUsersPublisher.map { _ in }
-                )
+            let reloadData = searchModel.usersPublisher.map { _ in }
+                .merge(with: searchModel.totalCountPublisher.map { _ in },
+                       searchModel.isFetchingUsersPublisher.map { _ in })
                 .eraseToAnyPublisher()
 
             // keyboard notification
@@ -97,30 +89,41 @@ final class SearchViewModel {
                 .switchToLatest()
                 .eraseToAnyPublisher()
 
-            self.output = Output(accessTokenAlert: model.errorMessage,
-                                 updateLoadingView: updateLoadingView,
-                                 selectedUser: selectedUser,
-                                 keyboardWillShow: keyboardWillShow,
-                                 keyboardWillHide: keyboardWillHide,
-                                 countString: countString,
-                                 reloadData: reloadData,
-                                 favorites: favoritesOutput)
+            self.output = Output(
+                users: searchModel.users,
+                isFetchingUsers: searchModel.isFetchingUsers,
+                accessTokenAlert: searchModel.errorMessage,
+                updateLoadingView: updateLoadingView,
+                selectedUser: selectedUser,
+                keyboardWillShow: keyboardWillShow,
+                keyboardWillHide: keyboardWillHide,
+                countString: countString,
+                reloadData: reloadData
+            )
         }
 
         searchText
             .map { $0 ?? "" }
             .sink {
-                model.fetchUsers(withQuery: $0)
+                searchModel.fetchUsers(withQuery: $0)
             }
             .store(in: &cancellables)
 
         isReachedBottom
             .removeDuplicates()
             .filter { $0 }
             .sink { _ in
-                model.fetchUsers()
+                searchModel.fetchUsers()
             }
             .store(in: &cancellables)
+
+        searchModel.usersPublisher
+            .assign(to: \.users, on: output)
+            .store(in: &cancellables)
+
+        searchModel.isFetchingUsersPublisher
+            .assign(to: \.isFetchingUsers, on: output)
+            .store(in: &cancellables)
     }
 }
 
@@ -132,17 +135,40 @@ extension SearchViewModel {
         let isReachedBottom: (Bool) -> Void
         let selectedIndexPath: (IndexPath) -> Void
         let headerFooterView: (UIView) -> Void
-        let favorites: ([Repository]) -> Void
     }
 
-    struct Output {
+    final class Output {
+        @Published
+        fileprivate(set) var users: [User]
+        @Published
+        fileprivate(set) var isFetchingUsers: Bool
         let accessTokenAlert: AnyPublisher<ErrorMessage, Never>
         let updateLoadingView: AnyPublisher<(UIView, Bool), Never>
         let selectedUser: AnyPublisher<User, Never>
         let keyboardWillShow: AnyPublisher<UIKeyboardInfo, Never>
         let keyboardWillHide: AnyPublisher<UIKeyboardInfo, Never>
         let countString: AnyPublisher<String, Never>
         let reloadData: AnyPublisher<Void, Never>
-        let favorites: AnyPublisher<[Repository], Never>
+        init(
+            users: [User],
+            isFetchingUsers: Bool,
+            accessTokenAlert: AnyPublisher<ErrorMessage, Never>,
+            updateLoadingView: AnyPublisher<(UIView, Bool), Never>,
+            selectedUser: AnyPublisher<User, Never>,
+            keyboardWillShow: AnyPublisher<UIKeyboardInfo, Never>,
+            keyboardWillHide: AnyPublisher<UIKeyboardInfo, Never>,
+            countString: AnyPublisher<String, Never>,
+            reloadData: AnyPublisher<Void, Never>
+        ) {
+            self.users = users
+            self.isFetchingUsers = isFetchingUsers
+            self.accessTokenAlert = accessTokenAlert
+            self.updateLoadingView = updateLoadingView
+            self.selectedUser = selectedUser
+            self.keyboardWillShow = keyboardWillShow
+            self.keyboardWillHide = keyboardWillHide
+            self.countString = countString
+            self.reloadData = reloadData
+        }
     }
 }