Resolve PR comments

Author: supersonicbyte

Sources/App/Commands/Ingest.swift

@@ -125,13 +125,7 @@ func ingest(client: Client,
                         s3Readme = .error("\(error)")
                     }
 
-                    let fork: Fork?
-                    do {
-                        fork = try await getFork(on: database, metadata: metadata)
-                    } catch {
-                        fork = nil
-                        Current.logger().warning("updating forked from failed")
-                    }
+                    let fork: Fork? = try? await getFork(on: database, parent: metadata.repository?.parent)
 
                     try await updateRepository(on: database,
                                                for: repo,
@@ -223,13 +217,10 @@ func updateRepository(on database: Database,
     try await repository.save(on: database)
 }
 
-func getFork(on database: Database, metadata: Github.Metadata) async throws -> Fork? {
-    guard let url = metadata.repository?.parent?.url,
-          let parentUrl = URL(string: url)?.normalizedParent?.absoluteString else {
-        return nil
-    }
+func getFork(on database: Database, parent: Github.Metadata.Parent?) async -> Fork? {
+    guard let parentUrl = parent?.normalizedURL else { return nil }
 
-    if let packageId = try await Package.query(on: database)
+    if let packageId = try? await Package.query(on: database)
         .filter(\.$url, .custom("ilike"), parentUrl)
         .first()?.id {
         return .parentId(packageId)
@@ -250,11 +241,13 @@ private extension Github.Metadata.Repository {
     var repositoryName: String? { name }
 }
 
-private extension URL {
-    var normalizedParent: Self? {
-        guard var components = URLComponents(url: self, resolvingAgainstBaseURL: false) else { return nil }
-        if components.scheme == "http" { components.scheme = "https" }
-        if !components.path.hasSuffix(".git") { components.path = components.path + ".git" }
-        return components.url!
+private extension Github.Metadata.Parent {
+    // Returns a normalized version of the URL. Adding a `.git` if not present.
+    var normalizedURL: String? {
+        guard let url else { return nil }
+        guard let normalizedURL = URL(string: url)?.normalized?.absoluteString else {
+            return nil
+        }
+        return normalizedURL
     }
 }

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

@@ -0,0 +1,24 @@
+// Copyright Dave Verwer, Sven A. Schmidt, and other contributors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import Foundation
+
+extension URL {
+    var normalized: Self? {
+        guard var components = URLComponents(url: self, resolvingAgainstBaseURL: false) else { return nil }
+        if components.scheme == "http" { components.scheme = "https" }
+        if !components.path.hasSuffix(".git") { components.path = components.path + ".git" }
+        return components.url!
+    }
+}

Tests/AppTests/IngestorTests.swift

@@ -604,36 +604,31 @@ class IngestorTests: AppTestCase {
         try await Package(id: .id0, url: "https://github.com/foo/parent.git".url, processingStage: .analysis).save(on: app.db)
         try await Package(url: "https://github.com/bar/forked.git", processingStage: .analysis).save(on: app.db)
 
-        var metadata = Github.Metadata.mock
-
-        do {  // test lookup when package is in the index
-            metadata.repository?.parent = .init(url: "https://github.com/foo/parent.git")
-            let fork = try await getFork(on: app.db, metadata: metadata)
-            XCTAssertEqual(fork, .parentId(.id0))
-        }
-
-        do {  // test lookup when package is in the index but with different case in URL
-            metadata.repository?.parent = .init(url: "https://github.com/Foo/Parent.git")
-            let fork = try await getFork(on: app.db, metadata: metadata)
-            XCTAssertEqual(fork, .parentId(.id0))
-        }
+        var parent: Github.Metadata.Parent?
 
-        do {  // test whem metadata repo url doesn't have `.git` at end
-            metadata.repository?.parent = .init(url: "https://github.com/Foo/Parent")
-            let fork = try await getFork(on: app.db, metadata: metadata)
-            XCTAssertEqual(fork, .parentId(.id0))
-        }
-
-        do {  // test lookup when package is not in the index
-            metadata.repository?.parent = .init(url: "https://github.com/some/other.git")
-            let fork = try await getFork(on: app.db, metadata: metadata)
-            XCTAssertEqual(fork, .parentURL("https://github.com/some/other.git"))
-        }
-
-        do {  // test lookup when parent url is nil
-            metadata.repository?.parent = .init(url: nil)
-            let fork = try await getFork(on: app.db, metadata: metadata)
-            XCTAssertEqual(fork, nil)
-        }
+        // test lookup when package is in the index
+        parent = .init(url: "https://github.com/foo/parent.git")
+        let fork = await getFork(on: app.db, parent: parent)
+        XCTAssertEqual(fork, .parentId(.id0))
+        
+        // test lookup when package is in the index but with different case in URL
+        parent = .init(url: "https://github.com/Foo/Parent.git")
+        let fork2 = await getFork(on: app.db, parent: parent)
+        XCTAssertEqual(fork2, .parentId(.id0))
+        
+        // test whem metadata repo url doesn't have `.git` at end
+        parent = .init(url: "https://github.com/Foo/Parent")
+        let fork3 = await getFork(on: app.db, parent: parent)
+        XCTAssertEqual(fork3, .parentId(.id0))
+        
+        // test lookup when package is not in the index
+        parent = .init(url: "https://github.com/some/other.git")
+        let fork4 = await getFork(on: app.db, parent: parent)
+        XCTAssertEqual(fork4, .parentURL("https://github.com/some/other.git"))
+        
+        // test lookup when parent url is nil
+        parent = nil
+        let fork5 = await getFork(on: app.db, parent: parent)
+        XCTAssertEqual(fork5, nil)
     }
 }