Bump
This commit is contained in:
parent
9d4c5d8316
commit
f28dda5fd6
@ -7,10 +7,7 @@ import no.iktdev.exfl.observable.Observables
|
|||||||
import no.iktdev.mediaprocessing.shared.common.DatabaseEnvConfig
|
import no.iktdev.mediaprocessing.shared.common.DatabaseEnvConfig
|
||||||
import no.iktdev.mediaprocessing.shared.common.SharedConfig
|
import no.iktdev.mediaprocessing.shared.common.SharedConfig
|
||||||
import no.iktdev.mediaprocessing.shared.common.datasource.MySqlDataSource
|
import no.iktdev.mediaprocessing.shared.common.datasource.MySqlDataSource
|
||||||
import no.iktdev.mediaprocessing.shared.common.persistance.PersistentDataReader
|
import no.iktdev.mediaprocessing.shared.common.persistance.*
|
||||||
import no.iktdev.mediaprocessing.shared.common.persistance.PersistentDataStore
|
|
||||||
import no.iktdev.mediaprocessing.shared.common.persistance.PersistentEventManager
|
|
||||||
import no.iktdev.mediaprocessing.shared.common.persistance.events
|
|
||||||
import no.iktdev.mediaprocessing.shared.common.toEventsDatabase
|
import no.iktdev.mediaprocessing.shared.common.toEventsDatabase
|
||||||
import no.iktdev.mediaprocessing.shared.common.toStoredDatabase
|
import no.iktdev.mediaprocessing.shared.common.toStoredDatabase
|
||||||
import no.iktdev.mediaprocessing.shared.kafka.core.KafkaEnv
|
import no.iktdev.mediaprocessing.shared.kafka.core.KafkaEnv
|
||||||
@ -68,6 +65,7 @@ fun main(args: Array<String>) {
|
|||||||
|
|
||||||
val kafkaTables = listOf(
|
val kafkaTables = listOf(
|
||||||
events, // For kafka
|
events, // For kafka
|
||||||
|
allEvents
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -46,6 +46,7 @@ class BaseInfoFromFile(@Autowired override var coordinator: Coordinator) : TaskC
|
|||||||
Status.COMPLETED,
|
Status.COMPLETED,
|
||||||
title = fileNameParser.guessDesiredTitle(),
|
title = fileNameParser.guessDesiredTitle(),
|
||||||
sanitizedName = fileNameParser.guessDesiredFileName(),
|
sanitizedName = fileNameParser.guessDesiredFileName(),
|
||||||
|
searchTitles = fileNameParser.guessSearchableTitle(),
|
||||||
derivedFromEventId = eventId
|
derivedFromEventId = eventId
|
||||||
)
|
)
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
|
|||||||
@ -184,6 +184,14 @@ class PersistentEventManager(private val dataSource: DataSource) {
|
|||||||
it[integrity] = getIntegrityOfData(message.dataAsJson())
|
it[integrity] = getIntegrityOfData(message.dataAsJson())
|
||||||
it[data] = message.dataAsJson()
|
it[data] = message.dataAsJson()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
allEvents.insert {
|
||||||
|
it[referenceId] = message.referenceId
|
||||||
|
it[eventId] = message.eventId
|
||||||
|
it[events.event] = event.event
|
||||||
|
it[integrity] = getIntegrityOfData(message.dataAsJson())
|
||||||
|
it[data] = message.dataAsJson()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
val success = if (exception != null) {
|
val success = if (exception != null) {
|
||||||
if (exception.isExposedSqlException()) {
|
if (exception.isExposedSqlException()) {
|
||||||
|
|||||||
@ -0,0 +1,17 @@
|
|||||||
|
package no.iktdev.mediaprocessing.shared.common.persistance
|
||||||
|
|
||||||
|
import org.jetbrains.exposed.dao.id.IntIdTable
|
||||||
|
import org.jetbrains.exposed.sql.Column
|
||||||
|
import org.jetbrains.exposed.sql.javatime.CurrentDateTime
|
||||||
|
import org.jetbrains.exposed.sql.javatime.datetime
|
||||||
|
import java.time.LocalDateTime
|
||||||
|
|
||||||
|
object allEvents: IntIdTable() {
|
||||||
|
val referenceId: Column<String> = varchar("referenceId", 50)
|
||||||
|
val eventId: Column<String> = varchar("eventId", 50)
|
||||||
|
val event: Column<String> = varchar("event",100)
|
||||||
|
val data: Column<String> = text("data")
|
||||||
|
val integrity: Column<String> = varchar("integrity", 100)
|
||||||
|
//val success: Column<Boolean> = bool("success").default(false)
|
||||||
|
val created: Column<LocalDateTime> = datetime("created").defaultExpression(CurrentDateTime)
|
||||||
|
}
|
||||||
@ -10,6 +10,7 @@ data class BaseInfoPerformed(
|
|||||||
override val status: Status,
|
override val status: Status,
|
||||||
val title: String,
|
val title: String,
|
||||||
val sanitizedName: String,
|
val sanitizedName: String,
|
||||||
|
val searchTitles: List<String> = emptyList<String>(),
|
||||||
override val derivedFromEventId: String
|
override val derivedFromEventId: String
|
||||||
) : MessageDataWrapper(status = status, derivedFromEventId = derivedFromEventId)
|
) : MessageDataWrapper(status = status, derivedFromEventId = derivedFromEventId)
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user