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

Fixed typo

Browse Source
This commit is contained in:
Brage Skjønborg 2026-01-29 07:37:09 +01:00
parent 76fa917104
commit 1d43b9b0a0
6 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
shared/database/src/main/kotlin/no/iktdev/mediaprocessing/shared/database/DatabaseUtil.kt
View File

@ -1,5 +1,9 @@
package no.iktdev.mediaprocessing.shared.database package no.iktdev.mediaprocessing.shared.database
import org.jetbrains.exposed.sql.Column
import org.jetbrains.exposed.sql.Op
import org.jetbrains.exposed.sql.SqlExpressionBuilder.like
import org.jetbrains.exposed.sql.or
import org.jetbrains.exposed.sql.transactions.transaction import org.jetbrains.exposed.sql.transactions.transaction
fun <T> withTransaction( fun <T> withTransaction(
@ -21,3 +25,9 @@ fun <T> withTransaction(
Result.failure(e) Result.failure(e)
} }
} }
fun Column<String>.likeAny(values: List<String>): Op<Boolean> =
values
.map { this like "%$it%" }
.reduce(Op<Boolean>::or)

11
shared/database/src/main/kotlin/no/iktdev/mediaprocessing/shared/database/stores/EventStore.kt
View File

@ -7,12 +7,11 @@ import no.iktdev.eventi.stores.EventStore
import no.iktdev.mediaprocessing.shared.common.UtcNow import no.iktdev.mediaprocessing.shared.common.UtcNow
import no.iktdev.mediaprocessing.shared.common.dto.EventQuery import no.iktdev.mediaprocessing.shared.common.dto.EventQuery
import no.iktdev.mediaprocessing.shared.common.dto.Paginated import no.iktdev.mediaprocessing.shared.common.dto.Paginated
import no.iktdev.mediaprocessing.shared.database.likeAny
import no.iktdev.mediaprocessing.shared.database.queries.pagedQuery import no.iktdev.mediaprocessing.shared.database.queries.pagedQuery
import no.iktdev.mediaprocessing.shared.database.tables.EventsTable import no.iktdev.mediaprocessing.shared.database.tables.EventsTable
import no.iktdev.mediaprocessing.shared.database.withTransaction import no.iktdev.mediaprocessing.shared.database.withTransaction
import org.jetbrains.exposed.sql.Op
import org.jetbrains.exposed.sql.insert import org.jetbrains.exposed.sql.insert
import org.jetbrains.exposed.sql.or
import org.jetbrains.exposed.sql.selectAll import org.jetbrains.exposed.sql.selectAll
import java.time.Instant import java.time.Instant
import java.util.* import java.util.*
@ -40,13 +39,7 @@ object EventStore: EventStore {
} }
query.key?.let { keys -> query.key?.let { keys ->
if (keys.isNotEmpty()) { where { EventsTable.event.likeAny(keys)}
where {
keys
.map { key -> EventsTable.event like "%$key%" }
.reduce(Op<Boolean>::or)
}
}
} }
query.from?.let { from -> query.from?.let { from ->

14
shared/database/src/main/kotlin/no/iktdev/mediaprocessing/shared/database/stores/TaskStore.kt
View File

@ -8,10 +8,14 @@ import no.iktdev.eventi.stores.TaskStore
import no.iktdev.mediaprocessing.shared.common.UtcNow import no.iktdev.mediaprocessing.shared.common.UtcNow
import no.iktdev.mediaprocessing.shared.common.dto.Paginated import no.iktdev.mediaprocessing.shared.common.dto.Paginated
import no.iktdev.mediaprocessing.shared.common.dto.TaskQuery import no.iktdev.mediaprocessing.shared.common.dto.TaskQuery
import no.iktdev.mediaprocessing.shared.database.likeAny
import no.iktdev.mediaprocessing.shared.database.queries.pagedQuery import no.iktdev.mediaprocessing.shared.database.queries.pagedQuery
import no.iktdev.mediaprocessing.shared.database.tables.TasksTable import no.iktdev.mediaprocessing.shared.database.tables.TasksTable
import no.iktdev.mediaprocessing.shared.database.withTransaction import no.iktdev.mediaprocessing.shared.database.withTransaction
import org.jetbrains.exposed.sql.* import org.jetbrains.exposed.sql.and
import org.jetbrains.exposed.sql.insert
import org.jetbrains.exposed.sql.selectAll
import org.jetbrains.exposed.sql.update
import java.time.Duration import java.time.Duration
import java.util.* import java.util.*
@ -34,13 +38,7 @@ object TaskStore: TaskStore {
where { TasksTable.status inList enums } where { TasksTable.status inList enums }
} }
query.key?.let { keys -> query.key?.let { keys ->
if (keys.isNotEmpty()) { where { TasksTable.task.likeAny(keys) }
where {
keys
.map { key -> TasksTable.task like "%$key%" }
.reduce(Op<Boolean>::or)
}
}
} }
query.claimed?.let { where { TasksTable.claimed eq it } } query.claimed?.let { where { TasksTable.claimed eq it } }

2
shared/database/src/main/kotlin/no/iktdev/mediaprocessing/shared/database/tables/EventsTable.kt
View File

@ -10,7 +10,7 @@ object EventsTable: IntIdTable(name = "EVENTS") {
val referenceId: Column<String> = varchar("REFERENCE_ID", 36) val referenceId: Column<String> = varchar("REFERENCE_ID", 36)
val eventId: Column<String> = varchar("EVENT_ID", 36) val eventId: Column<String> = varchar("EVENT_ID", 36)
val event: Column<String> = varchar("EVENT",100) val event: Column<String> = varchar("EVENT",100)
val data = registerColumn<String>("data", LongTextColumnType()) val data = registerColumn<String>("DATA", LongTextColumnType())
val persistedAt = timestamp("PERSISTED_AT") val persistedAt = timestamp("PERSISTED_AT")
.clientDefault { UtcNow() } .clientDefault { UtcNow() }

2
shared/database/src/main/kotlin/no/iktdev/mediaprocessing/shared/database/tables/TasksTable.kt
View File

@ -13,7 +13,7 @@ object TasksTable: IntIdTable(name = "TASKS") {
val taskId: Column<String> = varchar("TASK_ID", 36) val taskId: Column<String> = varchar("TASK_ID", 36)
val task: Column<String> = varchar("TASK",100) val task: Column<String> = varchar("TASK",100)
val status: Column<TaskStatus> = enumerationByName("STATUS", 50, TaskStatus::class).default(TaskStatus.Pending) val status: Column<TaskStatus> = enumerationByName("STATUS", 50, TaskStatus::class).default(TaskStatus.Pending)
val data = registerColumn<String>("data", LongTextColumnType()) val data = registerColumn<String>("DATA", LongTextColumnType())
val claimed: Column<Boolean> = bool("CLAIMED").default(false) val claimed: Column<Boolean> = bool("CLAIMED").default(false)
val claimedBy: Column<String?> = varchar("CLAIMED_BY",100).nullable() val claimedBy: Column<String?> = varchar("CLAIMED_BY",100).nullable()
val consumed: Column<Boolean> = bool("CONSUMED").default(false) val consumed: Column<Boolean> = bool("CONSUMED").default(false)