From 36eb28ad6bdd3570f37918cdc6956335a5582bd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Brage=20Skj=C3=B8nborg?= Date: Wed, 21 Jan 2026 18:32:42 +0100 Subject: [PATCH] Database inserts ++ --- .../shared/database/stores/EventStore.kt | 14 +++++++------- .../shared/database/tables/EventsTable.kt | 5 ++--- .../shared/database/tables/TasksTable.kt | 5 ++--- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/shared/database/src/main/kotlin/no/iktdev/mediaprocessing/shared/database/stores/EventStore.kt b/shared/database/src/main/kotlin/no/iktdev/mediaprocessing/shared/database/stores/EventStore.kt index 74b9bc2a..9b7d567b 100644 --- a/shared/database/src/main/kotlin/no/iktdev/mediaprocessing/shared/database/stores/EventStore.kt +++ b/shared/database/src/main/kotlin/no/iktdev/mediaprocessing/shared/database/stores/EventStore.kt @@ -19,8 +19,8 @@ object EventStore: EventStore { .map { PersistedEvent( id = it[EventsTable.id].value.toLong(), - referenceId = it[EventsTable.referenceId], - eventId = it[EventsTable.eventId], + referenceId = UUID.fromString(it[EventsTable.referenceId]), + eventId = UUID.fromString(it[EventsTable.eventId]), event = "", // You might want to store the event type as well data = it[EventsTable.data], persistedAt = it[EventsTable.persistedAt] @@ -33,12 +33,12 @@ object EventStore: EventStore { override fun getPersistedEventsFor(referenceId: UUID): List { val result = withTransaction { EventsTable.selectAll() - .where { EventsTable.referenceId eq referenceId} + .where { EventsTable.referenceId eq referenceId.toString()} .map { PersistedEvent( id = it[EventsTable.id].value.toLong(), - referenceId = it[EventsTable.referenceId], - eventId = it[EventsTable.eventId], + referenceId = UUID.fromString(it[EventsTable.referenceId]), + eventId = UUID.fromString(it[EventsTable.eventId]), event = "", // You might want to store the event type as well data = it[EventsTable.data], persistedAt = it[EventsTable.persistedAt] @@ -55,8 +55,8 @@ object EventStore: EventStore { } withTransaction { EventsTable.insert { - it[EventsTable.referenceId] = event.referenceId - it[EventsTable.eventId] = event.eventId + it[EventsTable.referenceId] = event.referenceId.toString() + it[EventsTable.eventId] = event.eventId.toString() it[EventsTable.event] = eventName it[EventsTable.data] = asData it[EventsTable.persistedAt] = LocalDateTime.now() diff --git a/shared/database/src/main/kotlin/no/iktdev/mediaprocessing/shared/database/tables/EventsTable.kt b/shared/database/src/main/kotlin/no/iktdev/mediaprocessing/shared/database/tables/EventsTable.kt index 913f8603..8d28fe48 100644 --- a/shared/database/src/main/kotlin/no/iktdev/mediaprocessing/shared/database/tables/EventsTable.kt +++ b/shared/database/src/main/kotlin/no/iktdev/mediaprocessing/shared/database/tables/EventsTable.kt @@ -5,11 +5,10 @@ import org.jetbrains.exposed.sql.Column import org.jetbrains.exposed.sql.javatime.CurrentDateTime import org.jetbrains.exposed.sql.javatime.datetime import java.time.LocalDateTime -import java.util.* object EventsTable: IntIdTable(name = "EVENTS") { - val referenceId: Column = uuid("REFERENCE_ID") - val eventId: Column = uuid("EVENT_ID") + val referenceId: Column = varchar("REFERENCE_ID", 36) + val eventId: Column = varchar("EVENT_ID", 36) val event: Column = varchar("EVENT",100) val data: Column = text("DATA") val persistedAt: Column = datetime("PERSISTED_AT").defaultExpression(CurrentDateTime) diff --git a/shared/database/src/main/kotlin/no/iktdev/mediaprocessing/shared/database/tables/TasksTable.kt b/shared/database/src/main/kotlin/no/iktdev/mediaprocessing/shared/database/tables/TasksTable.kt index 9192a0a5..bd5bcf39 100644 --- a/shared/database/src/main/kotlin/no/iktdev/mediaprocessing/shared/database/tables/TasksTable.kt +++ b/shared/database/src/main/kotlin/no/iktdev/mediaprocessing/shared/database/tables/TasksTable.kt @@ -6,11 +6,10 @@ import org.jetbrains.exposed.sql.Column import org.jetbrains.exposed.sql.javatime.CurrentDateTime import org.jetbrains.exposed.sql.javatime.datetime import java.time.LocalDateTime -import java.util.* object TasksTable: IntIdTable(name = "TASKS") { - val referenceId: Column = uuid("REFERENCE_ID") - val taskId: Column = uuid("TASK_ID") + val referenceId: Column = varchar("REFERENCE_ID", 36) + val taskId: Column = varchar("TASK_ID", 36) val task: Column = varchar("TASK",100) val status: Column = enumerationByName("STATUS", 50, TaskStatus::class).default(TaskStatus.Pending) val data: Column = text("DATA")