From 44e34cead69d7012005ba7d33abd4946ec023118 Mon Sep 17 00:00:00 2001
From: bskjon <bskjon@outlook.com>
Date: Mon, 1 Jul 2024 19:41:20 +0200
Subject: [PATCH] Updated check

---
 .../coordinator/tasks/event/CompleteMediaTask.kt    |  4 ++--
 .../mediaprocessing/coordinator/utils/TasksUtil.kt  | 13 +++++++------
 2 files changed, 9 insertions(+), 8 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 5638ff2f..d91ffc8f 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
@@ -82,8 +82,8 @@ class CompleteMediaTask(@Autowired override var coordinator: EventCoordinator) :
         }
 
         val isWaitingForPrecondition = isAwaitingPrecondition(taskEvents, events)
-        if (isWaitingForPrecondition) {
-            log.info { "Waiting for preconditions" }
+        if (isWaitingForPrecondition.isNotEmpty()) {
+            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 973585d8..1f4c12b4 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
@@ -6,12 +6,13 @@ import no.iktdev.mediaprocessing.shared.common.task.TaskType
 import no.iktdev.mediaprocessing.shared.kafka.core.KafkaEvents
 
 
-fun isAwaitingPrecondition(tasks: List<TaskType>, events: List<PersistentMessage>): Boolean {
+fun isAwaitingPrecondition(tasks: List<TaskType>, events: List<PersistentMessage>): Map<TaskType, Boolean> {
+    val response = mutableMapOf<TaskType, Boolean>()
     if (tasks.any { it == TaskType.Encode }) {
         if (events.lastOrNull { it.isOfEvent(
                 KafkaEvents.EventMediaParameterEncodeCreated
             ) } == null) {
-            return true
+            response[TaskType.Encode] = true
         }
     }
 
@@ -20,12 +21,12 @@ fun isAwaitingPrecondition(tasks: List<TaskType>, events: List<PersistentMessage
         if (events.lastOrNull { it.isOfEvent(
                 KafkaEvents.EventWorkConvertCreated
             ) } == null) {
-            return true
+            response[TaskType.Convert] = true
         }
     } else if (tasks.any { it == TaskType.Convert }) {
         val extractEvent =  events.lastOrNull { it.isOfEvent(KafkaEvents.EventMediaParameterExtractCreated) }
         if (extractEvent == null || extractEvent.isSuccess()) {
-            return true
+            response[TaskType.Convert] = true
         }
     }
 
@@ -33,12 +34,12 @@ fun isAwaitingPrecondition(tasks: List<TaskType>, events: List<PersistentMessage
         if (events.lastOrNull { it.isOfEvent(
                 KafkaEvents.EventMediaParameterExtractCreated
             ) } == null) {
-            return true
+            response[TaskType.Extract] = true
         }
     }
 
 
-    return false
+    return response
 }