# Search by Language 오류 수정

Author: 87kangsw

GitTime/Sources/Network/GitHubAPI.swift

@@ -14,7 +14,7 @@ enum GitHubAPI {
     case activityEvent(userName: String, page: Int)
     case followers(userName: String, page: Int)
     case following(userName: String, page: Int)
-    case searchUser(query: String, page: Int, language: String?)
+    case searchUser(query: String, page: Int)
     case searchRepo(query: String, page: Int, language: String?)
 }
 
@@ -59,15 +59,22 @@ extension GitHubAPI: TargetType {
                 "page": page
             ]
             return .requestParameters(parameters: params, encoding: URLEncoding.default)
+            
         case let .activityEvent(_, page):
             let params: [String: Any] = [
                 "per_page": 30,
                 "page": page
             ]
             return .requestParameters(parameters: params, encoding: URLEncoding.default)
-        case let .searchUser(query, page, language),
-             let .searchRepo(query, page, language):
 
+        case let .searchUser(query, page):
+            let params: [String: Any] = [
+                "q": query,
+                "page": page
+            ]
+            return .requestParameters(parameters: params, encoding: URLEncoding.default)
+            
+        case let .searchRepo(query, page, language):
             var query = query
             if let language = language {
                 query = "\(query)+\(language.lowercased())"

GitTime/Sources/Services/SearchService.swift

@@ -9,7 +9,7 @@
 import RxSwift
 
 protocol SearchServiceType {
-    func searchUser(query: String, page: Int, language: String?) -> Observable<([User], Bool)>
+    func searchUser(query: String, page: Int) -> Observable<([User], Bool)>
     func searchRepo(query: String, page: Int, language: String?) -> Observable<([Repository], Bool)>
 }
 
@@ -21,8 +21,8 @@ class SearchService: SearchServiceType {
         self.networking = networking
     }
 
-    func searchUser(query: String, page: Int, language: String?) -> Observable<([User], Bool)> {
-        return self.networking.request(.searchUser(query: query, page: page, language: language))
+    func searchUser(query: String, page: Int) -> Observable<([User], Bool)> {
+        return self.networking.request(.searchUser(query: query, page: page))
             .map(SearchResults<User>.self)
             .map { result -> ([User], Bool) in
                 let canLoadMore = result.totalCount > page * 30

GitTime/Sources/ViewControllers/Search/SearchViewController.swift

@@ -107,21 +107,7 @@ class SearchViewController: BaseViewController, StoryboardView, ReactorBased {
             .filterNil()
             .subscribe(onNext: { [weak self] type in
                 guard let self = self, let headerView = self.tableView.tableHeaderView else { return }
-                var frame = headerView.frame
-                switch type {
-                case .users:
-                    frame.size.height = 63.0
-                    self.segmentBottomToLanguageConstraint.isActive = false
-                    self.segmentBottomToSuperViewConstraint.isActive = true
-                case .repositories:
-                    frame.size.height = 117.0
-                    self.segmentBottomToLanguageConstraint.isActive = true
-                    self.segmentBottomToSuperViewConstraint.isActive = false
-                }
-                headerView.frame = frame
-                self.tableView.tableHeaderView = headerView
-                headerView.setNeedsLayout()
-                headerView.layoutIfNeeded()
+                self.updateHeaderViewFrame(headerView, type: type)
                 self.languageButton.isHidden = type == .users
             }).disposed(by: self.disposeBag)
 
@@ -131,6 +117,19 @@ class SearchViewController: BaseViewController, StoryboardView, ReactorBased {
             .bind(to: reactor.action)
             .disposed(by: self.disposeBag)
 
+        languageButton.rx.tap
+            .flatMap { [weak self] _ -> Observable<Language> in
+                guard let self = self else { return .empty() }
+                let languageReactor = LanguagesViewReactor(languagesService: LanguagesService(),
+                                                           userDefaultsService: UserDefaultsService())
+                let languageVC = LanguagesViewController.instantiate(withReactor: languageReactor)
+                self.present(languageVC.navigationWrap(), animated: true, completion: nil)
+                return languageVC.selectedLanguage
+        }.subscribe(onNext: { language in
+            // let languageName = language.type != .all ? language.name : nil
+            reactor.action.onNext(.selectLanguage(language))
+        }).disposed(by: self.disposeBag)
+        
         // State
         reactor.state.map { $0.isLoading }
             .distinctUntilChanged()
@@ -227,4 +226,22 @@ class SearchViewController: BaseViewController, StoryboardView, ReactorBased {
             }
         })
     }
+    
+    private func updateHeaderViewFrame(_ headerView: UIView, type: SearchTypes) {
+        var frame = headerView.frame
+        switch type {
+        case .users:
+            frame.size.height = 63.0
+            self.segmentBottomToLanguageConstraint.isActive = false
+            self.segmentBottomToSuperViewConstraint.isActive = true
+        case .repositories:
+            frame.size.height = 117.0
+            self.segmentBottomToLanguageConstraint.isActive = true
+            self.segmentBottomToSuperViewConstraint.isActive = false
+        }
+        headerView.frame = frame
+        self.tableView.tableHeaderView = headerView
+        headerView.setNeedsLayout()
+        headerView.layoutIfNeeded()
+    }
 }

GitTime/Sources/ViewControllers/Search/SearchViewReactor.swift

@@ -131,15 +131,14 @@ class SearchViewReactor: Reactor {
             self.removeSearchWord(text)
             return .just(.removeRecentSearchWord(indexPath))
         case .selectLanguage(let language):
-            // self.userdefaultsService.set(value: language, forKey: UserDefaultsKey.langauge)
+            guard self.currentState.segmentType == SearchTypes.repositories else { return .empty() }
             self.userdefaultsService.setStruct(value: language, forKey: UserDefaultsKey.langauge)
             let languageMutation: Observable<Mutation> = .just(.setLanguage(language))
 
             guard let query = self.currentState.query, !query.isEmpty else { return .empty() }
             let startLoadingMutation: Observable<Mutation> = .just(.setLoading(true))
             let endLoadingMutation: Observable<Mutation> = .just(.setLoading(false))
-            let requestMutation: Observable<Mutation> = (self.currentState.segmentType == SearchTypes.users) ?
-                self.searchUsersMutation(query: query) : self.searchRepositoriesMutation(query: query)
+            let requestMutation: Observable<Mutation> = self.searchRepositoriesMutation(query: query, language: language)
 
             return .concat([languageMutation, startLoadingMutation, requestMutation, endLoadingMutation])
         }
@@ -204,18 +203,17 @@ class SearchViewReactor: Reactor {
     private func searchUsersMutation(query: String) -> Observable<Mutation> {
         let currentPage = SearchViewReactor.INITIAL_PAGE
         guard !query.isEmpty else { return .just(.setSearchUsers([], nextPage: currentPage, canLoadMore: false)) }
-        let language = self.currentState.language
-        return self.searchService.searchUser(query: query, page: currentPage, language: language?.name)
+        return self.searchService.searchUser(query: query, page: currentPage)
             .map { (lists, canLoadMore) -> Mutation in
                 let newPage = !canLoadMore ? currentPage : currentPage + 1
                 return .setSearchUsers(lists, nextPage: newPage, canLoadMore: canLoadMore)
             }.catchErrorJustReturn(.setSearchUsers([], nextPage: currentPage, canLoadMore: false))
     }
 
-    private func searchRepositoriesMutation(query: String) -> Observable<Mutation> {
+    private func searchRepositoriesMutation(query: String, language: Language? = nil) -> Observable<Mutation> {
         let currentPage = SearchViewReactor.INITIAL_PAGE
         guard !query.isEmpty else { return .just(.setSearchRepos([], nextPage: currentPage, canLoadMore: false)) }
-        let language = self.currentState.language
+        let language = language ?? self.currentState.language
         return self.searchService.searchRepo(query: query, page: currentPage, language: language?.name)
             .map { (lists, canLoadMore) -> Mutation in
                 let newPage = !canLoadMore ? currentPage : currentPage + 1
@@ -241,7 +239,7 @@ class SearchViewReactor: Reactor {
 
         switch currentSearchType {
         case .users:
-            return self.searchService.searchUser(query: query, page: currentPage, language: language?.name)
+            return self.searchService.searchUser(query: query, page: currentPage)
                 .map { (lists, canLoadMore) -> Mutation in
                     let newPage = !canLoadMore ? currentPage : currentPage + 1
                     return .setMoreSearchUsers(lists, nextPage: newPage, canLoadMore: canLoadMore)