CHANGELOG.md

@@ -1,11 +1,5 @@
 # Changelog
 
-## 0.9.21
-
-* `Repos`:
-    * `Exposed`:
-        * fixes in `AbstractExposedWriteCRUDRepo`
-
 ## 0.9.20
 
 * `Repos`:

gradle.properties

@@ -14,5 +14,5 @@ crypto_js_version=4.1.1
 # Project data
 
 group=dev.inmo
-version=0.9.21
+version=0.9.20
-android_code_version=111
+android_code_version=110

repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/AbstractExposedWriteCRUDRepo.kt

@@ -17,19 +17,13 @@ abstract class AbstractExposedWriteCRUDRepo<ObjectType, IdType, InputValueType>(
     ExposedCRUDRepo<ObjectType, IdType>,
     WriteStandardCRUDRepo<ObjectType, IdType, InputValueType>
 {
-    protected val _newObjectsFlow = MutableSharedFlow<ObjectType>(replyCacheInFlows, flowsChannelsSize)
+    protected val newObjectsChannel = MutableSharedFlow<ObjectType>(replyCacheInFlows, flowsChannelsSize)
-    protected val _updatedObjectsFlow = MutableSharedFlow<ObjectType>(replyCacheInFlows, flowsChannelsSize)
+    protected val updateObjectsChannel = MutableSharedFlow<ObjectType>(replyCacheInFlows, flowsChannelsSize)
-    protected val _deletedObjectsIdsFlow = MutableSharedFlow<IdType>(replyCacheInFlows, flowsChannelsSize)
+    protected val deleteObjectsIdsChannel = MutableSharedFlow<IdType>(replyCacheInFlows, flowsChannelsSize)
-    @Deprecated("Renamed", ReplaceWith("_newObjectsFlow"))
-    protected val newObjectsChannel = _newObjectsFlow
-    @Deprecated("Renamed", ReplaceWith("_updatedObjectsFlow"))
-    protected val updateObjectsChannel = _updatedObjectsFlow
-    @Deprecated("Renamed", ReplaceWith("_deletedObjectsIdsFlow"))
-    protected val deleteObjectsIdsChannel = _deletedObjectsIdsFlow
 
-    override val newObjectsFlow: Flow<ObjectType> = _newObjectsFlow.asSharedFlow()
+    override val newObjectsFlow: Flow<ObjectType> = newObjectsChannel.asSharedFlow()
-    override val updatedObjectsFlow: Flow<ObjectType> = _updatedObjectsFlow.asSharedFlow()
+    override val updatedObjectsFlow: Flow<ObjectType> = updateObjectsChannel.asSharedFlow()
-    override val deletedObjectsIdsFlow: Flow<IdType> = _deletedObjectsIdsFlow.asSharedFlow()
+    override val deletedObjectsIdsFlow: Flow<IdType> = deleteObjectsIdsChannel.asSharedFlow()
 
     protected abstract fun InsertStatement<Number>.asObject(value: InputValueType): ObjectType
     abstract val selectByIds: SqlExpressionBuilder.(List<IdType>) -> Op<Boolean>
@@ -49,7 +43,7 @@ abstract class AbstractExposedWriteCRUDRepo<ObjectType, IdType, InputValueType>(
         return transaction(db = database) {
             values.map { value -> createWithoutNotification(value) }
         }.onEach {
-            _newObjectsFlow.emit(it)
+            newObjectsChannel.emit(it)
         }
     }
 
@@ -80,7 +74,7 @@ abstract class AbstractExposedWriteCRUDRepo<ObjectType, IdType, InputValueType>(
         onBeforeUpdate(listOf(id to value))
         return updateWithoutNotification(id, value).also {
             if (it != null) {
-                _updatedObjectsFlow.emit(it)
+                updateObjectsChannel.emit(it)
             }
         }
     }
@@ -91,25 +85,16 @@ abstract class AbstractExposedWriteCRUDRepo<ObjectType, IdType, InputValueType>(
                 values.map { (id, value) -> updateWithoutNotification(id, value) }
             }.filterNotNull()
         ).onEach {
-            _updatedObjectsFlow.emit(it)
+            updateObjectsChannel.emit(it)
         }
     }
     protected open suspend fun onBeforeDelete(ids: List<IdType>) {}
     override suspend fun deleteById(ids: List<IdType>) {
         onBeforeDelete(ids)
         transaction(db = database) {
-            val deleted = deleteWhere(null, null) {
+            deleteWhere(null, null) {
                 selectByIds(ids)
             }
-            if (deleted == ids.size) {
-                ids
-            } else {
-                ids.filter {
-                    select { selectById(it) }.limit(1).none()
-                }
-            }
-        }.forEach {
-            _deletedObjectsIdsFlow.emit(it)
         }
     }
 }