From 8024583d365c36dd236413890134d57421f0b6f6 Mon Sep 17 00:00:00 2001
From: bskjon <bskjon@outlook.com>
Date: Mon, 1 Jul 2024 21:13:28 +0200
Subject: [PATCH] Updated check

---
 .../coordinator/tasks/event/CompleteMediaTask.kt |  2 +-
 .../coordinator/utils/TasksUtil.kt               | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CompleteMediaTask.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CompleteMediaTask.kt
index d91ffc8f..7b46ad42 100644
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CompleteMediaTask.kt
+++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CompleteMediaTask.kt
@@ -83,7 +83,7 @@ class CompleteMediaTask(@Autowired override var coordinator: EventCoordinator) :
 
         val isWaitingForPrecondition = isAwaitingPrecondition(taskEvents, events)
         if (isWaitingForPrecondition.isNotEmpty()) {
-            log.info { "Waiting for preconditions: ${isWaitingForPrecondition.keys.joinToString(",") }}" }
+            log.info { "Waiting for preconditions: ${isWaitingForPrecondition.keys.joinToString(",") }" }
             return null
         }
 
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/utils/TasksUtil.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/utils/TasksUtil.kt
index 1f4c12b4..0b12efe0 100644
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/utils/TasksUtil.kt
+++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/utils/TasksUtil.kt
@@ -1,10 +1,12 @@
 package no.iktdev.mediaprocessing.coordinator.utils
 
+import mu.KotlinLogging
 import no.iktdev.mediaprocessing.shared.common.persistance.*
 import no.iktdev.mediaprocessing.shared.common.task.Task
 import no.iktdev.mediaprocessing.shared.common.task.TaskType
 import no.iktdev.mediaprocessing.shared.kafka.core.KafkaEvents
 
+val log = KotlinLogging.logger {}
 
 fun isAwaitingPrecondition(tasks: List<TaskType>, events: List<PersistentMessage>): Map<TaskType, Boolean> {
     val response = mutableMapOf<TaskType, Boolean>()
@@ -13,20 +15,22 @@ fun isAwaitingPrecondition(tasks: List<TaskType>, events: List<PersistentMessage
                 KafkaEvents.EventMediaParameterEncodeCreated
             ) } == null) {
             response[TaskType.Encode] = true
+            log.info { "Waiting for ${KafkaEvents.EventMediaParameterEncodeCreated}" }
+
         }
     }
 
-
+    val convertEvent = events.lastOrNull { it.isOfEvent(KafkaEvents.EventWorkConvertCreated) } == null
     if (tasks.any { it == TaskType.Convert } && tasks.none {it == TaskType.Extract}) {
-        if (events.lastOrNull { it.isOfEvent(
-                KafkaEvents.EventWorkConvertCreated
-            ) } == null) {
+        if (convertEvent) {
             response[TaskType.Convert] = true
+            log.info { "Waiting for ${KafkaEvents.EventWorkConvertCreated}" }
         }
     } else if (tasks.any { it == TaskType.Convert }) {
         val extractEvent =  events.lastOrNull { it.isOfEvent(KafkaEvents.EventMediaParameterExtractCreated) }
-        if (extractEvent == null || extractEvent.isSuccess()) {
+        if (extractEvent == null || extractEvent.isSuccess() && !convertEvent) {
             response[TaskType.Convert] = true
+            log.info { "Waiting for ${KafkaEvents.EventMediaParameterExtractCreated}" }
         }
     }
 
@@ -35,6 +39,8 @@ fun isAwaitingPrecondition(tasks: List<TaskType>, events: List<PersistentMessage
                 KafkaEvents.EventMediaParameterExtractCreated
             ) } == null) {
             response[TaskType.Extract] = true
+            log.info { "Waiting for ${KafkaEvents.EventMediaParameterExtractCreated}" }
+
         }
     }