Wire up custom collection generation

Author: finestructure

Sources/App/Controllers/PackageCollectionController.swift

@@ -33,7 +33,13 @@ enum PackageCollectionController {
                         authorName: "\(owner) via the Swift Package Index"
                     )
                 case let .custom(name):
-                    fatalError("FIXME")
+                    return try await SignedCollection.generate(
+                        db: req.db,
+                        filterBy: .customCollection(name),
+                        authorName: "Swift Package Index",
+                        collectionName: name,
+                        overview: "A custom package collection generated by the Swift Package Index"
+                    )
             }
         } catch PackageCollection.Error.noResults {
             throw Abort(.notFound)

Tests/AppTests/ApiTests.swift

@@ -809,7 +809,6 @@ class ApiTests: AppTestCase {
             try await v.save(on: app.db)
             try await Product(version: v, type: .library(.automatic), name: "lib")
                 .save(on: app.db)
-            try await Search.refresh(on: app.db)
 
             let event = App.ActorIsolated<TestEvent?>(nil)
             Current.postPlausibleEvent = { @Sendable _, kind, path, _ in
@@ -897,7 +896,6 @@ class ApiTests: AppTestCase {
                 try await Product(version: v, type: .library(.automatic), name: "p2")
                     .save(on: app.db)
             }
-            try await Search.refresh(on: app.db)
 
             do {  // MUT
                 let body: ByteBuffer = .init(string: """

Tests/AppTests/PackageCollectionControllerTests.swift

@@ -74,6 +74,62 @@ class PackageCollectionControllerTests: AppTestCase {
         }
     }
 
+    func test_custom_request() async throws {
+        try XCTSkipIf(!isRunningInCI && Current.collectionSigningPrivateKey() == nil, "Skip test for local user due to unset COLLECTION_SIGNING_PRIVATE_KEY env variable")
+        try await withDependencies {
+            $0.date.now = .t0
+        } operation: {
+            let p = try await savePackage(on: app.db, "https://github.com/foo/1")
+            do {
+                let v = try Version(id: UUID(),
+                                    package: p,
+                                    packageName: "P1-main",
+                                    reference: .branch("main"),
+                                    toolsVersion: "5.0")
+                try await v.save(on: app.db)
+                try await Product(version: v, type: .library(.automatic), name: "P1Lib")
+                    .save(on: app.db)
+            }
+            do {
+                let v = try Version(id: UUID(),
+                                    package: p,
+                                    latest: .release,
+                                    packageName: "P1-tag",
+                                    reference: .tag(1, 2, 3),
+                                    toolsVersion: "5.1")
+                try await v.save(on: app.db)
+                try await Product(version: v, type: .library(.automatic), name: "P1Lib", targets: ["t1"])
+                    .save(on: app.db)
+                try await Build(version: v,
+                                platform: .iOS,
+                                status: .ok,
+                                swiftVersion: .init(5, 6, 0)).save(on: app.db)
+                try await Target(version: v, name: "t1").save(on: app.db)
+            }
+            try await Repository(package: p,
+                                 defaultBranch: "main",
+                                 license: .mit,
+                                 licenseUrl: "https://foo/mit",
+                                 owner: "foo",
+                                 summary: "summary 1").create(on: app.db)
+            let collection = CustomCollection(id: .id2, .init(name: "Custom Collection", url: "https://github.com/foo/bar/list.json"))
+            try await collection.save(on: app.db)
+            try await collection.$packages.attach(p, on: app.db)
+
+            // MUT
+            let encoder = self.encoder
+            try await app.test(
+                .GET,
+                "collections/Custom%20Collection/collection.json",
+                afterResponse: { @MainActor res async throws in
+                    // validation
+                    XCTAssertEqual(res.status, .ok)
+                    let json = try res.content.decode(PackageCollection.self)
+                    assertSnapshot(of: json, as: .json(encoder))
+                })
+        }
+    }
+
     func test_nonexisting_404() throws {
         // Ensure a request for a non-existing collection returns a 404
         // MUT

Tests/AppTests/__Snapshots__/PackageCollectionControllerTests/test_custom_request.1.json

@@ -0,0 +1,71 @@
+{
+  "formatVersion" : "1.0",
+  "generatedAt" : "1970-01-01T00:00:00Z",
+  "generatedBy" : {
+    "name" : "Swift Package Index"
+  },
+  "name" : "Custom Collection",
+  "overview" : "A custom package collection generated by the Swift Package Index",
+  "packages" : [
+    {
+      "license" : {
+        "name" : "MIT",
+        "url" : "https:\/\/foo\/mit"
+      },
+      "summary" : "summary 1",
+      "url" : "https:\/\/github.com\/foo\/1",
+      "versions" : [
+        {
+          "defaultToolsVersion" : "5.1",
+          "license" : {
+            "name" : "MIT",
+            "url" : "https:\/\/foo\/mit"
+          },
+          "manifests" : {
+            "5.1" : {
+              "minimumPlatformVersions" : [
+
+              ],
+              "packageName" : "P1-tag",
+              "products" : [
+                {
+                  "name" : "P1Lib",
+                  "targets" : [
+                    "t1"
+                  ],
+                  "type" : {
+                    "library" : [
+                      "automatic"
+                    ]
+                  }
+                }
+              ],
+              "targets" : [
+                {
+                  "moduleName" : "t1",
+                  "name" : "t1"
+                }
+              ],
+              "toolsVersion" : "5.1"
+            }
+          },
+          "signer" : {
+            "commonName" : "Swift Package Index",
+            "organizationName" : "Swift Package Index",
+            "organizationalUnitName" : "Swift Package Index",
+            "type" : "ADP"
+          },
+          "verifiedCompatibility" : [
+            {
+              "platform" : {
+                "name" : "ios"
+              },
+              "swiftVersion" : "5.6"
+            }
+          ],
+          "version" : "1.2.3"
+        }
+      ]
+    }
+  ]
+}