Convert Stats

Author: finestructure

Sources/App/Core/Stats.swift

@@ -36,11 +36,11 @@ extension Stats {
     }
 
 
-    static func fetch(on database: Database) -> EventLoopFuture<Stats?> {
+    static func fetch(on database: Database) async throws -> Stats? {
         guard let db = database as? SQLDatabase else {
             fatalError("Database must be an SQLDatabase ('as? SQLDatabase' must succeed)")
         }
-        return db.raw("SELECT * FROM \(ident: Self.schema)")
+        return try await db.raw("SELECT * FROM \(ident: Self.schema)")
             .first(decoding: Stats.self)
     }
 }

Sources/App/Views/Home/HomeIndex+Query.swift

@@ -18,7 +18,7 @@ import Plot
 
 extension HomeIndex.Model {
     static func query(database: Database) async throws -> Self {
-        let stats = try await Stats.fetch(on: database).get()
+        let stats = try await Stats.fetch(on: database)
         let packages = try await RecentPackage.fetch(on: database).map(makeDateLink)
         let releases = try await RecentRelease.fetch(on: database)
             .map(Release.init(recent:))

Tests/AppTests/AnalyzerTests.swift

@@ -199,7 +199,7 @@ class AnalyzerTests: AppTestCase {
 
         // ensure stats, recent packages, and releases are refreshed
         let app = self.app!
-        try await XCTAssertEqualAsync(try await Stats.fetch(on: app.db).get(), .init(packageCount: 2))
+        try await XCTAssertEqualAsync(try await Stats.fetch(on: app.db), .init(packageCount: 2))
         try await XCTAssertEqualAsync(try await RecentPackage.fetch(on: app.db).count, 2)
         try await XCTAssertEqualAsync(try await RecentRelease.fetch(on: app.db).count, 2)
     }

Tests/AppTests/StatsTests.swift

@@ -32,7 +32,7 @@ class StatsTests: AppTestCase {
         try await Stats.refresh(on: app.db)
 
         // MUT
-        let res = try await Stats.fetch(on: app.db).get()
+        let res = try await Stats.fetch(on: app.db)
 
         // validate
         XCTAssertEqual(res, .some(.init(packageCount: 2)))