Merge pull request #19 from InsanusMokrassar/0.4.2

0.4.2

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.4.2
+
+* `Repos`:
+    * Add `WriteOneToManyKeyValueRepo#set` function and extensions
+
 ## 0.4.1
 
 * `Repos`:

gradle.properties

@@ -41,5 +41,5 @@ dokka_version=1.4.0
 # Project data
 
 group=dev.inmo
-version=0.4.1
-android_code_version=5
+version=0.4.2
+android_code_version=6

repos/common/src/commonMain/kotlin/dev/inmo/micro_utils/repos/OneToManyKeyValueRepo.kt

@@ -47,6 +47,11 @@ interface WriteOneToManyKeyValueRepo<Key, Value> : Repo {
     suspend fun remove(toRemove: Map<Key, List<Value>>)
 
     suspend fun clear(k: Key)
+
+    suspend fun set(toSet: Map<Key, List<Value>>) {
+        toSet.keys.forEach { key -> clear(key) }
+        add(toSet)
+    }
 }
 
 suspend inline fun <Key, Value, REPO : WriteOneToManyKeyValueRepo<Key, Value>> REPO.add(
@@ -65,6 +70,22 @@ suspend inline fun <Key, Value> WriteOneToManyKeyValueRepo<Key, Value>.add(
     k: Key, vararg v: Value
 ) = add(k, v.toList())
 
+suspend inline fun <Key, Value, REPO : WriteOneToManyKeyValueRepo<Key, Value>> REPO.set(
+    keysAndValues: List<Pair<Key, List<Value>>>
+) = set(keysAndValues.toMap())
+
+suspend inline fun <Key, Value, REPO : WriteOneToManyKeyValueRepo<Key, Value>> REPO.set(
+    vararg keysAndValues: Pair<Key, List<Value>>
+) = set(keysAndValues.toMap())
+
+suspend inline fun <Key, Value> WriteOneToManyKeyValueRepo<Key, Value>.set(
+    k: Key, v: List<Value>
+) = set(mapOf(k to v))
+
+suspend inline fun <Key, Value> WriteOneToManyKeyValueRepo<Key, Value>.set(
+    k: Key, vararg v: Value
+) = set(k, v.toList())
+
 interface OneToManyKeyValueRepo<Key, Value> : ReadOneToManyKeyValueRepo<Key, Value>, WriteOneToManyKeyValueRepo<Key, Value>
 
 suspend inline fun <Key, Value> WriteOneToManyKeyValueRepo<Key, Value>.remove(

repos/common/src/commonMain/kotlin/dev/inmo/micro_utils/repos/mappers/OneToManyKeyValueMappers.kt

@@ -107,6 +107,12 @@ open class MapperWriteOneToManyKeyValueRepo<FromKey, FromValue, ToKey, ToValue>(
         }.toMap()
     )
 
+    override suspend fun set(toSet: Map<FromKey, List<FromValue>>) {
+        to.set(
+            toSet.map { (k, vs) -> k.toOutKey() to vs.map { v -> v.toOutValue() } }.toMap()
+        )
+    }
+
     override suspend fun clear(k: FromKey) = to.clear(k.toOutKey())
 }
 

repos/common/src/main/kotlin/dev/inmo/micro_utils/repos/onetomany/OneToManyAndroidRepo.kt

@@ -87,6 +87,29 @@ class OneToManyAndroidRepo<Key, Value>(
         }
     }
 
+    override suspend fun set(toSet: Map<Key, List<Value>>) {
+        val (clearedKeys, inserted) = helper.writableTransaction {
+            toSet.mapNotNull { (k, _) ->
+                if (delete(tableName, "$idColumnName=?", arrayOf(k.asId())) > 0) {
+                    k
+                } else {
+                    null
+                }
+            } to toSet.flatMap { (k, values) ->
+                values.map { v ->
+                    insert(
+                        tableName,
+                        null,
+                        contentValuesOf(idColumnName to k.asId(), valueColumnName to v.asValue())
+                    )
+                    k to v
+                }
+            }
+        }
+        clearedKeys.forEach { _onDataCleared.emit(it) }
+        inserted.forEach { newPair -> _onNewValue.emit(newPair) }
+    }
+
     override suspend fun contains(k: Key): Boolean = helper.readableTransaction {
         select(tableName, selection = "$idColumnName=?", selectionArgs = arrayOf(k.asId()), limit = FirstPagePagination(1).limitClause()).use {
             it.count > 0

repos/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/repos/ktor/client/one_to_many/KtorWriteOneToManyKeyValueRepo.kt

@@ -42,12 +42,12 @@ class KtorWriteOneToManyKeyValueRepo<Key, Value> (
     override suspend fun add(toAdd: Map<Key, List<Value>>) = client.unipost(
         buildStandardUrl(
             baseUrl,
-            clearRoute,
+            addRoute,
         ),
         BodyPair(keyValueMapSerializer, toAdd),
         Unit.serializer(),
     )
-    override suspend fun clear(k: Key)  = client.unipost(
+    override suspend fun clear(k: Key) = client.unipost(
         buildStandardUrl(
             baseUrl,
             clearRoute,
@@ -55,4 +55,13 @@ class KtorWriteOneToManyKeyValueRepo<Key, Value> (
         BodyPair(keySerializer, k),
         Unit.serializer(),
     )
+
+    override suspend fun set(toSet: Map<Key, List<Value>>) = client.unipost(
+        buildStandardUrl(
+            baseUrl,
+            setRoute,
+        ),
+        BodyPair(keyValueMapSerializer, toSet),
+        Unit.serializer(),
+    )
 }

repos/ktor/common/src/commonMain/kotlin/dev/inmo/micro_utils/repos/ktor/common/one_to_many/OneToManyRoutes.kt

@@ -13,4 +13,5 @@ const val onDataClearedRoute = "onDataCleared"
 
 const val addRoute = "add"
 const val removeRoute = "remove"
-const val clearRoute = "clear"
+const val clearRoute = "clear"
+const val setRoute = "set"

repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/one_to_many/ConfigureOneToManyWriteKeyValueRepoRoutes.kt

@@ -61,4 +61,13 @@ fun <Key, Value> Route.configureOneToManyWriteKeyValueRepoRoutes(
             originalRepo.clear(key),
         )
     }
+
+    post(setRoute) {
+        val obj = call.uniload(keyValueMapSerializer)
+
+        call.unianswer(
+            Unit.serializer(),
+            originalRepo.set(obj)
+        )
+    }
 }