Skip to content

Commit 236fb08

Browse files
committed
Drop [FluentKit.Model] save overload, convert to a/a
1 parent 3ec5bdb commit 236fb08

File tree

6 files changed

+451
-460
lines changed

6 files changed

+451
-460
lines changed

Sources/App/Commands/Common.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ import Vapor
1919

2020
/// Update packages (in the `[Result<Joined<Package, Repository>, Error>]` array).
2121
///
22-
/// Unlike the overload with a result parameter `Result<(Joined<Package, Repository>, [Version])` this will not use `Version` information to update the package.
23-
///
2422
/// - Parameters:
2523
/// - client: `Client` object
2624
/// - database: `Database` object

Sources/App/Core/Extensions/Model+ext.swift

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@ import Fluent
1616

1717

1818
extension Array where Element: FluentKit.Model {
19-
public func save(on database: Database) -> EventLoopFuture<Void> {
20-
map {
21-
$0.save(on: database)
22-
}.flatten(on: database.eventLoop)
23-
}
24-
2519
public func save(on database: Database) async throws -> Void {
2620
for element in self {
2721
try await element.save(on: database)

Tests/AppTests/IngestorTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ class IngestorTests: AppTestCase {
265265
Package(id: UUID(), url: "https://github.com/foo/1", status: .ok, processingStage: .reconciliation),
266266
Package(id: UUID(), url: "https://github.com/foo/2", status: .new, processingStage: .reconciliation)
267267
]
268-
try await pkgs.save(on: app.db).get()
268+
try await pkgs.save(on: app.db)
269269
let results: [Result<Joined<Package, Repository>, Error>] = [ .success(.init(model: pkgs[0])),
270270
.success(.init(model: pkgs[1]))]
271271

Tests/AppTests/PackageTests.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -242,18 +242,18 @@ final class PackageTests: AppTestCase {
242242
)
243243
}
244244

245-
func test_findSignificantReleases_old_beta() throws {
245+
func test_findSignificantReleases_old_beta() async throws {
246246
// Test to ensure outdated betas aren't picked up as latest versions
247247
// setup
248248
let pkg = Package(id: UUID(), url: "1")
249-
try pkg.save(on: app.db).wait()
250-
try Repository(package: pkg, defaultBranch: "main").save(on: app.db).wait()
249+
try await pkg.save(on: app.db)
250+
try await Repository(package: pkg, defaultBranch: "main").save(on: app.db)
251251
let versions = [
252252
try Version(package: pkg, packageName: "foo", reference: .branch("main")),
253253
try Version(package: pkg, packageName: "foo", reference: .tag(2, 0, 0)),
254254
try Version(package: pkg, packageName: "foo", reference: .tag(2, 0, 0, "rc1"))
255255
]
256-
try versions.save(on: app.db).wait()
256+
try await versions.save(on: app.db)
257257

258258
// MUT
259259
let (release, preRelease, defaultBranch) = Package.findSignificantReleases(versions: versions, branch: "main")

0 commit comments

Comments
 (0)