Convert JPR and related ELFs to a/a

Author: finestructure

Sources/App/Controllers/PackageController+routes.swift

@@ -301,7 +301,7 @@ enum PackageController {
         }
 
         let pkg = try await Joined<Package, Repository>
-            .query(on: req.db, owner: owner, repository: repository).get()
+            .query(on: req.db, owner: owner, repository: repository)
 
         // For repositories that have no README file at all.
         guard let readmeHtmlUrl = pkg.repository?.readmeHtmlUrl else {
@@ -328,18 +328,15 @@ enum PackageController {
     }
 
     @Sendable
-    static func releases(req: Request) throws -> EventLoopFuture<Node<HTML.BodyContext>> {
+    static func releases(req: Request) async throws -> Node<HTML.BodyContext> {
         guard
             let owner = req.parameters.get("owner"),
             let repository = req.parameters.get("repository")
-        else {
-            return req.eventLoop.future(error: Abort(.notFound))
-        }
+        else { throw Abort(.notFound) }
 
-        return Joined<Package, Repository>
-            .query(on: req.db, owner: owner, repository: repository)
-            .map { PackageReleases.Model.init(package: $0) }
-            .map { PackageReleases.View(model: $0).document() }
+        let pkg = try await Joined<Package, Repository>.query(on: req.db, owner: owner, repository: repository)
+        let model = PackageReleases.Model(package: pkg)
+        return PackageReleases.View(model: model).document()
     }
 
     @Sendable

Sources/App/Core/Query+Support/Joined+Package.swift

@@ -26,8 +26,8 @@ extension Joined where M == Package, R == Repository {
               method: .left)
     }
 
-    static func query(on database: Database, owner: String, repository: String) -> EventLoopFuture<Self> {
-        query(on: database)
+    static func query(on database: Database, owner: String, repository: String) async throws -> Self {
+        try await query(on: database)
             .filter(Repository.self, \.$owner, .custom("ilike"), owner)
             .filter(Repository.self, \.$name, .custom("ilike"), repository)
             .first()

Tests/AppTests/JoinedTests.swift

@@ -19,36 +19,36 @@ import XCTest
 class JoinedTests: AppTestCase {
     typealias JPR = Joined<Package, Repository>
 
-    func test_query_owner_repository() throws {
+    func test_query_owner_repository() async throws {
         // setup
         let pkg = Package(url: "1")
-        try pkg.save(on: app.db).wait()
-        try Repository(package: pkg, name: "bar", owner: "foo")
-            .save(on: app.db).wait()
+        try await pkg.save(on: app.db)
+        try await Repository(package: pkg, name: "bar", owner: "foo")
+            .save(on: app.db)
         do {  // inselected package
             let pkg = Package(url: "2")
-            try pkg.save(on: app.db).wait()
-            try Repository(package: pkg, name: "bar2", owner: "foo")
-                .save(on: app.db).wait()
+            try await pkg.save(on: app.db)
+            try await Repository(package: pkg, name: "bar2", owner: "foo")
+                .save(on: app.db)
         }
 
         // MUT
-        let jpr = try JPR.query(on: app.db, owner: "foo", repository: "bar").wait()
+        let jpr = try await JPR.query(on: app.db, owner: "foo", repository: "bar")
 
         // validate
         XCTAssertEqual(jpr.package.id, pkg.id)
         XCTAssertEqual(jpr.repository?.owner, "foo")
         XCTAssertEqual(jpr.repository?.name, "bar")
     }
 
-    func test_repository_access() throws {
+    func test_repository_access() async throws {
         // Test accessing repository through the join vs through the package relation
         // setup
         let p = try savePackage(on: app.db, "1")
-        try Repository(package: p).save(on: app.db).wait()
+        try await Repository(package: p).save(on: app.db)
 
         // MUT
-        let jpr = try XCTUnwrap(JPR.query(on: app.db).first().wait())
+        let jpr = try await XCTUnwrapAsync(try await JPR.query(on: app.db).first())
 
         // validate
         XCTAssertNotNil(jpr.repository)