diff --git a/build.gradle.kts b/build.gradle.kts index 215c75a13..aa6ee06bd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -20,7 +20,7 @@ plugins { allprojects { group = "io.newm.server" - version = "0.13.2-SNAPSHOT" + version = "0.14.0-SNAPSHOT" } subprojects { diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 3902b6ec6..ccdef5f57 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -319,8 +319,8 @@ object Dependencies { private const val VERSION = Versions.TEST_CONTAINERS const val CORE = "org.testcontainers:testcontainers:$VERSION" - const val JUINT = "org.testcontainers:junit-jupiter:$VERSION" - const val POSTGRESQL = "org.testcontainers:postgresql:$VERSION" + const val JUINT = "org.testcontainers:testcontainers-junit-jupiter:$VERSION" + const val POSTGRESQL = "org.testcontainers:testcontainers-postgresql:$VERSION" } object Typesafe { diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index e43eb771f..53a9723e9 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,51 +1,51 @@ object Versions { - const val APACHE_COMMONS_CODEC = "1.20.0" + const val APACHE_COMMONS_CODEC = "1.22.0" const val APACHE_COMMONS_EMAIL = "1.6.0" - const val APACHE_COMMONS_NET = "3.11.1" - const val APACHE_COMMONS_NUMBERS = "1.2" + const val APACHE_COMMONS_NET = "3.13.0" + const val APACHE_COMMONS_NUMBERS = "1.3" const val APACHE_CURATORS = "5.9.0" - const val APACHE_TIKA = "3.2.3" - const val AWS = "2.40.16" - const val AYZA = "10.0.2" - const val BOUNCY_CASTLE = "1.83" - const val CAFFEINE = "3.2.3" + const val APACHE_TIKA = "3.3.1" + const val AWS = "2.46.12" + const val AYZA = "10.0.5" + const val BOUNCY_CASTLE = "1.84" + const val CAFFEINE = "3.2.4" const val CBOR = "0.4.1-NEWM" const val CLOUDINARY = "1.39.0" - const val COROUTINES = "1.10.2" - const val EXPOSED = "0.61.0" - const val FLYWAYDB = "11.20.0" + const val COROUTINES = "1.11.0" + const val EXPOSED = "1.3.0" + const val FLYWAYDB = "12.8.1" const val GOOGLE_TRUTH = "1.4.5" - const val GRPC = "1.78.0" + const val GRPC = "1.82.0" const val GRPC_KOTLIN = "1.5.0" - const val HIKARICP = "7.0.2" + const val HIKARICP = "7.1.0" const val I2P_CRYPTO = "0.3.0" const val JBCRYPT = "0.10.2" - const val JSOUP = "1.21.2" - const val JUNIT = "6.0.1" + const val JSOUP = "1.22.2" + const val JUNIT = "6.1.0" const val J_AUDIO_TAGGER = "3.0.1" const val KOIN = "4.1.0-Beta8" - const val KOIN_TEST = "4.1.1" + const val KOIN_TEST = "4.2.2" const val KOGMIOS = "2.7.1" - const val KOTLINX_SERIALIZATION = "1.9.0" - const val KOTLIN_LOGGING = "7.0.13" - const val KOTLIN_PLUGIN = "2.3.0" + const val KOTLINX_SERIALIZATION = "1.11.0" + const val KOTLIN_LOGGING = "8.0.4" + const val KOTLIN_PLUGIN = "2.4.0" const val KTLINT = "1.8.0" const val KTLINT_PLUGIN = "12.1.1" - const val KTOR = "3.4.0" + const val KTOR = "3.5.0" const val KTOR_FLYWAY = "3.3.0" - const val LOGBACK = "1.5.23" - const val MAVEN_PUBLISH = "0.35.0" - const val MOCKK = "1.14.7" - const val POSTGRESQL = "42.7.8" - const val PROTOBUF = "4.33.2" - const val PROTOBUF_PLUGIN = "0.9.5" + const val LOGBACK = "1.5.34" + const val MAVEN_PUBLISH = "0.36.0" + const val MOCKK = "1.14.11" + const val POSTGRESQL = "42.7.11" + const val PROTOBUF = "4.35.1" + const val PROTOBUF_PLUGIN = "0.10.0" const val QR_CODE_KOTLIN = "4.5.0" const val QUARTZ = "2.5.2" - const val SENTRY = "8.29.0" + const val SENTRY = "8.44.0" const val SHADOW_PLUGIN = "9.2.1" - const val SPRING_SECURITY = "6.5.6" - const val SWAGGER = "1.0.59" - const val TEST_CONTAINERS = "1.21.4" - const val TYPESAFE = "1.4.5" + const val SPRING_SECURITY = "7.1.0" + const val SWAGGER = "1.0.62" + const val TEST_CONTAINERS = "2.0.5" + const val TYPESAFE = "1.4.9" const val VERSIONS_PLUGIN = "0.53.0" } diff --git a/gradle.properties b/gradle.properties index baa80e9dd..f464980b3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,6 @@ kotlin.code.style=official org.gradle.parallel=false org.gradle.caching=true -org.gradle.configureondemand=true org.gradle.daemon=true org.gradle.unsafe.configuration-cache=true @@ -19,4 +18,4 @@ org.gradle.jvmargs=-Dfile.encoding=UTF-8 \ kotlin.incremental=true kotlin.incremental.js=true kotlin.caching.enabled=true -kotlin.parallel.tasks.in.project=true \ No newline at end of file +kotlin.parallel.tasks.in.project=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f8e1ee312..61285a659 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37f78a6af..5dd3c0121 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V10__AlterLedgerAssetMetadata.kt b/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V10__AlterLedgerAssetMetadata.kt index 02d414ffe..7c037b428 100644 --- a/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V10__AlterLedgerAssetMetadata.kt +++ b/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V10__AlterLedgerAssetMetadata.kt @@ -2,7 +2,7 @@ package io.newm.chain.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V10__AlterLedgerAssetMetadata : BaseJavaMigration() { diff --git a/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V11__CreateLedgerUtxoHistory.kt b/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V11__CreateLedgerUtxoHistory.kt index 784ff4749..91f8bfb8d 100644 --- a/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V11__CreateLedgerUtxoHistory.kt +++ b/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V11__CreateLedgerUtxoHistory.kt @@ -2,7 +2,7 @@ package io.newm.chain.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V11__CreateLedgerUtxoHistory : BaseJavaMigration() { diff --git a/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V12__AlterNativeAssetLogAddressTxLog.kt b/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V12__AlterNativeAssetLogAddressTxLog.kt index 99c071e4c..35429b1f2 100644 --- a/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V12__AlterNativeAssetLogAddressTxLog.kt +++ b/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V12__AlterNativeAssetLogAddressTxLog.kt @@ -2,7 +2,7 @@ package io.newm.chain.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V12__AlterNativeAssetLogAddressTxLog : BaseJavaMigration() { diff --git a/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V13__CreateMonitoredAddressChain.kt b/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V13__CreateMonitoredAddressChain.kt index 259704e8e..3c594c5bc 100644 --- a/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V13__CreateMonitoredAddressChain.kt +++ b/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V13__CreateMonitoredAddressChain.kt @@ -2,7 +2,7 @@ package io.newm.chain.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V13__CreateMonitoredAddressChain : BaseJavaMigration() { diff --git a/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V14__CleanupIndexes.kt b/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V14__CleanupIndexes.kt index 40b8015ba..8e7bd5eb6 100644 --- a/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V14__CleanupIndexes.kt +++ b/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V14__CleanupIndexes.kt @@ -2,7 +2,7 @@ package io.newm.chain.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V14__CleanupIndexes : BaseJavaMigration() { diff --git a/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V15__CleanupIndexes.kt b/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V15__CleanupIndexes.kt index 200d4b4e9..7694f396e 100644 --- a/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V15__CleanupIndexes.kt +++ b/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V15__CleanupIndexes.kt @@ -2,7 +2,7 @@ package io.newm.chain.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V15__CleanupIndexes : BaseJavaMigration() { diff --git a/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V16__AlterLedgerUtxos.kt b/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V16__AlterLedgerUtxos.kt index 50eea77b8..44b00b58c 100644 --- a/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V16__AlterLedgerUtxos.kt +++ b/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V16__AlterLedgerUtxos.kt @@ -2,7 +2,7 @@ package io.newm.chain.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V16__AlterLedgerUtxos : BaseJavaMigration() { diff --git a/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V17__AlterLedgerUtxos.kt b/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V17__AlterLedgerUtxos.kt index feed12355..7d1c70325 100644 --- a/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V17__AlterLedgerUtxos.kt +++ b/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V17__AlterLedgerUtxos.kt @@ -2,7 +2,7 @@ package io.newm.chain.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V17__AlterLedgerUtxos : BaseJavaMigration() { diff --git a/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V1__InitialCreation.kt b/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V1__InitialCreation.kt index 71ee90c9d..208f59873 100644 --- a/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V1__InitialCreation.kt +++ b/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V1__InitialCreation.kt @@ -2,7 +2,7 @@ package io.newm.chain.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V1__InitialCreation : BaseJavaMigration() { diff --git a/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V2__CreateLedgerAssetMetadata.kt b/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V2__CreateLedgerAssetMetadata.kt index 3dd8605b4..3a7926a5f 100644 --- a/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V2__CreateLedgerAssetMetadata.kt +++ b/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V2__CreateLedgerAssetMetadata.kt @@ -2,7 +2,7 @@ package io.newm.chain.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V2__CreateLedgerAssetMetadata : BaseJavaMigration() { diff --git a/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V3__AlterLedgerUtxos.kt b/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V3__AlterLedgerUtxos.kt index 130777fc8..dc6bfa543 100644 --- a/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V3__AlterLedgerUtxos.kt +++ b/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V3__AlterLedgerUtxos.kt @@ -2,7 +2,7 @@ package io.newm.chain.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V3__AlterLedgerUtxos : BaseJavaMigration() { diff --git a/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V4__CreateUsers.kt b/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V4__CreateUsers.kt index f29b70c03..1d0d6d067 100644 --- a/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V4__CreateUsers.kt +++ b/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V4__CreateUsers.kt @@ -2,7 +2,7 @@ package io.newm.chain.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V4__CreateUsers : BaseJavaMigration() { diff --git a/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V5__AlterLedgerUtxos.kt b/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V5__AlterLedgerUtxos.kt index fdfcf0b07..48cef8aaf 100644 --- a/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V5__AlterLedgerUtxos.kt +++ b/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V5__AlterLedgerUtxos.kt @@ -2,7 +2,7 @@ package io.newm.chain.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V5__AlterLedgerUtxos : BaseJavaMigration() { diff --git a/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V6__CreateAddressTxLog.kt b/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V6__CreateAddressTxLog.kt index 540f34dce..dbb55aba4 100644 --- a/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V6__CreateAddressTxLog.kt +++ b/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V6__CreateAddressTxLog.kt @@ -2,7 +2,7 @@ package io.newm.chain.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V6__CreateAddressTxLog : BaseJavaMigration() { diff --git a/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V7__DropKeys.kt b/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V7__DropKeys.kt index 5e0386dfa..f9d626617 100644 --- a/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V7__DropKeys.kt +++ b/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V7__DropKeys.kt @@ -2,7 +2,7 @@ package io.newm.chain.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V7__DropKeys : BaseJavaMigration() { diff --git a/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V8__AlterLedgerAssets.kt b/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V8__AlterLedgerAssets.kt index 61ab65a6b..9328a3762 100644 --- a/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V8__AlterLedgerAssets.kt +++ b/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V8__AlterLedgerAssets.kt @@ -2,7 +2,7 @@ package io.newm.chain.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V8__AlterLedgerAssets : BaseJavaMigration() { diff --git a/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V9__CreateNativeAssetLog.kt b/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V9__CreateNativeAssetLog.kt index 62dae15cc..577928fb2 100644 --- a/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V9__CreateNativeAssetLog.kt +++ b/newm-chain-db/src/main/kotlin/io/newm/chain/database/migration/V9__CreateNativeAssetLog.kt @@ -2,7 +2,7 @@ package io.newm.chain.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V9__CreateNativeAssetLog : BaseJavaMigration() { diff --git a/newm-chain-db/src/main/kotlin/io/newm/chain/database/repository/ChainRepositoryImpl.kt b/newm-chain-db/src/main/kotlin/io/newm/chain/database/repository/ChainRepositoryImpl.kt index 5db1478b1..494686728 100644 --- a/newm-chain-db/src/main/kotlin/io/newm/chain/database/repository/ChainRepositoryImpl.kt +++ b/newm-chain-db/src/main/kotlin/io/newm/chain/database/repository/ChainRepositoryImpl.kt @@ -12,17 +12,19 @@ import io.newm.chain.util.hexToByteArray import io.newm.chain.util.toHexString import io.newm.kogmios.protocols.model.PointDetail import io.newm.kogmios.protocols.model.Tip -import org.jetbrains.exposed.sql.SortOrder -import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq -import org.jetbrains.exposed.sql.SqlExpressionBuilder.greater -import org.jetbrains.exposed.sql.SqlExpressionBuilder.greaterEq -import org.jetbrains.exposed.sql.SqlExpressionBuilder.less -import org.jetbrains.exposed.sql.and -import org.jetbrains.exposed.sql.batchInsert -import org.jetbrains.exposed.sql.deleteWhere -import org.jetbrains.exposed.sql.insertAndGetId -import org.jetbrains.exposed.sql.max -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.core.SortOrder +import org.jetbrains.exposed.v1.core.and +import org.jetbrains.exposed.v1.core.eq +import org.jetbrains.exposed.v1.core.eqSubQuery +import org.jetbrains.exposed.v1.core.greater +import org.jetbrains.exposed.v1.core.greaterEq +import org.jetbrains.exposed.v1.core.less +import org.jetbrains.exposed.v1.core.max +import org.jetbrains.exposed.v1.jdbc.batchInsert +import org.jetbrains.exposed.v1.jdbc.deleteWhere +import org.jetbrains.exposed.v1.jdbc.insertAndGetId +import org.jetbrains.exposed.v1.jdbc.select +import org.jetbrains.exposed.v1.jdbc.transactions.transaction import org.slf4j.Logger import org.slf4j.LoggerFactory diff --git a/newm-chain-db/src/main/kotlin/io/newm/chain/database/repository/LedgerRepository.kt b/newm-chain-db/src/main/kotlin/io/newm/chain/database/repository/LedgerRepository.kt index 0266240dd..0ec1aa73b 100644 --- a/newm-chain-db/src/main/kotlin/io/newm/chain/database/repository/LedgerRepository.kt +++ b/newm-chain-db/src/main/kotlin/io/newm/chain/database/repository/LedgerRepository.kt @@ -67,6 +67,8 @@ interface LedgerRepository { currentEpoch: Long ): Long + fun queryTransactionInfo(txId: String): TransactionInfo? + fun queryAdaHandle(adaHandleName: String): String? fun siblingHashCount(hash: String): Long diff --git a/newm-chain-db/src/main/kotlin/io/newm/chain/database/repository/LedgerRepositoryImpl.kt b/newm-chain-db/src/main/kotlin/io/newm/chain/database/repository/LedgerRepositoryImpl.kt index 7dbf123f9..6a2eaf9cd 100644 --- a/newm-chain-db/src/main/kotlin/io/newm/chain/database/repository/LedgerRepositoryImpl.kt +++ b/newm-chain-db/src/main/kotlin/io/newm/chain/database/repository/LedgerRepositoryImpl.kt @@ -52,28 +52,35 @@ import kotlin.math.max import kotlinx.coroutines.runBlocking import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock -import org.jetbrains.exposed.sql.LongColumnType -import org.jetbrains.exposed.sql.SortOrder -import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq -import org.jetbrains.exposed.sql.SqlExpressionBuilder.greaterEq -import org.jetbrains.exposed.sql.SqlExpressionBuilder.inList -import org.jetbrains.exposed.sql.SqlExpressionBuilder.isNull -import org.jetbrains.exposed.sql.SqlExpressionBuilder.less -import org.jetbrains.exposed.sql.and -import org.jetbrains.exposed.sql.batchInsert -import org.jetbrains.exposed.sql.castTo -import org.jetbrains.exposed.sql.count -import org.jetbrains.exposed.sql.deleteWhere -import org.jetbrains.exposed.sql.innerJoin -import org.jetbrains.exposed.sql.insert -import org.jetbrains.exposed.sql.insertAndGetId -import org.jetbrains.exposed.sql.max -import org.jetbrains.exposed.sql.or -import org.jetbrains.exposed.sql.selectAll -import org.jetbrains.exposed.sql.sum -import org.jetbrains.exposed.sql.transactions.transaction -import org.jetbrains.exposed.sql.update -import org.jetbrains.exposed.sql.transactions.TransactionManager +import org.jetbrains.exposed.v1.core.LongColumnType +import org.jetbrains.exposed.v1.core.ResultRow +import org.jetbrains.exposed.v1.core.SortOrder +import org.jetbrains.exposed.v1.core.and +import org.jetbrains.exposed.v1.core.castTo +import org.jetbrains.exposed.v1.core.count +import org.jetbrains.exposed.v1.core.eq +import org.jetbrains.exposed.v1.core.greater +import org.jetbrains.exposed.v1.core.greaterEq +import org.jetbrains.exposed.v1.core.inList +import org.jetbrains.exposed.v1.core.innerJoin +import org.jetbrains.exposed.v1.core.isNotNull +import org.jetbrains.exposed.v1.core.isNull +import org.jetbrains.exposed.v1.core.less +import org.jetbrains.exposed.v1.core.lessEq +import org.jetbrains.exposed.v1.core.like +import org.jetbrains.exposed.v1.core.max +import org.jetbrains.exposed.v1.core.or +import org.jetbrains.exposed.v1.core.regexp +import org.jetbrains.exposed.v1.core.sum +import org.jetbrains.exposed.v1.jdbc.batchInsert +import org.jetbrains.exposed.v1.jdbc.deleteWhere +import org.jetbrains.exposed.v1.jdbc.insert +import org.jetbrains.exposed.v1.jdbc.insertAndGetId +import org.jetbrains.exposed.v1.jdbc.select +import org.jetbrains.exposed.v1.jdbc.selectAll +import org.jetbrains.exposed.v1.jdbc.transactions.TransactionManager +import org.jetbrains.exposed.v1.jdbc.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.update import org.slf4j.LoggerFactory class LedgerRepositoryImpl : LedgerRepository { @@ -222,6 +229,122 @@ class LedgerRepositoryImpl : LedgerRepository { }.toHashSet() } + override fun queryTransactionInfo(txId: String): TransactionInfo? = + transaction { + warnLongQueriesDuration = 1000L + + val createdRows = + LedgerUtxosTable + .innerJoin(LedgerTable, { ledgerId }, { LedgerTable.id }) + .selectAll() + .where { LedgerUtxosTable.txId eq txId } + .orderBy(LedgerUtxosTable.txIx, SortOrder.ASC) + .toList() + + val spentRows = + LedgerUtxosTable + .innerJoin(LedgerTable, { ledgerId }, { LedgerTable.id }) + .selectAll() + .where { LedgerUtxosTable.transactionSpent eq txId } + .orderBy(LedgerUtxosTable.txId, SortOrder.ASC) + .toList() + + if (createdRows.isEmpty() && spentRows.isEmpty()) { + return@transaction null + } + + val blockNumber = validateTransactionInfoBlockNumber(txId, createdRows, spentRows) + val slotNumber = + ChainTable + .select(ChainTable.slotNumber) + .where { ChainTable.blockNumber eq blockNumber } + .firstOrNull() + ?.let { row -> row[ChainTable.slotNumber] } + ?: throw TransactionInfoIntegrityException( + "Unable to resolve slot number for txId=$txId at block=$blockNumber" + ) + + TransactionInfo( + blockNumber = blockNumber, + slotNumber = slotNumber, + spentUtxos = spentRows.map { row -> row.toRepositoryUtxo() }, + createdUtxos = createdRows.map { row -> row.toRepositoryUtxo() }, + ) + } + + private fun validateTransactionInfoBlockNumber( + txId: String, + createdRows: List, + spentRows: List, + ): Long { + val createdBlocks = createdRows.map { row -> row[LedgerUtxosTable.blockCreated] }.distinct() + if (createdBlocks.size > 1) { + throw TransactionInfoIntegrityException( + "Created UTXOs for txId=$txId span multiple blocks: $createdBlocks" + ) + } + + val spentBlockNumbers = + spentRows + .map { row -> + row[LedgerUtxosTable.blockSpent] + ?: throw TransactionInfoIntegrityException( + "Spent UTXO row for txId=$txId is missing block_spent" + ) + } + val spentBlocks = spentBlockNumbers.distinct() + if (spentBlocks.size > 1) { + throw TransactionInfoIntegrityException( + "Spent UTXOs for txId=$txId span multiple blocks: $spentBlocks" + ) + } + + val createdBlock = createdBlocks.singleOrNull() + val spentBlock = spentBlocks.singleOrNull() + if ((createdBlock != null) && (spentBlock != null) && (createdBlock != spentBlock)) { + throw TransactionInfoIntegrityException( + "Created and spent UTXOs disagree on block for txId=$txId: created=$createdBlock spent=$spentBlock" + ) + } + + return (createdBlock ?: spentBlock) + ?: throw TransactionInfoIntegrityException( + "Unable to infer block number for txId=$txId" + ) + } + + private fun ResultRow.toRepositoryUtxo(): Utxo { + val ledgerUtxoId = this[LedgerUtxosTable.id].value + val nativeAssets = + LedgerUtxoAssetsTable + .innerJoin( + LedgerAssetsTable, + { ledgerAssetId }, + { LedgerAssetsTable.id }, + { LedgerUtxoAssetsTable.ledgerUtxoId eq ledgerUtxoId } + ).selectAll() + .map { naRow -> + NativeAsset( + policy = naRow[LedgerAssetsTable.policy], + name = naRow[LedgerAssetsTable.name], + amount = BigInteger(naRow[LedgerUtxoAssetsTable.amount]), + ) + } + + return Utxo( + address = this[LedgerTable.address], + hash = this[LedgerUtxosTable.txId], + ix = this[LedgerUtxosTable.txIx].toLong(), + lovelace = BigInteger(this[LedgerUtxosTable.lovelace]), + nativeAssets = nativeAssets, + datumHash = this[LedgerUtxosTable.datumHash], + datum = this[LedgerUtxosTable.datum], + isInlineDatum = this[LedgerUtxosTable.isInlineDatum], + scriptRef = this[LedgerUtxosTable.scriptRef], + scriptRefVersion = this[LedgerUtxosTable.scriptRefVersion], + ) + } + override fun queryUtxoByNativeAsset( name: String, policy: String @@ -937,15 +1060,19 @@ class LedgerRepositoryImpl : LedgerRepository { val statement = connection.prepareStatement(sql.toString(), false) try { var paramIndex = 1 - statement.set(paramIndex++, blockNumber) + statement.set(paramIndex++, blockNumber, LedgerUtxosTable.blockSpent.columnType) batch.forEach { spentUtxo -> - statement.set(paramIndex++, spentUtxo.hash) - statement.set(paramIndex++, spentUtxo.ix.toInt()) - statement.set(paramIndex++, spentUtxo.transactionSpent) + statement.set(paramIndex++, spentUtxo.hash, LedgerUtxosTable.txId.columnType) + statement.set(paramIndex++, spentUtxo.ix.toInt(), LedgerUtxosTable.txIx.columnType) + statement.set( + paramIndex++, + spentUtxo.transactionSpent, + LedgerUtxosTable.transactionSpent.columnType + ) } batch.forEach { spentUtxo -> - statement.set(paramIndex++, spentUtxo.hash) - statement.set(paramIndex++, spentUtxo.ix.toInt()) + statement.set(paramIndex++, spentUtxo.hash, LedgerUtxosTable.txId.columnType) + statement.set(paramIndex++, spentUtxo.ix.toInt(), LedgerUtxosTable.txIx.columnType) } statement.executeUpdate() } finally { diff --git a/newm-chain-db/src/main/kotlin/io/newm/chain/database/repository/TransactionInfo.kt b/newm-chain-db/src/main/kotlin/io/newm/chain/database/repository/TransactionInfo.kt new file mode 100644 index 000000000..4bb6900fe --- /dev/null +++ b/newm-chain-db/src/main/kotlin/io/newm/chain/database/repository/TransactionInfo.kt @@ -0,0 +1,14 @@ +package io.newm.chain.database.repository + +import io.newm.chain.model.Utxo + +data class TransactionInfo( + val blockNumber: Long, + val slotNumber: Long, + val spentUtxos: List, + val createdUtxos: List, +) + +class TransactionInfoIntegrityException( + message: String, +) : RuntimeException(message) diff --git a/newm-chain-db/src/main/kotlin/io/newm/chain/database/repository/UsersRepositoryImpl.kt b/newm-chain-db/src/main/kotlin/io/newm/chain/database/repository/UsersRepositoryImpl.kt index 53f3fd7b6..346730a23 100644 --- a/newm-chain-db/src/main/kotlin/io/newm/chain/database/repository/UsersRepositoryImpl.kt +++ b/newm-chain-db/src/main/kotlin/io/newm/chain/database/repository/UsersRepositoryImpl.kt @@ -3,10 +3,11 @@ package io.newm.chain.database.repository import com.github.benmanes.caffeine.cache.Caffeine import io.newm.chain.database.entity.User import io.newm.chain.database.table.UsersTable -import org.jetbrains.exposed.sql.insertAndGetId -import org.jetbrains.exposed.sql.selectAll -import org.jetbrains.exposed.sql.transactions.transaction -import org.jetbrains.exposed.sql.update +import org.jetbrains.exposed.v1.core.eq +import org.jetbrains.exposed.v1.jdbc.insertAndGetId +import org.jetbrains.exposed.v1.jdbc.selectAll +import org.jetbrains.exposed.v1.jdbc.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.update import java.time.Duration class UsersRepositoryImpl : UsersRepository { diff --git a/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/AddressTxLogTable.kt b/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/AddressTxLogTable.kt index d4227913e..2a5c63780 100644 --- a/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/AddressTxLogTable.kt +++ b/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/AddressTxLogTable.kt @@ -1,7 +1,7 @@ package io.newm.chain.database.table -import org.jetbrains.exposed.dao.id.LongIdTable -import org.jetbrains.exposed.sql.Column +import org.jetbrains.exposed.v1.core.Column +import org.jetbrains.exposed.v1.core.dao.id.LongIdTable object AddressTxLogTable : LongIdTable(name = "address_tx_log") { val address: Column = text("address") diff --git a/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/ChainTable.kt b/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/ChainTable.kt index fafc1a2e2..d7a4d2e91 100644 --- a/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/ChainTable.kt +++ b/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/ChainTable.kt @@ -1,7 +1,7 @@ package io.newm.chain.database.table -import org.jetbrains.exposed.dao.id.LongIdTable -import org.jetbrains.exposed.sql.Column +import org.jetbrains.exposed.v1.core.Column +import org.jetbrains.exposed.v1.core.dao.id.LongIdTable object ChainTable : LongIdTable(name = "chain") { val blockNumber: Column = long("block_number").index() diff --git a/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/LedgerAssetMetadataTable.kt b/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/LedgerAssetMetadataTable.kt index b254a4357..4488992fb 100644 --- a/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/LedgerAssetMetadataTable.kt +++ b/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/LedgerAssetMetadataTable.kt @@ -1,7 +1,7 @@ package io.newm.chain.database.table -import org.jetbrains.exposed.dao.id.LongIdTable -import org.jetbrains.exposed.sql.Column +import org.jetbrains.exposed.v1.core.Column +import org.jetbrains.exposed.v1.core.dao.id.LongIdTable object LedgerAssetMetadataTable : LongIdTable(name = "ledger_asset_metadata") { // fk to the ledger_assets table containing policyid/name diff --git a/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/LedgerAssetsTable.kt b/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/LedgerAssetsTable.kt index 7c5dec5c2..50964ff49 100644 --- a/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/LedgerAssetsTable.kt +++ b/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/LedgerAssetsTable.kt @@ -1,7 +1,7 @@ package io.newm.chain.database.table -import org.jetbrains.exposed.dao.id.LongIdTable -import org.jetbrains.exposed.sql.Column +import org.jetbrains.exposed.v1.core.Column +import org.jetbrains.exposed.v1.core.dao.id.LongIdTable object LedgerAssetsTable : LongIdTable(name = "ledger_assets") { // policy id for this asset diff --git a/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/LedgerTable.kt b/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/LedgerTable.kt index bcb72bb63..0179f6df4 100644 --- a/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/LedgerTable.kt +++ b/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/LedgerTable.kt @@ -1,7 +1,7 @@ package io.newm.chain.database.table -import org.jetbrains.exposed.dao.id.LongIdTable -import org.jetbrains.exposed.sql.Column +import org.jetbrains.exposed.v1.core.Column +import org.jetbrains.exposed.v1.core.dao.id.LongIdTable object LedgerTable : LongIdTable(name = "ledger") { // Address that holds utxos on the ledger diff --git a/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/LedgerUtxoAssetsTable.kt b/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/LedgerUtxoAssetsTable.kt index 2cfaa93e8..e61aaba71 100644 --- a/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/LedgerUtxoAssetsTable.kt +++ b/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/LedgerUtxoAssetsTable.kt @@ -1,7 +1,7 @@ package io.newm.chain.database.table -import org.jetbrains.exposed.dao.id.LongIdTable -import org.jetbrains.exposed.sql.Column +import org.jetbrains.exposed.v1.core.Column +import org.jetbrains.exposed.v1.core.dao.id.LongIdTable object LedgerUtxoAssetsTable : LongIdTable(name = "ledger_utxo_assets") { val ledgerUtxoId: Column = long("ledger_utxo_id").references(LedgerUtxosTable.id) diff --git a/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/LedgerUtxosHistoryTable.kt b/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/LedgerUtxosHistoryTable.kt index bf48070cb..cb531837f 100644 --- a/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/LedgerUtxosHistoryTable.kt +++ b/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/LedgerUtxosHistoryTable.kt @@ -1,7 +1,7 @@ package io.newm.chain.database.table -import org.jetbrains.exposed.sql.Column -import org.jetbrains.exposed.sql.Table +import org.jetbrains.exposed.v1.core.Column +import org.jetbrains.exposed.v1.core.Table object LedgerUtxosHistoryTable : Table(name = "ledger_utxos_history") { // credential diff --git a/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/LedgerUtxosTable.kt b/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/LedgerUtxosTable.kt index 9e44ab0aa..9e545f467 100644 --- a/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/LedgerUtxosTable.kt +++ b/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/LedgerUtxosTable.kt @@ -1,7 +1,7 @@ package io.newm.chain.database.table -import org.jetbrains.exposed.dao.id.LongIdTable -import org.jetbrains.exposed.sql.Column +import org.jetbrains.exposed.v1.core.Column +import org.jetbrains.exposed.v1.core.dao.id.LongIdTable object LedgerUtxosTable : LongIdTable(name = "ledger_utxos") { // foreign key to the ledger table diff --git a/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/MonitoredAddressChainTable.kt b/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/MonitoredAddressChainTable.kt index 7358f77cf..5bcd4aa22 100644 --- a/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/MonitoredAddressChainTable.kt +++ b/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/MonitoredAddressChainTable.kt @@ -1,7 +1,7 @@ package io.newm.chain.database.table -import org.jetbrains.exposed.dao.id.LongIdTable -import org.jetbrains.exposed.sql.Column +import org.jetbrains.exposed.v1.core.Column +import org.jetbrains.exposed.v1.core.dao.id.LongIdTable object MonitoredAddressChainTable : LongIdTable(name = "monitored_address_chain") { // the address diff --git a/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/NativeAssetMonitorLogTable.kt b/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/NativeAssetMonitorLogTable.kt index 558402926..cd2a3b3f3 100644 --- a/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/NativeAssetMonitorLogTable.kt +++ b/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/NativeAssetMonitorLogTable.kt @@ -1,7 +1,7 @@ package io.newm.chain.database.table -import org.jetbrains.exposed.dao.id.LongIdTable -import org.jetbrains.exposed.sql.Column +import org.jetbrains.exposed.v1.core.Column +import org.jetbrains.exposed.v1.core.dao.id.LongIdTable object NativeAssetMonitorLogTable : LongIdTable(name = "native_asset_log") { val monitorNativeAssetsResponseBytes: Column = binary("monitor_native_assets_response") diff --git a/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/PaymentStakeAddressTable.kt b/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/PaymentStakeAddressTable.kt index 7fdfd6722..4163164f2 100644 --- a/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/PaymentStakeAddressTable.kt +++ b/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/PaymentStakeAddressTable.kt @@ -1,7 +1,7 @@ package io.newm.chain.database.table -import org.jetbrains.exposed.dao.id.LongIdTable -import org.jetbrains.exposed.sql.Column +import org.jetbrains.exposed.v1.core.Column +import org.jetbrains.exposed.v1.core.dao.id.LongIdTable object PaymentStakeAddressTable : LongIdTable(name = "payment_stake_addresses") { val receivingAddress: Column = text("receiving_address") diff --git a/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/RawTransactionsTable.kt b/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/RawTransactionsTable.kt index aae819e34..99d54592d 100644 --- a/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/RawTransactionsTable.kt +++ b/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/RawTransactionsTable.kt @@ -1,7 +1,7 @@ package io.newm.chain.database.table -import org.jetbrains.exposed.dao.id.LongIdTable -import org.jetbrains.exposed.sql.Column +import org.jetbrains.exposed.v1.core.Column +import org.jetbrains.exposed.v1.core.dao.id.LongIdTable object RawTransactionsTable : LongIdTable(name = "raw_transactions") { // the block number diff --git a/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/StakeDelegationsTable.kt b/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/StakeDelegationsTable.kt index 9d88eceb3..0fcac9f91 100644 --- a/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/StakeDelegationsTable.kt +++ b/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/StakeDelegationsTable.kt @@ -1,7 +1,7 @@ package io.newm.chain.database.table -import org.jetbrains.exposed.dao.id.LongIdTable -import org.jetbrains.exposed.sql.Column +import org.jetbrains.exposed.v1.core.Column +import org.jetbrains.exposed.v1.core.dao.id.LongIdTable object StakeDelegationsTable : LongIdTable(name = "stake_delegations") { // the block in which this delegation/deregistration occurred diff --git a/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/StakeRegistrationsTable.kt b/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/StakeRegistrationsTable.kt index 1685a3d87..8570ec83f 100644 --- a/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/StakeRegistrationsTable.kt +++ b/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/StakeRegistrationsTable.kt @@ -1,7 +1,7 @@ package io.newm.chain.database.table -import org.jetbrains.exposed.dao.id.LongIdTable -import org.jetbrains.exposed.sql.Column +import org.jetbrains.exposed.v1.core.Column +import org.jetbrains.exposed.v1.core.dao.id.LongIdTable object StakeRegistrationsTable : LongIdTable(name = "stake_registrations") { // the user's stake address diff --git a/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/TransactionLogTable.kt b/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/TransactionLogTable.kt index 75228255a..24fc94256 100644 --- a/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/TransactionLogTable.kt +++ b/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/TransactionLogTable.kt @@ -1,7 +1,7 @@ package io.newm.chain.database.table -import org.jetbrains.exposed.dao.id.LongIdTable -import org.jetbrains.exposed.sql.Column +import org.jetbrains.exposed.v1.core.Column +import org.jetbrains.exposed.v1.core.dao.id.LongIdTable object TransactionLogTable : LongIdTable(name = "transaction_log") { val transactionId: Column = text("transaction_id") diff --git a/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/UsersTable.kt b/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/UsersTable.kt index b1db76195..9bb8275cb 100644 --- a/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/UsersTable.kt +++ b/newm-chain-db/src/main/kotlin/io/newm/chain/database/table/UsersTable.kt @@ -1,7 +1,7 @@ package io.newm.chain.database.table -import org.jetbrains.exposed.dao.id.LongIdTable -import org.jetbrains.exposed.sql.Column +import org.jetbrains.exposed.v1.core.Column +import org.jetbrains.exposed.v1.core.dao.id.LongIdTable object UsersTable : LongIdTable(name = "api_users") { val name: Column = text("name") diff --git a/newm-chain-db/src/test/kotlin/io/newm/chain/database/repository/QueryTransactionInfoRepositoryTest.kt b/newm-chain-db/src/test/kotlin/io/newm/chain/database/repository/QueryTransactionInfoRepositoryTest.kt new file mode 100644 index 000000000..787780b54 --- /dev/null +++ b/newm-chain-db/src/test/kotlin/io/newm/chain/database/repository/QueryTransactionInfoRepositoryTest.kt @@ -0,0 +1,286 @@ +package io.newm.chain.database.repository + +import com.google.common.truth.Truth.assertThat +import com.zaxxer.hikari.HikariDataSource +import java.util.UUID +import org.jetbrains.exposed.v1.jdbc.Database +import org.jetbrains.exposed.v1.jdbc.SchemaUtils +import org.jetbrains.exposed.v1.jdbc.insert +import org.jetbrains.exposed.v1.jdbc.insertAndGetId +import org.jetbrains.exposed.v1.jdbc.transactions.transaction +import org.junit.jupiter.api.AfterAll +import org.junit.jupiter.api.BeforeAll +import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.Test +import org.junit.jupiter.api.TestInstance +import org.junit.jupiter.api.assertThrows +import org.testcontainers.containers.PostgreSQLContainer +import io.newm.chain.database.table.ChainTable +import io.newm.chain.database.table.LedgerAssetsTable +import io.newm.chain.database.table.LedgerTable +import io.newm.chain.database.table.LedgerUtxoAssetsTable +import io.newm.chain.database.table.LedgerUtxosTable + +@TestInstance(TestInstance.Lifecycle.PER_CLASS) +class QueryTransactionInfoRepositoryTest { + private val repository = LedgerRepositoryImpl() + private val container = + PostgreSQLContainer("postgres:12").apply { + withDatabaseName("newm-chain-db") + withUsername("tester") + withPassword("newm1234") + } + + private lateinit var hikariDataSource: HikariDataSource + + @BeforeAll + fun beforeAll() { + container.start() + hikariDataSource = HikariDataSource().apply { + driverClassName = container.driverClassName + jdbcUrl = container.jdbcUrl + username = container.username + password = container.password + } + Database.connect(hikariDataSource) + transaction { + SchemaUtils.create( + ChainTable, + LedgerTable, + LedgerAssetsTable, + LedgerUtxosTable, + LedgerUtxoAssetsTable, + ) + } + } + + @AfterAll + fun afterAll() { + hikariDataSource.close() + container.stop() + } + + @BeforeEach + fun beforeEach() { + transaction { + exec( + "TRUNCATE ${listOf(LedgerUtxoAssetsTable, LedgerUtxosTable, LedgerAssetsTable, LedgerTable, ChainTable).joinToString(", ") { it.tableName }} RESTART IDENTITY CASCADE" + ) + } + } + + @Test + fun `queryTransactionInfo returns block slot spent and created utxos`() { + insertChainBlock(blockNumber = 100L, slotNumber = 1000L) + insertLedgerUtxo( + address = "addr_test_source1", + txId = "source-1", + txIx = 0, + lovelace = "1000", + blockCreated = 90L, + blockSpent = 100L, + transactionSpent = "target-tx", + ) + insertLedgerUtxo( + address = "addr_test_source2", + txId = "source-2", + txIx = 1, + lovelace = "2000", + blockCreated = 91L, + blockSpent = 100L, + transactionSpent = "target-tx", + ) + insertLedgerUtxo( + address = "addr_test_dest1", + txId = "target-tx", + txIx = 0, + lovelace = "2500", + blockCreated = 100L, + ) + insertLedgerUtxo( + address = "addr_test_dest2", + txId = "target-tx", + txIx = 1, + lovelace = "500", + blockCreated = 100L, + ) + + val result = repository.queryTransactionInfo("target-tx") + + assertThat(result).isNotNull() + assertThat(result!!.blockNumber).isEqualTo(100L) + assertThat(result.slotNumber).isEqualTo(1000L) + assertThat(result.spentUtxos.map { utxo -> utxo.hash to utxo.ix }) + .containsExactly("source-1" to 0L, "source-2" to 1L) + assertThat(result.createdUtxos.map { utxo -> utxo.hash to utxo.ix }) + .containsExactly("target-tx" to 0L, "target-tx" to 1L) + } + + @Test + fun `queryTransactionInfo returns null when no retained rows exist`() { + assertThat(repository.queryTransactionInfo("missing-tx")).isNull() + } + + @Test + fun `queryTransactionInfo fails when created utxos span multiple blocks`() { + insertChainBlock(blockNumber = 100L, slotNumber = 1000L) + insertChainBlock(blockNumber = 101L, slotNumber = 1001L) + insertLedgerUtxo( + address = "addr_test_dest1", + txId = "target-tx", + txIx = 0, + lovelace = "2500", + blockCreated = 100L, + ) + insertLedgerUtxo( + address = "addr_test_dest2", + txId = "target-tx", + txIx = 1, + lovelace = "500", + blockCreated = 101L, + ) + + assertThrows { + repository.queryTransactionInfo("target-tx") + } + } + + @Test + fun `queryTransactionInfo fails when spent utxos span multiple blocks`() { + insertChainBlock(blockNumber = 100L, slotNumber = 1000L) + insertChainBlock(blockNumber = 101L, slotNumber = 1001L) + insertLedgerUtxo( + address = "addr_test_source1", + txId = "source-1", + txIx = 0, + lovelace = "1000", + blockCreated = 90L, + blockSpent = 100L, + transactionSpent = "target-tx", + ) + insertLedgerUtxo( + address = "addr_test_source2", + txId = "source-2", + txIx = 1, + lovelace = "2000", + blockCreated = 91L, + blockSpent = 101L, + transactionSpent = "target-tx", + ) + + assertThrows { + repository.queryTransactionInfo("target-tx") + } + } + + @Test + fun `queryTransactionInfo fails when created and spent utxos disagree on block`() { + insertChainBlock(blockNumber = 100L, slotNumber = 1000L) + insertChainBlock(blockNumber = 101L, slotNumber = 1001L) + insertLedgerUtxo( + address = "addr_test_source1", + txId = "source-1", + txIx = 0, + lovelace = "1000", + blockCreated = 90L, + blockSpent = 101L, + transactionSpent = "target-tx", + ) + insertLedgerUtxo( + address = "addr_test_dest1", + txId = "target-tx", + txIx = 0, + lovelace = "2500", + blockCreated = 100L, + ) + + assertThrows { + repository.queryTransactionInfo("target-tx") + } + } + + @Test + fun `queryTransactionInfo fails when chain block is missing`() { + insertLedgerUtxo( + address = "addr_test_dest1", + txId = "target-tx", + txIx = 0, + lovelace = "2500", + blockCreated = 100L, + ) + + assertThrows { + repository.queryTransactionInfo("target-tx") + } + } + + private fun insertChainBlock( + blockNumber: Long, + slotNumber: Long, + ) { + transaction { + ChainTable.insert { row -> + row[ChainTable.blockNumber] = blockNumber + row[ChainTable.slotNumber] = slotNumber + row[ChainTable.hash] = UUID.randomUUID().toString() + row[ChainTable.prevHash] = UUID.randomUUID().toString() + row[ChainTable.poolId] = "pool1" + row[ChainTable.etaV] = "eta" + row[ChainTable.nodeVkey] = "node-vkey" + row[ChainTable.nodeVrfVkey] = "node-vrf" + row[ChainTable.blockVrf0] = "block-vrf-0" + row[ChainTable.blockVrf1] = "block-vrf-1" + row[ChainTable.etaVrf0] = "eta-vrf-0" + row[ChainTable.etaVrf1] = "eta-vrf-1" + row[ChainTable.leaderVrf0] = "leader-vrf-0" + row[ChainTable.leaderVrf1] = "leader-vrf-1" + row[ChainTable.blockSize] = 1 + row[ChainTable.blockBodyHash] = "body-hash" + row[ChainTable.poolOpcert] = "opcert" + row[ChainTable.sequenceNumber] = 1 + row[ChainTable.kesPeriod] = 1 + row[ChainTable.sigmaSignature] = "sigma" + row[ChainTable.protocolMajorVersion] = 8 + row[ChainTable.protocolMinorVersion] = 0 + } + } + } + + private fun insertLedgerUtxo( + address: String, + txId: String, + txIx: Int, + lovelace: String, + blockCreated: Long, + blockSpent: Long? = null, + transactionSpent: String? = null, + ) { + transaction { + val ledgerId = + LedgerTable + .insertAndGetId { row -> + row[LedgerTable.address] = address + row[LedgerTable.stakeAddress] = null + row[LedgerTable.addressType] = "00" + }.value + + LedgerUtxosTable.insert { row -> + row[LedgerUtxosTable.ledgerId] = ledgerId + row[LedgerUtxosTable.txId] = txId + row[LedgerUtxosTable.txIx] = txIx + row[LedgerUtxosTable.datumHash] = null + row[LedgerUtxosTable.datum] = null + row[LedgerUtxosTable.isInlineDatum] = null + row[LedgerUtxosTable.scriptRef] = null + row[LedgerUtxosTable.scriptRefVersion] = null + row[LedgerUtxosTable.lovelace] = lovelace + row[LedgerUtxosTable.blockCreated] = blockCreated + row[LedgerUtxosTable.blockSpent] = blockSpent + row[LedgerUtxosTable.transactionSpent] = transactionSpent + row[LedgerUtxosTable.cbor] = null + row[LedgerUtxosTable.paymentCred] = null + row[LedgerUtxosTable.stakeCred] = null + } + } + } +} diff --git a/newm-chain-grpc/build.gradle.kts b/newm-chain-grpc/build.gradle.kts index 652132584..3dee4bfef 100644 --- a/newm-chain-grpc/build.gradle.kts +++ b/newm-chain-grpc/build.gradle.kts @@ -17,6 +17,22 @@ plugins { java.sourceCompatibility = JavaVersion.VERSION_21 java.targetCompatibility = JavaVersion.VERSION_21 +val protocArtifactClassifier = + when (val osName = System.getProperty("os.name").lowercase()) { + in listOf("linux") -> "linux" + + in listOf("mac os x", "darwin") -> "osx" + + else -> when { + osName.startsWith("windows") -> "windows" + else -> error("Unsupported OS for protoc artifacts: $osName") + } + } + "-" + when (val osArch = System.getProperty("os.arch").lowercase()) { + "x86_64", "amd64" -> "x86_64" + "aarch64", "arm64" -> "aarch_64" + else -> error("Unsupported architecture for protoc artifacts: $osArch") + } + ktlint { version.set(Dependencies.KtLint.VERSION) filter { @@ -55,11 +71,11 @@ dependencies { protobuf { protoc { - artifact = Dependencies.Protobuf.PROTOC + artifact = "${Dependencies.Protobuf.PROTOC}:$protocArtifactClassifier@exe" } plugins { id("grpc") { - artifact = Dependencies.Grpc.GRPC + artifact = "${Dependencies.Grpc.GRPC}:$protocArtifactClassifier@exe" } id("grpckt") { artifact = Dependencies.GrpcKotlin.GRPCKT diff --git a/newm-chain-grpc/src/main/proto/newm_chain.proto b/newm-chain-grpc/src/main/proto/newm_chain.proto index ecf8830ff..7ce8cd486 100644 --- a/newm-chain-grpc/src/main/proto/newm_chain.proto +++ b/newm-chain-grpc/src/main/proto/newm_chain.proto @@ -7,6 +7,7 @@ package newmchain; service NewmChain { rpc SubmitTransaction (SubmitTransactionRequest) returns (SubmitTransactionResponse); + rpc QueryTransactionInfo (QueryTransactionInfoRequest) returns (QueryTransactionInfoResponse); rpc QueryCurrentEpoch (QueryCurrentEpochRequest) returns (QueryCurrentEpochResponse); rpc QueryTip (QueryTipRequest) returns (QueryTipResponse); rpc QueryUtxos (QueryUtxosRequest) returns (QueryUtxosResponse); @@ -47,6 +48,23 @@ message SubmitTransactionResponse { string tx_id = 2; } +// Returns retained ledger-derived details for a confirmed on-chain transaction. +// +// This is intended for recent transactions that are still present in ledger-derived storage. +// A response with found = false means no retained ledger-derived rows were found for the +// transaction id. It does not guarantee the transaction never existed on-chain. +message QueryTransactionInfoRequest { + string tx_id = 1; +} + +message QueryTransactionInfoResponse { + bool found = 1; + uint64 block_number = 2; + uint64 slot_number = 3; + repeated Utxo spent_utxos = 4; + repeated Utxo created_utxos = 5; +} + message QueryCurrentEpochRequest {} message QueryCurrentEpochResponse { diff --git a/newm-chain/src/main/kotlin/io/newm/chain/Application.kt b/newm-chain/src/main/kotlin/io/newm/chain/Application.kt index 07816472a..2da6d6646 100644 --- a/newm-chain/src/main/kotlin/io/newm/chain/Application.kt +++ b/newm-chain/src/main/kotlin/io/newm/chain/Application.kt @@ -14,7 +14,7 @@ import io.newm.shared.daemon.initializeDaemons import kotlin.system.exitProcess import kotlinx.coroutines.delay import kotlinx.coroutines.launch -import org.jetbrains.exposed.sql.exposedLogger +import org.jetbrains.exposed.v1.core.exposedLogger import org.slf4j.LoggerFactory private var createJwtUser: String = "" diff --git a/newm-chain/src/main/kotlin/io/newm/chain/daemon/BlockDaemon.kt b/newm-chain/src/main/kotlin/io/newm/chain/daemon/BlockDaemon.kt index 6bca2fb9a..40d7a43e7 100644 --- a/newm-chain/src/main/kotlin/io/newm/chain/daemon/BlockDaemon.kt +++ b/newm-chain/src/main/kotlin/io/newm/chain/daemon/BlockDaemon.kt @@ -68,10 +68,10 @@ import kotlinx.coroutines.delay import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import org.jetbrains.exposed.sql.SqlExpressionBuilder.greaterEq -import org.jetbrains.exposed.sql.batchInsert -import org.jetbrains.exposed.sql.deleteWhere -import org.jetbrains.exposed.sql.transactions.experimental.newSuspendedTransaction +import org.jetbrains.exposed.v1.core.greaterEq +import org.jetbrains.exposed.v1.jdbc.batchInsert +import org.jetbrains.exposed.v1.jdbc.deleteWhere +import org.jetbrains.exposed.v1.jdbc.transactions.suspendTransaction class BlockDaemon( private val environment: ApplicationEnvironment, @@ -337,7 +337,7 @@ class BlockDaemon( var createTime = 0L var pruneTime = 0L measureTimeMillis { - newSuspendedTransaction { + suspendTransaction { warnLongQueriesDuration = 1000L val firstBlock = blocksToCommit.first().block as BlockPraos val lastBlock = blocksToCommit.last().block as BlockPraos @@ -731,8 +731,8 @@ class BlockDaemon( ) // Update the db for native asset changes - NativeAssetMonitorLogTable.batchInsert(batch, shouldReturnGeneratedValues = false) { - this[NativeAssetMonitorLogTable.monitorNativeAssetsResponseBytes] = it + NativeAssetMonitorLogTable.batchInsert(data = batch, shouldReturnGeneratedValues = false) { responseBytes -> + this[NativeAssetMonitorLogTable.monitorNativeAssetsResponseBytes] = responseBytes this[NativeAssetMonitorLogTable.blockNumber] = block.height } } diff --git a/newm-chain/src/main/kotlin/io/newm/chain/daemon/MonitorAddressDaemon.kt b/newm-chain/src/main/kotlin/io/newm/chain/daemon/MonitorAddressDaemon.kt index da25b2503..92218f7c3 100644 --- a/newm-chain/src/main/kotlin/io/newm/chain/daemon/MonitorAddressDaemon.kt +++ b/newm-chain/src/main/kotlin/io/newm/chain/daemon/MonitorAddressDaemon.kt @@ -51,12 +51,12 @@ import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.takeWhile import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq -import org.jetbrains.exposed.sql.SqlExpressionBuilder.greaterEq -import org.jetbrains.exposed.sql.and -import org.jetbrains.exposed.sql.batchInsert -import org.jetbrains.exposed.sql.deleteWhere -import org.jetbrains.exposed.sql.transactions.experimental.newSuspendedTransaction +import org.jetbrains.exposed.v1.core.and +import org.jetbrains.exposed.v1.core.eq +import org.jetbrains.exposed.v1.core.greaterEq +import org.jetbrains.exposed.v1.jdbc.batchInsert +import org.jetbrains.exposed.v1.jdbc.deleteWhere +import org.jetbrains.exposed.v1.jdbc.transactions.suspendTransaction class MonitorAddressDaemon( private val environment: ApplicationEnvironment, @@ -230,7 +230,7 @@ class MonitorAddressDaemon( val firstBlock = blocksToCommit.first() val latestBlock = blocksToCommit.last() measureTimeMillis { - newSuspendedTransaction { + suspendTransaction { warnLongQueriesDuration = 1000L rollbackTime += measureTimeMillis { @@ -443,9 +443,10 @@ class MonitorAddressDaemon( } AddressTxLogTable.batchInsert( - batch, + data = batch, shouldReturnGeneratedValues = false - ) { (monitorAddress, monitorAddressResponse) -> + ) { entry -> + val (monitorAddress, monitorAddressResponse) = entry this[AddressTxLogTable.blockNumber] = block.height this[AddressTxLogTable.address] = monitorAddress this[AddressTxLogTable.txId] = monitorAddressResponse.txId diff --git a/newm-chain/src/main/kotlin/io/newm/chain/database/DatabaseInit.kt b/newm-chain/src/main/kotlin/io/newm/chain/database/DatabaseInit.kt index 201775a3c..f6df159c2 100644 --- a/newm-chain/src/main/kotlin/io/newm/chain/database/DatabaseInit.kt +++ b/newm-chain/src/main/kotlin/io/newm/chain/database/DatabaseInit.kt @@ -11,8 +11,8 @@ import io.ktor.server.application.install import io.newm.chain.util.config.Config import io.newm.shared.ktx.getConfigString import java.util.Properties -import org.jetbrains.exposed.sql.Database -import org.jetbrains.exposed.sql.DatabaseConfig +import org.jetbrains.exposed.v1.core.DatabaseConfig +import org.jetbrains.exposed.v1.jdbc.Database fun Application.initializeDatabase() { Config.shelleyGenesisHash = environment.getConfigString("database.shelleyGenesisHash") diff --git a/newm-chain/src/main/kotlin/io/newm/chain/grpc/NewmChainService.kt b/newm-chain/src/main/kotlin/io/newm/chain/grpc/NewmChainService.kt index f3727ec11..9d241119b 100644 --- a/newm-chain/src/main/kotlin/io/newm/chain/grpc/NewmChainService.kt +++ b/newm-chain/src/main/kotlin/io/newm/chain/grpc/NewmChainService.kt @@ -12,6 +12,7 @@ import io.github.oshai.kotlinlogging.KotlinLogging import io.newm.chain.cardano.address.Address import io.newm.chain.cardano.address.AddressCredential import io.newm.chain.cardano.address.BIP32PublicKey +import io.newm.chain.database.repository.TransactionInfoIntegrityException import io.newm.chain.cardano.toLedgerAssetMetadataItem import io.newm.chain.database.repository.ChainRepository import io.newm.chain.database.repository.LedgerRepository @@ -42,6 +43,7 @@ import io.newm.txbuilder.ktx.cborHexToPlutusData import io.newm.txbuilder.ktx.verify import io.newm.txbuilder.ktx.withMinUtxo import io.sentry.Sentry +import io.grpc.Status import java.util.UUID import java.util.concurrent.ConcurrentHashMap import kotlin.experimental.and @@ -214,6 +216,33 @@ class NewmChainService : NewmChainGrpcKt.NewmChainCoroutineImplBase() { } } + override suspend fun queryTransactionInfo(request: QueryTransactionInfoRequest): QueryTransactionInfoResponse { + try { + return ledgerRepository.queryTransactionInfo(request.txId)?.let { transactionInfo -> + queryTransactionInfoResponse { + found = true + blockNumber = transactionInfo.blockNumber + slotNumber = transactionInfo.slotNumber + spentUtxos.addAll(transactionInfo.spentUtxos.map { utxo -> utxo.toRpcUtxo() }) + createdUtxos.addAll(transactionInfo.createdUtxos.map { utxo -> utxo.toRpcUtxo() }) + } + } ?: queryTransactionInfoResponse { + found = false + } + } catch (e: TransactionInfoIntegrityException) { + Sentry.addBreadcrumb(request.toString(), "NewmChainService") + log.error(e) { "queryTransactionInfo integrity error!" } + throw Status.INTERNAL + .withDescription(e.message ?: "queryTransactionInfo integrity error") + .withCause(e) + .asRuntimeException() + } catch (e: Throwable) { + Sentry.addBreadcrumb(request.toString(), "NewmChainService") + log.error(e) { "queryTransactionInfo error!" } + throw e + } + } + override suspend fun queryTip(request: QueryTipRequest): QueryTipResponse { try { return chainRepository.getTipInfo()?.let { tip -> diff --git a/newm-chain/src/test/kotlin/io/newm/chain/grpc/QueryTransactionInfoServiceTest.kt b/newm-chain/src/test/kotlin/io/newm/chain/grpc/QueryTransactionInfoServiceTest.kt new file mode 100644 index 000000000..54c2b3ab7 --- /dev/null +++ b/newm-chain/src/test/kotlin/io/newm/chain/grpc/QueryTransactionInfoServiceTest.kt @@ -0,0 +1,91 @@ +package io.newm.chain.grpc + +import com.google.common.truth.Truth.assertThat +import io.grpc.Status +import io.grpc.StatusRuntimeException +import io.mockk.every +import io.mockk.mockk +import io.newm.chain.database.repository.ChainRepository +import io.newm.chain.database.repository.LedgerRepository +import io.newm.chain.database.repository.TransactionInfoIntegrityException +import io.newm.chain.ledger.SubmittedTransactionCache +import io.newm.kogmios.protocols.model.Block +import kotlinx.coroutines.flow.MutableSharedFlow +import kotlinx.coroutines.runBlocking +import org.junit.jupiter.api.Test +import org.koin.core.context.startKoin +import org.koin.core.context.stopKoin +import org.koin.core.qualifier.named +import org.koin.dsl.module +import org.junit.jupiter.api.assertThrows + +class QueryTransactionInfoServiceTest { + @Test + fun `queryTransactionInfo returns found false when repository returns null`() = + runBlocking { + val ledgerRepository = mockk() + every { ledgerRepository.queryTransactionInfo("missing-tx") } returns null + + val response = withService(ledgerRepository) { service -> + service.queryTransactionInfo( + queryTransactionInfoRequest { + txId = "missing-tx" + } + ) + } + + assertThat(response.found).isFalse() + assertThat(response.blockNumber).isEqualTo(0L) + assertThat(response.slotNumber).isEqualTo(0L) + assertThat(response.spentUtxosCount).isEqualTo(0) + assertThat(response.createdUtxosCount).isEqualTo(0) + } + + @Test + fun `queryTransactionInfo maps integrity failures to grpc internal`() = + runBlocking { + val ledgerRepository = mockk() + every { ledgerRepository.queryTransactionInfo("bad-tx") } throws TransactionInfoIntegrityException("broken") + + val exception = + withService(ledgerRepository) { service -> + assertThrows { + runBlocking { + service.queryTransactionInfo( + queryTransactionInfoRequest { + txId = "bad-tx" + } + ) + } + } + } + + assertThat(exception.status.code).isEqualTo(Status.Code.INTERNAL) + assertThat(exception.status.description).isEqualTo("broken") + } + + private suspend fun withService( + ledgerRepository: LedgerRepository, + block: suspend (NewmChainService) -> T, + ): T { + stopKoin() + startKoin { + modules( + module { + single { mockk(relaxed = true) } + single { ledgerRepository } + single { mockk(relaxed = true) } + single { mockk(relaxed = true) } + single { mockk(relaxed = true) } + single(qualifier = named("confirmedBlockFlow")) { mockk>(relaxed = true) } + } + ) + } + + return try { + block(NewmChainService()) + } finally { + stopKoin() + } + } +} diff --git a/newm-server/src/main/kotlin/io/newm/server/auth/twofactor/database/TwoFactorAuthEntity.kt b/newm-server/src/main/kotlin/io/newm/server/auth/twofactor/database/TwoFactorAuthEntity.kt index 5b91f2810..748f98d8e 100644 --- a/newm-server/src/main/kotlin/io/newm/server/auth/twofactor/database/TwoFactorAuthEntity.kt +++ b/newm-server/src/main/kotlin/io/newm/server/auth/twofactor/database/TwoFactorAuthEntity.kt @@ -1,12 +1,12 @@ package io.newm.server.auth.twofactor.database -import org.jetbrains.exposed.dao.Entity -import org.jetbrains.exposed.dao.EntityClass -import org.jetbrains.exposed.dao.id.EntityID -import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq -import org.jetbrains.exposed.sql.SqlExpressionBuilder.lessEq -import org.jetbrains.exposed.sql.deleteWhere -import org.jetbrains.exposed.sql.lowerCase +import org.jetbrains.exposed.v1.dao.Entity +import org.jetbrains.exposed.v1.dao.EntityClass +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.core.eq +import org.jetbrains.exposed.v1.core.lessEq +import org.jetbrains.exposed.v1.jdbc.deleteWhere +import org.jetbrains.exposed.v1.core.lowerCase import java.time.LocalDateTime class TwoFactorAuthEntity( diff --git a/newm-server/src/main/kotlin/io/newm/server/auth/twofactor/database/TwoFactorAuthTable.kt b/newm-server/src/main/kotlin/io/newm/server/auth/twofactor/database/TwoFactorAuthTable.kt index 8e2861350..205cca8a0 100644 --- a/newm-server/src/main/kotlin/io/newm/server/auth/twofactor/database/TwoFactorAuthTable.kt +++ b/newm-server/src/main/kotlin/io/newm/server/auth/twofactor/database/TwoFactorAuthTable.kt @@ -1,8 +1,8 @@ package io.newm.server.auth.twofactor.database -import org.jetbrains.exposed.dao.id.LongIdTable -import org.jetbrains.exposed.sql.Column -import org.jetbrains.exposed.sql.javatime.datetime +import org.jetbrains.exposed.v1.core.dao.id.LongIdTable +import org.jetbrains.exposed.v1.core.Column +import org.jetbrains.exposed.v1.javatime.datetime import java.time.LocalDateTime object TwoFactorAuthTable : LongIdTable(name = "two_factor_auth") { diff --git a/newm-server/src/main/kotlin/io/newm/server/auth/twofactor/repo/TwoFactorAuthRepositoryImpl.kt b/newm-server/src/main/kotlin/io/newm/server/auth/twofactor/repo/TwoFactorAuthRepositoryImpl.kt index 608738276..967b5f88a 100644 --- a/newm-server/src/main/kotlin/io/newm/server/auth/twofactor/repo/TwoFactorAuthRepositoryImpl.kt +++ b/newm-server/src/main/kotlin/io/newm/server/auth/twofactor/repo/TwoFactorAuthRepositoryImpl.kt @@ -12,7 +12,7 @@ import io.newm.shared.ktx.getString import io.newm.shared.ktx.nextDigitCode import io.newm.shared.ktx.toHash import io.newm.shared.ktx.verify -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction import java.security.SecureRandom import java.time.LocalDateTime diff --git a/newm-server/src/main/kotlin/io/newm/server/config/database/ConfigEntity.kt b/newm-server/src/main/kotlin/io/newm/server/config/database/ConfigEntity.kt index 003149e97..e87f250bb 100644 --- a/newm-server/src/main/kotlin/io/newm/server/config/database/ConfigEntity.kt +++ b/newm-server/src/main/kotlin/io/newm/server/config/database/ConfigEntity.kt @@ -1,8 +1,8 @@ package io.newm.server.config.database -import org.jetbrains.exposed.dao.Entity -import org.jetbrains.exposed.dao.EntityClass -import org.jetbrains.exposed.dao.id.EntityID +import org.jetbrains.exposed.v1.dao.Entity +import org.jetbrains.exposed.v1.dao.EntityClass +import org.jetbrains.exposed.v1.core.dao.id.EntityID class ConfigEntity( id: EntityID diff --git a/newm-server/src/main/kotlin/io/newm/server/config/database/ConfigTable.kt b/newm-server/src/main/kotlin/io/newm/server/config/database/ConfigTable.kt index 04439ba19..5c9dd3875 100644 --- a/newm-server/src/main/kotlin/io/newm/server/config/database/ConfigTable.kt +++ b/newm-server/src/main/kotlin/io/newm/server/config/database/ConfigTable.kt @@ -1,8 +1,8 @@ package io.newm.server.config.database -import org.jetbrains.exposed.dao.id.EntityID -import org.jetbrains.exposed.dao.id.IdTable -import org.jetbrains.exposed.sql.Column +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.core.dao.id.IdTable +import org.jetbrains.exposed.v1.core.Column object ConfigTable : IdTable(name = "config") { override val id: Column> = text("id").entityId() diff --git a/newm-server/src/main/kotlin/io/newm/server/config/repo/ConfigRepositoryImpl.kt b/newm-server/src/main/kotlin/io/newm/server/config/repo/ConfigRepositoryImpl.kt index 29c38183f..d99e37cf1 100644 --- a/newm-server/src/main/kotlin/io/newm/server/config/repo/ConfigRepositoryImpl.kt +++ b/newm-server/src/main/kotlin/io/newm/server/config/repo/ConfigRepositoryImpl.kt @@ -10,7 +10,7 @@ import java.time.Duration import kotlinx.coroutines.runBlocking import kotlinx.serialization.json.Json import org.apache.commons.net.util.SubnetUtils -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction internal class ConfigRepositoryImpl : ConfigRepository { private val log by lazy { KotlinLogging.logger { } } diff --git a/newm-server/src/main/kotlin/io/newm/server/database/DatabaseInit.kt b/newm-server/src/main/kotlin/io/newm/server/database/DatabaseInit.kt index a82a441ee..cd92a270b 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/DatabaseInit.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/DatabaseInit.kt @@ -8,8 +8,8 @@ import com.zaxxer.hikari.HikariDataSource import io.ktor.server.application.Application import io.ktor.server.application.install import io.newm.shared.koin.inject -import org.jetbrains.exposed.sql.Database -import org.jetbrains.exposed.sql.DatabaseConfig +import org.jetbrains.exposed.v1.jdbc.Database +import org.jetbrains.exposed.v1.core.DatabaseConfig fun Application.initializeDatabase() { val hikariDataSource: HikariDataSource by inject() diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V10__CreateKeys.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V10__CreateKeys.kt index 443e25f7c..b7099f960 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V10__CreateKeys.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V10__CreateKeys.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V10__CreateKeys : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V11__SongsUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V11__SongsUpdates.kt index 14abee36a..1ade83f7c 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V11__SongsUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V11__SongsUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V11__SongsUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V12__UsersUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V12__UsersUpdates.kt index 4bd47e70f..12e4cc582 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V12__UsersUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V12__UsersUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V12__UsersUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V13__CreateConfig.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V13__CreateConfig.kt index bd7cf84fc..236e7a223 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V13__CreateConfig.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V13__CreateConfig.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V13__CreateConfig : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V14__CreateCollaborations.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V14__CreateCollaborations.kt index 7874e5916..33a37db1f 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V14__CreateCollaborations.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V14__CreateCollaborations.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V14__CreateCollaborations : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V15__SongsUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V15__SongsUpdates.kt index 327553e3a..895034134 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V15__SongsUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V15__SongsUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V15__SongsUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V16__SongsUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V16__SongsUpdates.kt index 902d16275..4b8f86dd5 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V16__SongsUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V16__SongsUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V16__SongsUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V17__CollaborationsUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V17__CollaborationsUpdates.kt index ffee36786..9b3dca2f6 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V17__CollaborationsUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V17__CollaborationsUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V17__CollaborationsUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V18__ConfigUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V18__ConfigUpdates.kt index 548ce130d..becd3692d 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V18__ConfigUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V18__ConfigUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V18__ConfigUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V19__CollaborationsUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V19__CollaborationsUpdates.kt index c5963dce6..b2972bfcc 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V19__CollaborationsUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V19__CollaborationsUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V19__CollaborationsUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V1__InitialCreation.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V1__InitialCreation.kt index d6fe86280..60e09b849 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V1__InitialCreation.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V1__InitialCreation.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V1__InitialCreation : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V20__SongsUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V20__SongsUpdates.kt index 8ea0c030c..68b47f623 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V20__SongsUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V20__SongsUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V20__SongsUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V21__CollaborationsUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V21__CollaborationsUpdates.kt index 2b32fb0c3..1661533e8 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V21__CollaborationsUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V21__CollaborationsUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V21__CollaborationsUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V22__CreateQuartzScheduler.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V22__CreateQuartzScheduler.kt index 918ac2baa..b7df869c7 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V22__CreateQuartzScheduler.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V22__CreateQuartzScheduler.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V22__CreateQuartzScheduler : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V23__ConfigUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V23__ConfigUpdates.kt index cf8883984..f3260b4cd 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V23__ConfigUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V23__ConfigUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V23__ConfigUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V24__UsersUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V24__UsersUpdates.kt index 7664be623..b5b321f00 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V24__UsersUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V24__UsersUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V24__UsersUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V25__SongsUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V25__SongsUpdates.kt index c9dc786f9..2f087e4d0 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V25__SongsUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V25__SongsUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V25__SongsUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V26__SongsUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V26__SongsUpdates.kt index f51ffbf8e..fd963829e 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V26__SongsUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V26__SongsUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V26__SongsUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V27__ConfigUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V27__ConfigUpdates.kt index 484569714..2547d252e 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V27__ConfigUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V27__ConfigUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V27__ConfigUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V28__UsersUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V28__UsersUpdates.kt index 229abbc37..9f0dd0637 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V28__UsersUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V28__UsersUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V28__UsersUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V29__UsersUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V29__UsersUpdates.kt index 97b28fe5d..6c303bfd3 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V29__UsersUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V29__UsersUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V29__UsersUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V2__SongsUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V2__SongsUpdates.kt index dda7b778b..58b4dbff7 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V2__SongsUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V2__SongsUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V2__SongsUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V30__SongsUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V30__SongsUpdates.kt index 9647c85e6..d5a442eae 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V30__SongsUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V30__SongsUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V30__SongsUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V31__ConfigUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V31__ConfigUpdates.kt index fb9280df5..b64fe3a68 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V31__ConfigUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V31__ConfigUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V31__ConfigUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V32__SongsUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V32__SongsUpdates.kt index 399e62c29..d258dcfc7 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V32__SongsUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V32__SongsUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V32__SongsUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V33__SongsUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V33__SongsUpdates.kt index 3402809f0..71a092a4a 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V33__SongsUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V33__SongsUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V33__SongsUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V34__SongsUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V34__SongsUpdates.kt index 83b2407d9..e1ffbb8a9 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V34__SongsUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V34__SongsUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V34__SongsUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V35__SongsUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V35__SongsUpdates.kt index 790641d5b..2b2ed0dab 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V35__SongsUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V35__SongsUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V35__SongsUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V36__SongsUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V36__SongsUpdates.kt index e1f59eebd..14457aaa8 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V36__SongsUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V36__SongsUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V36__SongsUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V37__UsersUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V37__UsersUpdates.kt index 020ed0715..d92e25422 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V37__UsersUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V37__UsersUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V37__UsersUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V38__SongsUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V38__SongsUpdates.kt index caf6f61a2..d2a71a43b 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V38__SongsUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V38__SongsUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V38__SongsUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V39__ConfigUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V39__ConfigUpdates.kt index c4aa43c08..49c13c6c2 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V39__ConfigUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V39__ConfigUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V39__ConfigUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V3__SongsUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V3__SongsUpdates.kt index ae23d141d..c0965775a 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V3__SongsUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V3__SongsUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V3__SongsUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V40__SongsUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V40__SongsUpdates.kt index c8d1a8c0c..71760d979 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V40__SongsUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V40__SongsUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V40__SongsUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V41__CreateSongReceipts.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V41__CreateSongReceipts.kt index ad55796ba..ad66fbd5c 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V41__CreateSongReceipts.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V41__CreateSongReceipts.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V41__CreateSongReceipts : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V42__UsersUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V42__UsersUpdates.kt index fb531c23c..03e95bde4 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V42__UsersUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V42__UsersUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V42__UsersUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V43__UsersUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V43__UsersUpdates.kt index d4275a64b..dca8492aa 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V43__UsersUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V43__UsersUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V43__UsersUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V44__CascadeFixes.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V44__CascadeFixes.kt index bf6b9e6f9..a619dcf79 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V44__CascadeFixes.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V44__CascadeFixes.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V44__CascadeFixes : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V45__CreateEarnings.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V45__CreateEarnings.kt index b7c97d638..063641d13 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V45__CreateEarnings.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V45__CreateEarnings.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V45__CreateEarnings : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V46__SongsUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V46__SongsUpdates.kt index 8b41c4f09..3f4a441d7 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V46__SongsUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V46__SongsUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V46__SongsUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V47__CollaborationsUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V47__CollaborationsUpdates.kt index 71f3a9aa5..2753cfb98 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V47__CollaborationsUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V47__CollaborationsUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V47__CollaborationsUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V48__CreateSongErrorHistory.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V48__CreateSongErrorHistory.kt index fb62f9c07..d6dd64691 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V48__CreateSongErrorHistory.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V48__CreateSongErrorHistory.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V48__CreateSongErrorHistory : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V49__SongsUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V49__SongsUpdates.kt index 96204868d..da4cbf28b 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V49__SongsUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V49__SongsUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V49__SongsUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V4__SongsUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V4__SongsUpdates.kt index 7ad7c9919..bd6380a5a 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V4__SongsUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V4__SongsUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V4__SongsUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V50__CreateWalletConnections.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V50__CreateWalletConnections.kt index 522d57d4a..c708580c4 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V50__CreateWalletConnections.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V50__CreateWalletConnections.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V50__CreateWalletConnections : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V51__WalletConnectionsUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V51__WalletConnectionsUpdates.kt index e5b5a3e61..0caa10b54 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V51__WalletConnectionsUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V51__WalletConnectionsUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V51__WalletConnectionsUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V52__CreateMarketplace.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V52__CreateMarketplace.kt index d243a4423..6bc02a9dc 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V52__CreateMarketplace.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V52__CreateMarketplace.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V52__CreateMarketplace : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V53__CreateReleases.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V53__CreateReleases.kt index f36764b05..7c78ef00c 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V53__CreateReleases.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V53__CreateReleases.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction class V53__CreateReleases : BaseJavaMigration() { override fun migrate(context: Context?) { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V54__MarketplaceUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V54__MarketplaceUpdates.kt index 982fa459f..6588af7a9 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V54__MarketplaceUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V54__MarketplaceUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V54__MarketplaceUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V55__ConfigUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V55__ConfigUpdates.kt index 8217b1e83..e432d6605 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V55__ConfigUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V55__ConfigUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V55__ConfigUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V56__UserSongMarketplaceUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V56__UserSongMarketplaceUpdates.kt index 85572c506..4c952913d 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V56__UserSongMarketplaceUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V56__UserSongMarketplaceUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V56__UserSongMarketplaceUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V57__ConfigUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V57__ConfigUpdates.kt index b82f08964..3d8ef505b 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V57__ConfigUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V57__ConfigUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V57__ConfigUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V58__ReleasesUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V58__ReleasesUpdates.kt index 812b85915..5e300629a 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V58__ReleasesUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V58__ReleasesUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V58__ReleasesUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V59__MarketplaceUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V59__MarketplaceUpdates.kt index d633bc53d..f6846ab1f 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V59__MarketplaceUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V59__MarketplaceUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V59__MarketplaceUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V5__SongsUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V5__SongsUpdates.kt index faf729629..71ebc38e2 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V5__SongsUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V5__SongsUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V5__SongsUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V60__EarningsUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V60__EarningsUpdates.kt index f24d91bc0..5c2f4bdb3 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V60__EarningsUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V60__EarningsUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V60__EarningsUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V61__CreateScriptAddressWhitelist.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V61__CreateScriptAddressWhitelist.kt index 3a4ce217d..17b55d4c5 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V61__CreateScriptAddressWhitelist.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V61__CreateScriptAddressWhitelist.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V61__CreateScriptAddressWhitelist : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V62__ConfigUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V62__ConfigUpdates.kt index b06e14046..344d7cf74 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V62__ConfigUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V62__ConfigUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V62__ConfigUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V63__UsersUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V63__UsersUpdates.kt index b736ff188..5954c8b71 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V63__UsersUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V63__UsersUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V63__UsersUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V64__ConfigUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V64__ConfigUpdates.kt index 90187c4fe..3a8416cb5 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V64__ConfigUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V64__ConfigUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V64__ConfigUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V65__JwtsDrop.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V65__JwtsDrop.kt index 4c28a83b1..5e9d1d40e 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V65__JwtsDrop.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V65__JwtsDrop.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V65__JwtsDrop : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V66__MarketplaceUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V66__MarketplaceUpdates.kt index b4941c766..396b5f05a 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V66__MarketplaceUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V66__MarketplaceUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V66__MarketplaceUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V67__SongsReleasesUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V67__SongsReleasesUpdates.kt index 9ad616476..caee96461 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V67__SongsReleasesUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V67__SongsReleasesUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V67__SongsReleasesUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V68__CreateMintingStatusHistory.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V68__CreateMintingStatusHistory.kt index 5e305d0ac..8da6dc5b9 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V68__CreateMintingStatusHistory.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V68__CreateMintingStatusHistory.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V68__CreateMintingStatusHistory : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V69__MarketplaceUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V69__MarketplaceUpdates.kt index 6c5915310..d15e2a930 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V69__MarketplaceUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V69__MarketplaceUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V69__MarketplaceUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V6__UsersUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V6__UsersUpdates.kt index e5f869b8c..5fde29464 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V6__UsersUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V6__UsersUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V6__UsersUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V70__MarketplaceUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V70__MarketplaceUpdates.kt index b8d8e8993..f2b6411ab 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V70__MarketplaceUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V70__MarketplaceUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V70__MarketplaceUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V71__MarketplaceUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V71__MarketplaceUpdates.kt index 30ece1cfb..534c82c8d 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V71__MarketplaceUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V71__MarketplaceUpdates.kt @@ -4,7 +4,7 @@ import io.newm.chain.util.extractStakeKeyHex import io.newm.server.features.marketplace.database.MarketplaceSaleEntity import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V71__MarketplaceUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V72__CreateSongSmartLinks.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V72__CreateSongSmartLinks.kt index 844941e05..b86e7ddb3 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V72__CreateSongSmartLinks.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V72__CreateSongSmartLinks.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V72__CreateSongSmartLinks : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V73__UsersUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V73__UsersUpdates.kt index f570b0da4..24bb7d0d2 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V73__UsersUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V73__UsersUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V73__UsersUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V74__UsersUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V74__UsersUpdates.kt index 7fa580b63..e47f0de9e 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V74__UsersUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V74__UsersUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V74__UsersUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V75__ConfigUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V75__ConfigUpdates.kt index a64ab9fc6..317dded3e 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V75__ConfigUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V75__ConfigUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V75__ConfigUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V76__CollaborationsUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V76__CollaborationsUpdates.kt index 54e144401..cd541701d 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V76__CollaborationsUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V76__CollaborationsUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V76__CollaborationsUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V77__ConfigUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V77__ConfigUpdates.kt index b535ca534..cc77409ea 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V77__ConfigUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V77__ConfigUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V77__ConfigUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V78__ReleasesUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V78__ReleasesUpdates.kt index eabe69840..3f3e40402 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V78__ReleasesUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V78__ReleasesUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V78__ReleasesUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V79__ConfigUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V79__ConfigUpdates.kt index e1fc4cd9a..64854ce81 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V79__ConfigUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V79__ConfigUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V79__ConfigUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V7__UsersUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V7__UsersUpdates.kt index 454a287da..fcf84a23e 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V7__UsersUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V7__UsersUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V7__UsersUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V80__ConfigUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V80__ConfigUpdates.kt index 93276213b..4597222af 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V80__ConfigUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V80__ConfigUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V80__ConfigUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V81__ConfigUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V81__ConfigUpdates.kt index 5e0b7104c..1dffa353d 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V81__ConfigUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V81__ConfigUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V81__ConfigUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V82__UsersUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V82__UsersUpdates.kt index c8f0e0ac7..37264578a 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V82__UsersUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V82__UsersUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V82__UsersUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V83__ConfigUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V83__ConfigUpdates.kt index 1860a7d40..50af5445b 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V83__ConfigUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V83__ConfigUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V83__ConfigUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V84__ConfigUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V84__ConfigUpdates.kt index 0d683c778..dfc832558 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V84__ConfigUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V84__ConfigUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V84__ConfigUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V85__WalletConnectionsUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V85__WalletConnectionsUpdates.kt index 65911763b..c8ed4ed5a 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V85__WalletConnectionsUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V85__WalletConnectionsUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V85__WalletConnectionsUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V8__SongsUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V8__SongsUpdates.kt index 95e00641e..50c8f72ed 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V8__SongsUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V8__SongsUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V8__SongsUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/database/migration/V9__UsersUpdates.kt b/newm-server/src/main/kotlin/io/newm/server/database/migration/V9__UsersUpdates.kt index eba17ab1d..d192160ef 100644 --- a/newm-server/src/main/kotlin/io/newm/server/database/migration/V9__UsersUpdates.kt +++ b/newm-server/src/main/kotlin/io/newm/server/database/migration/V9__UsersUpdates.kt @@ -2,7 +2,7 @@ package io.newm.server.database.migration import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction @Suppress("unused") class V9__UsersUpdates : BaseJavaMigration() { diff --git a/newm-server/src/main/kotlin/io/newm/server/features/cardano/database/KeyEntity.kt b/newm-server/src/main/kotlin/io/newm/server/features/cardano/database/KeyEntity.kt index fcea92c8f..8735f0021 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/cardano/database/KeyEntity.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/cardano/database/KeyEntity.kt @@ -3,16 +3,16 @@ package io.newm.server.features.cardano.database import io.newm.chain.util.hexToByteArray import io.newm.server.features.cardano.model.Key import io.newm.server.features.cardano.model.KeyFilters -import org.jetbrains.exposed.dao.UUIDEntity -import org.jetbrains.exposed.dao.UUIDEntityClass -import org.jetbrains.exposed.dao.id.EntityID -import org.jetbrains.exposed.sql.AndOp -import org.jetbrains.exposed.sql.Op -import org.jetbrains.exposed.sql.SizedIterable -import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq -import org.jetbrains.exposed.sql.SqlExpressionBuilder.greater -import org.jetbrains.exposed.sql.SqlExpressionBuilder.inList -import org.jetbrains.exposed.sql.SqlExpressionBuilder.less +import org.jetbrains.exposed.v1.dao.java.UUIDEntity +import org.jetbrains.exposed.v1.dao.java.UUIDEntityClass +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.core.AndOp +import org.jetbrains.exposed.v1.core.Op +import org.jetbrains.exposed.v1.jdbc.SizedIterable +import org.jetbrains.exposed.v1.core.eq +import org.jetbrains.exposed.v1.core.greater +import org.jetbrains.exposed.v1.core.inList +import org.jetbrains.exposed.v1.core.less import java.time.LocalDateTime import java.util.* diff --git a/newm-server/src/main/kotlin/io/newm/server/features/cardano/database/KeyTable.kt b/newm-server/src/main/kotlin/io/newm/server/features/cardano/database/KeyTable.kt index a2eb257d8..38f428147 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/cardano/database/KeyTable.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/cardano/database/KeyTable.kt @@ -1,9 +1,9 @@ package io.newm.server.features.cardano.database -import org.jetbrains.exposed.dao.id.UUIDTable -import org.jetbrains.exposed.sql.Column -import org.jetbrains.exposed.sql.javatime.CurrentDateTime -import org.jetbrains.exposed.sql.javatime.datetime +import org.jetbrains.exposed.v1.core.dao.id.java.UUIDTable +import org.jetbrains.exposed.v1.core.Column +import org.jetbrains.exposed.v1.javatime.CurrentDateTime +import org.jetbrains.exposed.v1.javatime.datetime import java.time.LocalDateTime object KeyTable : UUIDTable(name = "keys") { diff --git a/newm-server/src/main/kotlin/io/newm/server/features/cardano/database/ScriptAddressWhitelistEntity.kt b/newm-server/src/main/kotlin/io/newm/server/features/cardano/database/ScriptAddressWhitelistEntity.kt index ef8ff28be..4bff3aabc 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/cardano/database/ScriptAddressWhitelistEntity.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/cardano/database/ScriptAddressWhitelistEntity.kt @@ -1,9 +1,9 @@ package io.newm.server.features.cardano.database import java.util.UUID -import org.jetbrains.exposed.dao.UUIDEntity -import org.jetbrains.exposed.dao.UUIDEntityClass -import org.jetbrains.exposed.dao.id.EntityID +import org.jetbrains.exposed.v1.dao.java.UUIDEntity +import org.jetbrains.exposed.v1.dao.java.UUIDEntityClass +import org.jetbrains.exposed.v1.core.dao.id.EntityID class ScriptAddressWhitelistEntity( id: EntityID diff --git a/newm-server/src/main/kotlin/io/newm/server/features/cardano/database/ScriptAddressWhitelistTable.kt b/newm-server/src/main/kotlin/io/newm/server/features/cardano/database/ScriptAddressWhitelistTable.kt index c98d36720..a8fd9e5ae 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/cardano/database/ScriptAddressWhitelistTable.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/cardano/database/ScriptAddressWhitelistTable.kt @@ -1,7 +1,7 @@ package io.newm.server.features.cardano.database -import org.jetbrains.exposed.dao.id.UUIDTable -import org.jetbrains.exposed.sql.Column +import org.jetbrains.exposed.v1.core.dao.id.java.UUIDTable +import org.jetbrains.exposed.v1.core.Column object ScriptAddressWhitelistTable : UUIDTable(name = "script_address_whitelist") { // scriptAddress that is allowed to pull earnings. We prevent anything sitting in some smart contracts from pulling diff --git a/newm-server/src/main/kotlin/io/newm/server/features/cardano/repo/CardanoRepositoryImpl.kt b/newm-server/src/main/kotlin/io/newm/server/features/cardano/repo/CardanoRepositoryImpl.kt index e79940811..c14eef8a8 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/cardano/repo/CardanoRepositoryImpl.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/cardano/repo/CardanoRepositoryImpl.kt @@ -95,8 +95,9 @@ import io.newm.txbuilder.ktx.toNativeAssetMap import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock -import org.jetbrains.exposed.sql.transactions.experimental.newSuspendedTransaction -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.core.eq +import org.jetbrains.exposed.v1.jdbc.transactions.suspendTransaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction import org.springframework.security.crypto.encrypt.BytesEncryptor import org.springframework.security.crypto.encrypt.Encryptors import software.amazon.awssdk.core.SdkBytes @@ -651,7 +652,7 @@ internal class CardanoRepositoryImpl( userId: UserId, getAssetsByAddress: suspend (String) -> List ): List = - newSuspendedTransaction { + suspendTransaction { WalletConnectionEntity.getAllByUserIdAndWalletChain(userId, WalletChain.Cardano).toList() }.map { connection -> connection.id.value to getAssetsByAddress(connection.address) diff --git a/newm-server/src/main/kotlin/io/newm/server/features/collaboration/database/CollaborationEntity.kt b/newm-server/src/main/kotlin/io/newm/server/features/collaboration/database/CollaborationEntity.kt index cb3dc81d0..8a027c4ad 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/collaboration/database/CollaborationEntity.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/collaboration/database/CollaborationEntity.kt @@ -10,28 +10,29 @@ import io.newm.server.features.user.database.UserTable import io.newm.server.typealiases.SongId import io.newm.server.typealiases.UserId import io.newm.shared.ktx.exists -import org.jetbrains.exposed.dao.UUIDEntity -import org.jetbrains.exposed.dao.UUIDEntityClass -import org.jetbrains.exposed.dao.id.EntityID -import org.jetbrains.exposed.sql.AndOp -import org.jetbrains.exposed.sql.Op -import org.jetbrains.exposed.sql.SizedIterable -import org.jetbrains.exposed.sql.SortOrder -import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq -import org.jetbrains.exposed.sql.SqlExpressionBuilder.greater -import org.jetbrains.exposed.sql.SqlExpressionBuilder.inList -import org.jetbrains.exposed.sql.SqlExpressionBuilder.less -import org.jetbrains.exposed.sql.SqlExpressionBuilder.like -import org.jetbrains.exposed.sql.SqlExpressionBuilder.neq -import org.jetbrains.exposed.sql.SqlExpressionBuilder.notInList -import org.jetbrains.exposed.sql.and -import org.jetbrains.exposed.sql.count -import org.jetbrains.exposed.sql.innerJoin -import org.jetbrains.exposed.sql.leftJoin -import org.jetbrains.exposed.sql.lowerCase -import org.jetbrains.exposed.sql.mapLazy -import org.jetbrains.exposed.sql.or -import org.jetbrains.exposed.sql.selectAll +import org.jetbrains.exposed.v1.dao.java.UUIDEntity +import org.jetbrains.exposed.v1.dao.java.UUIDEntityClass +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.core.AndOp +import org.jetbrains.exposed.v1.core.Op +import org.jetbrains.exposed.v1.jdbc.SizedIterable +import org.jetbrains.exposed.v1.core.SortOrder +import org.jetbrains.exposed.v1.core.eq +import org.jetbrains.exposed.v1.core.greater +import org.jetbrains.exposed.v1.core.inList +import org.jetbrains.exposed.v1.core.less +import org.jetbrains.exposed.v1.core.like +import org.jetbrains.exposed.v1.core.neq +import org.jetbrains.exposed.v1.core.notInList +import org.jetbrains.exposed.v1.core.and +import org.jetbrains.exposed.v1.core.count +import org.jetbrains.exposed.v1.core.innerJoin +import org.jetbrains.exposed.v1.core.leftJoin +import org.jetbrains.exposed.v1.core.lowerCase +import org.jetbrains.exposed.v1.jdbc.mapLazy +import org.jetbrains.exposed.v1.core.or +import org.jetbrains.exposed.v1.jdbc.select +import org.jetbrains.exposed.v1.jdbc.selectAll import java.time.LocalDateTime import java.util.UUID diff --git a/newm-server/src/main/kotlin/io/newm/server/features/collaboration/database/CollaborationTable.kt b/newm-server/src/main/kotlin/io/newm/server/features/collaboration/database/CollaborationTable.kt index d6f790e6d..120768dfe 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/collaboration/database/CollaborationTable.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/collaboration/database/CollaborationTable.kt @@ -4,12 +4,12 @@ import io.newm.server.features.collaboration.model.CollaborationStatus import io.newm.server.features.song.database.SongTable import io.newm.server.typealiases.SongId import io.newm.shared.exposed.textArray -import org.jetbrains.exposed.dao.id.EntityID -import org.jetbrains.exposed.dao.id.UUIDTable -import org.jetbrains.exposed.sql.Column -import org.jetbrains.exposed.sql.ReferenceOption -import org.jetbrains.exposed.sql.javatime.CurrentDateTime -import org.jetbrains.exposed.sql.javatime.datetime +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.core.dao.id.java.UUIDTable +import org.jetbrains.exposed.v1.core.Column +import org.jetbrains.exposed.v1.core.ReferenceOption +import org.jetbrains.exposed.v1.javatime.CurrentDateTime +import org.jetbrains.exposed.v1.javatime.datetime import java.time.LocalDateTime object CollaborationTable : UUIDTable(name = "collaborations") { diff --git a/newm-server/src/main/kotlin/io/newm/server/features/collaboration/model/CollaborationFilters.kt b/newm-server/src/main/kotlin/io/newm/server/features/collaboration/model/CollaborationFilters.kt index f028f7f49..abf38c018 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/collaboration/model/CollaborationFilters.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/collaboration/model/CollaborationFilters.kt @@ -9,7 +9,7 @@ import io.newm.server.ktx.songIds import io.newm.server.ktx.sortOrder import io.newm.server.model.FilterCriteria import io.newm.server.model.toFilterCriteria -import org.jetbrains.exposed.sql.SortOrder +import org.jetbrains.exposed.v1.core.SortOrder import java.time.LocalDateTime import java.util.UUID diff --git a/newm-server/src/main/kotlin/io/newm/server/features/collaboration/model/CollaboratorFilters.kt b/newm-server/src/main/kotlin/io/newm/server/features/collaboration/model/CollaboratorFilters.kt index f5c091f98..972d64688 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/collaboration/model/CollaboratorFilters.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/collaboration/model/CollaboratorFilters.kt @@ -6,7 +6,7 @@ import io.newm.server.ktx.phrase import io.newm.server.ktx.songIds import io.newm.server.ktx.sortOrder import io.newm.server.model.FilterCriteria -import org.jetbrains.exposed.sql.SortOrder +import org.jetbrains.exposed.v1.core.SortOrder import java.util.UUID data class CollaboratorFilters( diff --git a/newm-server/src/main/kotlin/io/newm/server/features/collaboration/repo/CollaborationRepositoryImpl.kt b/newm-server/src/main/kotlin/io/newm/server/features/collaboration/repo/CollaborationRepositoryImpl.kt index 41770af5d..cb536318b 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/collaboration/repo/CollaborationRepositoryImpl.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/collaboration/repo/CollaborationRepositoryImpl.kt @@ -24,9 +24,9 @@ import io.newm.shared.exception.HttpForbiddenException import io.newm.shared.exception.HttpUnprocessableEntityException import io.newm.shared.ktx.getConfigString import io.newm.shared.ktx.millisToMinutesSecondsString -import org.jetbrains.exposed.dao.id.EntityID -import org.jetbrains.exposed.sql.Transaction -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.core.Transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction import java.util.UUID internal class CollaborationRepositoryImpl( diff --git a/newm-server/src/main/kotlin/io/newm/server/features/earnings/daemon/MonitorClaimOrderJob.kt b/newm-server/src/main/kotlin/io/newm/server/features/earnings/daemon/MonitorClaimOrderJob.kt index 146aa72fa..d74f292b8 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/earnings/daemon/MonitorClaimOrderJob.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/earnings/daemon/MonitorClaimOrderJob.kt @@ -33,7 +33,7 @@ import java.time.ZoneOffset import kotlin.time.Duration.Companion.minutes import kotlinx.coroutines.delay import kotlinx.coroutines.runBlocking -import org.jetbrains.exposed.sql.transactions.experimental.newSuspendedTransaction +import org.jetbrains.exposed.v1.jdbc.transactions.suspendTransaction import org.quartz.Job import org.quartz.JobExecutionContext import org.quartz.JobExecutionException @@ -211,7 +211,7 @@ class MonitorClaimOrderJob : Job { val submitTransactionResponse = cardanoRepository.submitTransaction(transactionBuilderResponse.transactionCbor) if (submitTransactionResponse.result == "MsgAcceptTx") { - newSuspendedTransaction { + suspendTransaction { earningsRepository.claimed( claimOrderId = claimOrder.id!!, earningsIds = claimOrder.earningsIds diff --git a/newm-server/src/main/kotlin/io/newm/server/features/earnings/database/ClaimOrderEntity.kt b/newm-server/src/main/kotlin/io/newm/server/features/earnings/database/ClaimOrderEntity.kt index 3c625f0cc..3a9877b95 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/earnings/database/ClaimOrderEntity.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/earnings/database/ClaimOrderEntity.kt @@ -3,9 +3,9 @@ package io.newm.server.features.earnings.database import io.newm.server.features.earnings.model.ClaimOrder import io.newm.server.features.earnings.model.ClaimOrderStatus import java.util.UUID -import org.jetbrains.exposed.dao.UUIDEntity -import org.jetbrains.exposed.dao.UUIDEntityClass -import org.jetbrains.exposed.dao.id.EntityID +import org.jetbrains.exposed.v1.dao.java.UUIDEntity +import org.jetbrains.exposed.v1.dao.java.UUIDEntityClass +import org.jetbrains.exposed.v1.core.dao.id.EntityID class ClaimOrderEntity( id: EntityID diff --git a/newm-server/src/main/kotlin/io/newm/server/features/earnings/database/ClaimOrdersTable.kt b/newm-server/src/main/kotlin/io/newm/server/features/earnings/database/ClaimOrdersTable.kt index 660a9f933..516a937b4 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/earnings/database/ClaimOrdersTable.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/earnings/database/ClaimOrdersTable.kt @@ -4,12 +4,12 @@ import io.newm.server.features.cardano.database.KeyTable import io.newm.shared.exposed.uuidArray import java.time.LocalDateTime import java.util.UUID -import org.jetbrains.exposed.dao.id.EntityID -import org.jetbrains.exposed.dao.id.UUIDTable -import org.jetbrains.exposed.sql.Column -import org.jetbrains.exposed.sql.ReferenceOption -import org.jetbrains.exposed.sql.javatime.CurrentDateTime -import org.jetbrains.exposed.sql.javatime.datetime +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.core.dao.id.java.UUIDTable +import org.jetbrains.exposed.v1.core.Column +import org.jetbrains.exposed.v1.core.ReferenceOption +import org.jetbrains.exposed.v1.javatime.CurrentDateTime +import org.jetbrains.exposed.v1.javatime.datetime object ClaimOrdersTable : UUIDTable(name = "claim_orders") { // The user's stake address diff --git a/newm-server/src/main/kotlin/io/newm/server/features/earnings/database/EarningEntity.kt b/newm-server/src/main/kotlin/io/newm/server/features/earnings/database/EarningEntity.kt index 05aaf7692..37ba79ed0 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/earnings/database/EarningEntity.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/earnings/database/EarningEntity.kt @@ -3,9 +3,9 @@ package io.newm.server.features.earnings.database import io.newm.server.features.earnings.model.Earning import io.newm.server.features.song.database.SongEntity import io.newm.server.typealiases.SongId -import org.jetbrains.exposed.dao.UUIDEntity -import org.jetbrains.exposed.dao.UUIDEntityClass -import org.jetbrains.exposed.dao.id.EntityID +import org.jetbrains.exposed.v1.dao.java.UUIDEntity +import org.jetbrains.exposed.v1.dao.java.UUIDEntityClass +import org.jetbrains.exposed.v1.core.dao.id.EntityID import java.time.LocalDateTime import java.util.UUID diff --git a/newm-server/src/main/kotlin/io/newm/server/features/earnings/database/EarningsTable.kt b/newm-server/src/main/kotlin/io/newm/server/features/earnings/database/EarningsTable.kt index 6739eedc1..e067050fd 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/earnings/database/EarningsTable.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/earnings/database/EarningsTable.kt @@ -2,12 +2,12 @@ package io.newm.server.features.earnings.database import io.newm.server.features.song.database.SongTable import io.newm.server.typealiases.SongId -import org.jetbrains.exposed.dao.id.EntityID -import org.jetbrains.exposed.dao.id.UUIDTable -import org.jetbrains.exposed.sql.Column -import org.jetbrains.exposed.sql.ReferenceOption -import org.jetbrains.exposed.sql.javatime.CurrentDateTime -import org.jetbrains.exposed.sql.javatime.datetime +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.core.dao.id.java.UUIDTable +import org.jetbrains.exposed.v1.core.Column +import org.jetbrains.exposed.v1.core.ReferenceOption +import org.jetbrains.exposed.v1.javatime.CurrentDateTime +import org.jetbrains.exposed.v1.javatime.datetime import java.time.LocalDateTime import java.util.UUID diff --git a/newm-server/src/main/kotlin/io/newm/server/features/earnings/repo/EarningsRepositoryImpl.kt b/newm-server/src/main/kotlin/io/newm/server/features/earnings/repo/EarningsRepositoryImpl.kt index a8221e040..aa54255b2 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/earnings/repo/EarningsRepositoryImpl.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/earnings/repo/EarningsRepositoryImpl.kt @@ -25,14 +25,14 @@ import io.newm.shared.koin.inject import io.newm.shared.ktx.toDate import io.newm.shared.ktx.toHexString import org.apache.curator.framework.recipes.locks.InterProcessMutex -import org.jetbrains.exposed.dao.id.EntityID -import org.jetbrains.exposed.sql.SortOrder -import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq -import org.jetbrains.exposed.sql.SqlExpressionBuilder.inList -import org.jetbrains.exposed.sql.and -import org.jetbrains.exposed.sql.batchInsert -import org.jetbrains.exposed.sql.transactions.experimental.newSuspendedTransaction -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.core.SortOrder +import org.jetbrains.exposed.v1.core.eq +import org.jetbrains.exposed.v1.core.inList +import org.jetbrains.exposed.v1.core.and +import org.jetbrains.exposed.v1.jdbc.batchInsert +import org.jetbrains.exposed.v1.jdbc.transactions.suspendTransaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction import org.koin.core.parameter.parametersOf import org.quartz.JobBuilder.newJob import org.quartz.JobKey @@ -226,7 +226,7 @@ class EarningsRepositoryImpl( private suspend fun createClaimOrderInternal(claimOrderRequest: ClaimOrderRequest): ClaimOrder? { val claimOrder = - newSuspendedTransaction { + suspendTransaction { val stakeAddress = claimOrderRequest.walletAddress.extractStakeAddress(cardanoRepository.isMainnet()) // check for existing open claim record first getActiveClaimOrderByStakeAddress(stakeAddress) ?: run { diff --git a/newm-server/src/main/kotlin/io/newm/server/features/ethereum/repo/EthereumRepositoryImpl.kt b/newm-server/src/main/kotlin/io/newm/server/features/ethereum/repo/EthereumRepositoryImpl.kt index 8e5216aeb..a81dfdfba 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/ethereum/repo/EthereumRepositoryImpl.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/ethereum/repo/EthereumRepositoryImpl.kt @@ -17,7 +17,7 @@ import io.newm.server.ktx.checkedBody import io.newm.server.ktx.getSecureConfigString import io.newm.server.typealiases.UserId import io.newm.shared.ktx.getConfigString -import org.jetbrains.exposed.sql.transactions.experimental.newSuspendedTransaction +import org.jetbrains.exposed.v1.jdbc.transactions.suspendTransaction internal class EthereumRepositoryImpl( private val client: HttpClient, @@ -28,7 +28,7 @@ internal class EthereumRepositoryImpl( override suspend fun getWalletNftSongs(userId: UserId): List { logger.debug { "getWalletNftSongs: userId = $userId" } - val connections = newSuspendedTransaction { + val connections = suspendTransaction { WalletConnectionEntity.getAllByUserIdAndWalletChain(userId, WalletChain.Ethereum).toList() } val apiUrl = environment.getConfigString("alchemy.apiUrl") diff --git a/newm-server/src/main/kotlin/io/newm/server/features/idenfy/repo/IdenfyRepositoryImpl.kt b/newm-server/src/main/kotlin/io/newm/server/features/idenfy/repo/IdenfyRepositoryImpl.kt index f98bd6aba..a567d35fa 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/idenfy/repo/IdenfyRepositoryImpl.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/idenfy/repo/IdenfyRepositoryImpl.kt @@ -15,7 +15,7 @@ import io.newm.server.ktx.checkedBody import io.newm.server.ktx.getSecureString import io.newm.server.typealiases.UserId import io.newm.shared.ktx.* -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction import java.util.* class IdenfyRepositoryImpl( diff --git a/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplaceArtistEntity.kt b/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplaceArtistEntity.kt index bad33474a..28460ed77 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplaceArtistEntity.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplaceArtistEntity.kt @@ -7,19 +7,21 @@ import io.newm.server.features.song.model.MintingStatus import io.newm.server.features.user.database.UserEntity import io.newm.server.features.user.database.UserTable import io.newm.server.typealiases.UserId -import org.jetbrains.exposed.dao.UUIDEntityClass -import org.jetbrains.exposed.dao.id.EntityID -import org.jetbrains.exposed.sql.AndOp -import org.jetbrains.exposed.sql.Op -import org.jetbrains.exposed.sql.SizedIterable -import org.jetbrains.exposed.sql.SortOrder -import org.jetbrains.exposed.sql.SqlExpressionBuilder.greater -import org.jetbrains.exposed.sql.SqlExpressionBuilder.inList -import org.jetbrains.exposed.sql.SqlExpressionBuilder.less -import org.jetbrains.exposed.sql.SqlExpressionBuilder.notInList -import org.jetbrains.exposed.sql.and -import org.jetbrains.exposed.sql.innerJoin -import org.jetbrains.exposed.sql.mapLazy +import org.jetbrains.exposed.v1.dao.java.UUIDEntityClass +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.core.AndOp +import org.jetbrains.exposed.v1.core.Op +import org.jetbrains.exposed.v1.jdbc.SizedIterable +import org.jetbrains.exposed.v1.core.SortOrder +import org.jetbrains.exposed.v1.core.eq +import org.jetbrains.exposed.v1.core.greater +import org.jetbrains.exposed.v1.core.inList +import org.jetbrains.exposed.v1.core.less +import org.jetbrains.exposed.v1.core.notInList +import org.jetbrains.exposed.v1.core.and +import org.jetbrains.exposed.v1.core.innerJoin +import org.jetbrains.exposed.v1.jdbc.mapLazy +import org.jetbrains.exposed.v1.jdbc.select class MarketplaceArtistEntity( id: EntityID diff --git a/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplaceBookmarkEntity.kt b/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplaceBookmarkEntity.kt index 6a9656b38..b9bef5dfe 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplaceBookmarkEntity.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplaceBookmarkEntity.kt @@ -2,9 +2,9 @@ package io.newm.server.features.marketplace.database import io.newm.chain.grpc.MonitorAddressResponse import io.newm.server.typealiases.BookmarkId -import org.jetbrains.exposed.dao.Entity -import org.jetbrains.exposed.dao.EntityClass -import org.jetbrains.exposed.dao.id.EntityID +import org.jetbrains.exposed.v1.dao.Entity +import org.jetbrains.exposed.v1.dao.EntityClass +import org.jetbrains.exposed.v1.core.dao.id.EntityID class MarketplaceBookmarkEntity( id: EntityID diff --git a/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplaceBookmarkTable.kt b/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplaceBookmarkTable.kt index de0d686d1..c04d12ab2 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplaceBookmarkTable.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplaceBookmarkTable.kt @@ -1,9 +1,9 @@ package io.newm.server.features.marketplace.database import io.newm.server.typealiases.BookmarkId -import org.jetbrains.exposed.dao.id.EntityID -import org.jetbrains.exposed.dao.id.IdTable -import org.jetbrains.exposed.sql.Column +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.core.dao.id.IdTable +import org.jetbrains.exposed.v1.core.Column object MarketplaceBookmarkTable : IdTable(name = "marketplace_bookmarks") { override val id: Column> = text("id").entityId() diff --git a/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplacePendingOrderEntity.kt b/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplacePendingOrderEntity.kt index 6900b6ab3..0225bd4e8 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplacePendingOrderEntity.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplacePendingOrderEntity.kt @@ -2,11 +2,11 @@ package io.newm.server.features.marketplace.database import io.newm.server.typealiases.PendingOrderId import io.newm.server.typealiases.SaleId -import org.jetbrains.exposed.dao.UUIDEntity -import org.jetbrains.exposed.dao.UUIDEntityClass -import org.jetbrains.exposed.dao.id.EntityID -import org.jetbrains.exposed.sql.SqlExpressionBuilder.lessEq -import org.jetbrains.exposed.sql.deleteWhere +import org.jetbrains.exposed.v1.dao.java.UUIDEntity +import org.jetbrains.exposed.v1.dao.java.UUIDEntityClass +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.core.lessEq +import org.jetbrains.exposed.v1.jdbc.deleteWhere import java.time.LocalDateTime class MarketplacePendingOrderEntity( diff --git a/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplacePendingOrderTable.kt b/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplacePendingOrderTable.kt index 9781bf680..82c39e30e 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplacePendingOrderTable.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplacePendingOrderTable.kt @@ -1,12 +1,12 @@ package io.newm.server.features.marketplace.database import io.newm.server.typealiases.SaleId -import org.jetbrains.exposed.dao.id.EntityID -import org.jetbrains.exposed.dao.id.UUIDTable -import org.jetbrains.exposed.sql.Column -import org.jetbrains.exposed.sql.ReferenceOption -import org.jetbrains.exposed.sql.javatime.CurrentDateTime -import org.jetbrains.exposed.sql.javatime.datetime +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.core.dao.id.java.UUIDTable +import org.jetbrains.exposed.v1.core.Column +import org.jetbrains.exposed.v1.core.ReferenceOption +import org.jetbrains.exposed.v1.javatime.CurrentDateTime +import org.jetbrains.exposed.v1.javatime.datetime import java.time.LocalDateTime object MarketplacePendingOrderTable : UUIDTable(name = "marketplace_pending_orders") { diff --git a/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplacePendingSaleEntity.kt b/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplacePendingSaleEntity.kt index 037ff6023..83d30d5c7 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplacePendingSaleEntity.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplacePendingSaleEntity.kt @@ -1,11 +1,11 @@ package io.newm.server.features.marketplace.database import io.newm.server.typealiases.PendingSaleId -import org.jetbrains.exposed.dao.UUIDEntity -import org.jetbrains.exposed.dao.UUIDEntityClass -import org.jetbrains.exposed.dao.id.EntityID -import org.jetbrains.exposed.sql.SqlExpressionBuilder.lessEq -import org.jetbrains.exposed.sql.deleteWhere +import org.jetbrains.exposed.v1.dao.java.UUIDEntity +import org.jetbrains.exposed.v1.dao.java.UUIDEntityClass +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.core.lessEq +import org.jetbrains.exposed.v1.jdbc.deleteWhere import java.time.LocalDateTime class MarketplacePendingSaleEntity( diff --git a/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplacePendingSaleTable.kt b/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplacePendingSaleTable.kt index 1adf12fba..71e617684 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplacePendingSaleTable.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplacePendingSaleTable.kt @@ -1,9 +1,9 @@ package io.newm.server.features.marketplace.database -import org.jetbrains.exposed.dao.id.UUIDTable -import org.jetbrains.exposed.sql.Column -import org.jetbrains.exposed.sql.javatime.CurrentDateTime -import org.jetbrains.exposed.sql.javatime.datetime +import org.jetbrains.exposed.v1.core.dao.id.java.UUIDTable +import org.jetbrains.exposed.v1.core.Column +import org.jetbrains.exposed.v1.javatime.CurrentDateTime +import org.jetbrains.exposed.v1.javatime.datetime import java.time.LocalDateTime object MarketplacePendingSaleTable : UUIDTable(name = "marketplace_pending_sales") { diff --git a/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplacePurchaseEntity.kt b/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplacePurchaseEntity.kt index 1f6457008..6a1cc7404 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplacePurchaseEntity.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplacePurchaseEntity.kt @@ -2,9 +2,9 @@ package io.newm.server.features.marketplace.database import io.newm.server.typealiases.PurchaseId import io.newm.server.typealiases.SaleId -import org.jetbrains.exposed.dao.UUIDEntity -import org.jetbrains.exposed.dao.UUIDEntityClass -import org.jetbrains.exposed.dao.id.EntityID +import org.jetbrains.exposed.v1.dao.java.UUIDEntity +import org.jetbrains.exposed.v1.dao.java.UUIDEntityClass +import org.jetbrains.exposed.v1.core.dao.id.EntityID import java.time.LocalDateTime class MarketplacePurchaseEntity( diff --git a/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplacePurchaseTable.kt b/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplacePurchaseTable.kt index c61c64e82..666f36bee 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplacePurchaseTable.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplacePurchaseTable.kt @@ -1,11 +1,11 @@ package io.newm.server.features.marketplace.database import io.newm.server.typealiases.SaleId -import org.jetbrains.exposed.dao.id.EntityID -import org.jetbrains.exposed.dao.id.UUIDTable -import org.jetbrains.exposed.sql.Column -import org.jetbrains.exposed.sql.ReferenceOption -import org.jetbrains.exposed.sql.javatime.datetime +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.core.dao.id.java.UUIDTable +import org.jetbrains.exposed.v1.core.Column +import org.jetbrains.exposed.v1.core.ReferenceOption +import org.jetbrains.exposed.v1.javatime.datetime import java.time.LocalDateTime object MarketplacePurchaseTable : UUIDTable(name = "marketplace_purchases") { diff --git a/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplaceSaleEntity.kt b/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplaceSaleEntity.kt index dabaa7ffe..752a1f864 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplaceSaleEntity.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplaceSaleEntity.kt @@ -22,24 +22,25 @@ import io.newm.server.typealiases.SaleId import io.newm.shared.exposed.notOverlaps import io.newm.shared.exposed.overlaps import io.newm.shared.koin.inject -import org.jetbrains.exposed.dao.UUIDEntity -import org.jetbrains.exposed.dao.UUIDEntityClass -import org.jetbrains.exposed.dao.id.EntityID -import org.jetbrains.exposed.sql.AndOp -import org.jetbrains.exposed.sql.Op -import org.jetbrains.exposed.sql.SizedIterable -import org.jetbrains.exposed.sql.SortOrder -import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq -import org.jetbrains.exposed.sql.SqlExpressionBuilder.greater -import org.jetbrains.exposed.sql.SqlExpressionBuilder.inList -import org.jetbrains.exposed.sql.SqlExpressionBuilder.less -import org.jetbrains.exposed.sql.SqlExpressionBuilder.like -import org.jetbrains.exposed.sql.SqlExpressionBuilder.notInList -import org.jetbrains.exposed.sql.and -import org.jetbrains.exposed.sql.innerJoin -import org.jetbrains.exposed.sql.lowerCase -import org.jetbrains.exposed.sql.mapLazy -import org.jetbrains.exposed.sql.or +import org.jetbrains.exposed.v1.dao.java.UUIDEntity +import org.jetbrains.exposed.v1.dao.java.UUIDEntityClass +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.core.AndOp +import org.jetbrains.exposed.v1.core.Op +import org.jetbrains.exposed.v1.jdbc.SizedIterable +import org.jetbrains.exposed.v1.core.SortOrder +import org.jetbrains.exposed.v1.core.eq +import org.jetbrains.exposed.v1.core.greater +import org.jetbrains.exposed.v1.core.inList +import org.jetbrains.exposed.v1.core.less +import org.jetbrains.exposed.v1.core.like +import org.jetbrains.exposed.v1.core.notInList +import org.jetbrains.exposed.v1.core.and +import org.jetbrains.exposed.v1.core.innerJoin +import org.jetbrains.exposed.v1.core.lowerCase +import org.jetbrains.exposed.v1.jdbc.mapLazy +import org.jetbrains.exposed.v1.core.or +import org.jetbrains.exposed.v1.jdbc.select import java.time.LocalDateTime import java.util.UUID diff --git a/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplaceSaleOwnerEntity.kt b/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplaceSaleOwnerEntity.kt index 89c7bab62..7d4d3504b 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplaceSaleOwnerEntity.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplaceSaleOwnerEntity.kt @@ -1,9 +1,10 @@ package io.newm.server.features.marketplace.database -import org.jetbrains.exposed.dao.UUIDEntity -import org.jetbrains.exposed.dao.UUIDEntityClass -import org.jetbrains.exposed.dao.id.EntityID -import org.jetbrains.exposed.sql.and +import org.jetbrains.exposed.v1.dao.java.UUIDEntity +import org.jetbrains.exposed.v1.dao.java.UUIDEntityClass +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.core.and +import org.jetbrains.exposed.v1.core.eq import java.time.LocalDateTime import java.util.UUID diff --git a/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplaceSaleOwnerTable.kt b/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplaceSaleOwnerTable.kt index 6124c7add..55dd9f651 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplaceSaleOwnerTable.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplaceSaleOwnerTable.kt @@ -1,9 +1,9 @@ package io.newm.server.features.marketplace.database -import org.jetbrains.exposed.dao.id.UUIDTable -import org.jetbrains.exposed.sql.Column -import org.jetbrains.exposed.sql.javatime.CurrentDateTime -import org.jetbrains.exposed.sql.javatime.datetime +import org.jetbrains.exposed.v1.core.dao.id.java.UUIDTable +import org.jetbrains.exposed.v1.core.Column +import org.jetbrains.exposed.v1.javatime.CurrentDateTime +import org.jetbrains.exposed.v1.javatime.datetime import java.time.LocalDateTime object MarketplaceSaleOwnerTable : UUIDTable(name = "marketplace_sale_owners") { diff --git a/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplaceSaleTable.kt b/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplaceSaleTable.kt index 8a932ab61..522de6423 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplaceSaleTable.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/marketplace/database/MarketplaceSaleTable.kt @@ -3,11 +3,11 @@ package io.newm.server.features.marketplace.database import io.newm.server.features.marketplace.model.SaleStatus import io.newm.server.features.song.database.SongTable import io.newm.server.typealiases.SongId -import org.jetbrains.exposed.dao.id.EntityID -import org.jetbrains.exposed.dao.id.UUIDTable -import org.jetbrains.exposed.sql.Column -import org.jetbrains.exposed.sql.ReferenceOption -import org.jetbrains.exposed.sql.javatime.datetime +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.core.dao.id.java.UUIDTable +import org.jetbrains.exposed.v1.core.Column +import org.jetbrains.exposed.v1.core.ReferenceOption +import org.jetbrains.exposed.v1.javatime.datetime import java.time.LocalDateTime object MarketplaceSaleTable : UUIDTable(name = "marketplace_sales") { diff --git a/newm-server/src/main/kotlin/io/newm/server/features/marketplace/model/ArtistFilters.kt b/newm-server/src/main/kotlin/io/newm/server/features/marketplace/model/ArtistFilters.kt index 7a6d44a0f..c06f799af 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/marketplace/model/ArtistFilters.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/marketplace/model/ArtistFilters.kt @@ -8,7 +8,7 @@ import io.newm.server.ktx.olderThan import io.newm.server.ktx.sortOrder import io.newm.server.model.FilterCriteria import io.newm.server.typealiases.UserId -import org.jetbrains.exposed.sql.SortOrder +import org.jetbrains.exposed.v1.core.SortOrder import java.time.LocalDateTime data class ArtistFilters( diff --git a/newm-server/src/main/kotlin/io/newm/server/features/marketplace/model/SaleFilters.kt b/newm-server/src/main/kotlin/io/newm/server/features/marketplace/model/SaleFilters.kt index a49ab8fbd..7671b273f 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/marketplace/model/SaleFilters.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/marketplace/model/SaleFilters.kt @@ -16,7 +16,7 @@ import io.newm.server.model.toFilterCriteria import io.newm.server.typealiases.SaleId import io.newm.server.typealiases.SongId import io.newm.server.typealiases.UserId -import org.jetbrains.exposed.sql.SortOrder +import org.jetbrains.exposed.v1.core.SortOrder import java.time.LocalDateTime data class SaleFilters( diff --git a/newm-server/src/main/kotlin/io/newm/server/features/marketplace/repo/MarketplaceRepositoryImpl.kt b/newm-server/src/main/kotlin/io/newm/server/features/marketplace/repo/MarketplaceRepositoryImpl.kt index 058bf6af0..88b5dab74 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/marketplace/repo/MarketplaceRepositoryImpl.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/marketplace/repo/MarketplaceRepositoryImpl.kt @@ -92,9 +92,11 @@ import io.newm.txbuilder.ktx.sortByHashAndIx import io.newm.txbuilder.ktx.toNativeAssetCborMap import java.math.BigInteger import java.util.UUID -import org.jetbrains.exposed.dao.id.EntityID -import org.jetbrains.exposed.sql.and -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.core.and +import org.jetbrains.exposed.v1.core.eq +import org.jetbrains.exposed.v1.jdbc.select +import org.jetbrains.exposed.v1.jdbc.transactions.transaction private const val SALE_TIP_KEY = "saleTip" private const val QUEUE_TIP_KEY = "queueTip" diff --git a/newm-server/src/main/kotlin/io/newm/server/features/minting/database/MintingStatusHistoryTable.kt b/newm-server/src/main/kotlin/io/newm/server/features/minting/database/MintingStatusHistoryTable.kt index 69c1cfad2..7ff50cf75 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/minting/database/MintingStatusHistoryTable.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/minting/database/MintingStatusHistoryTable.kt @@ -3,12 +3,12 @@ package io.newm.server.features.minting.database import io.newm.server.features.song.database.SongTable import io.newm.server.features.walletconnection.database.WalletConnectionTable.nullable import io.newm.server.typealiases.SongId -import org.jetbrains.exposed.dao.id.EntityID -import org.jetbrains.exposed.dao.id.UUIDTable -import org.jetbrains.exposed.sql.Column -import org.jetbrains.exposed.sql.ReferenceOption -import org.jetbrains.exposed.sql.javatime.CurrentDateTime -import org.jetbrains.exposed.sql.javatime.datetime +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.core.dao.id.java.UUIDTable +import org.jetbrains.exposed.v1.core.Column +import org.jetbrains.exposed.v1.core.ReferenceOption +import org.jetbrains.exposed.v1.javatime.CurrentDateTime +import org.jetbrains.exposed.v1.javatime.datetime import java.time.LocalDateTime object MintingStatusHistoryTable : UUIDTable(name = "minting_status_history") { diff --git a/newm-server/src/main/kotlin/io/newm/server/features/minting/database/MintingStatusTransactionEntity.kt b/newm-server/src/main/kotlin/io/newm/server/features/minting/database/MintingStatusTransactionEntity.kt index 310b59142..030c592a4 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/minting/database/MintingStatusTransactionEntity.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/minting/database/MintingStatusTransactionEntity.kt @@ -2,9 +2,9 @@ package io.newm.server.features.minting.database import io.newm.server.features.minting.model.MintingStatusTransactionModel import io.newm.server.typealiases.SongId -import org.jetbrains.exposed.dao.UUIDEntity -import org.jetbrains.exposed.dao.UUIDEntityClass -import org.jetbrains.exposed.dao.id.EntityID +import org.jetbrains.exposed.v1.dao.java.UUIDEntity +import org.jetbrains.exposed.v1.dao.java.UUIDEntityClass +import org.jetbrains.exposed.v1.core.dao.id.EntityID import java.time.LocalDateTime import java.util.UUID diff --git a/newm-server/src/main/kotlin/io/newm/server/features/minting/repo/MintingRepositoryImpl.kt b/newm-server/src/main/kotlin/io/newm/server/features/minting/repo/MintingRepositoryImpl.kt index 083380e39..70b3a97cb 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/minting/repo/MintingRepositoryImpl.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/minting/repo/MintingRepositoryImpl.kt @@ -61,8 +61,8 @@ import io.newm.txbuilder.ktx.toPlutusData import java.math.BigDecimal import kotlin.time.Duration.Companion.milliseconds import kotlin.time.Duration.Companion.seconds -import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.core.eq +import org.jetbrains.exposed.v1.jdbc.transactions.transaction import org.koin.core.parameter.parametersOf import org.slf4j.Logger diff --git a/newm-server/src/main/kotlin/io/newm/server/features/playlist/database/PlaylistEntity.kt b/newm-server/src/main/kotlin/io/newm/server/features/playlist/database/PlaylistEntity.kt index 9755defb8..b92fed4c1 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/playlist/database/PlaylistEntity.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/playlist/database/PlaylistEntity.kt @@ -5,21 +5,21 @@ import io.newm.server.features.playlist.model.PlaylistFilters import io.newm.server.features.song.database.SongEntity import io.newm.server.typealiases.SongId import io.newm.server.typealiases.UserId -import org.jetbrains.exposed.dao.UUIDEntity -import org.jetbrains.exposed.dao.UUIDEntityClass -import org.jetbrains.exposed.dao.id.EntityID -import org.jetbrains.exposed.sql.AndOp -import org.jetbrains.exposed.sql.Op -import org.jetbrains.exposed.sql.SizedIterable -import org.jetbrains.exposed.sql.SortOrder -import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq -import org.jetbrains.exposed.sql.SqlExpressionBuilder.greater -import org.jetbrains.exposed.sql.SqlExpressionBuilder.inList -import org.jetbrains.exposed.sql.SqlExpressionBuilder.less -import org.jetbrains.exposed.sql.SqlExpressionBuilder.notInList -import org.jetbrains.exposed.sql.and -import org.jetbrains.exposed.sql.deleteWhere -import org.jetbrains.exposed.sql.insert +import org.jetbrains.exposed.v1.dao.java.UUIDEntity +import org.jetbrains.exposed.v1.dao.java.UUIDEntityClass +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.core.AndOp +import org.jetbrains.exposed.v1.core.Op +import org.jetbrains.exposed.v1.jdbc.SizedIterable +import org.jetbrains.exposed.v1.core.SortOrder +import org.jetbrains.exposed.v1.core.eq +import org.jetbrains.exposed.v1.core.greater +import org.jetbrains.exposed.v1.core.inList +import org.jetbrains.exposed.v1.core.less +import org.jetbrains.exposed.v1.core.notInList +import org.jetbrains.exposed.v1.core.and +import org.jetbrains.exposed.v1.jdbc.deleteWhere +import org.jetbrains.exposed.v1.jdbc.insert import java.time.LocalDateTime import java.util.UUID diff --git a/newm-server/src/main/kotlin/io/newm/server/features/playlist/database/PlaylistTable.kt b/newm-server/src/main/kotlin/io/newm/server/features/playlist/database/PlaylistTable.kt index 9172e8d9d..1e9df7799 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/playlist/database/PlaylistTable.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/playlist/database/PlaylistTable.kt @@ -2,12 +2,12 @@ package io.newm.server.features.playlist.database import io.newm.server.features.user.database.UserTable import io.newm.server.typealiases.UserId -import org.jetbrains.exposed.dao.id.EntityID -import org.jetbrains.exposed.dao.id.UUIDTable -import org.jetbrains.exposed.sql.Column -import org.jetbrains.exposed.sql.ReferenceOption -import org.jetbrains.exposed.sql.javatime.CurrentDateTime -import org.jetbrains.exposed.sql.javatime.datetime +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.core.dao.id.java.UUIDTable +import org.jetbrains.exposed.v1.core.Column +import org.jetbrains.exposed.v1.core.ReferenceOption +import org.jetbrains.exposed.v1.javatime.CurrentDateTime +import org.jetbrains.exposed.v1.javatime.datetime import java.time.LocalDateTime object PlaylistTable : UUIDTable(name = "playlists") { diff --git a/newm-server/src/main/kotlin/io/newm/server/features/playlist/database/SongsInPlaylistsTable.kt b/newm-server/src/main/kotlin/io/newm/server/features/playlist/database/SongsInPlaylistsTable.kt index e82d35812..ab5808912 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/playlist/database/SongsInPlaylistsTable.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/playlist/database/SongsInPlaylistsTable.kt @@ -1,10 +1,10 @@ package io.newm.server.features.playlist.database import io.newm.server.features.song.database.SongTable -import org.jetbrains.exposed.dao.id.EntityID -import org.jetbrains.exposed.sql.Column -import org.jetbrains.exposed.sql.ReferenceOption -import org.jetbrains.exposed.sql.Table +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.core.Column +import org.jetbrains.exposed.v1.core.ReferenceOption +import org.jetbrains.exposed.v1.core.Table import java.util.UUID object SongsInPlaylistsTable : Table(name = "songs_in_playlists") { diff --git a/newm-server/src/main/kotlin/io/newm/server/features/playlist/model/PlaylistFilters.kt b/newm-server/src/main/kotlin/io/newm/server/features/playlist/model/PlaylistFilters.kt index 579126fab..d278f5bb0 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/playlist/model/PlaylistFilters.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/playlist/model/PlaylistFilters.kt @@ -7,7 +7,7 @@ import io.newm.server.ktx.olderThan import io.newm.server.ktx.ownerIds import io.newm.server.ktx.sortOrder import io.newm.server.model.FilterCriteria -import org.jetbrains.exposed.sql.SortOrder +import org.jetbrains.exposed.v1.core.SortOrder import java.time.LocalDateTime import java.util.UUID diff --git a/newm-server/src/main/kotlin/io/newm/server/features/playlist/repo/PlaylistRepositoryImpl.kt b/newm-server/src/main/kotlin/io/newm/server/features/playlist/repo/PlaylistRepositoryImpl.kt index 7e16dd0a2..912fa924c 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/playlist/repo/PlaylistRepositoryImpl.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/playlist/repo/PlaylistRepositoryImpl.kt @@ -13,8 +13,8 @@ import io.newm.server.typealiases.UserId import io.newm.shared.exception.HttpForbiddenException import io.newm.shared.exception.HttpUnprocessableEntityException import java.util.UUID -import org.jetbrains.exposed.dao.id.EntityID -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.jdbc.transactions.transaction internal class PlaylistRepositoryImpl : PlaylistRepository { private val logger = KotlinLogging.logger {} diff --git a/newm-server/src/main/kotlin/io/newm/server/features/referralhero/repo/ReferralHeroRepositoryImpl.kt b/newm-server/src/main/kotlin/io/newm/server/features/referralhero/repo/ReferralHeroRepositoryImpl.kt index b4e111699..0d91237e9 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/referralhero/repo/ReferralHeroRepositoryImpl.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/referralhero/repo/ReferralHeroRepositoryImpl.kt @@ -24,7 +24,7 @@ import io.newm.server.ktx.checkedBody import io.newm.server.ktx.getSecureConfigString import io.newm.shared.ktx.coLazy import io.newm.shared.ktx.getConfigString -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction import java.time.LocalDateTime class ReferralHeroRepositoryImpl( diff --git a/newm-server/src/main/kotlin/io/newm/server/features/release/repo/OutletReleaseRepositoryImpl.kt b/newm-server/src/main/kotlin/io/newm/server/features/release/repo/OutletReleaseRepositoryImpl.kt index 7c7035b0e..d62482f70 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/release/repo/OutletReleaseRepositoryImpl.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/release/repo/OutletReleaseRepositoryImpl.kt @@ -20,7 +20,7 @@ import io.newm.server.features.release.model.SpotifySearchResponse import io.newm.server.features.song.database.SongEntity import io.newm.server.ktx.checkedBody import io.newm.server.typealiases.SongId -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction private const val SPOTIFY_SEARCH_API_URL = "https://api.spotify.com/v1/search" private const val SPOTIFY_PLAYLIST_API_URL = "https://api.spotify.com/v1/playlists/" diff --git a/newm-server/src/main/kotlin/io/newm/server/features/scheduler/ReferralHeroSyncJob.kt b/newm-server/src/main/kotlin/io/newm/server/features/scheduler/ReferralHeroSyncJob.kt index e96e0c4d8..054b76c11 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/scheduler/ReferralHeroSyncJob.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/scheduler/ReferralHeroSyncJob.kt @@ -7,7 +7,7 @@ import io.newm.server.features.referralhero.repo.ReferralHeroRepository import io.newm.server.features.user.database.UserEntity import io.newm.shared.koin.inject import kotlinx.coroutines.runBlocking -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction import org.quartz.DisallowConcurrentExecution import org.quartz.Job import org.quartz.JobExecutionContext diff --git a/newm-server/src/main/kotlin/io/newm/server/features/song/SongRoutes.kt b/newm-server/src/main/kotlin/io/newm/server/features/song/SongRoutes.kt index c37785366..7437ca9c3 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/song/SongRoutes.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/song/SongRoutes.kt @@ -34,7 +34,7 @@ import io.newm.shared.ktx.patch import io.newm.shared.ktx.post import io.newm.shared.ktx.put import io.newm.shared.ktx.toLocalDateTime -import org.jetbrains.exposed.sql.SortOrder +import org.jetbrains.exposed.v1.core.SortOrder private const val SONGS_PATH = "v1/songs" diff --git a/newm-server/src/main/kotlin/io/newm/server/features/song/database/ReleaseEntity.kt b/newm-server/src/main/kotlin/io/newm/server/features/song/database/ReleaseEntity.kt index 62ef5c55b..b57818101 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/song/database/ReleaseEntity.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/song/database/ReleaseEntity.kt @@ -8,24 +8,24 @@ import io.newm.server.features.user.database.UserTable import io.newm.server.typealiases.ReleaseId import io.newm.server.typealiases.UserId import io.newm.shared.ktx.exists -import org.jetbrains.exposed.dao.UUIDEntity -import org.jetbrains.exposed.dao.UUIDEntityClass -import org.jetbrains.exposed.dao.id.EntityID -import org.jetbrains.exposed.sql.AndOp -import org.jetbrains.exposed.sql.Op -import org.jetbrains.exposed.sql.SizedIterable -import org.jetbrains.exposed.sql.SortOrder -import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq -import org.jetbrains.exposed.sql.SqlExpressionBuilder.greater -import org.jetbrains.exposed.sql.SqlExpressionBuilder.inList -import org.jetbrains.exposed.sql.SqlExpressionBuilder.less -import org.jetbrains.exposed.sql.SqlExpressionBuilder.like -import org.jetbrains.exposed.sql.SqlExpressionBuilder.notInList -import org.jetbrains.exposed.sql.and -import org.jetbrains.exposed.sql.innerJoin -import org.jetbrains.exposed.sql.lowerCase -import org.jetbrains.exposed.sql.or -import org.jetbrains.exposed.sql.selectAll +import org.jetbrains.exposed.v1.dao.java.UUIDEntity +import org.jetbrains.exposed.v1.dao.java.UUIDEntityClass +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.core.AndOp +import org.jetbrains.exposed.v1.core.Op +import org.jetbrains.exposed.v1.jdbc.SizedIterable +import org.jetbrains.exposed.v1.core.SortOrder +import org.jetbrains.exposed.v1.core.eq +import org.jetbrains.exposed.v1.core.greater +import org.jetbrains.exposed.v1.core.inList +import org.jetbrains.exposed.v1.core.less +import org.jetbrains.exposed.v1.core.like +import org.jetbrains.exposed.v1.core.notInList +import org.jetbrains.exposed.v1.core.and +import org.jetbrains.exposed.v1.core.innerJoin +import org.jetbrains.exposed.v1.core.lowerCase +import org.jetbrains.exposed.v1.core.or +import org.jetbrains.exposed.v1.jdbc.selectAll import java.time.LocalDate import java.time.LocalDateTime diff --git a/newm-server/src/main/kotlin/io/newm/server/features/song/database/ReleaseTable.kt b/newm-server/src/main/kotlin/io/newm/server/features/song/database/ReleaseTable.kt index 1f31c0845..a2b9c066a 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/song/database/ReleaseTable.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/song/database/ReleaseTable.kt @@ -6,13 +6,13 @@ import io.newm.server.features.user.database.UserTable import io.newm.server.typealiases.UserId import java.time.LocalDate import java.time.LocalDateTime -import org.jetbrains.exposed.dao.id.EntityID -import org.jetbrains.exposed.dao.id.UUIDTable -import org.jetbrains.exposed.sql.Column -import org.jetbrains.exposed.sql.ReferenceOption -import org.jetbrains.exposed.sql.javatime.CurrentDateTime -import org.jetbrains.exposed.sql.javatime.date -import org.jetbrains.exposed.sql.javatime.datetime +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.core.dao.id.java.UUIDTable +import org.jetbrains.exposed.v1.core.Column +import org.jetbrains.exposed.v1.core.ReferenceOption +import org.jetbrains.exposed.v1.javatime.CurrentDateTime +import org.jetbrains.exposed.v1.javatime.date +import org.jetbrains.exposed.v1.javatime.datetime object ReleaseTable : UUIDTable(name = "releases") { val archived: Column = bool("archived").default(false) diff --git a/newm-server/src/main/kotlin/io/newm/server/features/song/database/SongEntity.kt b/newm-server/src/main/kotlin/io/newm/server/features/song/database/SongEntity.kt index 97666064f..2e06b96af 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/song/database/SongEntity.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/song/database/SongEntity.kt @@ -15,25 +15,26 @@ import io.newm.shared.exposed.overlaps import io.newm.shared.ktx.exists import java.time.LocalDateTime import java.util.UUID -import org.jetbrains.exposed.dao.UUIDEntity -import org.jetbrains.exposed.dao.UUIDEntityClass -import org.jetbrains.exposed.dao.id.EntityID -import org.jetbrains.exposed.sql.AndOp -import org.jetbrains.exposed.sql.Op -import org.jetbrains.exposed.sql.SizedCollection -import org.jetbrains.exposed.sql.SizedIterable -import org.jetbrains.exposed.sql.SortOrder -import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq -import org.jetbrains.exposed.sql.SqlExpressionBuilder.greater -import org.jetbrains.exposed.sql.SqlExpressionBuilder.inList -import org.jetbrains.exposed.sql.SqlExpressionBuilder.less -import org.jetbrains.exposed.sql.SqlExpressionBuilder.like -import org.jetbrains.exposed.sql.SqlExpressionBuilder.notInList -import org.jetbrains.exposed.sql.and -import org.jetbrains.exposed.sql.innerJoin -import org.jetbrains.exposed.sql.lowerCase -import org.jetbrains.exposed.sql.or -import org.jetbrains.exposed.sql.selectAll +import org.jetbrains.exposed.v1.dao.java.UUIDEntity +import org.jetbrains.exposed.v1.dao.java.UUIDEntityClass +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.core.AndOp +import org.jetbrains.exposed.v1.core.Op +import org.jetbrains.exposed.v1.jdbc.SizedCollection +import org.jetbrains.exposed.v1.jdbc.SizedIterable +import org.jetbrains.exposed.v1.core.SortOrder +import org.jetbrains.exposed.v1.core.eq +import org.jetbrains.exposed.v1.core.greater +import org.jetbrains.exposed.v1.core.inList +import org.jetbrains.exposed.v1.core.less +import org.jetbrains.exposed.v1.core.like +import org.jetbrains.exposed.v1.core.notInList +import org.jetbrains.exposed.v1.core.and +import org.jetbrains.exposed.v1.core.innerJoin +import org.jetbrains.exposed.v1.core.lowerCase +import org.jetbrains.exposed.v1.core.or +import org.jetbrains.exposed.v1.jdbc.select +import org.jetbrains.exposed.v1.jdbc.selectAll class SongEntity( id: EntityID diff --git a/newm-server/src/main/kotlin/io/newm/server/features/song/database/SongErrorHistoryTable.kt b/newm-server/src/main/kotlin/io/newm/server/features/song/database/SongErrorHistoryTable.kt index e3dcc6265..bd9a46767 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/song/database/SongErrorHistoryTable.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/song/database/SongErrorHistoryTable.kt @@ -1,11 +1,11 @@ package io.newm.server.features.song.database -import org.jetbrains.exposed.dao.id.EntityID -import org.jetbrains.exposed.dao.id.UUIDTable -import org.jetbrains.exposed.sql.Column -import org.jetbrains.exposed.sql.ReferenceOption -import org.jetbrains.exposed.sql.javatime.CurrentDateTime -import org.jetbrains.exposed.sql.javatime.datetime +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.core.dao.id.java.UUIDTable +import org.jetbrains.exposed.v1.core.Column +import org.jetbrains.exposed.v1.core.ReferenceOption +import org.jetbrains.exposed.v1.javatime.CurrentDateTime +import org.jetbrains.exposed.v1.javatime.datetime import java.time.LocalDateTime import java.util.UUID diff --git a/newm-server/src/main/kotlin/io/newm/server/features/song/database/SongReceiptEntity.kt b/newm-server/src/main/kotlin/io/newm/server/features/song/database/SongReceiptEntity.kt index 8c0c81cb3..2420c5559 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/song/database/SongReceiptEntity.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/song/database/SongReceiptEntity.kt @@ -3,9 +3,9 @@ package io.newm.server.features.song.database import io.newm.server.features.song.model.SongReceipt import java.time.LocalDateTime import java.util.UUID -import org.jetbrains.exposed.dao.UUIDEntity -import org.jetbrains.exposed.dao.UUIDEntityClass -import org.jetbrains.exposed.dao.id.EntityID +import org.jetbrains.exposed.v1.dao.java.UUIDEntity +import org.jetbrains.exposed.v1.dao.java.UUIDEntityClass +import org.jetbrains.exposed.v1.core.dao.id.EntityID class SongReceiptEntity( id: EntityID diff --git a/newm-server/src/main/kotlin/io/newm/server/features/song/database/SongReceiptTable.kt b/newm-server/src/main/kotlin/io/newm/server/features/song/database/SongReceiptTable.kt index e6ba21f45..a5308ca92 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/song/database/SongReceiptTable.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/song/database/SongReceiptTable.kt @@ -1,12 +1,12 @@ package io.newm.server.features.song.database import io.newm.server.typealiases.SongId -import org.jetbrains.exposed.dao.id.EntityID -import org.jetbrains.exposed.dao.id.UUIDTable -import org.jetbrains.exposed.sql.Column -import org.jetbrains.exposed.sql.ReferenceOption -import org.jetbrains.exposed.sql.javatime.CurrentDateTime -import org.jetbrains.exposed.sql.javatime.datetime +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.core.dao.id.java.UUIDTable +import org.jetbrains.exposed.v1.core.Column +import org.jetbrains.exposed.v1.core.ReferenceOption +import org.jetbrains.exposed.v1.javatime.CurrentDateTime +import org.jetbrains.exposed.v1.javatime.datetime import java.time.LocalDateTime object SongReceiptTable : UUIDTable(name = "song_receipts") { diff --git a/newm-server/src/main/kotlin/io/newm/server/features/song/database/SongSmartLinkEntity.kt b/newm-server/src/main/kotlin/io/newm/server/features/song/database/SongSmartLinkEntity.kt index 65f940a78..ae7505924 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/song/database/SongSmartLinkEntity.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/song/database/SongSmartLinkEntity.kt @@ -2,9 +2,10 @@ package io.newm.server.features.song.database import io.newm.server.features.song.model.SongSmartLink import io.newm.server.typealiases.SongId -import org.jetbrains.exposed.dao.UUIDEntity -import org.jetbrains.exposed.dao.UUIDEntityClass -import org.jetbrains.exposed.dao.id.EntityID +import org.jetbrains.exposed.v1.dao.java.UUIDEntity +import org.jetbrains.exposed.v1.dao.java.UUIDEntityClass +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.core.eq import java.time.LocalDateTime import java.util.UUID diff --git a/newm-server/src/main/kotlin/io/newm/server/features/song/database/SongSmartLinkTable.kt b/newm-server/src/main/kotlin/io/newm/server/features/song/database/SongSmartLinkTable.kt index ac63067f6..7120eda57 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/song/database/SongSmartLinkTable.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/song/database/SongSmartLinkTable.kt @@ -1,12 +1,12 @@ package io.newm.server.features.song.database import io.newm.server.typealiases.SongId -import org.jetbrains.exposed.dao.id.EntityID -import org.jetbrains.exposed.dao.id.UUIDTable -import org.jetbrains.exposed.sql.Column -import org.jetbrains.exposed.sql.ReferenceOption -import org.jetbrains.exposed.sql.javatime.CurrentDateTime -import org.jetbrains.exposed.sql.javatime.datetime +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.core.dao.id.java.UUIDTable +import org.jetbrains.exposed.v1.core.Column +import org.jetbrains.exposed.v1.core.ReferenceOption +import org.jetbrains.exposed.v1.javatime.CurrentDateTime +import org.jetbrains.exposed.v1.javatime.datetime import java.time.LocalDateTime object SongSmartLinkTable : UUIDTable(name = "song_smart_links") { diff --git a/newm-server/src/main/kotlin/io/newm/server/features/song/database/SongTable.kt b/newm-server/src/main/kotlin/io/newm/server/features/song/database/SongTable.kt index d6aa5580c..e23ffa5bd 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/song/database/SongTable.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/song/database/SongTable.kt @@ -7,12 +7,12 @@ import io.newm.server.features.song.model.MintingStatus import io.newm.server.features.user.database.UserTable import io.newm.server.typealiases.UserId import io.newm.shared.exposed.textArray -import org.jetbrains.exposed.dao.id.EntityID -import org.jetbrains.exposed.dao.id.UUIDTable -import org.jetbrains.exposed.sql.Column -import org.jetbrains.exposed.sql.ReferenceOption -import org.jetbrains.exposed.sql.javatime.CurrentDateTime -import org.jetbrains.exposed.sql.javatime.datetime +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.core.dao.id.java.UUIDTable +import org.jetbrains.exposed.v1.core.Column +import org.jetbrains.exposed.v1.core.ReferenceOption +import org.jetbrains.exposed.v1.javatime.CurrentDateTime +import org.jetbrains.exposed.v1.javatime.datetime import java.time.LocalDateTime import java.util.UUID diff --git a/newm-server/src/main/kotlin/io/newm/server/features/song/model/SongFilters.kt b/newm-server/src/main/kotlin/io/newm/server/features/song/model/SongFilters.kt index 2be53c4f3..5acd949c6 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/song/model/SongFilters.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/song/model/SongFilters.kt @@ -14,7 +14,7 @@ import io.newm.server.ktx.sortedBy import io.newm.server.model.FilterCriteria import io.newm.server.model.toFilterCriteria import io.newm.server.model.toStringFilterCriteria -import org.jetbrains.exposed.sql.SortOrder +import org.jetbrains.exposed.v1.core.SortOrder import java.time.LocalDateTime import java.util.UUID diff --git a/newm-server/src/main/kotlin/io/newm/server/features/song/repo/SongRepositoryImpl.kt b/newm-server/src/main/kotlin/io/newm/server/features/song/repo/SongRepositoryImpl.kt index ef7f93547..037818426 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/song/repo/SongRepositoryImpl.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/song/repo/SongRepositoryImpl.kt @@ -103,15 +103,17 @@ import kotlinx.serialization.json.Json import org.apache.tika.Tika import org.jaudiotagger.audio.AudioFileIO import org.jetbrains.annotations.VisibleForTesting -import org.jetbrains.exposed.dao.id.EntityID -import org.jetbrains.exposed.sql.CustomFunction -import org.jetbrains.exposed.sql.Expression -import org.jetbrains.exposed.sql.and -import org.jetbrains.exposed.sql.insert -import org.jetbrains.exposed.sql.selectAll -import org.jetbrains.exposed.sql.stringLiteral -import org.jetbrains.exposed.sql.TextColumnType -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.core.CustomFunction +import org.jetbrains.exposed.v1.core.Expression +import org.jetbrains.exposed.v1.core.and +import org.jetbrains.exposed.v1.core.eq +import org.jetbrains.exposed.v1.jdbc.insert +import org.jetbrains.exposed.v1.jdbc.select +import org.jetbrains.exposed.v1.jdbc.selectAll +import org.jetbrains.exposed.v1.core.stringLiteral +import org.jetbrains.exposed.v1.core.TextColumnType +import org.jetbrains.exposed.v1.jdbc.transactions.transaction import software.amazon.awssdk.services.s3.S3Client import software.amazon.awssdk.services.s3.model.DeleteObjectRequest import software.amazon.awssdk.services.s3.model.PutObjectRequest @@ -1272,9 +1274,7 @@ internal class SongRepositoryImpl( sendMintingNotification("released", songId) } - else -> { - Unit - } + else -> {} } } diff --git a/newm-server/src/main/kotlin/io/newm/server/features/user/database/UserEntity.kt b/newm-server/src/main/kotlin/io/newm/server/features/user/database/UserEntity.kt index 9dc6f1956..5ed73c9ab 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/user/database/UserEntity.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/user/database/UserEntity.kt @@ -8,18 +8,20 @@ import io.newm.server.features.user.model.UserVerificationStatus import io.newm.server.model.ClientPlatform import io.newm.server.typealiases.UserId import io.newm.shared.ktx.exists -import org.jetbrains.exposed.dao.UUIDEntity -import org.jetbrains.exposed.dao.UUIDEntityClass -import org.jetbrains.exposed.dao.id.EntityID -import org.jetbrains.exposed.sql.AndOp -import org.jetbrains.exposed.sql.Op -import org.jetbrains.exposed.sql.SizedIterable -import org.jetbrains.exposed.sql.SortOrder -import org.jetbrains.exposed.sql.SqlExpressionBuilder.greater -import org.jetbrains.exposed.sql.SqlExpressionBuilder.inList -import org.jetbrains.exposed.sql.SqlExpressionBuilder.less -import org.jetbrains.exposed.sql.SqlExpressionBuilder.notInList -import org.jetbrains.exposed.sql.lowerCase +import org.jetbrains.exposed.v1.dao.java.UUIDEntity +import org.jetbrains.exposed.v1.dao.java.UUIDEntityClass +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.core.AndOp +import org.jetbrains.exposed.v1.core.Op +import org.jetbrains.exposed.v1.jdbc.SizedIterable +import org.jetbrains.exposed.v1.core.SortOrder +import org.jetbrains.exposed.v1.core.eq +import org.jetbrains.exposed.v1.core.greater +import org.jetbrains.exposed.v1.core.inList +import org.jetbrains.exposed.v1.core.isNullOrEmpty +import org.jetbrains.exposed.v1.core.less +import org.jetbrains.exposed.v1.core.notInList +import org.jetbrains.exposed.v1.core.lowerCase import java.time.LocalDateTime open class UserEntity( diff --git a/newm-server/src/main/kotlin/io/newm/server/features/user/database/UserTable.kt b/newm-server/src/main/kotlin/io/newm/server/features/user/database/UserTable.kt index 7b0a63a94..46d737795 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/user/database/UserTable.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/user/database/UserTable.kt @@ -4,10 +4,10 @@ import io.newm.server.auth.oauth.model.OAuthType import io.newm.server.features.referralhero.model.ReferralStatus import io.newm.server.features.user.model.UserVerificationStatus import io.newm.server.model.ClientPlatform -import org.jetbrains.exposed.dao.id.UUIDTable -import org.jetbrains.exposed.sql.Column -import org.jetbrains.exposed.sql.javatime.CurrentDateTime -import org.jetbrains.exposed.sql.javatime.datetime +import org.jetbrains.exposed.v1.core.dao.id.java.UUIDTable +import org.jetbrains.exposed.v1.core.Column +import org.jetbrains.exposed.v1.javatime.CurrentDateTime +import org.jetbrains.exposed.v1.javatime.datetime import java.time.LocalDateTime object UserTable : UUIDTable(name = "users") { diff --git a/newm-server/src/main/kotlin/io/newm/server/features/user/model/UserFilters.kt b/newm-server/src/main/kotlin/io/newm/server/features/user/model/UserFilters.kt index d5221021a..9bbc5ee56 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/user/model/UserFilters.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/user/model/UserFilters.kt @@ -8,7 +8,7 @@ import io.newm.server.ktx.olderThan import io.newm.server.ktx.roles import io.newm.server.ktx.sortOrder import io.newm.server.model.FilterCriteria -import org.jetbrains.exposed.sql.SortOrder +import org.jetbrains.exposed.v1.core.SortOrder import java.time.LocalDateTime import java.util.UUID diff --git a/newm-server/src/main/kotlin/io/newm/server/features/user/repo/UserRepositoryImpl.kt b/newm-server/src/main/kotlin/io/newm/server/features/user/repo/UserRepositoryImpl.kt index 3deee8bb9..cac8af038 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/user/repo/UserRepositoryImpl.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/user/repo/UserRepositoryImpl.kt @@ -43,8 +43,8 @@ import io.newm.shared.ktx.isValidPassword import io.newm.shared.ktx.orNull import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.launch -import org.jetbrains.exposed.sql.transactions.experimental.newSuspendedTransaction -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.suspendTransaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction import java.time.LocalDateTime internal class UserRepositoryImpl( @@ -170,7 +170,7 @@ internal class UserRepositoryImpl( if (user.isEmailVerified != true) { throw HttpUnauthorizedException("Unverified email: $email") } - return newSuspendedTransaction { + return suspendTransaction { val entity = UserEntity.getByEmail(email) ?: let { val referralHeroSubscriber = getOrCreateReferralHeroSubscriber(email, referrer) UserEntity.new { @@ -245,7 +245,7 @@ internal class UserRepositoryImpl( val email = user.email?.asValidEmail()?.asVerifiedEmail(user.authCode) val passwordHash = user.newPassword?.asValidPassword(user.confirmPassword)?.toHash() - val userEntity = newSuspendedTransaction { + val userEntity = suspendTransaction { val entity = UserEntity[userId] user.firstName?.let { entity.checkNameModifiable(it, entity.firstName) diff --git a/newm-server/src/main/kotlin/io/newm/server/features/walletconnection/database/WalletConnectionChallengeEntity.kt b/newm-server/src/main/kotlin/io/newm/server/features/walletconnection/database/WalletConnectionChallengeEntity.kt index 185be25dd..18fee8d9b 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/walletconnection/database/WalletConnectionChallengeEntity.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/walletconnection/database/WalletConnectionChallengeEntity.kt @@ -1,11 +1,11 @@ package io.newm.server.features.walletconnection.database import io.newm.server.features.walletconnection.model.ChallengeMethod -import org.jetbrains.exposed.dao.UUIDEntity -import org.jetbrains.exposed.dao.UUIDEntityClass -import org.jetbrains.exposed.dao.id.EntityID -import org.jetbrains.exposed.sql.SqlExpressionBuilder.lessEq -import org.jetbrains.exposed.sql.deleteWhere +import org.jetbrains.exposed.v1.dao.java.UUIDEntity +import org.jetbrains.exposed.v1.dao.java.UUIDEntityClass +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.core.lessEq +import org.jetbrains.exposed.v1.jdbc.deleteWhere import java.time.LocalDateTime import java.util.UUID diff --git a/newm-server/src/main/kotlin/io/newm/server/features/walletconnection/database/WalletConnectionChallengeTable.kt b/newm-server/src/main/kotlin/io/newm/server/features/walletconnection/database/WalletConnectionChallengeTable.kt index 410ae7e94..d01ce41be 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/walletconnection/database/WalletConnectionChallengeTable.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/walletconnection/database/WalletConnectionChallengeTable.kt @@ -1,10 +1,10 @@ package io.newm.server.features.walletconnection.database import io.newm.server.features.walletconnection.model.ChallengeMethod -import org.jetbrains.exposed.dao.id.UUIDTable -import org.jetbrains.exposed.sql.Column -import org.jetbrains.exposed.sql.javatime.CurrentDateTime -import org.jetbrains.exposed.sql.javatime.datetime +import org.jetbrains.exposed.v1.core.dao.id.java.UUIDTable +import org.jetbrains.exposed.v1.core.Column +import org.jetbrains.exposed.v1.javatime.CurrentDateTime +import org.jetbrains.exposed.v1.javatime.datetime import java.time.LocalDateTime object WalletConnectionChallengeTable : UUIDTable(name = "wallet_connection_challenges") { diff --git a/newm-server/src/main/kotlin/io/newm/server/features/walletconnection/database/WalletConnectionEntity.kt b/newm-server/src/main/kotlin/io/newm/server/features/walletconnection/database/WalletConnectionEntity.kt index aff137697..60bb0c1f5 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/walletconnection/database/WalletConnectionEntity.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/walletconnection/database/WalletConnectionEntity.kt @@ -3,15 +3,15 @@ package io.newm.server.features.walletconnection.database import io.newm.server.features.walletconnection.model.WalletChain import io.newm.server.features.walletconnection.model.WalletConnection import io.newm.server.typealiases.UserId -import org.jetbrains.exposed.dao.UUIDEntity -import org.jetbrains.exposed.dao.UUIDEntityClass -import org.jetbrains.exposed.dao.id.EntityID -import org.jetbrains.exposed.sql.SizedIterable -import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq -import org.jetbrains.exposed.sql.SqlExpressionBuilder.lessEq -import org.jetbrains.exposed.sql.SqlExpressionBuilder.neq -import org.jetbrains.exposed.sql.and -import org.jetbrains.exposed.sql.deleteWhere +import org.jetbrains.exposed.v1.dao.java.UUIDEntity +import org.jetbrains.exposed.v1.dao.java.UUIDEntityClass +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.jdbc.SizedIterable +import org.jetbrains.exposed.v1.core.eq +import org.jetbrains.exposed.v1.core.lessEq +import org.jetbrains.exposed.v1.core.neq +import org.jetbrains.exposed.v1.core.and +import org.jetbrains.exposed.v1.jdbc.deleteWhere import java.time.LocalDateTime import java.util.UUID diff --git a/newm-server/src/main/kotlin/io/newm/server/features/walletconnection/database/WalletConnectionTable.kt b/newm-server/src/main/kotlin/io/newm/server/features/walletconnection/database/WalletConnectionTable.kt index 6724bef96..f0735250b 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/walletconnection/database/WalletConnectionTable.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/walletconnection/database/WalletConnectionTable.kt @@ -3,12 +3,12 @@ package io.newm.server.features.walletconnection.database import io.newm.server.features.user.database.UserTable import io.newm.server.features.walletconnection.model.WalletChain import io.newm.server.typealiases.UserId -import org.jetbrains.exposed.dao.id.EntityID -import org.jetbrains.exposed.dao.id.UUIDTable -import org.jetbrains.exposed.sql.Column -import org.jetbrains.exposed.sql.ReferenceOption -import org.jetbrains.exposed.sql.javatime.CurrentDateTime -import org.jetbrains.exposed.sql.javatime.datetime +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.core.dao.id.java.UUIDTable +import org.jetbrains.exposed.v1.core.Column +import org.jetbrains.exposed.v1.core.ReferenceOption +import org.jetbrains.exposed.v1.javatime.CurrentDateTime +import org.jetbrains.exposed.v1.javatime.datetime import java.time.LocalDateTime object WalletConnectionTable : UUIDTable(name = "wallet_connections") { diff --git a/newm-server/src/main/kotlin/io/newm/server/features/walletconnection/repo/WalletConnectionRepositoryImpl.kt b/newm-server/src/main/kotlin/io/newm/server/features/walletconnection/repo/WalletConnectionRepositoryImpl.kt index 08e272338..fe5eeb923 100644 --- a/newm-server/src/main/kotlin/io/newm/server/features/walletconnection/repo/WalletConnectionRepositoryImpl.kt +++ b/newm-server/src/main/kotlin/io/newm/server/features/walletconnection/repo/WalletConnectionRepositoryImpl.kt @@ -28,9 +28,9 @@ import io.newm.shared.exception.HttpForbiddenException import io.newm.shared.exception.HttpNotFoundException import io.newm.shared.ktx.existsHavingId import io.newm.shared.ktx.getConfigLong -import org.jetbrains.exposed.dao.id.EntityID -import org.jetbrains.exposed.sql.transactions.experimental.newSuspendedTransaction -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.jdbc.transactions.suspendTransaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction import qrcode.QRCode import qrcode.color.Colors import java.util.UUID @@ -234,7 +234,7 @@ internal class WalletConnectionRepositoryImpl( ) { logger.debug { "updateUserConnection: connectionId = $connectionId, userId = $userId, request = $request" } - newSuspendedTransaction { + suspendTransaction { with(WalletConnectionEntity[connectionId]) { if (this.userId?.value != userId) throw HttpForbiddenException("User doesn't own connection") this.name = request.name diff --git a/newm-server/src/main/kotlin/io/newm/server/ktx/ApplicationCallExt.kt b/newm-server/src/main/kotlin/io/newm/server/ktx/ApplicationCallExt.kt index 335a94167..4ac4131fb 100644 --- a/newm-server/src/main/kotlin/io/newm/server/ktx/ApplicationCallExt.kt +++ b/newm-server/src/main/kotlin/io/newm/server/ktx/ApplicationCallExt.kt @@ -27,7 +27,7 @@ import io.newm.shared.ktx.orZero import io.newm.shared.ktx.toHexString import io.newm.shared.ktx.toLocalDateTime import io.newm.shared.ktx.toUUID -import org.jetbrains.exposed.sql.SortOrder +import org.jetbrains.exposed.v1.core.SortOrder import java.nio.ByteBuffer import java.security.Key import java.time.LocalDateTime diff --git a/newm-server/src/main/kotlin/io/newm/server/security/KeyParser.kt b/newm-server/src/main/kotlin/io/newm/server/security/KeyParser.kt index 71e12c39f..3f9e0803d 100644 --- a/newm-server/src/main/kotlin/io/newm/server/security/KeyParser.kt +++ b/newm-server/src/main/kotlin/io/newm/server/security/KeyParser.kt @@ -1,6 +1,6 @@ package io.newm.server.security -import io.ktor.util.decodeBase64Bytes +import java.util.Base64 object KeyParser { fun parse(key: String): ByteArray { @@ -10,7 +10,7 @@ object KeyParser { .replace(headerFooterRegexPattern, "") .replace(whitespaceRegexPattern, "") - return base64Key.decodeBase64Bytes() + return Base64.getDecoder().decode(base64Key) } private val headerFooterRegexPattern = Regex("-----.*?-----") diff --git a/newm-server/src/main/kotlin/io/newm/server/statuspages/StatusPagesInstall.kt b/newm-server/src/main/kotlin/io/newm/server/statuspages/StatusPagesInstall.kt index 32037e906..bbbe00927 100644 --- a/newm-server/src/main/kotlin/io/newm/server/statuspages/StatusPagesInstall.kt +++ b/newm-server/src/main/kotlin/io/newm/server/statuspages/StatusPagesInstall.kt @@ -10,8 +10,8 @@ import io.ktor.server.plugins.statuspages.StatusPages import io.ktor.server.response.respond import io.newm.server.logging.captureToSentry import io.newm.shared.exception.HttpStatusException -import org.jetbrains.exposed.dao.exceptions.EntityNotFoundException -import org.jetbrains.exposed.exceptions.ExposedSQLException +import org.jetbrains.exposed.v1.dao.exceptions.EntityNotFoundException +import org.jetbrains.exposed.v1.exceptions.ExposedSQLException fun Application.installStatusPages() { install(StatusPages) { diff --git a/newm-server/src/test/kotlin/io/newm/server/BaseApplicationTests.kt b/newm-server/src/test/kotlin/io/newm/server/BaseApplicationTests.kt index 4ac12c6f5..86ba91310 100644 --- a/newm-server/src/test/kotlin/io/newm/server/BaseApplicationTests.kt +++ b/newm-server/src/test/kotlin/io/newm/server/BaseApplicationTests.kt @@ -59,10 +59,10 @@ import io.newm.shared.serialization.UUIDSerializer import kotlinx.coroutines.runBlocking import kotlinx.serialization.json.Json import kotlinx.serialization.modules.SerializersModule -import org.jetbrains.exposed.dao.id.EntityID -import org.jetbrains.exposed.sql.Database -import org.jetbrains.exposed.sql.SchemaUtils -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.jdbc.Database +import org.jetbrains.exposed.v1.jdbc.SchemaUtils +import org.jetbrains.exposed.v1.jdbc.transactions.transaction import org.junit.jupiter.api.AfterAll import org.junit.jupiter.api.BeforeAll import org.junit.jupiter.api.TestInstance diff --git a/newm-server/src/test/kotlin/io/newm/server/TestContext.kt b/newm-server/src/test/kotlin/io/newm/server/TestContext.kt index b45e93a52..0ebb11cf3 100644 --- a/newm-server/src/test/kotlin/io/newm/server/TestContext.kt +++ b/newm-server/src/test/kotlin/io/newm/server/TestContext.kt @@ -1,9 +1,9 @@ package io.newm.server -import org.testcontainers.containers.PostgreSQLContainer +import org.testcontainers.postgresql.PostgreSQLContainer object TestContext { - val container = PostgreSQLContainer("postgres:12").apply { + val container = PostgreSQLContainer("postgres:12").apply { withDatabaseName("newm-db") withUsername("tester") withPassword("newm1234") diff --git a/newm-server/src/test/kotlin/io/newm/server/features/cardano/CardanoRoutesTests.kt b/newm-server/src/test/kotlin/io/newm/server/features/cardano/CardanoRoutesTests.kt index 1ee9f9630..eb7e745c3 100644 --- a/newm-server/src/test/kotlin/io/newm/server/features/cardano/CardanoRoutesTests.kt +++ b/newm-server/src/test/kotlin/io/newm/server/features/cardano/CardanoRoutesTests.kt @@ -17,11 +17,11 @@ import io.newm.server.features.user.database.UserEntity import io.newm.server.features.user.database.UserTable import io.newm.server.typealiases.UserId import kotlinx.coroutines.runBlocking -import org.jetbrains.exposed.dao.id.EntityID -import org.jetbrains.exposed.sql.SqlExpressionBuilder.neq -import org.jetbrains.exposed.sql.deleteAll -import org.jetbrains.exposed.sql.deleteWhere -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.core.neq +import org.jetbrains.exposed.v1.jdbc.deleteAll +import org.jetbrains.exposed.v1.jdbc.deleteWhere +import org.jetbrains.exposed.v1.jdbc.transactions.transaction import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import java.time.LocalDate diff --git a/newm-server/src/test/kotlin/io/newm/server/features/collaborations/CollaborationRoutesTests.kt b/newm-server/src/test/kotlin/io/newm/server/features/collaborations/CollaborationRoutesTests.kt index 67637ead3..9b9603152 100644 --- a/newm-server/src/test/kotlin/io/newm/server/features/collaborations/CollaborationRoutesTests.kt +++ b/newm-server/src/test/kotlin/io/newm/server/features/collaborations/CollaborationRoutesTests.kt @@ -30,11 +30,11 @@ import io.newm.server.features.user.database.UserTable import io.newm.server.typealiases.UserId import io.newm.shared.ktx.existsHavingId import kotlinx.coroutines.runBlocking -import org.jetbrains.exposed.dao.id.EntityID -import org.jetbrains.exposed.sql.SqlExpressionBuilder.neq -import org.jetbrains.exposed.sql.deleteAll -import org.jetbrains.exposed.sql.deleteWhere -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.core.neq +import org.jetbrains.exposed.v1.jdbc.deleteAll +import org.jetbrains.exposed.v1.jdbc.deleteWhere +import org.jetbrains.exposed.v1.jdbc.transactions.transaction import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import java.time.LocalDateTime diff --git a/newm-server/src/test/kotlin/io/newm/server/features/distribution/eveara/EvearaDistributionRepositoryTest.kt b/newm-server/src/test/kotlin/io/newm/server/features/distribution/eveara/EvearaDistributionRepositoryTest.kt index 9a8d249a6..19f439f09 100644 --- a/newm-server/src/test/kotlin/io/newm/server/features/distribution/eveara/EvearaDistributionRepositoryTest.kt +++ b/newm-server/src/test/kotlin/io/newm/server/features/distribution/eveara/EvearaDistributionRepositoryTest.kt @@ -33,8 +33,8 @@ import io.newm.server.typealiases.SongId import io.newm.shared.koin.inject import io.newm.shared.ktx.info import kotlinx.coroutines.runBlocking -import org.jetbrains.exposed.sql.deleteAll -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.deleteAll +import org.jetbrains.exposed.v1.jdbc.transactions.transaction import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test diff --git a/newm-server/src/test/kotlin/io/newm/server/features/earnings/EarningsRoutesTests.kt b/newm-server/src/test/kotlin/io/newm/server/features/earnings/EarningsRoutesTests.kt index e7e7e9ab1..c1f6c5ecf 100644 --- a/newm-server/src/test/kotlin/io/newm/server/features/earnings/EarningsRoutesTests.kt +++ b/newm-server/src/test/kotlin/io/newm/server/features/earnings/EarningsRoutesTests.kt @@ -16,8 +16,8 @@ import io.newm.server.features.song.model.Song import io.newm.server.features.user.database.UserTable import io.newm.server.features.user.model.User import kotlinx.coroutines.runBlocking -import org.jetbrains.exposed.sql.deleteAll -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.deleteAll +import org.jetbrains.exposed.v1.jdbc.transactions.transaction import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test diff --git a/newm-server/src/test/kotlin/io/newm/server/features/idenfy/IdenfyRoutesTests.kt b/newm-server/src/test/kotlin/io/newm/server/features/idenfy/IdenfyRoutesTests.kt index 06e41c427..78a75db18 100644 --- a/newm-server/src/test/kotlin/io/newm/server/features/idenfy/IdenfyRoutesTests.kt +++ b/newm-server/src/test/kotlin/io/newm/server/features/idenfy/IdenfyRoutesTests.kt @@ -22,7 +22,7 @@ import java.security.Key import javax.crypto.Mac import kotlinx.coroutines.runBlocking import kotlinx.serialization.json.Json -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.transactions.transaction import org.junit.jupiter.api.Test class IdenfyRoutesTests : BaseApplicationTests() { diff --git a/newm-server/src/test/kotlin/io/newm/server/features/marketplace/MarketplaceRoutesTests.kt b/newm-server/src/test/kotlin/io/newm/server/features/marketplace/MarketplaceRoutesTests.kt index 4a5fba904..f5f847ec4 100644 --- a/newm-server/src/test/kotlin/io/newm/server/features/marketplace/MarketplaceRoutesTests.kt +++ b/newm-server/src/test/kotlin/io/newm/server/features/marketplace/MarketplaceRoutesTests.kt @@ -37,11 +37,11 @@ import io.newm.server.features.song.model.SongSmartLink import io.newm.server.features.user.database.UserEntity import io.newm.server.features.user.database.UserTable import kotlinx.coroutines.runBlocking -import org.jetbrains.exposed.dao.id.EntityID -import org.jetbrains.exposed.sql.SqlExpressionBuilder.neq -import org.jetbrains.exposed.sql.deleteAll -import org.jetbrains.exposed.sql.deleteWhere -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.core.neq +import org.jetbrains.exposed.v1.jdbc.deleteAll +import org.jetbrains.exposed.v1.jdbc.deleteWhere +import org.jetbrains.exposed.v1.jdbc.transactions.transaction import org.junit.jupiter.api.BeforeAll import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test diff --git a/newm-server/src/test/kotlin/io/newm/server/features/minting/repo/MintingRepositoryTest.kt b/newm-server/src/test/kotlin/io/newm/server/features/minting/repo/MintingRepositoryTest.kt index 922cf530b..0dec0f943 100644 --- a/newm-server/src/test/kotlin/io/newm/server/features/minting/repo/MintingRepositoryTest.kt +++ b/newm-server/src/test/kotlin/io/newm/server/features/minting/repo/MintingRepositoryTest.kt @@ -33,8 +33,8 @@ import io.newm.server.typealiases.SongId import io.newm.shared.ktx.toHexString import io.newm.txbuilder.ktx.toCborObject import kotlinx.coroutines.runBlocking -import org.jetbrains.exposed.sql.deleteAll -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.deleteAll +import org.jetbrains.exposed.v1.jdbc.transactions.transaction import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test diff --git a/newm-server/src/test/kotlin/io/newm/server/features/playlist/PlaylistRoutesTests.kt b/newm-server/src/test/kotlin/io/newm/server/features/playlist/PlaylistRoutesTests.kt index 2138d7776..6ec062b5e 100644 --- a/newm-server/src/test/kotlin/io/newm/server/features/playlist/PlaylistRoutesTests.kt +++ b/newm-server/src/test/kotlin/io/newm/server/features/playlist/PlaylistRoutesTests.kt @@ -31,13 +31,14 @@ import io.newm.server.typealiases.UserId import io.newm.shared.ktx.exists import io.newm.shared.ktx.existsHavingId import kotlinx.coroutines.runBlocking -import org.jetbrains.exposed.dao.id.EntityID -import org.jetbrains.exposed.sql.SqlExpressionBuilder.neq -import org.jetbrains.exposed.sql.and -import org.jetbrains.exposed.sql.deleteAll -import org.jetbrains.exposed.sql.deleteWhere -import org.jetbrains.exposed.sql.insert -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.core.and +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.core.eq +import org.jetbrains.exposed.v1.core.neq +import org.jetbrains.exposed.v1.jdbc.deleteAll +import org.jetbrains.exposed.v1.jdbc.deleteWhere +import org.jetbrains.exposed.v1.jdbc.insert +import org.jetbrains.exposed.v1.jdbc.transactions.transaction import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import java.time.LocalDateTime diff --git a/newm-server/src/test/kotlin/io/newm/server/features/song/SongRoutesTests.kt b/newm-server/src/test/kotlin/io/newm/server/features/song/SongRoutesTests.kt index c42feabfe..2547823c1 100644 --- a/newm-server/src/test/kotlin/io/newm/server/features/song/SongRoutesTests.kt +++ b/newm-server/src/test/kotlin/io/newm/server/features/song/SongRoutesTests.kt @@ -51,11 +51,11 @@ import java.time.LocalDate import java.time.LocalDateTime import java.util.UUID import kotlinx.coroutines.runBlocking -import org.jetbrains.exposed.dao.id.EntityID -import org.jetbrains.exposed.sql.SqlExpressionBuilder.neq -import org.jetbrains.exposed.sql.deleteAll -import org.jetbrains.exposed.sql.deleteWhere -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.core.neq +import org.jetbrains.exposed.v1.jdbc.deleteAll +import org.jetbrains.exposed.v1.jdbc.deleteWhere +import org.jetbrains.exposed.v1.jdbc.transactions.transaction import org.junit.jupiter.api.BeforeAll import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test diff --git a/newm-server/src/test/kotlin/io/newm/server/features/user/UserRoutesTests.kt b/newm-server/src/test/kotlin/io/newm/server/features/user/UserRoutesTests.kt index 03f402f75..0762b5cc8 100644 --- a/newm-server/src/test/kotlin/io/newm/server/features/user/UserRoutesTests.kt +++ b/newm-server/src/test/kotlin/io/newm/server/features/user/UserRoutesTests.kt @@ -38,8 +38,8 @@ import io.newm.shared.ktx.existsHavingId import io.newm.shared.ktx.getConfigString import io.newm.shared.ktx.toHash import kotlinx.coroutines.runBlocking -import org.jetbrains.exposed.sql.deleteAll -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.deleteAll +import org.jetbrains.exposed.v1.jdbc.transactions.transaction import org.junit.jupiter.api.BeforeAll import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test diff --git a/newm-server/src/test/kotlin/io/newm/server/features/walletconnection/WalletConnectionRoutesTest.kt b/newm-server/src/test/kotlin/io/newm/server/features/walletconnection/WalletConnectionRoutesTest.kt index 4624b6df4..fc7939110 100644 --- a/newm-server/src/test/kotlin/io/newm/server/features/walletconnection/WalletConnectionRoutesTest.kt +++ b/newm-server/src/test/kotlin/io/newm/server/features/walletconnection/WalletConnectionRoutesTest.kt @@ -42,9 +42,9 @@ import io.newm.shared.ktx.toHexString import io.newm.shared.ktx.toTempFile import kotlinx.coroutines.runBlocking import org.apache.tika.Tika -import org.jetbrains.exposed.dao.id.EntityID -import org.jetbrains.exposed.sql.deleteAll -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.core.dao.id.EntityID +import org.jetbrains.exposed.v1.jdbc.deleteAll +import org.jetbrains.exposed.v1.jdbc.transactions.transaction import org.junit.jupiter.api.BeforeAll import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test diff --git a/newm-shared/src/main/kotlin/io/newm/shared/exposed/ExposedArrays.kt b/newm-shared/src/main/kotlin/io/newm/shared/exposed/ExposedArrays.kt index a083cbf60..f23a76622 100644 --- a/newm-shared/src/main/kotlin/io/newm/shared/exposed/ExposedArrays.kt +++ b/newm-shared/src/main/kotlin/io/newm/shared/exposed/ExposedArrays.kt @@ -1,22 +1,22 @@ package io.newm.shared.exposed import java.util.UUID -import org.jetbrains.exposed.sql.Column -import org.jetbrains.exposed.sql.ComparisonOp -import org.jetbrains.exposed.sql.CustomFunction -import org.jetbrains.exposed.sql.DoubleColumnType -import org.jetbrains.exposed.sql.EqOp -import org.jetbrains.exposed.sql.ExpressionWithColumnType -import org.jetbrains.exposed.sql.FloatColumnType -import org.jetbrains.exposed.sql.IntegerColumnType -import org.jetbrains.exposed.sql.LongColumnType -import org.jetbrains.exposed.sql.NotOp -import org.jetbrains.exposed.sql.Op -import org.jetbrains.exposed.sql.QueryParameter -import org.jetbrains.exposed.sql.SqlExpressionBuilder.asLiteral -import org.jetbrains.exposed.sql.Table -import org.jetbrains.exposed.sql.TextColumnType -import org.jetbrains.exposed.sql.UUIDColumnType +import org.jetbrains.exposed.v1.core.Column +import org.jetbrains.exposed.v1.core.ComparisonOp +import org.jetbrains.exposed.v1.core.CustomFunction +import org.jetbrains.exposed.v1.core.DoubleColumnType +import org.jetbrains.exposed.v1.core.EqOp +import org.jetbrains.exposed.v1.core.ExpressionWithColumnType +import org.jetbrains.exposed.v1.core.FloatColumnType +import org.jetbrains.exposed.v1.core.IntegerColumnType +import org.jetbrains.exposed.v1.core.LongColumnType +import org.jetbrains.exposed.v1.core.NotOp +import org.jetbrains.exposed.v1.core.Op +import org.jetbrains.exposed.v1.core.QueryParameter +import org.jetbrains.exposed.v1.core.Table +import org.jetbrains.exposed.v1.core.TextColumnType +import org.jetbrains.exposed.v1.core.asLiteral +import org.jetbrains.exposed.v1.core.java.UUIDColumnType // // Exposed support for arrays diff --git a/newm-shared/src/main/kotlin/io/newm/shared/ktx/EntityClassExt.kt b/newm-shared/src/main/kotlin/io/newm/shared/ktx/EntityClassExt.kt index 4bc197c71..6269865ba 100644 --- a/newm-shared/src/main/kotlin/io/newm/shared/ktx/EntityClassExt.kt +++ b/newm-shared/src/main/kotlin/io/newm/shared/ktx/EntityClassExt.kt @@ -1,10 +1,9 @@ package io.newm.shared.ktx -import org.jetbrains.exposed.dao.Entity -import org.jetbrains.exposed.dao.EntityClass -import org.jetbrains.exposed.sql.Op -import org.jetbrains.exposed.sql.SqlExpressionBuilder +import org.jetbrains.exposed.v1.core.Op +import org.jetbrains.exposed.v1.dao.Entity +import org.jetbrains.exposed.v1.dao.EntityClass -fun , T : Entity> EntityClass.exists(op: SqlExpressionBuilder.() -> Op): Boolean = table.exists(op) +fun , T : Entity> EntityClass.exists(op: () -> Op): Boolean = table.exists(op) fun , T : Entity> EntityClass.existsHavingId(id: ID): Boolean = table.existsHavingId(id) diff --git a/newm-shared/src/main/kotlin/io/newm/shared/ktx/TableExt.kt b/newm-shared/src/main/kotlin/io/newm/shared/ktx/TableExt.kt index 1eb92f22b..9173db256 100644 --- a/newm-shared/src/main/kotlin/io/newm/shared/ktx/TableExt.kt +++ b/newm-shared/src/main/kotlin/io/newm/shared/ktx/TableExt.kt @@ -1,18 +1,18 @@ package io.newm.shared.ktx -import org.jetbrains.exposed.dao.id.IdTable -import org.jetbrains.exposed.sql.Op -import org.jetbrains.exposed.sql.ResultRow -import org.jetbrains.exposed.sql.SqlExpressionBuilder -import org.jetbrains.exposed.sql.Table -import org.jetbrains.exposed.sql.selectAll +import org.jetbrains.exposed.v1.core.Op +import org.jetbrains.exposed.v1.core.ResultRow +import org.jetbrains.exposed.v1.core.Table +import org.jetbrains.exposed.v1.core.dao.id.IdTable +import org.jetbrains.exposed.v1.core.eq +import org.jetbrains.exposed.v1.jdbc.selectAll -fun Table.firstOrNull(where: SqlExpressionBuilder.() -> Op): ResultRow? = selectAll().where(where).limit(1).firstOrNull() +fun Table.firstOrNull(where: () -> Op): ResultRow? = selectAll().where(where).limit(1).firstOrNull() -fun Table.exists(where: SqlExpressionBuilder.() -> Op): Boolean = firstOrNull(where) != null +fun Table.exists(where: () -> Op): Boolean = firstOrNull(where) != null fun > IdTable.firstHavingIdOrNull(id: T): ResultRow? = this.firstOrNull { this@firstHavingIdOrNull.id eq id } fun > IdTable.existsHavingId(id: T): Boolean = exists { this@existsHavingId.id eq id } -fun > IdTable.getId(where: SqlExpressionBuilder.() -> Op): T? = firstOrNull(where)?.get(id)?.value +fun > IdTable.getId(where: () -> Op): T? = firstOrNull(where)?.get(id)?.value