diff --git a/repos/common/src/commonMain/kotlin/dev/inmo/micro_utils/repos/IdUtils.kt b/repos/common/src/commonMain/kotlin/dev/inmo/micro_utils/repos/IdUtils.kt deleted file mode 100644 index 8c99e003e29..00000000000 --- a/repos/common/src/commonMain/kotlin/dev/inmo/micro_utils/repos/IdUtils.kt +++ /dev/null @@ -1,5 +0,0 @@ -package dev.inmo.micro_utils.repos - -import com.benasher44.uuid.uuid4 - -fun generateId() = uuid4().toString() \ No newline at end of file diff --git a/repos/common/src/commonMain/kotlin/dev/inmo/micro_utils/repos/OneToManyKeyValueRepo.kt b/repos/common/src/commonMain/kotlin/dev/inmo/micro_utils/repos/OneToManyKeyValueRepo.kt index 3d5ec4bb464..8cd84aa7bb8 100644 --- a/repos/common/src/commonMain/kotlin/dev/inmo/micro_utils/repos/OneToManyKeyValueRepo.kt +++ b/repos/common/src/commonMain/kotlin/dev/inmo/micro_utils/repos/OneToManyKeyValueRepo.kt @@ -12,12 +12,10 @@ interface OneToManyReadKeyValueRepo : Repo { suspend fun count(): Long } -interface OneToManyWriteKeyValueRepo : - Repo { +interface OneToManyWriteKeyValueRepo : Repo { suspend fun add(k: Key, v: Value) suspend fun remove(k: Key, v: Value) suspend fun clear(k: Key) } -interface OneToManyKeyValueRepo : OneToManyReadKeyValueRepo, - OneToManyWriteKeyValueRepo \ No newline at end of file +interface OneToManyKeyValueRepo : OneToManyReadKeyValueRepo, OneToManyWriteKeyValueRepo \ No newline at end of file diff --git a/repos/common/src/commonMain/kotlin/dev/inmo/micro_utils/repos/StandartKeyValueRepo.kt b/repos/common/src/commonMain/kotlin/dev/inmo/micro_utils/repos/StandartKeyValueRepo.kt index fb085626c88..b3a1a4637f7 100644 --- a/repos/common/src/commonMain/kotlin/dev/inmo/micro_utils/repos/StandartKeyValueRepo.kt +++ b/repos/common/src/commonMain/kotlin/dev/inmo/micro_utils/repos/StandartKeyValueRepo.kt @@ -20,5 +20,4 @@ interface StandardWriteKeyValueRepo : Repo { suspend fun unset(k: Key) } -interface StandardKeyValueRepo : StandardReadKeyValueRepo, - StandardWriteKeyValueRepo \ No newline at end of file +interface StandardKeyValueRepo : StandardReadKeyValueRepo, StandardWriteKeyValueRepo \ No newline at end of file diff --git a/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/keyvalue/AbstractExposedKeyValueRepo.kt b/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/keyvalue/AbstractExposedKeyValueRepo.kt index 56fa9f88147..f4e53f0997d 100644 --- a/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/keyvalue/AbstractExposedKeyValueRepo.kt +++ b/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/keyvalue/AbstractExposedKeyValueRepo.kt @@ -24,7 +24,7 @@ abstract class AbstractExposedKeyValueRepo( override val onValueRemoved: Flow = onValueRemovedChannel.asFlow() override suspend fun set(k: Key, v: Value) { - transaction(db = database) { + transaction(database) { if (select { keyColumn.eq(k) }.limit(1).any()) { update({ keyColumn.eq(k) }) { it[valueColumn] = v @@ -40,7 +40,7 @@ abstract class AbstractExposedKeyValueRepo( } override suspend fun unset(k: Key) { - transaction(db = database) { + transaction(database) { deleteWhere { keyColumn.eq(k) } } onValueRemovedChannel.send(k) diff --git a/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/keyvalue/AbstractExposedReadKeyValueRepo.kt b/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/keyvalue/AbstractExposedReadKeyValueRepo.kt index 6bf88b7cdfa..8e556fdf0bf 100644 --- a/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/keyvalue/AbstractExposedReadKeyValueRepo.kt +++ b/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/keyvalue/AbstractExposedReadKeyValueRepo.kt @@ -15,23 +15,23 @@ abstract class AbstractExposedReadKeyValueRepo( ) : StandardReadKeyValueRepo, Table() { override val primaryKey: PrimaryKey = PrimaryKey(keyColumn, valueColumn) - override suspend fun get(k: Key): Value? = transaction(db = database) { + override suspend fun get(k: Key): Value? = transaction(database) { select { keyColumn.eq(k) }.limit(1).firstOrNull() ?.getOrNull(valueColumn) } - override suspend fun contains(key: Key): Boolean = transaction(db = database) { + override suspend fun contains(key: Key): Boolean = transaction(database) { select { keyColumn.eq(key) }.limit(1).any() } - override suspend fun count(): Long = transaction(db = database) { selectAll().count() } + override suspend fun count(): Long = transaction(database) { selectAll().count() } - override suspend fun keys(pagination: Pagination, reversed: Boolean): PaginationResult = transaction(db = database) { + override suspend fun keys(pagination: Pagination, reversed: Boolean): PaginationResult = transaction(database) { selectAll().paginate(pagination, keyColumn to if (reversed) SortOrder.DESC else SortOrder.ASC).map { it[keyColumn] } }.createPaginationResult(pagination, count()) - override suspend fun values(pagination: Pagination, reversed: Boolean): PaginationResult = transaction(db = database) { + override suspend fun values(pagination: Pagination, reversed: Boolean): PaginationResult = transaction(database) { selectAll().paginate(pagination, keyColumn to if (reversed) SortOrder.DESC else SortOrder.ASC).map { it[valueColumn] } diff --git a/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/onetomany/AbstractOneToManyExposedKeyValueRepo.kt b/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/onetomany/AbstractOneToManyExposedKeyValueRepo.kt index a6f1127e90d..8553c12e611 100644 --- a/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/onetomany/AbstractOneToManyExposedKeyValueRepo.kt +++ b/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/onetomany/AbstractOneToManyExposedKeyValueRepo.kt @@ -14,7 +14,7 @@ abstract class AbstractOneToManyExposedKeyValueRepo( database ) { override suspend fun add(k: Key, v: Value) { - transaction(db = database) { + transaction(database) { insert { it[keyColumn] = k it[valueColumn] = v @@ -23,10 +23,10 @@ abstract class AbstractOneToManyExposedKeyValueRepo( } override suspend fun remove(k: Key, v: Value) { - transaction(db = database) { deleteWhere { keyColumn.eq(k).and(valueColumn.eq(v)) } } + transaction(database) { deleteWhere { keyColumn.eq(k).and(valueColumn.eq(v)) } } } override suspend fun clear(k: Key) { - transaction(db = database) { deleteWhere { keyColumn.eq(k) } } + transaction(database) { deleteWhere { keyColumn.eq(k) } } } } diff --git a/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/onetomany/AbstractOneToManyExposedReadKeyValueRepo.kt b/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/onetomany/AbstractOneToManyExposedReadKeyValueRepo.kt index 07ae9574e3c..37b0bb763f0 100644 --- a/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/onetomany/AbstractOneToManyExposedReadKeyValueRepo.kt +++ b/repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/onetomany/AbstractOneToManyExposedReadKeyValueRepo.kt @@ -18,33 +18,33 @@ abstract class AbstractOneToManyExposedReadKeyValueRepo( protected val keyColumn: Column = keyColumnAllocator() protected val valueColumn: Column = valueColumnAllocator() - override suspend fun count(k: Key): Long = transaction(db = database) { select { keyColumn.eq(k) }.count() } + override suspend fun count(k: Key): Long = transaction(database) { select { keyColumn.eq(k) }.count() } - override suspend fun count(): Long = transaction(db = database) { selectAll().count() } + override suspend fun count(): Long = transaction(database) { selectAll().count() } override suspend fun get( k: Key, pagination: Pagination, reversed: Boolean - ): PaginationResult = transaction(db = database) { + ): PaginationResult = transaction(database) { select { keyColumn.eq(k) }.paginate(pagination, keyColumn, reversed).map { it[valueColumn] } }.createPaginationResult( pagination, count(k) ) - override suspend fun keys(pagination: Pagination, reversed: Boolean): PaginationResult = transaction(db = database) { + override suspend fun keys(pagination: Pagination, reversed: Boolean): PaginationResult = transaction(database) { selectAll().paginate(pagination, keyColumn, reversed).map { it[keyColumn] } }.createPaginationResult( pagination, count() ) - override suspend fun contains(k: Key): Boolean = transaction(db = database) { + override suspend fun contains(k: Key): Boolean = transaction(database) { select { keyColumn.eq(k) }.limit(1).any() } - override suspend fun contains(k: Key, v: Value): Boolean = transaction(db = database) { + override suspend fun contains(k: Key, v: Value): Boolean = transaction(database) { select { keyColumn.eq(k).and(valueColumn.eq(v)) }.limit(1).any() } }