check failed status only for currently running reports

Energinet-DataHub · Sep 19, 2024 · 2319938 · 2319938
1 parent a335c05
commit 2319938
Showing 1 changed file with 16 additions and 16 deletions.
diff --git a/...stration.SettlementReports/Functions/SettlementReports/SettlementReportListHttpTrigger.cs b/...stration.SettlementReports/Functions/SettlementReports/SettlementReportListHttpTrigger.cs
@@ -98,23 +98,23 @@ private async Task<IEnumerable<RequestedSettlementReportDto>> CheckStatusOfSettl
         foreach (var settlementReport in settlementReports)
         {
             var updatedReport = settlementReport;
-            if (settlementReport.JobId == null)
-            {
-                var instanceInfo = await durableTaskClient
-                    .GetInstanceAsync(settlementReport.RequestId.Id, getInputsAndOutputs: true)
-                    .ConfigureAwait(false);
 
-                if (instanceInfo == null)
-                {
-                    // If the orchestration instance is not found, we assume it is running on the other orchestration,
-                    // either the heavy or the light one
-                    continue;
-                }
+            var instanceInfo = await durableTaskClient
+                .GetInstanceAsync(settlementReport.RequestId.Id, getInputsAndOutputs: true)
+                .ConfigureAwait(false);
 
+            if (instanceInfo == null)
+            {
+                // If the orchestration instance is not found, we assume it is running on the other orchestration,
+                // either the heavy or the light one
+                continue;
+            }
+
+            if (settlementReport.Status == SettlementReportStatus.InProgress)
+            {
                 if (instanceInfo.RuntimeStatus
-                        is not OrchestrationRuntimeStatus.Running
-                        and not OrchestrationRuntimeStatus.Pending
-                        and not OrchestrationRuntimeStatus.Suspended)
+                    is OrchestrationRuntimeStatus.Terminated
+                    or OrchestrationRuntimeStatus.Failed)
                 {
                     await _updateFailedSettlementReportsHandler
                         .UpdateFailedReportAsync(settlementReport.RequestId)
@@ -130,9 +130,9 @@ await _updateFailedSettlementReportsHandler
                         updatedReport = updatedReport with { Progress = customStatus.OrchestrationProgress };
                     }
                 }
-
-                finalSettlementReports.Add(updatedReport);
             }
+
+            finalSettlementReports.Add(updatedReport);
         }
 
         return finalSettlementReports;