Add endpoint for new analysis for inspection record

Author: akustn

api.Tests/Services/WorkflowServiceTests.cs

@@ -181,7 +181,9 @@ public async Task TriggerWorkflow_ArgoReturnsError_MarksWorkflowAndRunFailed()
             outputBlobStorageLocation: _db.NewBlobStorageLocation()
         );
 
-        await TriggerWorkflowInScope(workflow.Id);
+        await Assert.ThrowsAsync<WorkflowTriggerFailedException>(
+            () => TriggerWorkflowInScope(workflow.Id)
+        );
 
         await _context.Entry(workflow).ReloadAsync(TestContext.Current.CancellationToken);
         await _context.Entry(run).ReloadAsync(TestContext.Current.CancellationToken);

api/Controllers/AnalysisController.cs

@@ -143,7 +143,7 @@ public async Task<IActionResult> Delete([FromRoute] Guid id)
     [Authorize(Roles = Role.Any)]
     [Route("available")]
     [ProducesResponseType(StatusCodes.Status200OK)]
-    public async Task<IActionResult> GetAvailableAnalyses()
+    public async Task<ActionResult<List<string>>> GetAvailableAnalyses()
     {
         try
         {

api/Controllers/InspectionRecordController.cs

@@ -360,4 +360,48 @@ public async Task<IActionResult> Delete([FromRoute] Guid id)
             return NotFound(ex.Message);
         }
     }
+
+    [HttpPost]
+    [Authorize(Roles = Role.Any)]
+    [Route("id/{id:guid}/analyses")]
+    [ProducesResponseType(StatusCodes.Status202Accepted)]
+    [ProducesResponseType(StatusCodes.Status400BadRequest)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    [ProducesResponseType(StatusCodes.Status409Conflict)]
+    [ProducesResponseType(StatusCodes.Status502BadGateway)]
+    public async Task<IActionResult> AddAnalysis(
+        [FromRoute] Guid id,
+        [FromBody] AddAnalysisRequest request
+    )
+    {
+        request.AnalysisName = Sanitize.SanitizeUserInput(request.AnalysisName);
+        try
+        {
+            await inspectionRecordService.AddAnalysis(id, request.AnalysisName);
+            return AcceptedAtAction(nameof(GetById), new { id }, null);
+        }
+        catch (KeyNotFoundException ex)
+        {
+            return NotFound(ex.Message);
+        }
+        catch (WorkflowTriggerFailedException ex)
+        {
+            logger.LogError(ex, "Upstream workflow trigger failed for inspection record {Id}", id);
+            return StatusCode(StatusCodes.Status502BadGateway, ex.Message);
+        }
+        catch (InvalidOperationException ex)
+        {
+            return Conflict(ex.Message);
+        }
+        catch (Exception e)
+        {
+            logger.LogError(e, "Error adding analysis to inspection record");
+            throw;
+        }
+    }
+}
+
+public class AddAnalysisRequest
+{
+    public required string AnalysisName { get; set; }
 }

api/Services/InspectionRecordService.cs

@@ -1,8 +1,10 @@
+using api.Configurations;
 using api.Database.Context;
 using api.Database.Models;
 using api.MQTT;
 using api.Utilities;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Options;
 
 namespace api.Services;
 
@@ -30,6 +32,8 @@ int pageSize
     );
 
     public Task Delete(Guid id);
+
+    public Task<InspectionRecord> AddAnalysis(Guid inspectionRecordId, string analysisName);
 }
 
 public class InspectionRecordParameters
@@ -65,9 +69,12 @@ public class CreateInspectionRecordAnalysisGroup
 public class InspectionRecordService(
     SaraDbContext context,
     IAnalysisTriggerService analysisTriggerService,
+    IOptions<AnalysisOptions> analysisOptions,
     ILogger<InspectionRecordService> logger
 ) : IInspectionRecordService
 {
+    private readonly AnalysisOptions _analysisOptions = analysisOptions.Value;
+
     public async Task<InspectionRecord> CreateFromMqttMessage(IsarInspectionResultMessage message)
     {
         var inspectionId = Sanitize.SanitizeUserInput(message.InspectionId);
@@ -285,4 +292,31 @@ InspectionRecordParameters parameters
             parameters.PageSize
         );
     }
+
+    public async Task<InspectionRecord> AddAnalysis(Guid inspectionRecordId, string analysisName)
+    {
+        if (!_analysisOptions.Analyses.ContainsKey(analysisName))
+        {
+            throw new InvalidOperationException(
+                $"Unknown analysis '{analysisName}'. Valid analyses are: "
+                    + string.Join(", ", _analysisOptions.Analyses.Keys)
+            );
+        }
+
+        var record =
+            await ReadById(inspectionRecordId)
+            ?? throw new KeyNotFoundException(
+                $"Inspection record with id {inspectionRecordId} not found"
+            );
+
+        await analysisTriggerService.OnInspectionRecordCreated(
+            new InspectionRecordCreatedEvent
+            {
+                InspectionRecordId = record.Id,
+                RequiredAnalysis = [analysisName],
+            }
+        );
+
+        return record;
+    }
 }

api/Services/WorkflowService.cs

@@ -11,6 +11,9 @@
 
 namespace api.Services;
 
+public class WorkflowTriggerFailedException(string message, Exception? innerException = null)
+    : Exception(message, innerException);
+
 public interface IWorkflowService
 {
     public Task TriggerWorkflow(Guid workflowId);
@@ -168,6 +171,11 @@ public async Task TriggerWorkflow(Guid workflowId)
             );
 
             await MarkWorkflowFailed(workflow, ex.Message);
+
+            throw new WorkflowTriggerFailedException(
+                $"Failed to trigger workflow '{workflow.WorkflowType}'",
+                ex
+            );
         }
     }
 
@@ -236,7 +244,14 @@ public async Task OnWorkflowCompleted(Guid workflowId)
             nextWorkflow.StepNumber
         );
 
-        await TriggerWorkflow(nextWorkflow.Id);
+        try
+        {
+            await TriggerWorkflow(nextWorkflow.Id);
+        }
+        catch (WorkflowTriggerFailedException)
+        {
+            // Already logged and persisted inside TriggerWorkflow.
+        }
     }
 
     private async Task MarkWorkflowFailed(Workflow workflow, string errorMessage)