[MBL-19564][S/T/P] Enhanced domain lookup searching in "Find your school" screen

Core/Core/Features/Login/APIAccount.swift

@@ -42,6 +42,33 @@ public struct APIAccountResult: Codable, Equatable {
     }
 }
 
+// MARK: - Helpers
+
+extension Array where Element == APIAccountResult {
+
+    func sortedPromotingQueryPrefixed(_ query: String) -> Self {
+        let qValue = query.lowercased().trimmed()
+
+        return enumerated()
+            .sorted { result1, result2 in
+                let name1 = result1.element.name.lowercased().trimmed()
+                let name2 = result2.element.name.lowercased().trimmed()
+
+                let queryMatch1 = name1.hasPrefix(qValue)
+                let queryMatch2 = name2.hasPrefix(qValue)
+
+                if queryMatch1 == queryMatch2 {
+                    return result1.offset < result2.offset
+                } else if queryMatch1 {
+                    return true
+                } else {
+                    return false
+                }
+            }
+            .map { $0.element }
+    }
+}
+
 #if DEBUG
 extension APIAccountResult {
     public static func make(
@@ -67,7 +94,7 @@ public struct GetAccountsSearchRequest: APIRequestable {
     public let path = "https://canvas.instructure.com/api/v1/accounts/search"
     public var query: [APIQueryItem] {
         return [
-            .perPage(50),
+            .perPage(100),
             .value("search_term", searchTerm)
         ]
     }

Core/Core/Features/Login/LoginFindSchoolViewController.swift

@@ -107,7 +107,7 @@ class LoginFindSchoolViewController: UIViewController {
         loadingView?.startAnimating()
         searchTask = api.makeRequest(GetAccountsSearchRequest(searchTerm: query)) { [weak self] (results, _, error) in performUIUpdate {
             guard let self = self, error == nil else { return }
-            self.accounts = results ?? []
+            self.accounts = results?.sortedPromotingQueryPrefixed(query) ?? []
             self.loadingView.stopAnimating()
             self.resultsTableView.reloadData()
             self.searchTask = nil

Core/CoreTests/Features/Login/APIAccountTests.swift

@@ -58,11 +58,38 @@ class APIAccountResultTests: XCTestCase {
     func testGetAccountsSearchRequest() {
         XCTAssertEqual(GetAccountsSearchRequest(searchTerm: "").path, "https://canvas.instructure.com/api/v1/accounts/search")
         XCTAssertEqual(GetAccountsSearchRequest(searchTerm: "abcd").queryItems, [
-            URLQueryItem(name: "per_page", value: "50"),
+            URLQueryItem(name: "per_page", value: "100"),
             URLQueryItem(name: "search_term", value: "abcd")
         ])
         XCTAssertEqual(GetAccountsSearchRequest(searchTerm: "").headers, [
             HttpHeader.authorization: nil
         ])
     }
+
+    func testAccountResultsQueryBasedSorting() {
+        let results: [APIAccountResult] = [
+            .make(name: "Boston University", domain: "bu.edu"),
+            .make(name: "Harvard University", domain: "harvard.edu"),
+            .make(name: "Boston College", domain: "bc.edu"),
+            .make(name: "MIT", domain: "mit.edu"),
+            .make(name: "boston medical center", domain: "bmc.org")
+        ]
+
+        let sorted = results.sortedPromotingQueryPrefixed("boston")
+
+        XCTAssertEqual(sorted[0].name, "Boston University")
+        XCTAssertEqual(sorted[1].name, "Boston College")
+        XCTAssertEqual(sorted[2].name, "boston medical center")
+        XCTAssertEqual(sorted[3].name, "Harvard University")
+        XCTAssertEqual(sorted[4].name, "MIT")
+
+        let sortedUppercase = results.sortedPromotingQueryPrefixed("BOSTON")
+        XCTAssertEqual(sortedUppercase, sorted)
+
+        let sortedNoMatches = results.sortedPromotingQueryPrefixed("yale")
+        XCTAssertEqual(sortedNoMatches, results)
+
+        let sortedEmpty = results.sortedPromotingQueryPrefixed("")
+        XCTAssertEqual(sortedEmpty, results)
+    }
 }