From c7bad81bd9217c658a43456518e0b0601c4ffa91 Mon Sep 17 00:00:00 2001 From: Brage Date: Sun, 24 Mar 2024 01:01:55 +0100 Subject: [PATCH] Performing filter on waits --- .../mediaprocessing/coordinator/mapping/ProcessMapping.kt | 4 +++- .../mediaprocessing/shared/kafka/dto/MessageDataWrapper.kt | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/mapping/ProcessMapping.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/mapping/ProcessMapping.kt index 56115ae7..e1648c6a 100644 --- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/mapping/ProcessMapping.kt +++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/mapping/ProcessMapping.kt @@ -4,6 +4,7 @@ import no.iktdev.mediaprocessing.shared.common.persistance.PersistentMessage import no.iktdev.mediaprocessing.shared.kafka.core.KafkaEvents import no.iktdev.mediaprocessing.shared.kafka.dto.events_result.ProcessStarted import no.iktdev.mediaprocessing.shared.contract.reader.MediaProcessedDto +import no.iktdev.mediaprocessing.shared.kafka.dto.isSuccess class ProcessMapping(val events: List) { @@ -38,7 +39,8 @@ class ProcessMapping(val events: List) { } fun waitsForExtract(): Boolean { - val arguments = events.filter { it.event == KafkaEvents.EVENT_MEDIA_EXTRACT_PARAMETER_CREATED } + // Check if message is declared as skipped with statis + val arguments = events.filter { it.event == KafkaEvents.EVENT_MEDIA_EXTRACT_PARAMETER_CREATED }.filter { it.data.isSuccess() } val created = events.filter { it.event == KafkaEvents.EVENT_WORK_EXTRACT_CREATED } val performed = events.filter { it.event == KafkaEvents.EVENT_WORK_EXTRACT_PERFORMED } diff --git a/shared/kafka/src/main/kotlin/no/iktdev/mediaprocessing/shared/kafka/dto/MessageDataWrapper.kt b/shared/kafka/src/main/kotlin/no/iktdev/mediaprocessing/shared/kafka/dto/MessageDataWrapper.kt index 1756e403..c921ae6b 100644 --- a/shared/kafka/src/main/kotlin/no/iktdev/mediaprocessing/shared/kafka/dto/MessageDataWrapper.kt +++ b/shared/kafka/src/main/kotlin/no/iktdev/mediaprocessing/shared/kafka/dto/MessageDataWrapper.kt @@ -16,4 +16,8 @@ data class SimpleMessageData( fun MessageDataWrapper?.isSuccess(): Boolean { return this != null && this.status != Status.ERROR +} + +fun MessageDataWrapper?.isSkipped(): Boolean { + return this != null && this.status != Status.SKIPPED } \ No newline at end of file