github syntax search working

Author: Ryan Nystrom

Classes/Repository/GQL+RepositoryIssueSummaryType.swift

@@ -54,3 +54,50 @@ extension RepoPullRequestPagesQuery.Data.Repository.PullRequest.Node: Repository
     }
 
 }
+
+extension RepoSearchPagesQuery.Data.Search.Node.AsIssue: RepositoryIssueSummaryType {
+
+    var labelableFields: LabelableFields {
+        return fragments.labelableFields
+    }
+
+    var repoEventFields: RepoEventFields {
+        return fragments.repoEventFields
+    }
+
+    var pullRequest: Bool {
+        return false
+    }
+
+    var status: IssueStatus {
+        switch issueState {
+        case .closed: return .closed
+        case .open, .__unknown: return .open
+        }
+    }
+
+}
+
+extension RepoSearchPagesQuery.Data.Search.Node.AsPullRequest: RepositoryIssueSummaryType {
+
+    var labelableFields: LabelableFields {
+        return fragments.labelableFields
+    }
+
+    var repoEventFields: RepoEventFields {
+        return fragments.repoEventFields
+    }
+
+    var pullRequest: Bool {
+        return false
+    }
+
+    var status: IssueStatus {
+        switch pullRequestState {
+        case .closed: return .closed
+        case .merged: return .merged
+        case .open, .__unknown: return .open
+        }
+    }
+
+}

Classes/Repository/RepositoryClient.swift

@@ -46,6 +46,21 @@ extension RepoPullRequestPagesQuery: RepositoryQuery {
 
 }
 
+extension RepoSearchPagesQuery: RepositoryQuery {
+
+    func summaryTypes(from data: GraphQLSelectionSet) -> [RepositoryIssueSummaryType] {
+        guard let results = data as? RepoSearchPagesQuery.Data else { return [] }
+        return results.search.nodes?.compactMap { $0?.asIssue ?? $0?.asPullRequest } ?? []
+    }
+
+    func nextPageToken(from data: GraphQLSelectionSet) -> String? {
+        guard let results = data as? RepoSearchPagesQuery.Data,
+            results.search.pageInfo.hasNextPage else { return nil }
+        return results.search.pageInfo.endCursor
+    }
+
+}
+
 func createSummaryModel(
     _ node: RepositoryIssueSummaryType,
     contentSizeCategory: UIContentSizeCategory,
@@ -161,4 +176,17 @@ final class RepositoryClient {
         )
     }
 
+    func searchIssues(
+        query: String,
+        nextPage: String? = nil,
+        containerWidth: CGFloat,
+        completion: @escaping (Result<RepositoryPayload>) -> Void
+        ) {
+        loadPage(
+            query: RepoSearchPagesQuery(query: query, page_size: 30),
+            containerWidth: containerWidth,
+            completion: completion
+        )
+    }
+
 }

Classes/Repository/RepositoryIssuesViewController.swift

@@ -23,7 +23,8 @@ SearchBarSectionControllerDelegate {
     private let client: RepositoryClient
     private let type: RepositoryIssuesType
     private let searchKey: ListDiffable = "searchKey" as ListDiffable
-    private var searchQuery: String = ""
+    private let debouncer = Debouncer()
+    private var previousSearchString = "is:open"
 
     init(client: GithubClient, repo: RepositoryDetails, type: RepositoryIssuesType) {
         self.repo = repo
@@ -59,8 +60,10 @@ SearchBarSectionControllerDelegate {
     // MARK: Overrides
 
     override func fetch(page: NSString?) {
-        let width = view.bounds.width
-        let block = { [weak self] (result: Result<RepositoryClient.RepositoryPayload>) in
+        client.searchIssues(
+            query: fullQueryString,
+            containerWidth: view.bounds.width
+        ) { [weak self] (result: Result<RepositoryClient.RepositoryPayload>) in
             switch result {
             case .error:
                 self?.error(animated: trueUnlessReduceMotionEnabled)
@@ -73,17 +76,15 @@ SearchBarSectionControllerDelegate {
                 self?.update(page: payload.nextPage as NSString?, animated: trueUnlessReduceMotionEnabled)
             }
         }
-
-        switch type {
-        case .issues: client.loadIssues(nextPage: page as String?, containerWidth: width, completion: block)
-        case .pullRequests: client.loadPullRequests(nextPage: page as String?, containerWidth: width, completion: block)
-        }
     }
 
     // MARK: SearchBarSectionControllerDelegate
 
     func didChangeSelection(sectionController: SearchBarSectionController, query: String) {
-        filter(query: query, animated: trueUnlessReduceMotionEnabled)
+        let trimmed = query.trimmingCharacters(in: .whitespacesAndNewlines)
+        guard previousSearchString != trimmed else { return }
+        previousSearchString = trimmed
+        debouncer.action = { [weak self] in self?.fetch(page: nil) }
     }
 
     // MARK: BaseListViewControllerDataSource
@@ -98,7 +99,11 @@ SearchBarSectionControllerDelegate {
 
     func sectionController(model: Any, listAdapter: ListAdapter) -> ListSectionController {
         if let object = model as? ListDiffable, object === searchKey {
-            return SearchBarSectionController(placeholder: Constants.Strings.search, delegate: self)
+            return SearchBarSectionController(
+                placeholder: Constants.Strings.search,
+                delegate: self,
+                query: previousSearchString
+            )
         }
         return RepositorySummarySectionController(client: client.githubClient, repo: repo)
     }
@@ -115,4 +120,16 @@ SearchBarSectionControllerDelegate {
             type: empty
         )
     }
+
+    // MARK: Private API
+
+    var fullQueryString: String {
+        let typeQuery: String
+        switch type {
+        case .issues: typeQuery = "is:issue"
+        case .pullRequests: typeQuery = "is:pr"
+        }
+        return "repo:\(repo.owner)/\(repo.name) \(typeQuery) \(previousSearchString)"
+    }
+
 }

Classes/Section Controllers/SearchBar/SearchBarSectionController.swift

@@ -15,13 +15,15 @@ protocol SearchBarSectionControllerDelegate: class {
 
 final class SearchBarSectionController: ListSectionController, SearchBarCellDelegate {
 
+    public private(set) var query: String
+
     private weak var delegate: SearchBarSectionControllerDelegate?
     private let placeholder: String
-    private var query = ""
 
-    init(placeholder: String, delegate: SearchBarSectionControllerDelegate) {
+    init(placeholder: String, delegate: SearchBarSectionControllerDelegate, query: String = "") {
         self.delegate = delegate
         self.placeholder = placeholder
+        self.query = query
         super.init()
     }