RED-6476: Changed handling of manual-remove-redactions.

For cases where a manual-remove-redaction was applied to a redaction, that has multiple source (e.g. dictionary + rule), we still apply it when merging the redaction-log, instead of skipping it.  This prevents a redaction from reappearing, when it has been removed by the user.

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/redactionlog/RedactionLogMergeService.java

@@ -28,6 +28,7 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemp
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.type.Type;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Change;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.ChangeType;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Engine;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.ManualChange;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.ManualRedactionType;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Point;
@@ -189,8 +190,39 @@ public class RedactionLogMergeService {
 
         manualRedactionWrappers.forEach(mrw -> {
 
-            if (mrw.getItem() instanceof ManualImageRecategorization) {
+            Object item = mrw.getItem();
-                var imageRecategorization = (ManualImageRecategorization) mrw.getItem();
+            if (item instanceof ManualImageRecategorization) {
+                var imageRecategorization = (ManualImageRecategorization) item;
+                processManualImageRecategorization(redactionLogEntry, types, colors, imageRecategorization);
+            }
+
+            if (item instanceof IdRemoval) {
+                var manualRemoval = (IdRemoval) item;
+                processIdRemoval(redactionLogEntry, types, colors, manualRemoval);
+            }
+
+            if (item instanceof ManualForceRedaction) {
+                var manualForceRedact = (ManualForceRedaction) item;
+                processManualForceRedaction(redactionLogEntry, types, colors, manualForceRedact);
+            }
+
+            if (item instanceof ManualLegalBasisChange) {
+                var manualLegalBasisChange = (ManualLegalBasisChange) item;
+                processManualLegalBasisChange(redactionLogEntry, types, colors, manualLegalBasisChange);
+            }
+
+            if (item instanceof ManualResizeRedaction) {
+                var manualResizeRedact = (ManualResizeRedaction) item;
+                processManualResizeRedaction(redactionLogEntry, types, colors, manualResizeRedact);
+            }
+
+        });
+
+    }
+
+
+    private void processManualImageRecategorization(RedactionLogEntry redactionLogEntry, List<Type> types, Colors colors, ManualImageRecategorization imageRecategorization) {
+
         String manualOverrideReason = null;
         if (imageRecategorization.getStatus().equals(AnnotationStatus.APPROVED)) {
 
@@ -215,25 +247,39 @@ public class RedactionLogMergeService {
         }
 
         redactionLogEntry.getManualChanges()
-                        .add(ManualChange.from(imageRecategorization)
+                .add(ManualChange.from(imageRecategorization).withManualRedactionType(ManualRedactionType.RECATEGORIZE).withChange("type", imageRecategorization.getType()));
-                                .withManualRedactionType(ManualRedactionType.RECATEGORIZE)
-                                .withChange("type", imageRecategorization.getType()));
     }
 
-            if (mrw.getItem() instanceof IdRemoval) {
+
-                var manualRemoval = (IdRemoval) mrw.getItem();
+    private String mergeReasonIfNecessary(String currentReason, String addition) {
-                if (manualRemoval.getStatus().equals(AnnotationStatus.APPROVED) && manualRemoval.isRemoveFromDictionary()) {
+
+        if (currentReason != null) {
+            if (!currentReason.contains(addition)) {
+                return currentReason + addition;
+            }
+            return currentReason;
+        } else {
+            return "";
+        }
+    }
+
+
+    private void processIdRemoval(RedactionLogEntry redactionLogEntry, List<Type> types, Colors colors, IdRemoval manualRemoval) {
+
+        boolean isApprovedRedaction = manualRemoval.getStatus().equals(AnnotationStatus.APPROVED);
+        if (isApprovedRedaction && manualRemoval.isRemoveFromDictionary() && isBasedOnDictionaryOnly(redactionLogEntry)) {
             log.debug("Skipping merge for dictionary-modifying entry");
         } else {
+            String redactionLogEntryType = redactionLogEntry.getType();
             String manualOverrideReason = null;
-                    if (manualRemoval.getStatus().equals(AnnotationStatus.APPROVED)) {
+            if (isApprovedRedaction) {
                 redactionLogEntry.setRedacted(false);
                 manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", removed by manual override");
-                        redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), colors, false, redactionLogEntry.isRedacted(), true, types));
+                redactionLogEntry.setColor(getColor(redactionLogEntryType, colors, false, redactionLogEntry.isRedacted(), true, types));
                 redactionLogEntry.setHint(false);
             } else if (manualRemoval.getStatus().equals(AnnotationStatus.REQUESTED)) {
                 manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to remove");
-                        redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), colors, true, redactionLogEntry.isRedacted(), false, types));
+                redactionLogEntry.setColor(getColor(redactionLogEntryType, colors, true, redactionLogEntry.isRedacted(), false, types));
             }
 
             if (manualOverrideReason != null) {
@@ -246,8 +292,15 @@ public class RedactionLogMergeService {
                         .withManualRedactionType(manualRemoval.isRemoveFromDictionary() ? ManualRedactionType.REMOVE_FROM_DICTIONARY : ManualRedactionType.REMOVE_LOCALLY));
     }
 
-            if (mrw.getItem() instanceof ManualForceRedaction) {
+
-                var manualForceRedact = (ManualForceRedaction) mrw.getItem();
+    private boolean isBasedOnDictionaryOnly(RedactionLogEntry redactionLogEntry) {
+
+        return redactionLogEntry.getEngines().contains(Engine.DICTIONARY) && redactionLogEntry.getEngines().size() == 1;
+    }
+
+
+    private void processManualForceRedaction(RedactionLogEntry redactionLogEntry, List<Type> types, Colors colors, ManualForceRedaction manualForceRedact) {
+
         String manualOverrideReason = null;
         var dictionaryIsHint = isHint(types, redactionLogEntry.getType());
         if (manualForceRedact.getStatus().equals(AnnotationStatus.APPROVED)) {
@@ -270,15 +323,14 @@ public class RedactionLogMergeService {
             redactionLogEntry.setReason(manualOverrideReason);
         }
 
-                var manualChange = ManualChange.from(manualForceRedact)
+        var manualChange = ManualChange.from(manualForceRedact).withManualRedactionType(dictionaryIsHint ? ManualRedactionType.FORCE_HINT : ManualRedactionType.FORCE_REDACT);
-                        .withManualRedactionType(dictionaryIsHint ? ManualRedactionType.FORCE_HINT : ManualRedactionType.FORCE_REDACT);
 
         redactionLogEntry.getManualChanges().add(manualChange);
-
     }
 
-            if (mrw.getItem() instanceof ManualLegalBasisChange) {
+
-                var manualLegalBasisChange = (ManualLegalBasisChange) mrw.getItem();
+    private void processManualLegalBasisChange(RedactionLogEntry redactionLogEntry, List<Type> types, Colors colors, ManualLegalBasisChange manualLegalBasisChange) {
+
         String manualOverrideReason = null;
         if (manualLegalBasisChange.getStatus().equals(AnnotationStatus.APPROVED)) {
             manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", legal basis was manually changed");
@@ -310,8 +362,9 @@ public class RedactionLogMergeService {
         redactionLogEntry.getManualChanges().add(manualChange);
     }
 
-            if (mrw.getItem() instanceof ManualResizeRedaction) {
+
-                var manualResizeRedact = (ManualResizeRedaction) mrw.getItem();
+    private void processManualResizeRedaction(RedactionLogEntry redactionLogEntry, List<Type> types, Colors colors, ManualResizeRedaction manualResizeRedact) {
+
         String manualOverrideReason = null;
         if (manualResizeRedact.getStatus().equals(AnnotationStatus.APPROVED)) {
             redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), colors, false, redactionLogEntry.isRedacted(), false, types));
@@ -342,23 +395,6 @@ public class RedactionLogMergeService {
                 .add(ManualChange.from(manualResizeRedact).withManualRedactionType(ManualRedactionType.RESIZE).withChange("value", manualResizeRedact.getValue()));
     }
 
-        });
-
-    }
-
-
-    private String mergeReasonIfNecessary(String currentReason, String addition) {
-
-        if (currentReason != null) {
-            if (!currentReason.contains(addition)) {
-                return currentReason + addition;
-            }
-            return currentReason;
-        } else {
-            return "";
-        }
-    }
-
 
     public List<RedactionLogEntry> addManualAddEntries(SectionGrid sectionGrid,
                                                        Set<ManualRedactionEntry> manualAdds,