From 8b8a07321678a8f62bed3623c6351ec597dccfeb Mon Sep 17 00:00:00 2001 From: bskjon Date: Sun, 23 Feb 2025 20:08:12 +0100 Subject: [PATCH] Minor changes --- .../tasksV2/implementations/WorkTaskListener.kt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/implementations/WorkTaskListener.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/implementations/WorkTaskListener.kt index e1c4db54..89f1c7c9 100644 --- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/implementations/WorkTaskListener.kt +++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/implementations/WorkTaskListener.kt @@ -1,5 +1,6 @@ package no.iktdev.mediaprocessing.coordinator.tasksV2.implementations +import com.google.gson.Gson import mu.KotlinLogging import no.iktdev.mediaprocessing.coordinator.CoordinatorEventListener import no.iktdev.mediaprocessing.shared.common.contract.Events @@ -12,18 +13,21 @@ abstract class WorkTaskListener: CoordinatorEventListener() { private val log = KotlinLogging.logger {} override fun shouldIProcessAndHandleEvent(incomingEvent: Event, events: List): Boolean { - return canStart(incomingEvent, events) } + fun canStart(incomingEvent: Event, events: List): Boolean { - val autoStart = events.find { it.eventType == Events.ProcessStarted }?.az()?.data - if (autoStart == null) { + val startEvent = events.find { it.eventType == Events.ProcessStarted }?.az() + val startType = startEvent?.data?.type + if (startType == null) { log.error { "Start event not found. Requiring permitt event" } + log.error { Gson().toJson(events) } + return false } return if (incomingEvent.eventType == Events.WorkProceedPermitted) { return true } else { - if (autoStart == null || autoStart.type == ProcessType.MANUAL) { + if (startType == ProcessType.MANUAL) { log.warn { "${incomingEvent.metadata.referenceId} waiting for Proceed event due to Manual process" } false } else true