Remove ELF-based JoinedQueryBuilder.first

Author: finestructure

Sources/App/Core/Query+Support/JoinedQueryBuilder.swift

@@ -139,11 +139,6 @@ struct JoinedQueryBuilder<J: ModelInitializable> {
             .map(J.init(model:))
     }
 
-    func first() -> EventLoopFuture<J?> {
-        queryBuilder.first()
-            .optionalMap(J.init(model:))
-    }
-
     func page(_ page: Int, size pageSize: Int) async throws -> Page<J> {
         let page = try await queryBuilder.page(page, size: pageSize)
         return .init(results: page.results.map(J.init(model:)),

Tests/AppTests/BuildMonitorIndexModelTests.swift

@@ -19,25 +19,25 @@ import XCTVapor
 
 class BuildMonitorIndexModelTests: AppTestCase {
 
-    func test_init_from_Build() throws {
+    func test_init_from_Build() async throws {
         do {
             let package = try savePackage(on: app.db, "https://github.com/daveverwer/LeftPad")
             let version = try Version(package: package,
                                       latest: .defaultBranch,
                                       packageName: "LeftPad from Version.packageName",
                                       reference: .branch("main"))
-            try version.save(on: app.db).wait()
-            try Build(id: .id0,
-                      version: version,
-                      platform: .macosXcodebuild,
-                      status: .ok,
-                      swiftVersion: .init(5, 6, 0)).save(on: app.db).wait()
-            try Repository(package: package,
-                           ownerName: "Dave Verwer from Repository.ownerName").save(on: app.db).wait()
+            try await version.save(on: app.db)
+            try await Build(id: .id0,
+                            version: version,
+                            platform: .macosXcodebuild,
+                            status: .ok,
+                            swiftVersion: .init(5, 6, 0)).save(on: app.db)
+            try await Repository(package: package,
+                                 ownerName: "Dave Verwer from Repository.ownerName").save(on: app.db)
         }
 
         // Query results back through the Joined4
-        let buildResult = try BuildResult.query(on: app.db).first().wait().unwrap()
+        let buildResult = try await BuildResult.query(on: app.db).first().unwrap()
 
         // MUT
         let model = try XCTUnwrap(BuildMonitorIndex.Model(buildResult: buildResult))
@@ -52,70 +52,70 @@ class BuildMonitorIndexModelTests: AppTestCase {
         XCTAssertEqual(model.status, .ok)
     }
 
-    func test_init_from_Build_without_repository_name() throws {
+    func test_init_from_Build_without_repository_name() async throws {
         do {
             let package = try savePackage(on: app.db, "https://github.com/daveverwer/LeftPad")
             let version = try Version(package: package,
                                       packageName: nil) // Deliberately missing a `packageName`
-            try version.save(on: app.db).wait()
-            try Build(version: version,
-                      platform: .macosXcodebuild,
-                      status: .ok,
-                      swiftVersion: .init(5, 6, 0)).save(on: app.db).wait()
-            try Repository(package: package,
-                           name: "LeftPad from Repository.name").save(on: app.db).wait()
+            try await version.save(on: app.db)
+            try await Build(version: version,
+                            platform: .macosXcodebuild,
+                            status: .ok,
+                            swiftVersion: .init(5, 6, 0)).save(on: app.db)
+            try await Repository(package: package,
+                                 name: "LeftPad from Repository.name").save(on: app.db)
         }
 
         // Query results back through the Joined4
-        let buildResult = try BuildResult.query(on: app.db).first().wait().unwrap()
+        let buildResult = try await BuildResult.query(on: app.db).first().unwrap()
 
         // MUT
         let model = try XCTUnwrap(BuildMonitorIndex.Model(buildResult: buildResult))
 
         XCTAssertEqual(model.packageName, "LeftPad from Repository.name")
     }
 
-    func test_init_from_Build_with_no_package_name() throws {
+    func test_init_from_Build_with_no_package_name() async throws {
         do {
             let package = try savePackage(on: app.db, "https://github.com/daveverwer/LeftPad")
             let version = try Version(package: package,
                                       packageName: nil) // Deliberately missing a `packageName`
-            try version.save(on: app.db).wait()
-            try Build(version: version,
-                      platform: .macosXcodebuild,
-                      status: .ok,
-                      swiftVersion: .init(5, 6, 0)).save(on: app.db).wait()
-            try Repository(package: package,
-                           name: nil) // Deliberately missing a `name`
-                .save(on: app.db).wait()
+            try await version.save(on: app.db)
+            try await Build(version: version,
+                            platform: .macosXcodebuild,
+                            status: .ok,
+                            swiftVersion: .init(5, 6, 0)).save(on: app.db)
+            try await Repository(package: package,
+                                 name: nil) // Deliberately missing a `name`
+            .save(on: app.db)
         }
 
         // Query results back through the Joined4
-        let buildResult = try BuildResult.query(on: app.db).first().wait().unwrap()
+        let buildResult = try await BuildResult.query(on: app.db).first().unwrap()
 
         // MUT
         let model = try XCTUnwrap(BuildMonitorIndex.Model(buildResult: buildResult))
 
         XCTAssertEqual(model.packageName, "Unknown Package")
     }
 
-    func test_init_from_Build_without_ownerName() throws {
+    func test_init_from_Build_without_ownerName() async throws {
         do {
             let package = try savePackage(on: app.db, "https://github.com/daveverwer/LeftPad")
             let version = try Version(package: package)
-            try version.save(on: app.db).wait()
-            try Build(version: version,
-                      platform: .macosXcodebuild,
-                      status: .ok,
-                      swiftVersion: .init(5, 6, 0)).save(on: app.db).wait()
-            try Repository(package: package,
-                           owner: "daveverwer from Repository.owner",
-                           ownerName: nil) // Deliberately missing an `ownerName`
-                .save(on: app.db).wait()
+            try await version.save(on: app.db)
+            try await Build(version: version,
+                            platform: .macosXcodebuild,
+                            status: .ok,
+                            swiftVersion: .init(5, 6, 0)).save(on: app.db)
+            try await Repository(package: package,
+                                 owner: "daveverwer from Repository.owner",
+                                 ownerName: nil) // Deliberately missing an `ownerName`
+            .save(on: app.db)
         }
 
         // Query results back through the Joined4
-        let buildResult = try BuildResult.query(on: app.db).first().wait().unwrap()
+        let buildResult = try await BuildResult.query(on: app.db).first().unwrap()
 
         // MUT
         let model = try XCTUnwrap(BuildMonitorIndex.Model(buildResult: buildResult))

Tests/AppTests/PackageInfoTests.swift

@@ -19,18 +19,17 @@ import XCTest
 
 class PackageInfoTests: AppTestCase {
 
-    func test_title_package_name() throws {
+    func test_title_package_name() async throws {
         // Ensure title is populated from package.name()
         // setup
         let p = try savePackage(on: app.db, "1")
-        try Repository(package: p, name: "repo name", owner: "owner")
-            .save(on: app.db).wait()
-        try Version(package: p, latest: .defaultBranch, packageName: "package name")
-            .save(on: app.db).wait()
-        let joined = try XCTUnwrap(Joined3<Package, Repository, Version>
-                                    .query(on: app.db, version: .defaultBranch)
-                                    .first()
-                                    .wait())
+        try await Repository(package: p, name: "repo name", owner: "owner")
+            .save(on: app.db)
+        try await Version(package: p, latest: .defaultBranch, packageName: "package name")
+            .save(on: app.db)
+        let joined = try await XCTUnwrapAsync(try await Joined3<Package, Repository, Version>
+            .query(on: app.db, version: .defaultBranch)
+            .first())
 
         // MUT
         let pkgInfo = PackageInfo(package: joined)
@@ -39,18 +38,17 @@ class PackageInfoTests: AppTestCase {
         XCTAssertEqual(pkgInfo?.title, "package name")
     }
 
-    func test_title_repo_name() throws {
+    func test_title_repo_name() async throws {
         // Ensure title is populated from repoName if package.name() is nil
         // setup
         let p = try savePackage(on: app.db, "1")
-        try Repository(package: p, name: "repo name", owner: "owner")
-            .save(on: app.db).wait()
-        try Version(package: p, latest: .defaultBranch, packageName: nil)
-            .save(on: app.db).wait()
-        let joined = try XCTUnwrap(Joined3<Package, Repository, Version>
-                                    .query(on: app.db, version: .defaultBranch)
-                                    .first()
-                                    .wait())
+        try await Repository(package: p, name: "repo name", owner: "owner")
+            .save(on: app.db)
+        try await Version(package: p, latest: .defaultBranch, packageName: nil)
+            .save(on: app.db)
+        let joined = try await XCTUnwrapAsync(try await Joined3<Package, Repository, Version>
+            .query(on: app.db, version: .defaultBranch)
+            .first())
 
         // MUT
         let pkgInfo = PackageInfo(package: joined)