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 1533b8b7..d7b7dc80 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 @@ -72,34 +72,13 @@ public class EntityChangeLogService { .collect(Collectors.toSet()); List removedEntries = previousEntityLogEntries.stream() .filter(entry -> !existingIds.contains(entry.getId())) - .collect(Collectors.toList()); - List removedDossierRedaction = removedEntries.stream() - .filter(e -> e.getState() == EntryState.REMOVED && e.getType().equals("dossier_redaction")) .toList(); - previousEntityLogEntries.removeAll(removedDossierRedaction); - removedEntries.removeAll(removedDossierRedaction); removedEntries.forEach(entry -> entry.getChanges().add(new Change(analysisNumber, ChangeType.REMOVED, now))); removedEntries.forEach(entry -> entry.setState(EntryState.REMOVED)); - removedEntries.forEach(entry -> addManualChangeForDictionaryRemovals(entry, manualRedactions)); newEntityLogEntries.addAll(removedEntries); } - private void addManualChangeForDictionaryRemovals(EntityLogEntry entry, ManualRedactions manualRedactions) { - - if (manualRedactions == null || manualRedactions.getIdsToRemove().isEmpty()) { - return; - } - - manualRedactions.getIdsToRemove() - .stream() - .filter(IdRemoval::isRemoveFromDictionary)// - .filter(removed -> removed.getAnnotationId().equals(entry.getId()))// - .findFirst()// - .ifPresent(idRemove -> entry.getManualChanges().add(ManualChangeFactory.toManualChange(idRemove, false))); - } - - private ChangeType calculateChangeType(EntryState state, EntryState previousState) { if (state.equals(previousState)) {