Convert Build

Author: finestructure

Sources/App/Commands/DeleteBuilds.swift

@@ -15,7 +15,7 @@
 import Vapor
 
 
-struct DeleteBuildsCommand: Command {
+struct DeleteBuildsCommand: AsyncCommand {
     struct Signature: CommandSignature {
         @Option(name: "version-id", short: "v")
         var versionId: UUID?
@@ -27,25 +27,21 @@ struct DeleteBuildsCommand: Command {
 
     var help: String { "Delete build records" }
 
-    func run(using context: CommandContext, signature: Signature) throws {
+    func run(using context: CommandContext, signature: Signature) async throws {
 
         switch (signature.versionId, signature.packageId) {
             case let (versionId?, .none):
                 context.console.info("Deleting builds for version id \(versionId) ...")
-                let count = try Build.delete(on: context.application.db,
-                                             versionId: versionId).wait()
+                let count = try await Build.delete(on: context.application.db, versionId: versionId)
                 context.console.info("Deleted \(pluralizedCount: count, singular: "record")")
 
             case let (.none, packageId?):
                 context.console.info("Deleting builds for package id \(packageId) ...")
                 let count: Int
                 if let kind = signature.latest {
-                    count = try Build.delete(on: context.application.db,
-                                             packageId: packageId,
-                                             versionKind: kind).wait()
+                    count = try await Build.delete(on: context.application.db, packageId: packageId, versionKind: kind)
                 } else {
-                    count = try Build.delete(on: context.application.db,
-                                                 packageId: packageId).wait()
+                    count = try await Build.delete(on: context.application.db, packageId: packageId)
                 }
                 context.console.info("Deleted \(pluralizedCount: count, singular: "record")")
 

Sources/App/Models/Build.swift

@@ -221,8 +221,8 @@ extension Build {
 // MARK: - Deletion
 
 extension Build {
-    static func delete(on database: Database, versionId: Version.Id) -> EventLoopFuture<Int> {
-        delete(on: database, deleteSQL: """
+    static func delete(on database: Database, versionId: Version.Id) async throws -> Int {
+        try await delete(on: database, deleteSQL: """
             DELETE
             FROM builds b
             USING versions v
@@ -233,8 +233,8 @@ extension Build {
     }
 
     static func delete(on database: Database,
-                       packageId: Package.Id) -> EventLoopFuture<Int> {
-        delete(on: database, deleteSQL: """
+                       packageId: Package.Id) async throws -> Int {
+        try await delete(on: database, deleteSQL: """
             DELETE
             FROM builds b
             USING versions v, packages p
@@ -247,8 +247,8 @@ extension Build {
 
     static func delete(on database: Database,
                        packageId: Package.Id,
-                       versionKind: Version.Kind) -> EventLoopFuture<Int> {
-        delete(on: database, deleteSQL: """
+                       versionKind: Version.Kind) async throws -> Int {
+        try await delete(on: database, deleteSQL: """
             DELETE
             FROM builds b
             USING versions v, packages p
@@ -261,13 +261,13 @@ extension Build {
     }
 
     static func delete(on database: Database,
-                       deleteSQL: SQLQueryString) -> EventLoopFuture<Int> {
+                       deleteSQL: SQLQueryString) async throws -> Int {
         guard let db = database as? SQLDatabase else {
             fatalError("Database must be an SQLDatabase ('as? SQLDatabase' must succeed)")
         }
-        return db.raw(deleteSQL)
+        return try await db.raw(deleteSQL)
             .all()
-            .map { $0.count }
+            .count
     }
 
 }

Tests/AppTests/BuildTests.swift

@@ -320,7 +320,7 @@ class BuildTests: AppTestCase {
             .save(on: app.db)
 
         // MUT
-        let count = try await Build.delete(on: app.db, versionId: vid2).get()
+        let count = try await Build.delete(on: app.db, versionId: vid2)
 
         // validate
         XCTAssertEqual(count, 1)
@@ -350,7 +350,7 @@ class BuildTests: AppTestCase {
 
 
         // MUT
-        let count = try await Build.delete(on: app.db, packageId: pkgId2).get()
+        let count = try await Build.delete(on: app.db, packageId: pkgId2)
 
         // validate
         XCTAssertEqual(count, 1)
@@ -383,7 +383,7 @@ class BuildTests: AppTestCase {
             .save(on: app.db)
 
         // MUT
-        let count = try await Build.delete(on: app.db, packageId: pkgId2, versionKind: .defaultBranch).get()
+        let count = try await Build.delete(on: app.db, packageId: pkgId2, versionKind: .defaultBranch)
 
         // validate
         XCTAssertEqual(count, 1)