Make purge collection reactive

taktik · Jul 13, 2022 · e1a69ec · e1a69ec
1 parent e41a6f9
commit e1a69ec
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 15 deletions.
diff --git a/src/main/kotlin/org/taktik/icure/asyncdao/GenericDAO.kt b/src/main/kotlin/org/taktik/icure/asyncdao/GenericDAO.kt
@@ -44,7 +44,7 @@ interface GenericDAO<T : Identifiable<String>> : LookupDAO<T> {
 	suspend fun remove(entity: T): DocIdentifier
 	fun remove(entities: Collection<T>): Flow<DocIdentifier>
 	suspend fun purge(entity: T): DocIdentifier
-	suspend fun purge(entities: Collection<T>)
+	suspend fun purge(entities: Collection<T>): Flow<DocIdentifier>
 	fun unRemove(entities: Collection<T>): Flow<DocIdentifier>
 	suspend fun unRemove(entity: T): DocIdentifier
 	suspend fun forceInitStandardDesignDocument(updateIfExists: Boolean = true, useVersioning: Boolean = true)

diff --git a/src/main/kotlin/org/taktik/icure/asyncdao/impl/CachedDAOImpl.kt b/src/main/kotlin/org/taktik/icure/asyncdao/impl/CachedDAOImpl.kt
@@ -239,12 +239,10 @@ abstract class CachedDAOImpl<T : StoredDocument>(
 		}
 	}
 
-	override suspend fun purge(entities: Collection<T>) {
-		super.purge(entities)
-		for (entity in entities) {
-			evictFromCache(entity)
+	override suspend fun purge(entities: Collection<T>): Flow<DocIdentifier> =
+		super.purge(entities).onEach {
+			it.id?.let { id -> evictFromCache(id) }
 		}
-	}
 
 	override fun <K : Collection<T>> save(newEntity: Boolean?, entities: K) = flow {
 		val savedEntities = try {

diff --git a/src/main/kotlin/org/taktik/icure/asyncdao/impl/GenericDAOImpl.kt b/src/main/kotlin/org/taktik/icure/asyncdao/impl/GenericDAOImpl.kt
@@ -253,16 +253,15 @@ abstract class GenericDAOImpl<T : StoredDocument>(
 			log.debug("remove $entities")
 		}
 		try {
+			val entitiesById = entities.associateBy { it.id }
 			val bulkUpdateResults = client.bulkUpdate(
 				entities.map {
 					beforeDelete(it).let {
 						it.withDeletionDate(System.currentTimeMillis()) as T
 					}
 				},
 				entityClass
-			).onEach { r ->
-				entities.firstOrNull { e -> r.id == e.id }?.let { afterDelete(it) }
-			}
+			).onEach { r -> entitiesById[r.id]?.let { afterDelete(it) } }
 			emitAll(bulkUpdateResults.map { DocIdentifier(it.id, it.rev) })
 		} catch (e: Exception) {
 			throw PersistenceException("failed to remove entities ", e)
@@ -291,17 +290,16 @@ abstract class GenericDAOImpl<T : StoredDocument>(
 		}
 	}
 
-	// This function is not reactive, but it doesn't seem to be used at all anyway...
-	override suspend fun purge(entities: Collection<T>) {
+	override suspend fun purge(entities: Collection<T>): Flow<DocIdentifier> = flow {
 		val client = couchDbDispatcher.getClient(dbInstanceUrl)
 		if (log.isDebugEnabled) {
 			log.debug("remove $entities")
 		}
 		try {
-			val bulkDeleteResults = client.bulkDelete(entities.map { beforeDelete(it) }).toList()
-			for (entity in entities) {
-				afterDelete(entity)
-			}
+			val entitiesById = entities.associateBy { it.id }
+			val bulkDeleteResults = client.bulkDelete(entities.map { beforeDelete(it) })
+				.onEach { r -> entitiesById[r.id]?.let { afterDelete(it) } }
+			emitAll(bulkDeleteResults.map { DocIdentifier(it.id, it.rev) })
 		} catch (e: Exception) {
 			throw PersistenceException("failed to remove entities ", e)
 		}