From c39354da09390e30baf0c978abed54685f1c8645 Mon Sep 17 00:00:00 2001
From: bskjon <bskjon@outlook.com>
Date: Tue, 2 Jul 2024 21:44:45 +0200
Subject: [PATCH] Updated ffmpeg stuff

---
 .../coordinator/tasks/event/CreateEncodeWorkTask.kt            | 2 +-
 .../coordinator/tasks/event/CreateExtractWorkTask.kt           | 2 +-
 .../mediaprocessing/shared/common/persistance/TasksManager.kt  | 3 ++-
 .../iktdev/mediaprocessing/shared/common/persistance/tasks.kt  | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

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 0e72a313..2e7ad728 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,7 @@ class CreateEncodeWorkTask(@Autowired override var coordinator: EventCoordinator
                     outFile = e.outFile,
                     arguments = e.arguments
                 ).let { task ->
-                    val status = taskManager.createTask(referenceId = event.referenceId, 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}" }
                     }
diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CreateExtractWorkTask.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CreateExtractWorkTask.kt
index f8e7ddec..35f875c1 100644
--- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CreateExtractWorkTask.kt
+++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CreateExtractWorkTask.kt
@@ -60,7 +60,7 @@ class CreateExtractWorkTask(@Autowired override var coordinator: EventCoordinato
                     outFile = e.outFile,
                     arguments = e.arguments
                 ).let { task ->
-                    val status = taskManager.createTask(referenceId = event.referenceId, 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 Extract task on ${forwardEvent.referenceId}@${forwardEvent.eventId}" }
                     }
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/persistance/TasksManager.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/persistance/TasksManager.kt
index 018d8224..dfb4eb04 100644
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/persistance/TasksManager.kt
+++ b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/persistance/TasksManager.kt
@@ -123,13 +123,14 @@ class TasksManager(private val dataSource: DataSource) {
         }
     }
 
-    fun createTask(referenceId: String, eventId: String = UUID.randomUUID().toString(), task: TaskType, data: String): Boolean {
+    fun createTask(referenceId: String, eventId: String = UUID.randomUUID().toString(), derivedFromEventId: String? = null, task: TaskType, data: String): Boolean {
         return executeWithStatus(dataSource) {
             tasks.insert {
                 it[tasks.referenceId] = referenceId
                 it[tasks.eventId] = eventId
                 it[tasks.task] = task.name
                 it[tasks.data] = data
+                it[tasks.derivedFromEventId] = derivedFromEventId
                 it[tasks.integrity] = getIntegrityOfData(data)
             }
         }
diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/persistance/tasks.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/persistance/tasks.kt
index 6994702c..147c859b 100644
--- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/persistance/tasks.kt
+++ b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/persistance/tasks.kt
@@ -14,6 +14,7 @@ object tasks: IntIdTable() {
     val consumed: Column<Boolean> = bool("consumed").default(false)
     val task: Column<String> = varchar("task",50)
     val eventId: Column<String> = varchar("eventId", 50)
+    val derivedFromEventId: Column<String?> = varchar("derivedFromEventId", 50).nullable()
     val data: Column<String> = text("data")
     val created: Column<LocalDateTime> = datetime("created").defaultExpression(CurrentDateTime)
     val lastCheckIn: Column<LocalDateTime?> = datetime("lastCheckIn").nullable()