From 2c751f19f6bc483df0bc93ce940b0cd4bb1df50f Mon Sep 17 00:00:00 2001 From: "Krzysztof Massalski (Extern)" Date: Thu, 7 Dec 2023 11:10:36 +0100 Subject: [PATCH] feat(impl):[#253] fix cancelation bug, when job has no id after save --- .../timeouts/CancelBatchProcessingService.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/services/timeouts/CancelBatchProcessingService.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/services/timeouts/CancelBatchProcessingService.java index 6873067ccd..5f2a19afe0 100644 --- a/irs-api/src/main/java/org/eclipse/tractusx/irs/services/timeouts/CancelBatchProcessingService.java +++ b/irs-api/src/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 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 jobIds = batch.getJobProgressList() + .stream() + .map(JobProgress::getJobId) + .filter(Objects::nonNull) + .toList(); + cancelNotFinishedJobs(jobIds); } }); }