Skip to content

Commit 357a813

Browse files
committed
Also trim what we load for the keyword page
1 parent 5b043cd commit 357a813

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

Sources/App/Controllers/KeywordController.swift

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ enum KeywordController {
2222
static func query(on database: Database, keyword: String, page: Int, pageSize: Int) async throws -> Page<Joined3<Package, Repository, Version>> {
2323
try await Joined3<Package, Repository, Version>
2424
.query(on: database, version: .defaultBranch)
25+
.field(Repository.self, \.$name)
26+
.field(Repository.self, \.$owner)
27+
.field(Repository.self, \.$lastActivityAt)
28+
.field(Repository.self, \.$stars)
29+
.field(Repository.self, \.$summary)
30+
.field(Version.self, \.$packageName)
2531
.filter(Repository.self, \.$keywords, .custom("@>"), [keyword])
2632
.sort(\.$score, .descending)
2733
.sort(Repository.self, \.$name)

Tests/AppTests/KeywordControllerTests.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class KeywordControllerTests: AppTestCase {
5454
pageSize: 10)
5555

5656
// validation
57-
XCTAssertEqual(page.results.map(\.model.url), ["1"])
57+
XCTAssertEqual(page.results.map(\.repository.name), ["1"])
5858
XCTAssertEqual(page.hasMoreResults, false)
5959
}
6060

@@ -76,7 +76,7 @@ class KeywordControllerTests: AppTestCase {
7676
page: 1,
7777
pageSize: 3)
7878
// validate
79-
XCTAssertEqual(page.results.map(\.model.url), ["0", "1", "2"])
79+
XCTAssertEqual(page.results.map(\.repository.name), ["0", "1", "2"])
8080
XCTAssertEqual(page.hasMoreResults, true)
8181
}
8282
do { // second page
@@ -86,7 +86,7 @@ class KeywordControllerTests: AppTestCase {
8686
page: 2,
8787
pageSize: 3)
8888
// validate
89-
XCTAssertEqual(page.results.map(\.model.url), ["3", "4", "5"])
89+
XCTAssertEqual(page.results.map(\.repository.name), ["3", "4", "5"])
9090
XCTAssertEqual(page.hasMoreResults, true)
9191
}
9292
do { // last page
@@ -96,7 +96,7 @@ class KeywordControllerTests: AppTestCase {
9696
page: 3,
9797
pageSize: 3)
9898
// validate
99-
XCTAssertEqual(page.results.map(\.model.url), ["6", "7", "8"])
99+
XCTAssertEqual(page.results.map(\.repository.name), ["6", "7", "8"])
100100
XCTAssertEqual(page.hasMoreResults, false)
101101
}
102102
}

0 commit comments

Comments
 (0)