From cd821b7e08e75fa5ac98dfd9459f193eaa1abbb3 Mon Sep 17 00:00:00 2001 From: bskjon Date: Sun, 6 Apr 2025 19:14:34 +0200 Subject: [PATCH] Adjusting check --- .../coordinator/tasksV2/listeners/ConvertWorkTaskListener.kt | 2 +- .../iktdev/mediaprocessing/shared/common/contract/dto/Enums.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/ConvertWorkTaskListener.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/ConvertWorkTaskListener.kt index 6b906e86..ffd7c491 100644 --- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/ConvertWorkTaskListener.kt +++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/ConvertWorkTaskListener.kt @@ -53,7 +53,7 @@ class ConvertWorkTaskListener: WorkTaskListener() { } val startedWithOperations = events.findFirstEventOf()?.data?.operations ?: return false - if (startedWithOperations.isOnly(OperationEvents.CONVERT)) { + if (startedWithOperations.isOnly(OperationEvents.CONVERT) && shouldIHandleAndProduce) { return true } return shouldIHandleAndProduce diff --git a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/dto/Enums.kt b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/dto/Enums.kt index b4f888a1..35b6df57 100644 --- a/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/dto/Enums.kt +++ b/shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/contract/dto/Enums.kt @@ -23,5 +23,5 @@ enum class OperationEvents { } fun List.isOnly(expected: OperationEvents): Boolean { - return this.size == 1 && this.firstOrNull { it == expected } != null + return this.size == 1 && this.all { it == expected } }