fix(EntityDiff): excluded fields missing from Deleted#previous

Author: SIMULATAN

integrations/builtin/src/main/kotlin/me/snoty/integration/builtin/diff/DiffNodeHandler.kt

@@ -4,6 +4,7 @@ import io.github.oshai.kotlinlogging.KotlinLogging
 import io.github.oshai.kotlinlogging.slf4j.logger
 import io.ktor.http.*
 import io.ktor.server.response.*
+import kotlinx.coroutines.flow.fold
 import kotlinx.coroutines.flow.toList
 import me.snoty.backend.utils.NULL_UUID
 import me.snoty.backend.utils.bson.encode
@@ -71,8 +72,12 @@ abstract class DiffNodeHandler(
 			}
 			.toMap()
 
-		val rawOldStates = entityStateService.getLastStates(node._id)
-			.toList()
+		val rawOldStates: Map<String, EntityState> = entityStateService.getLastStates(node._id)
+			.fold(mutableMapOf()) { acc, state ->
+				acc[state.id] = state
+				acc
+			}
+		
 		val (oldStates, changes) = processStates(rawOldStates, Data(newData), excludedFields)
 
 		entityStateService.updateStates(node._id, changes.values)
@@ -103,17 +108,21 @@ private fun Document.removeAll(fields: Collection<String>) {
 }
 
 internal fun processStates(
-	oldStates: List<EntityState>,
+	oldStates: Map<String, EntityState>,
 	newData: DiffNodeHandler.Data,
 	excludedFields: Collection<String>
 ): Pair<DiffNodeHandler.States, DiffNodeHandler.Changes> {
+	val fullOldStates = oldStates
 	val oldStates = oldStates
 		// remove excluded fields to not consider them in the diff
-		.map {
-			it.state.removeAll(excludedFields)
-			it.copy(checksum = it.state.checksum())
+		.mapValues { (_, it) ->
+			val newState = Document(it.state)
+			newState.removeAll(excludedFields)
+			it.copy(
+				state = newState,
+				checksum = newState.checksum()
+			)
 		}
-		.associateBy { it.id }
 
 	val createAndUpdate = newData
 		.mapValues { (id, newState) ->
@@ -125,16 +134,15 @@ internal fun processStates(
 
 			EntityStateService.EntityStateUpdate(EntityState(id, newState), diff)
 		}
-	val delete = oldStates
+	val delete = fullOldStates
 		// we only care about deleted entities
 		.filterKeys { it !in newData }
-		.mapValues { (id, _) ->
-			val oldState = oldStates[id] ?: error("Old state not found for entity $id")
+		.mapValues { (_, oldState) ->
 			// `null.diff` results in `DiffResult.Deleted`
 			EntityStateService.EntityStateUpdate(oldState, null.diff(oldState))
 		}
 
 	val allUpdates = createAndUpdate + delete
 
-	return DiffNodeHandler.States(oldStates) to DiffNodeHandler.Changes(allUpdates)
+	return DiffNodeHandler.States(fullOldStates) to DiffNodeHandler.Changes(allUpdates)
 }

integrations/builtin/src/main/kotlin/me/snoty/integration/builtin/diff/injector/DiffInjectorNodeHandler.kt

@@ -3,6 +3,7 @@ package me.snoty.integration.builtin.diff.injector
 import kotlinx.serialization.Serializable
 import me.snoty.backend.wiring.node.NodesScope
 import me.snoty.integration.builtin.diff.DiffNodeHandler
+import me.snoty.integration.common.annotation.ReceiveEmptyInput
 import me.snoty.integration.common.annotation.RegisterNode
 import me.snoty.integration.common.diff.DiffResult
 import me.snoty.integration.common.diff.EntityStateService
@@ -49,6 +50,7 @@ data class HasDiff(
 	inputType = EmptySchema::class,
 	outputType = EmptySchema::class,
 )
+@ReceiveEmptyInput
 @Single
 class DiffInjectorNodeHandler(
 	@ScopeId(NodesScope::class) entityStateService: EntityStateService,

integrations/builtin/src/main/resources/node/me.snoty.integration.builtin.diff.injector/diffinjector/node_bottom.liquid

@@ -1,15 +1,17 @@
-<button onclick="
-        templateAPI.getNodeAPI('{{ node._id }}').apiFetch('clear', { method: 'POST' })
-            .then(res => {
-                if (res.ok) {
-                    alert('Successfully cleared states')
-                } else {
-                    alert('Failed to clear states')
-                }
-            })
-    "
-   class="btn preset-filled"
+<a class="anchor" href="{{ node.apiUrl }}state">View states</a>
+
+<button style="margin-top: 2em" onclick="
+    templateAPI.getNodeAPI('{{ node._id }}').apiFetch('clear', { method: 'POST' })
+        .then(res => {
+            if (res.ok) {
+                alert('Successfully cleared states')
+            } else {
+                alert('Failed to clear states')
+            }
+        })
+"
+        class="btn preset-filled block"
 >
     Clear States
 </button>
-<small>Warning: this will delete all historic states. All entities will be reset to the status "Created"!</small>
+<small class="block">Warning: this will delete all historic states. All entities will be reset to the status "Created"!</small>

integrations/builtin/src/test/kotlin/me/snoty/integration/builtin/diff/DiffNodeHandlerTest.kt

@@ -25,7 +25,7 @@ class DiffNodeHandlerTest {
 		val (old, new) = getDocs()
 
 		val (_, newStates) = processStates(
-			oldStates = listOf(EntityState(id, old)),
+			oldStates = mapOf(id to EntityState(id, old)),
 			newData = DiffNodeHandler.Data(mapOf(id to new)),
 			excludedFields = listOf(excluded),
 		)
@@ -43,7 +43,7 @@ class DiffNodeHandlerTest {
 		new[key] = value
 
 		val (_, newStates) = processStates(
-			oldStates = listOf(EntityState(id, old)),
+			oldStates = mapOf(id to EntityState(id, old)),
 			newData = DiffNodeHandler.Data(mapOf(id to new)),
 			excludedFields = listOf(excluded),
 		)