From 3216212c439b70229b085aa7f63eefa58874767d Mon Sep 17 00:00:00 2001 From: bskjon Date: Mon, 24 Feb 2025 01:38:47 +0100 Subject: [PATCH] Logging --- .../listeners/CompletedTaskListener.kt | 34 +++++++++++++++---- 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/CompletedTaskListener.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/CompletedTaskListener.kt index 43be9eed..ffa320ec 100644 --- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/CompletedTaskListener.kt +++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/listeners/CompletedTaskListener.kt @@ -1,7 +1,9 @@ package no.iktdev.mediaprocessing.coordinator.tasksV2.listeners +import com.google.gson.GsonBuilder import mu.KotlinLogging import no.iktdev.eventi.core.ConsumableEvent +import no.iktdev.eventi.core.LocalDateTimeAdapter import no.iktdev.eventi.data.* import no.iktdev.mediaprocessing.coordinator.Coordinator import no.iktdev.mediaprocessing.coordinator.CoordinatorEventListener @@ -15,6 +17,7 @@ import no.iktdev.mediaprocessing.shared.common.contract.reader.* import org.springframework.beans.factory.annotation.Autowired import org.springframework.stereotype.Service import java.io.File +import java.time.LocalDateTime @Service class CompletedTaskListener : CoordinatorEventListener() { @@ -228,12 +231,7 @@ class CompletedTaskListener : CoordinatorEventListener() { log.info { "Cant find BaseInfoEvent on ${Events.ReadBaseInfoPerformed}" } return null } - val metadataInfo = - events.find { it.eventType == Events.MetadataSearchPerformed }?.az()?.data - ?: run { - log.info { "Cant find MediaMetadataReceivedEvent on ${Events.MetadataSearchPerformed}" } - null - } + val metadataInfo = getMetadata(events) val mediaInfo: MediaInfo = events.find { it.eventType == Events.ReadOutNameAndType } ?.az()?.let { it.data?.toValueObject() @@ -263,4 +261,28 @@ class CompletedTaskListener : CoordinatorEventListener() { } + private fun getMetadata(events: List): pyMetadata? { + val referenceId = events.firstNotNullOf { it.referenceId() } + + val gson = GsonBuilder() + .registerTypeAdapter(LocalDateTime::class.java, LocalDateTimeAdapter()) + .setPrettyPrinting() + .create() + + log.info { "Events in complete:\n${gson.toJson(events)}" } + + val metadataFound = events.find { it.eventType == Events.MetadataSearchPerformed } + if (metadataFound == null) { + log.warn { "ReferenceId: $referenceId -> ${Events.MetadataSearchPerformed} was not found in events" } + return null + } + val data = metadataFound.az() + if (data == null) { + log.warn { "ReferenceId: $referenceId -> ${Events.MetadataSearchPerformed} does not contain any data.." } + return null + } + + return data.data + } + } \ No newline at end of file