From c3fa3af80566724f86dca40e9ac956abaccbed8b Mon Sep 17 00:00:00 2001 From: maverickstuder Date: Wed, 27 Mar 2024 15:12:27 +0100 Subject: [PATCH] RED-8702: Explore document databases to store entityLog * partial fix for wrong service call --- .../redaction/v1/server/service/EntityChangeLogService.java | 6 ++++-- .../v1/server/storage/RedactionStorageService.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/EntityChangeLogService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/EntityChangeLogService.java index 2225a732..6ce32578 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/EntityChangeLogService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/EntityChangeLogService.java @@ -85,8 +85,10 @@ public class EntityChangeLogService { List removedEntries = previousEntityLogEntries.stream() .filter(entry -> !existingIds.contains(entry.getId())) .toList(); - removedEntries.forEach(entry -> entry.getChanges().add(new Change(analysisNumber, ChangeType.REMOVED, now))); - removedEntries.forEach(entry -> entry.setState(EntryState.REMOVED)); + removedEntries.stream() + .filter(entry -> !entry.getState().equals(EntryState.REMOVED)) + .peek(entry -> entry.getChanges().add(new Change(analysisNumber, ChangeType.REMOVED, now))) + .forEach(entry -> entry.setState(EntryState.REMOVED)); //entityLogMongoService.updateEntityLogEntries(dossierId, fileId, removedEntries); newEntityLogEntries.addAll(removedEntries); return removedEntries; diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/storage/RedactionStorageService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/storage/RedactionStorageService.java index 99e51913..58904855 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/storage/RedactionStorageService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/storage/RedactionStorageService.java @@ -212,7 +212,7 @@ public class RedactionStorageService { public List findEntriesWithIds(String dossierId, String fileId, Collection entryIds) { - return entityLogMongoService.findAllEntityLogEntriesWithContainingNodeIdsWithEntryIdsIn(dossierId, fileId, entryIds); + return entityLogMongoService.findAllEntityLogEntriesWithEntryIdsIn(dossierId, fileId, entryIds); }