From 7380e8a23e95d5328ca3ce29dfbc73b40a0d33ee Mon Sep 17 00:00:00 2001
From: bskjon <bskjon@outlook.com>
Date: Thu, 4 Jul 2024 16:35:09 +0200
Subject: [PATCH] Logging

---
 .../tasks/event/CreateConvertWorkTask.kt      | 23 +++++++++----------
 .../tasks/event/CreateEncodeWorkTask.kt       |  6 ++++-
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CreateConvertWorkTask.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CreateConvertWorkTask.kt
index 53da4adc..00c5870b 100644
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CreateConvertWorkTask.kt
+++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CreateConvertWorkTask.kt
@@ -55,7 +55,11 @@ class CreateConvertWorkTask(@Autowired override var coordinator: EventCoordinato
             innerData?.outFile
         } else null
 
-        val convertFile = result?.let { File(it) } ?: return null
+        val convertFile = result?.let { File(it) }
+        if (convertFile == null) {
+            log.warn { "${event.referenceId} No file to perform convert on.." }
+            return null
+        }
 
         val taskData = ConvertTaskData(
             allowOverwrite = true,
@@ -65,24 +69,19 @@ class CreateConvertWorkTask(@Autowired override var coordinator: EventCoordinato
             outFormats = emptyList()
         )
 
-        taskManager.createTask(
+        val status = taskManager.createTask(
             referenceId = event.referenceId,
             eventId = event.eventId,
             task = TaskType.Convert,
+            derivedFromEventId = event.eventId,
             data = Gson().toJson(taskData)
         )
+        if (!status) {
+            log.error { "Failed to create Convert task on ${event.referenceId}@${event.eventId}" }
+        }
 
-        return if (event.isOfEvent(KafkaEvents.EventMediaProcessStarted) &&
-            event.data.az<MediaProcessStarted>()?.operations?.isOnly(StartOperationEvents.CONVERT) == true
-        ) {
-            produceConvertWorkRequest(convertFile, null, event.eventId)
-        } else if (event.isOfEvent(KafkaEvents.EventWorkExtractPerformed) && startedEventData?.operations?.contains(
-                StartOperationEvents.CONVERT
-            ) == true
-        ) {
-            return produceConvertWorkRequest(convertFile, event.referenceId, event.eventId)
 
-        } else null
+        return produceConvertWorkRequest(convertFile, event.referenceId, event.eventId)
     }
 
     private fun produceConvertWorkRequest(
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CreateEncodeWorkTask.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CreateEncodeWorkTask.kt
index 748a94be..fe647659 100644
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CreateEncodeWorkTask.kt
+++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CreateEncodeWorkTask.kt
@@ -63,7 +63,11 @@ class CreateEncodeWorkTask(@Autowired override var coordinator: EventCoordinator
                     outFile = e.outFile,
                     arguments = e.arguments
                 ).let { task ->
-                    val status = taskManager.createTask(referenceId = event.referenceId, derivedFromEventId = event.eventId, task=  TaskType.Encode, data = Gson().toJson(task))
+                    val status = taskManager.createTask(
+                        referenceId = event.referenceId,
+                        derivedFromEventId = event.eventId,
+                        task = TaskType.Encode,
+                        data = Gson().toJson(task))
                     if (!status) {
                         log.error { "Failed to create Encode task on ${forwardEvent.referenceId}@${forwardEvent.eventId}" }
                     }