Merge branch 'dev' into dependabot/npm_and_yarn/Web/Admin.UI/version_updates-acfae90e01

Author: seanmcilvenna

DotNet/Admin.BFF/Application/Commands/Integration/KafkaConsumerService.cs

@@ -41,30 +41,21 @@ public void StartConsumer(string groupId, List<string> topics, string reportTrac
                         string traceId = string.Empty;
                         string errorMessage = null;
 
-                        if (consumeResult.Message.Headers.TryGetLastBytes("X-Correlation-Id",
-                                out var correlationHeader))
+                        if (consumeResult.Message.Headers.TryGetLastBytes("X-Correlation-Id", out var correlationHeader))
                         {
                             correlationId = System.Text.Encoding.UTF8.GetString(correlationHeader);
 
                             // read the exceptions
-                            if (consumeResult.Message.Headers.TryGetLastBytes("X-Exception-Message",
-                                    out var exceptionMessage))
-                            {
-                                errorMessage = System.Text.Encoding.UTF8.GetString(exceptionMessage);
-                            }
-
-                            else if (consumeResult.Message.Headers.TryGetLastBytes("X-Retry-Exception-Message",
-                                         out var retryExceptionMessage))
-                            {
-                                errorMessage = System.Text.Encoding.UTF8.GetString(retryExceptionMessage);
-                            }
-
-                            else if (consumeResult.Message.Headers.TryGetLastBytes("kafka_exception-message",
-                                         out var kafkaErrorBytes))
+                            
+                            if (TryReadHeader(consumeResult.Message.Headers, out var errorBytes,
+                                    "X-Exception-Message",
+                                    "X-Retry-Exception-Message",
+                                    "kafka_exception-message",
+                                    "kafka_dlt-exception-message"))
                             {
-                                errorMessage = System.Text.Encoding.UTF8.GetString(kafkaErrorBytes);
+                                errorMessage =  System.Text.Encoding.UTF8.GetString(errorBytes);
                             }
-
+                            
                             // Extract traceId from traceparent header
                             if (consumeResult.Message.Headers.TryGetLastBytes("traceparent", out var traceParentBytes))
                             {
@@ -155,6 +146,23 @@ public void StartConsumer(string groupId, List<string> topics, string reportTrac
             }
         }
 
+        private static bool TryReadHeader(
+            Headers headers,
+            out byte[] value,
+            params string[] keys)
+        {
+            foreach (var key in keys)
+            {
+                if (headers.TryGetLastBytes(key, out value))
+                {
+                    return true;
+                }
+            }
+
+            value = null!;
+            return false;
+        }
+        
         private bool checkReportTrackingId(string input, string reportTrackingId)
         {
             if (string.IsNullOrEmpty(input)) return false;

DotNet/Report/Domain/Queries/SubmissionEntryQueries.cs

@@ -246,9 +246,11 @@ public async Task<bool> PatientAllReadyForValidation(
         string patientId,
         CancellationToken cancellationToken = default)
     {
-        return await (from entry in _context.PatientSubmissionEntries
-                      where entry.ReportScheduleId == reportScheduleId && entry.FacilityId == facilityId && entry.PatientId == patientId 
-                      select entry.Status).AllAsync(s => s == PatientSubmissionStatus.ReadyForValidation || s == PatientSubmissionStatus.NotReportable);
+        List<PatientSubmissionStatus> statuses = await (from entry in _context.PatientSubmissionEntries
+                                                        where entry.ReportScheduleId == reportScheduleId && entry.FacilityId == facilityId && entry.PatientId == patientId
+                                                        select entry.Status).ToListAsync(cancellationToken);
+        return statuses.All(s => s == PatientSubmissionStatus.ReadyForValidation || s == PatientSubmissionStatus.NotReportable) &&
+            statuses.Any(s => s == PatientSubmissionStatus.ReadyForValidation);
     }
 
     public async Task<PagedConfigModel<ResourceSummary>> GetResourceSummary(string facilityId, string reportScheduleId, ResourceType? resourceType, int pageSize, int pageNumber,

DotNet/Report/KafkaProducers/ReportManifestProducer.cs

@@ -235,7 +235,7 @@ private OperationOutcome CreateOperationOutcome(List<PatientSubmissionEntry> fai
                 // Assuming PatientSubmissionEntry has a ValidationMessage property; adjust as per actual model
                 operationOutcome.Issue.Add(new OperationOutcome.IssueComponent
                 {
-                    Severity = OperationOutcome.IssueSeverity.Fatal,
+                    Severity = OperationOutcome.IssueSeverity.Error,
                     Code = OperationOutcome.IssueType.Invalid,
                     Diagnostics = $"Validation failed for patient {entry.PatientId}"
                 });

DotNet/Report/Listeners/ValidationCompleteListener.cs

@@ -19,6 +19,7 @@
 using System.Text;
 using LantanaGroup.Link.Shared.Application.Services.Security;
 using Task = System.Threading.Tasks.Task;
+using Hl7.Fhir.Support;
 
 namespace LantanaGroup.Link.Report.Listeners
 {
@@ -190,18 +191,12 @@ public async Task ProcessMessageAsync(ConsumeResult<string, ValidationCompleteVa
                 throw new DeadLetterException($"No Patient Submission Entries were found for schedule ID {schedule.Id}, patient ID {value.PatientId}, in status {PatientSubmissionStatus.ValidationRequested}");
             }
 
+            var operationOutcome = GetOperationOutcome();
+
             foreach (var entry in submissionEntries)
             {
                 if (!value.IsValid)
                 {
-                    var operationOutcome = new OperationOutcome();
-                    var issue = new OperationOutcome.IssueComponent
-                    {
-                        Severity = OperationOutcome.IssueSeverity.Fatal,
-                        Code = OperationOutcome.IssueType.Invalid,
-                        Diagnostics = "Patient has failed Validation"
-                    };
-                    operationOutcome.Issue = new List<OperationOutcome.IssueComponent> { issue };
                     await submissionEntryManager.AddResourceAsync(entry, operationOutcome, ResourceCategoryType.Patient, cancellationToken);
                 }
 
@@ -269,6 +264,21 @@ await submissionEntryManager.UpdateAsync(new PatientSubmissionEntryUpdateModel
             await _reportManifestProducer.Produce(schedule, correlationIdStr);
         }
 
+        private static OperationOutcome GetOperationOutcome()
+        {
+            OperationOutcome operationOutcome = new()
+            {
+                Id = Guid.NewGuid().ToString()
+            };
+            operationOutcome.AddIssue(new OperationOutcome.IssueComponent
+            {
+                Severity = OperationOutcome.IssueSeverity.Error,
+                Code = OperationOutcome.IssueType.Invalid,
+                Diagnostics = "Patient has failed Validation"
+            });
+            return operationOutcome;
+        }
+
         private static string GetFacilityIdFromHeader(Headers headers)
         {
             string facilityId = string.Empty;