Remap processing failures to ingestionError, which get recorded and advance the state

Author: finestructure

Sources/App/Commands/Common.swift

@@ -115,6 +115,8 @@ func recordError(database: Database,
             break
         case let .genericError(id, _):
             try await setStatus(id: id, status: .ingestionFailed)
+        case let .ingestionError(id, _):
+            try await setStatus(id: id, status: .ingestionFailed)
         case let .invalidPackageCachePath(id, _):
             try await setStatus(id: id, status: .invalidCachePath)
         case let .cacheDirectoryDoesNotExist(id, _):

Sources/App/Commands/Ingest.swift

@@ -142,6 +142,9 @@ func ingest(client: Client,
                 }
 
                 do {
+                    let result = result.mapError {
+                        AppError.ingestionError(pkg.model.id, $0.localizedDescription) as Error
+                    }
                     try await updatePackage(client: client, database: database, result: result, stage: .ingestion)
                 } catch {
                     Current.logger().report(error: error)

Sources/App/Core/AppError.swift

@@ -20,6 +20,7 @@ enum AppError: LocalizedError {
     case envVariableNotSet(_ variable: String)
     case invalidPackageCachePath(Package.Id?, _ path: String)
     case cacheDirectoryDoesNotExist(Package.Id?, _ path: String)
+    case ingestionError(Package.Id?, _ message: String)
     case invalidRevision(Version.Id?, _ revision: String?)
     case noValidVersions(Package.Id?, _ url: String)
     case shellCommandFailed(_ command: String, _ path: String, _ message: String)
@@ -32,6 +33,8 @@ enum AppError: LocalizedError {
                 return "Analysis failed: \(message) (id: \(id))"
             case let .envVariableNotSet(value):
                 return "Environment variable not set: \(value)"
+            case let .ingestionError(id, message):
+                return "Ingestion error: \(message) (id: \(id))"
             case let .invalidPackageCachePath(id, value):
                 return "Invalid packge cache path: \(value) (id: \(id))"
             case let .cacheDirectoryDoesNotExist(id, value):

Tests/AppTests/ErrorReportingTests.swift

@@ -33,7 +33,7 @@ class ErrorReportingTests: AppTestCase {
 
     func test_Ingestor_error_reporting() async throws {
         // setup
-        try await Package(url: "1", processingStage: .reconciliation).save(on: app.db)
+        try await Package(id: .id0, url: "1", processingStage: .reconciliation).save(on: app.db)
         Current.fetchMetadata = { _, _, _ in throw Github.Error.invalidURI(nil, "1") }
 
         // MUT
@@ -42,7 +42,7 @@ class ErrorReportingTests: AppTestCase {
         // validation
         logger.logs.withValue {
             XCTAssertEqual($0, [.init(level: .warning,
-                                      message: #"App.Github.Error.invalidURI(nil, "1")"#)])
+                                      message: #"App.AppError.ingestionError(Optional(\#(UUID.id0)), "invalid URL: 1 (id: nil)")"#)])
         }
     }