iktdev/MediaProcessing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Projection correction

Browse Source
This commit is contained in:
Brage Skjønborg 2026-01-30 15:09:58 +01:00
parent 6a423365cd
commit 6735ab54a5
9 changed files with 91 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/listeners/events/CompletedListener.kt Normal file
View File

@ -0,0 +1,19 @@
package no.iktdev.mediaprocessing.coordinator.listeners.events
import no.iktdev.eventi.events.EventListener
import no.iktdev.eventi.models.Event
import no.iktdev.mediaprocessing.shared.common.event_task_contract.events.StoreContentAndMetadataTaskResultEvent
import org.springframework.stereotype.Component
@Component
class CompletedListener: EventListener() {
override fun onEvent(
event: Event,
history: List<Event>
): Event? {
if (event !is StoreContentAndMetadataTaskResultEvent)
return null
}
}

24
apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/services/EventService.kt
View File

@ -1,12 +1,12 @@
package no.iktdev.mediaprocessing.coordinator.services
import no.iktdev.eventi.ZDS.toEvent
import no.iktdev.eventi.models.DeleteEvent
import no.iktdev.eventi.models.store.PersistedEvent
import no.iktdev.mediaprocessing.shared.common.dto.EventQuery
import no.iktdev.mediaprocessing.shared.common.dto.Paginated
import no.iktdev.mediaprocessing.shared.common.dto.SequenceEvent
import no.iktdev.mediaprocessing.shared.common.dto.toDto
import no.iktdev.mediaprocessing.shared.common.effectivePersisted
import no.iktdev.mediaprocessing.shared.database.stores.EventStore
import org.springframework.stereotype.Service
import java.util.*
@ -55,27 +55,11 @@ class EventService {
}
fun getEffectiveHistory(referenceId: UUID): List<PersistedEvent> {
val persisted = EventStore.getPersistedEventsFor(referenceId)
// Parse alle events (kan være null hvis ukjent type)
val parsed = persisted.mapNotNull { pe ->
pe.toEvent()?.let { ev -> pe to ev }
return EventStore
.getPersistedEventsFor(referenceId)
.effectivePersisted()
}
// Finn alle eventIds som er slettet
val deletedIds = parsed
.map { it.second }
.filterIsInstance<DeleteEvent>()
.map { it.deletedEventId }
.toSet()
// Filtrer persisted basert på event-logikken
val filtered = parsed
.filter { (_, ev) -> ev.eventId !in deletedIds } // fjern slettede
.filter { (_, ev) -> ev !is DeleteEvent } // fjern selve DeleteEvent
.map { it.first } // behold kun PersistedEvent
return filtered.sortedByDescending { it.persistedAt }
}
}

7
apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/services/SequenceAggregatorService.kt
View File

@ -5,7 +5,9 @@ import no.iktdev.eventi.models.store.PersistedEvent
import no.iktdev.mediaprocessing.shared.common.dto.CurrentState
import no.iktdev.mediaprocessing.shared.common.dto.Mode
import no.iktdev.mediaprocessing.shared.common.dto.SequenceSummary
import no.iktdev.mediaprocessing.shared.common.effective
import no.iktdev.mediaprocessing.shared.common.event_task_contract.events.CollectedEvent
import no.iktdev.mediaprocessing.shared.common.event_task_contract.events.CompletedEvent
import no.iktdev.mediaprocessing.shared.common.event_task_contract.events.StartFlow
import no.iktdev.mediaprocessing.shared.common.projection.CollectProjection
import no.iktdev.mediaprocessing.shared.database.stores.EventStore
@ -23,7 +25,7 @@ class SequenceAggregatorService() {
return grouped.values
// aktive = ingen CollectedEvent
.filter { events -> events.none { it.event == CollectedEvent::class.java.simpleName } }
.filter { events -> events.none { it.event == CompletedEvent::class.java.simpleName } }
.mapNotNull { events -> buildSummary(events) }
.sortedByDescending { it.lastEventTime }
}
@ -44,6 +46,7 @@ class SequenceAggregatorService() {
// Deserialiser kun eventene for denne sekvensen
val domainEvents = events.mapNotNull { it.toEvent() }
.effective()
val projection = CollectProjection(domainEvents)
@ -62,6 +65,8 @@ class SequenceAggregatorService() {
extractTaskStatus = projection.extreactTaskStatus,
convertTaskStatus = projection.convertTaskStatus,
coverDownloadTaskStatus = projection.coverDownloadTaskStatus,
contentMigratedTaskStatus = projection.contentMigratedTaskStatus,
contentStoredTaskStatus = projection.contentStoredTaskStatus,
mode = when (projection.startedWith?.mode) {
StartFlow.Auto -> Mode.Auto
StartFlow.Manual -> Mode.Manual

32
shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/Utils.kt
View File

@ -2,7 +2,10 @@ package no.iktdev.mediaprocessing.shared.common
import kotlinx.coroutines.delay
import mu.KotlinLogging
import no.iktdev.eventi.ZDS.toEvent
import no.iktdev.eventi.models.DeleteEvent
import no.iktdev.eventi.models.Event
import no.iktdev.eventi.models.store.PersistedEvent
import org.springframework.messaging.simp.SimpMessagingTemplate
import org.springframework.web.client.RestTemplate
import java.io.File
@ -217,3 +220,32 @@ fun File.resolveConflict(): File {
}
fun UtcNow(): Instant = Instant.now()
fun List<Event>.effective(): List<Event> {
val deletedIds = this
.filterIsInstance<DeleteEvent>()
.map { it.deletedEventId }
.toSet()
return this
.filter { it.eventId !in deletedIds }
.filterNot { it is DeleteEvent }
}
fun List<PersistedEvent>.effectivePersisted(): List<PersistedEvent> {
val parsed = this.mapNotNull { pe ->
pe.toEvent()?.let { ev -> pe to ev }
}
val effectiveEvents = parsed
.map { it.second }
.effective() // bruker extension over
val effectiveIds = effectiveEvents.map { it.eventId }.toSet()
return parsed
.filter { (_, ev) -> ev.eventId in effectiveIds }
.map { it.first }
.sortedBy { it.persistedAt }
}

2
shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/dto/SequenceSummary.kt
View File

@ -15,6 +15,8 @@ data class SequenceSummary(
val extractTaskStatus: CollectProjection.TaskStatus,
val convertTaskStatus: CollectProjection.TaskStatus,
val coverDownloadTaskStatus: CollectProjection.TaskStatus,
val contentMigratedTaskStatus: CollectProjection.TaskStatus,
val contentStoredTaskStatus: CollectProjection.TaskStatus,
val mode: Mode,
val currentState: CurrentState,
val hasErrors: Boolean,

1
shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/event_task_contract/EventRegistry.kt
View File

@ -7,6 +7,7 @@ object EventRegistry {
fun getEvents(): List<Class<out Event>> {
return listOf(
CollectedEvent::class.java,
CompletedEvent::class.java,
ConvertTaskCreatedEvent::class.java,
ConvertTaskResultEvent::class.java,

5
shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/event_task_contract/events/CompletedEvent.kt Normal file
View File

@ -0,0 +1,5 @@
package no.iktdev.mediaprocessing.shared.common.event_task_contract.events
import no.iktdev.eventi.models.Event
class CompletedEvent: Event()

7
shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/projection/CollectProjection.kt
View File

@ -19,6 +19,10 @@ class CollectProjection(val events: List<Event>) {
private set
var coverDownloadTaskStatus: TaskStatus = TaskStatus.NotInitiated
private set
var contentMigratedTaskStatus: TaskStatus = TaskStatus.NotInitiated
private set
var contentStoredTaskStatus: TaskStatus = TaskStatus.NotInitiated
private set
val metadata: MetadataProjection? by lazy { projectMetadata() }
val processedMedia: ProcessedMediaProjection? by lazy { projectProcessedMedia() }
val parsedFileInfo: ParsedFileInfoProjection? by lazy { projectParsedFileInfo() }
@ -30,7 +34,8 @@ class CollectProjection(val events: List<Event>) {
extreactTaskStatus = taskProjection.projectExtractSubtitleStatus()
convertTaskStatus = taskProjection.projectConvertStatus()
coverDownloadTaskStatus = taskProjection.projectCoverDownloadStatus()
contentMigratedTaskStatus = taskProjection.projectMigrateContentStatus()
contentStoredTaskStatus = taskProjection.projectStoreContentAndMetadataStatus()
}
fun getTaskStatus(): List<TaskStatus> = listOf(

14
shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/projection/TaskProjection.kt
View File

@ -90,6 +90,20 @@ class TaskProjection(val events: List<Event>) {
}
}
fun projectMigrateContentStatus(): TaskStatus {
return projectStatus<MigrateContentToStoreTaskCreatedEvent, MigrateContentToStoreTaskResultEvent>(
createdIds = { it.map { e -> e.taskId }},
resultStatus = { it.status },
resultIds = { it.flatMap { e -> e.metadata.derivedFromId?.toList() ?: emptyList() } }
)
}
fun projectStoreContentAndMetadataStatus(): TaskStatus {
return projectStatus<StoreContentAndMetadataTaskCreatedEvent, StoreContentAndMetadataTaskResultEvent>(
createdIds = { it.map { e -> e.taskId }},
resultStatus = {it.taskStatus},
resultIds = { it.flatMap { e -> e.metadata.derivedFromId?.toList() ?: emptyList() } }
)
}
}