Merge pull request #687 from catenax-ng/feature/#253-fix-bug

feat(impl):[#253] fix cancelation bug, when job has no id before save
catenax-ng · Dec 8, 2023 · 3a69591 · 3a69591
2 parents f84095b + 2c751f1
commit 3a69591
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/...rc/main/java/org/eclipse/tractusx/irs/services/timeouts/CancelBatchProcessingService.java b/...rc/main/java/org/eclipse/tractusx/irs/services/timeouts/CancelBatchProcessingService.java
@@ -24,6 +24,7 @@
 package org.eclipse.tractusx.irs.services.timeouts;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.UUID;
 
 import lombok.RequiredArgsConstructor;
@@ -62,7 +63,12 @@ public void cancelNotFinishedJobsInBatch(final UUID batchId) {
         log.info("Start scheduled timeout process for batchId: {}", batchId.toString());
         batchStore.find(batchId).ifPresent(batch -> {
             if (isBatchNotCompleted(batch.getBatchState())) {
-                cancelNotFinishedJobs(batch.getJobProgressList().stream().map(JobProgress::getJobId).toList());
+                final List<UUID> jobIds = batch.getJobProgressList()
+                                               .stream()
+                                               .map(JobProgress::getJobId)
+                                               .filter(Objects::nonNull)
+                                               .toList();
+                cancelNotFinishedJobs(jobIds);
             }
         });
     }
@@ -75,7 +81,12 @@ public void cancelNotFinishedJobsInBatchOrder(final UUID batchOrderId) {
                                               .toList();
         batches.forEach(batch -> {
             if (isBatchNotCompleted(batch.getBatchState())) {
-                cancelNotFinishedJobs(batch.getJobProgressList().stream().map(JobProgress::getJobId).toList());
+                final List<UUID> jobIds = batch.getJobProgressList()
+                                             .stream()
+                                             .map(JobProgress::getJobId)
+                                             .filter(Objects::nonNull)
+                                             .toList();
+                cancelNotFinishedJobs(jobIds);
             }
         });
     }