diff --git a/apps/coordinator/build.gradle.kts b/apps/coordinator/build.gradle.kts index 1cfaa8d8..13bc50ce 100644 --- a/apps/coordinator/build.gradle.kts +++ b/apps/coordinator/build.gradle.kts @@ -22,7 +22,7 @@ repositories { } -val exposedVersion = "0.44.0" +val exposedVersion = "0.61.0" dependencies { /*Spring boot*/ diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentCatalogStore.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentCatalogStore.kt index 11e52b46..64d66533 100644 --- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentCatalogStore.kt +++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentCatalogStore.kt @@ -20,7 +20,7 @@ object ContentCatalogStore { */ fun getCollectionByTitleAndType(type: String, titles: List): String? { return withTransaction(getStoreDatabase()) { - CatalogTable.select { + CatalogTable.selectAll().where { (CatalogTable.type eq type) and ((CatalogTable.title inList titles) or (CatalogTable.collection inList titles)) @@ -32,7 +32,7 @@ object ContentCatalogStore { private fun getCover(collection: String, type: String): String? { return withTransaction(getStoreDatabase()) { - CatalogTable.select { + CatalogTable.selectAll().where { (CatalogTable.collection eq collection) and (CatalogTable.type eq type) }.map { it[CatalogTable.cover] }.firstOrNull() @@ -41,7 +41,7 @@ object ContentCatalogStore { fun storeCatalog(title: String, titles: List, collection: String, type: String, cover: String?, genres: String?): Int? { val status = executeWithStatus(getStoreDatabase().database, run = { - val existingRow = CatalogTable.select { + val existingRow = CatalogTable.selectAll().where { (CatalogTable.collection eq collection) and (CatalogTable.type eq type) }.firstOrNull() @@ -157,7 +157,7 @@ object ContentCatalogStore { private fun getId(title: String, titles: List, collection: String, type: String): Int? { val ids = withTransaction(getStoreDatabase().database) { - CatalogTable.select { + CatalogTable.selectAll().where { ((CatalogTable.title eq title) or (CatalogTable.collection eq collection) or (CatalogTable.title inList titles)) and diff --git a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentTitleStore.kt b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentTitleStore.kt index c3dccc23..c4a408a6 100644 --- a/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentTitleStore.kt +++ b/apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasksV2/mapping/store/ContentTitleStore.kt @@ -7,6 +7,7 @@ import no.iktdev.streamit.library.db.withTransaction import org.jetbrains.exposed.sql.insertIgnore import org.jetbrains.exposed.sql.or import org.jetbrains.exposed.sql.select +import org.jetbrains.exposed.sql.selectAll object ContentTitleStore { @@ -31,7 +32,7 @@ object ContentTitleStore { fun findMasterTitles(titleList: List): List { return withTransaction(getStoreDatabase().database, run = { - TitleTable.select { + TitleTable.selectAll().where { (TitleTable.alternativeTitle inList titleList) or (TitleTable.masterTitle inList titleList) }.map {