Wire up custom collection reconciliation (TODO: add final test, fix tests

Author: finestructure

Sources/App/Commands/Reconcile.swift

@@ -50,26 +50,35 @@ func reconcile(client: Client, database: Database) async throws {
     let start = DispatchTime.now().uptimeNanoseconds
     defer { AppMetrics.reconcileDurationSeconds?.time(since: start) }
 
-    do { // reconcile main package list
-        async let sourcePackageList = try Current.fetchPackageList(client)
-        async let sourcePackageDenyList = try Current.fetchPackageDenyList(client)
-        async let currentList = try fetchCurrentPackageList(database)
-
-        let packageList = processPackageDenyList(packageList: try await sourcePackageList,
-                                                 denyList: try await sourcePackageDenyList)
-
-        try await reconcileLists(db: database,
-                                 source: packageList,
-                                 target: currentList)
-    }
+    // reconcile main package list
+    let fullPackageList = try await reconcileMainPackageList(client: client, database: database)
 
     do { // reconcile custom package collections
-        // - fetch custom-package-collections.json
-        // - for each entry: reconcileCustomCollection
+        @Dependency(\.packageListRepository) var packageListRepository
+        let collections = try await packageListRepository.fetchCustomCollections(client: client)
+        for collection in collections {
+            try await reconcileCustomCollection(client: client, database: database, fullPackageList: fullPackageList, collection)
+        }
     }
 }
 
 
+func reconcileMainPackageList(client: Client, database: Database) async throws -> [URL] {
+    async let sourcePackageList = try Current.fetchPackageList(client)
+    async let sourcePackageDenyList = try Current.fetchPackageDenyList(client)
+    async let currentList = try fetchCurrentPackageList(database)
+
+    let packageList = processPackageDenyList(packageList: try await sourcePackageList,
+                                             denyList: try await sourcePackageDenyList)
+
+    try await reconcileLists(db: database,
+                             source: packageList,
+                             target: currentList)
+
+    return packageList
+}
+
+
 func liveFetchPackageList(_ client: Client) async throws -> [URL] {
    try await client
         .get(Constants.packageListUri)

Sources/App/Core/Dependencies/PackageListRepositoryClient.swift

@@ -20,6 +20,7 @@ import Vapor
 @DependencyClient
 struct PackageListRepositoryClient {
     var fetchCustomCollection: @Sendable (_ client: Client, _ url: URL) async throws -> [URL]
+    var fetchCustomCollections: @Sendable (_ client: Client) async throws -> [CustomCollection.DTO]
     // TODO: move other package list dependencies here
 }
 

Tests/AppTests/ReconcilerTests.swift

@@ -35,13 +35,13 @@ class ReconcilerTests: AppTestCase {
         XCTAssertEqual(urls.map(\.absoluteString).sorted(), ["1", "2", "3"])
     }
 
-    func test_basic_reconciliation() async throws {
+    func test_reconcileMainPackageList() async throws {
         // setup
         let urls = ["1", "2", "3"]
         Current.fetchPackageList = { _ in urls.asURLs }
 
         // MUT
-        try await reconcile(client: app.client, database: app.db)
+        _ = try await reconcileMainPackageList(client: app.client, database: app.db)
 
         // validate
         let packages = try await Package.query(on: app.db).all()
@@ -55,7 +55,7 @@ class ReconcilerTests: AppTestCase {
         }
     }
 
-    func test_adds_and_deletes() async throws {
+    func test_reconcileMainPackageList_adds_and_deletes() async throws {
         // save intial set of packages 1, 2, 3
         for url in ["1", "2", "3"].asURLs {
             try await Package(url: url).save(on: app.db)
@@ -66,14 +66,14 @@ class ReconcilerTests: AppTestCase {
         Current.fetchPackageList = { _ in urls.asURLs }
 
         // MUT
-        try await reconcile(client: app.client, database: app.db)
+        _ = try await reconcileMainPackageList(client: app.client, database: app.db)
 
         // validate
         let packages = try await Package.query(on: app.db).all()
         XCTAssertEqual(packages.map(\.url).sorted(), urls.sorted())
     }
 
-    func test_packageDenyList() async throws {
+    func test_reconcileMainPackageList_packageDenyList() async throws {
         // Save the intial set of packages
         for url in ["1", "2", "3"].asURLs {
             try await Package(url: url).save(on: app.db)
@@ -88,14 +88,14 @@ class ReconcilerTests: AppTestCase {
         Current.fetchPackageDenyList = { _ in packageDenyList.asURLs }
 
         // MUT
-        try await reconcile(client: app.client, database: app.db)
+        _ = try await reconcileMainPackageList(client: app.client, database: app.db)
 
         // validate
         let packages = try await Package.query(on: app.db).all()
         XCTAssertEqual(packages.map(\.url).sorted(), ["1", "3", "5"])
     }
 
-    func test_packageDenyList_caseSensitivity() async throws {
+    func test_reconcileMainPackageList_packageDenyList_caseSensitivity() async throws {
         // Save the intial set of packages
         for url in ["https://example.com/one/one", "https://example.com/two/two"].asURLs {
             try await Package(url: url).save(on: app.db)
@@ -110,7 +110,7 @@ class ReconcilerTests: AppTestCase {
         Current.fetchPackageDenyList = { _ in packageDenyList.asURLs }
 
         // MUT
-        try await reconcile(client: app.client, database: app.db)
+        _ = try await reconcileMainPackageList(client: app.client, database: app.db)
 
         // validate
         let packages = try await Package.query(on: app.db).all()
@@ -206,4 +206,8 @@ class ReconcilerTests: AppTestCase {
         }
     }
 
+    func test_reconcile() async throws {
+        XCTFail("Implement integration test for both parts, main list + custom collection")
+    }
+
 }