Added equalsIgnoreCase fileattributes methods for rules

RED-1755: Calculate falgs in file-management-service async
Pull request #211 : RED-2015: Fixed (Manual) Redactions in download reports/files for excluded pages
2021-08-20 14:58:56 +02:00 · 2021-08-18 16:02:38 +02:00 · 2021-08-17 12:39:11 +02:00 · 2021-08-17 11:34:03 +02:00 · 2021-08-13 13:56:13 +02:00 · 2021-08-13 13:19:42 +02:00
15 changed files with 363 additions and 309 deletions
@@ -15,10 +15,6 @@ public class AnalyzeResult {
    private String fileId;
    private long duration;
    private int numberOfPages;
-    private boolean hasHints;
-    private boolean hasRequests;
-    private boolean hasRedactions;
-    private boolean hasImages;
    private boolean hasUpdates;
    private long dictionaryVersion;
    private long dossierDictionaryVersion;
@@ -0,0 +1,18 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import java.time.OffsetDateTime;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class Change {
+
+    private ChangeType type;
+    private OffsetDateTime dateTime;
+}
@@ -1,5 +1,5 @@
 package com.iqser.red.service.redaction.v1.model;

 public enum ChangeType {
-    ADDED, REMOVED
+    ADDED, REMOVED, CHANGED
 }
@@ -1,22 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class RedactionChangeLog {
-
-    private List<RedactionChangeLogEntry> redactionLogEntry = new ArrayList<>();
-
-    private long dictionaryVersion = -1;
-    private long dossierDictionaryVersion = -1;
-    private long rulesVersion = -1;
-    private long legalBasisVersion = -1;
-
-}
@@ -1,49 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class RedactionChangeLogEntry {
-
-    private String id;
-    private String type;
-    private String value;
-    private String reason;
-    private int matchedRule;
-    private String legalBasis;
-    private boolean redacted;
-    private boolean isHint;
-    private boolean isRecommendation;
-    private String section;
-    private float[] color;
-
-    @Builder.Default
-    private List<Rectangle> positions = new ArrayList<>();
-    private int sectionNumber;
-    private boolean manual;
-    private Status status;
-    private ManualRedactionType manualRedactionType;
-    private boolean isDictionaryEntry;
-
-    private String textBefore;
-    private String textAfter;
-
-    @Builder.Default
-    private List<Comment> comments = new ArrayList<>();
-
-    private ChangeType changeType;
-
-    private boolean isDossierDictionaryEntry;
-
-    private boolean excluded;
-
-}
@@ -0,0 +1,17 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class RedactionLogChanges {
+
+    private RedactionLog redactionLog;
+    private boolean hasChanges;
+
+}
@@ -58,4 +58,8 @@ public class RedactionLogEntry {
    private String recategorizationType;
    private String legalBasisChangeValue;

+    @EqualsAndHashCode.Exclude
+    @Builder.Default
+    private List<Change> changes = new ArrayList<>();
+
 }
@@ -1,5 +1,8 @@
 package com.iqser.red.service.redaction.v1.model;

+import java.util.HashSet;
+import java.util.Set;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -15,4 +18,6 @@ public class RedactionRequest {
    private String fileId;
    private String dossierTemplateId;
    private ManualRedactions manualRedactions;
+    @Builder.Default
+    private Set<Integer> excludedPages = new HashSet<>();
 }
@@ -159,7 +159,7 @@ public class RedactionController implements RedactionResource {
            // old redaction logs are returned directly
            return redactionLog;
        } else {
-            return redactionLogMergeService.mergeRedactionLogData(redactionLog, redactionRequest.getDossierTemplateId(), redactionRequest.getManualRedactions());
+            return redactionLogMergeService.mergeRedactionLogData(redactionLog, redactionRequest.getDossierTemplateId(), redactionRequest.getManualRedactions(), redactionRequest.getExcludedPages());
        }
    }

@@ -72,6 +72,19 @@ public class Section {
    }


+    public boolean fileAttributeByIdEqualsIgnoreCase(String id, String value){
+        return fileAttributes != null && fileAttributes.stream().filter(attribute -> id.equals(attribute.getId()) && value.equalsIgnoreCase(attribute.getValue())).findFirst().isPresent();
+    }
+
+    public boolean fileAttributeByPlaceholderEqualsIgnoreCase(String placeholder, String value){
+        return fileAttributes != null && fileAttributes.stream().filter(attribute -> placeholder.equals(attribute.getPlaceholder()) && value.equalsIgnoreCase(attribute.getValue())).findFirst().isPresent();
+    }
+
+    public boolean fileAttributeByLabelEqualsIgnoreCase(String label, String value){
+        return fileAttributes != null && fileAttributes.stream().filter(attribute -> label.equals(attribute.getLabel()) && value.equalsIgnoreCase(attribute.getValue())).findFirst().isPresent();
+    }
+
+
    public boolean rowEquals(String headerName, String value) {

        String cleanHeaderName = headerName.replaceAll("\n", "").replaceAll(" ", "").replaceAll("-", "");
@@ -1,12 +1,10 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;

 import com.iqser.red.service.redaction.v1.model.AnalyzeResult;
-import com.iqser.red.service.redaction.v1.model.RedactionChangeLog;
 import com.iqser.red.service.redaction.v1.model.RedactionLog;
-import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;

 import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
-import lombok.NoArgsConstructor;
+
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;

@@ -17,45 +15,14 @@ public class AnalyzeResponseService {
    private final RedactionServiceSettings redactionServiceSettings;

    public AnalyzeResult createAnalyzeResponse(String dossierId, String fileId, long duration, int pageCount,
-                                               RedactionLog redactionLog, RedactionChangeLog redactionChangeLog) {
+                                               RedactionLog redactionLog, boolean hasUpdates) {

-        boolean hasHints = redactionLog.getRedactionLogEntry()
-                .stream()
-                .filter(entry -> !entry.isExcluded())
-                .anyMatch(entry -> entry.isHint() && !entry.getType().equals("false_positive"));
-
-        boolean hasRequests = redactionLog.getRedactionLogEntry()
-                .stream()
-                .filter(entry -> !entry.isExcluded())
-                .anyMatch(entry -> entry.isManual() && entry.getStatus()
-                        .equals(com.iqser.red.service.redaction.v1.model.Status.REQUESTED));
-
-        boolean hasRedactions = redactionLog.getRedactionLogEntry()
-                .stream()
-                .filter(entry -> !entry.isExcluded())
-                .anyMatch(entry -> entry.isRedacted() && !entry.isManual() || entry.isManual() && entry.getStatus()
-                        .equals(com.iqser.red.service.redaction.v1.model.Status.APPROVED));
-
-        boolean hasImages = redactionLog.getRedactionLogEntry()
-                .stream()
-                .filter(entry -> !entry.isExcluded())
-                .anyMatch(entry -> entry.isHint() && entry.getType().equals("image") || entry.isImage());
-
-        boolean hasUpdates = redactionChangeLog != null && redactionChangeLog.getRedactionLogEntry() != null && !redactionChangeLog
-                .getRedactionLogEntry()
-                .isEmpty() && redactionChangeLog.getRedactionLogEntry()
-                .stream()
-                .anyMatch(entry -> !entry.getType().equals("false_positive"));

        return AnalyzeResult.builder()
                .dossierId(dossierId)
                .fileId(fileId)
                .duration(duration)
                .numberOfPages(pageCount)
-                .hasHints(hasHints)
-                .hasRedactions(hasRedactions)
-                .hasRequests(hasRequests)
-                .hasImages(hasImages)
                .hasUpdates(hasUpdates)
                .analysisVersion(redactionServiceSettings.getAnalysisVersion())
                .rulesVersion(redactionLog.getRulesVersion())
@@ -78,9 +78,9 @@ public class ReanalyzeService {
        log.info("Analyzed with rules {} and dictionary {} for dossierTemplate: {}", classifiedDoc.getRulesVersion(), classifiedDoc
                .getDictionaryVersion(), analyzeRequest.getDossierTemplateId());

-        // first create changelog - this only happens when we migrate files analyzed via the old process and we don't want to loose changeLog data
-        var changeLog = redactionChangeLogService.createAndStoreChangeLog(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), redactionLog);
-        // store redactionLog
+        var redactionLogChange = redactionChangeLogService.computeChanges(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), redactionLog);
+        redactionLog = redactionLogChange.getRedactionLog();
+
        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.REDACTION_LOG, redactionLog);
        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.TEXT, new Text(pageCount, classifiedDoc
                .getSectionText()));
@@ -88,7 +88,7 @@ public class ReanalyzeService {
                .getSectionGrid());

        long duration = System.currentTimeMillis() - startTime;
-        return analyzeResponseService.createAnalyzeResponse(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), duration, pageCount, redactionLog, changeLog);
+        return analyzeResponseService.createAnalyzeResponse(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), duration, pageCount, redactionLog, redactionLogChange.isHasChanges());
    }


@@ -266,13 +266,13 @@ public class ReanalyzeService {

        excludeExcludedPages(redactionLog, analyzeRequest.getExcludedPages());

-        var changeLog = redactionChangeLogService.createAndStoreChangeLog(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), redactionLog);
-        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.REDACTION_LOG, redactionLog);
+        var redactionLogChange = redactionChangeLogService.computeChanges(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), redactionLog);
+        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.REDACTION_LOG, redactionLogChange.getRedactionLog());

        long duration = System.currentTimeMillis() - startTime;

        return analyzeResponseService.createAnalyzeResponse(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), duration, text
-                .getNumberOfPages(), redactionLog, changeLog);
+                .getNumberOfPages(), redactionLogChange.getRedactionLog(), redactionLogChange.isHasChanges());
    }


@@ -311,9 +311,11 @@ public class ReanalyzeService {

    private void excludeExcludedPages(RedactionLog redactionLog, Set<Integer> excludedPages) {

-        redactionLog.getRedactionLogEntry()
-                .forEach(entry -> entry.getPositions()
-                        .forEach(pos -> entry.setExcluded(excludedPages != null && excludedPages.contains(pos.getPage()))));
+        if(excludedPages != null && !excludedPages.isEmpty()) {
+            redactionLog.getRedactionLogEntry().forEach(entry -> entry.getPositions().forEach(pos -> { if (excludedPages.contains(pos.getPage())) {
+                entry.setExcluded(true);
+            }}));
+        }
    }

 }
@@ -1,19 +1,25 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;

-import com.iqser.red.service.file.management.v1.api.model.FileType;
-import com.iqser.red.service.redaction.v1.model.ChangeType;
-import com.iqser.red.service.redaction.v1.model.RedactionChangeLog;
-import com.iqser.red.service.redaction.v1.model.RedactionChangeLogEntry;
-import com.iqser.red.service.redaction.v1.model.RedactionLog;
-import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
-import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+import java.time.OffsetDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
 import org.springframework.stereotype.Service;

-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
+import com.iqser.red.service.redaction.v1.model.Change;
+import com.iqser.red.service.redaction.v1.model.ChangeType;
+import com.iqser.red.service.redaction.v1.model.RedactionLog;
+import com.iqser.red.service.redaction.v1.model.RedactionLogChanges;
+import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
+import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;

@Slf4j
@Service
@@ -22,76 +28,77 @@ public class RedactionChangeLogService {

    private final RedactionStorageService redactionStorageService;

-    public RedactionChangeLog createAndStoreChangeLog(String dossierId, String fileId, RedactionLog currentRedactionLog) {

-        try {
-            RedactionLog previousRedactionLog = redactionStorageService.getRedactionLog(dossierId, fileId);
-            var changeLog = createChangeLog(currentRedactionLog, previousRedactionLog);
-            redactionStorageService.storeObject(dossierId, fileId, FileType.REDACTION_CHANGELOG, changeLog);
-            return changeLog;
-        } catch (Exception e) {
-            log.debug("Previous redaction log not available");
-            return null;
-        }
-
-    }
-
-
-    private RedactionChangeLog createChangeLog(RedactionLog currentRedactionLog, RedactionLog previousRedactionLog) {
+    public RedactionLogChanges computeChanges(String dossierId, String fileId, RedactionLog currentRedactionLog) {

+        RedactionLog previousRedactionLog = redactionStorageService.getRedactionLog(dossierId, fileId);

        if (previousRedactionLog == null) {
-            return null;
+            currentRedactionLog.getRedactionLogEntry().forEach(entry -> {
+                entry.getChanges().add(new Change(ChangeType.ADDED, OffsetDateTime.now()));
+            });
+            return new RedactionLogChanges(currentRedactionLog, false);
        }

-        List<RedactionLogEntry> added = new ArrayList<>(currentRedactionLog.getRedactionLogEntry());
-        added.removeAll(previousRedactionLog.getRedactionLogEntry());
+        List<RedactionLogEntry> notRemovedPreviousEntries = previousRedactionLog.getRedactionLogEntry()
+                .stream()
+                .filter(entry -> !entry.getChanges()
+                        .get(entry.getChanges().size() - 1)
+                        .getType()
+                        .equals(ChangeType.REMOVED))
+                .collect(Collectors.toList());

-        List<RedactionLogEntry> removed = new ArrayList<>(previousRedactionLog.getRedactionLogEntry());
+        Set<RedactionLogEntry> added = new HashSet<>(currentRedactionLog.getRedactionLogEntry());
+        added.removeAll(notRemovedPreviousEntries);
+
+        Set<RedactionLogEntry> removed = new HashSet<>(notRemovedPreviousEntries);
        removed.removeAll(currentRedactionLog.getRedactionLogEntry());

-        List<RedactionChangeLogEntry> changeLogEntries = added.stream()
-                .map(entry -> convert(entry, ChangeType.ADDED))
-                .collect(Collectors.toList());
-        changeLogEntries.addAll(removed.stream()
-                .map(entry -> convert(entry, ChangeType.REMOVED))
-                .collect(Collectors.toList()));
+        Map<String, RedactionLogEntry> addedIds = new HashMap<>();
+        added.forEach(entry -> {
+            addedIds.put(entry.getId(), entry);
+        });

-        return new RedactionChangeLog(changeLogEntries,
-                currentRedactionLog.getDictionaryVersion(),
-                currentRedactionLog.getDossierDictionaryVersion(),
-                currentRedactionLog.getRulesVersion(),
-                currentRedactionLog.getLegalBasisVersion());
-    }
+        Set<String> removedIds = new HashSet<>();
+        removed.forEach(entry -> {
+            removedIds.add(entry.getId());
+        });

+        List<RedactionLogEntry> newRedactionLogEntries = previousRedactionLog.getRedactionLogEntry();

-    private RedactionChangeLogEntry convert(RedactionLogEntry entry, ChangeType changeType) {
+        List<RedactionLogEntry> toRemove = new ArrayList<>();
+        newRedactionLogEntries.forEach(entry -> {
+            if (removedIds.contains(entry.getId()) && addedIds.containsKey(entry.getId())) {
+                List<Change> changes = entry.getChanges();
+                changes.add(new Change(ChangeType.CHANGED, OffsetDateTime.now()));
+                var newEntry = addedIds.get(entry.getId());
+                newEntry.setChanges(changes);
+                addedIds.put(entry.getId(), newEntry);
+                toRemove.add(entry);
+            } else if (removedIds.contains(entry.getId())) {
+                entry.getChanges().add(new Change(ChangeType.REMOVED, OffsetDateTime.now()));
+            } else if (addedIds.containsKey(entry.getId())) {
+                List<Change> changes = entry.getChanges();
+                changes.add(new Change(ChangeType.ADDED, OffsetDateTime.now()));
+                var newEntry = addedIds.get(entry.getId());
+                newEntry.setChanges(changes);
+                addedIds.put(entry.getId(), newEntry);
+                toRemove.add(entry);
+            }
+        });

-        return RedactionChangeLogEntry.builder()
-                .id(entry.getId())
-                .type(entry.getType())
-                .value(entry.getValue())
-                .reason(entry.getReason())
-                .matchedRule(entry.getMatchedRule())
-                .legalBasis(entry.getLegalBasis())
-                .redacted(entry.isRedacted())
-                .isHint(entry.isHint())
-                .isRecommendation(entry.isRecommendation())
-                .section(entry.getSection())
-                .color(entry.getColor())
-                .positions(entry.getPositions())
-                .sectionNumber(entry.getSectionNumber())
-                .manual(entry.isManual())
-                .status(entry.getStatus())
-                .manualRedactionType(entry.getManualRedactionType())
-                .isDictionaryEntry(entry.isDictionaryEntry())
-                .textBefore(entry.getTextBefore())
-                .textAfter(entry.getTextAfter())
-                .comments(entry.getComments())
-                .changeType(changeType)
-                .isDossierDictionaryEntry(entry.isDossierDictionaryEntry())
-                .excluded(entry.isExcluded())
-                .build();
+        newRedactionLogEntries.removeAll(toRemove);
+
+        addedIds.forEach((k, v) -> {
+            if(v.getChanges().isEmpty()) {
+                v.getChanges().add(new Change(ChangeType.ADDED, OffsetDateTime.now()));
+            }
+            newRedactionLogEntries.add(v);
+        });
+
+        currentRedactionLog.setRedactionLogEntry(newRedactionLogEntries);
+
+        return new RedactionLogChanges(currentRedactionLog, !addedIds.isEmpty() || !removedIds.isEmpty());
    }

 }
@@ -1,14 +1,31 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;

-import com.iqser.red.service.redaction.v1.model.*;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
+import java.time.OffsetDateTime;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.redaction.v1.model.Comment;
+import com.iqser.red.service.redaction.v1.model.IdRemoval;
+import com.iqser.red.service.redaction.v1.model.ManualForceRedact;
+import com.iqser.red.service.redaction.v1.model.ManualImageRecategorization;
+import com.iqser.red.service.redaction.v1.model.ManualLegalBasisChange;
+import com.iqser.red.service.redaction.v1.model.ManualRedactionEntry;
+import com.iqser.red.service.redaction.v1.model.ManualRedactionType;
+import com.iqser.red.service.redaction.v1.model.ManualRedactions;
+import com.iqser.red.service.redaction.v1.model.RedactionLog;
+import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
+import com.iqser.red.service.redaction.v1.model.Status;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;

@Slf4j
@Service
@@ -18,7 +35,8 @@ public class RedactionLogMergeService {
    private final DictionaryService dictionaryService;


-    public RedactionLog mergeRedactionLogData(RedactionLog redactionLog, String dossierTemplateId, ManualRedactions manualRedactions) {
+    public RedactionLog mergeRedactionLogData(RedactionLog redactionLog, String dossierTemplateId,
+                                              ManualRedactions manualRedactions, Set<Integer> excludedPages) {

        log.info("Merging Redaction log with manual redactions {}", manualRedactions);
        if (manualRedactions != null) {
@@ -27,10 +45,23 @@ public class RedactionLogMergeService {

            redactionLog.getRedactionLogEntry().addAll(manualRedactionLogEntries);

-            log.info("Adding {}", manualRedactionLogEntries);
+            var manualRedactionWrappers = createManualRedactionWrappers(manualRedactions);
+
            for (RedactionLogEntry entry : redactionLog.getRedactionLogEntry()) {
-                processRedactionLogEntry(manualRedactions, dossierTemplateId, entry);
+
+                processRedactionLogEntry(manualRedactionWrappers.stream()
+                        .filter(mr -> entry.getId().equals(mr.getId()))
+                        .collect(Collectors.toList()), dossierTemplateId, entry);
+
                entry.setComments(manualRedactions.getComments().get(entry.getId()));
+
+                if (excludedPages != null && !excludedPages.isEmpty()) {
+                    entry.getPositions().forEach(pos -> {
+                        if (excludedPages.contains(pos.getPage())) {
+                            entry.setExcluded(true);
+                        }
+                    });
+                }
            }

        }
@@ -39,126 +70,151 @@ public class RedactionLogMergeService {
    }


-    private void processRedactionLogEntry(ManualRedactions manualRedactions, String dossierTemplateId, RedactionLogEntry redactionLogEntry) {
+    private List<ManualRedactionWrapper> createManualRedactionWrappers(ManualRedactions manualRedactions) {

-        List<Comment> comments = null;
+        List<ManualRedactionWrapper> manualRedactionWrappers = new ArrayList<>();

-
-        if (manualRedactions != null && !manualRedactions.getImageRecategorizations().isEmpty()) {
-            for (ManualImageRecategorization recategorization : manualRedactions.getImageRecategorizations()) {
-                if (recategorization.getId().equals(redactionLogEntry.getId())) {
-                    String manualOverrideReason = null;
-                    if (recategorization.getStatus().equals(Status.APPROVED)) {
-                        redactionLogEntry.setStatus(Status.APPROVED);
-                        redactionLogEntry.setType(recategorization.getType());
-                        manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", recategorized by manual override");
-                    } else if (recategorization.getStatus().equals(Status.REQUESTED)) {
-                        manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to recategorize");
-                        redactionLogEntry.setStatus(Status.REQUESTED);
-                        redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry.isRedacted(), false));
-                        redactionLogEntry.setRecategorizationType(recategorization.getType());
-                    } else {
-                        redactionLogEntry.setStatus(Status.DECLINED);
-                    }
-
-                    redactionLogEntry.setManualRedactionUserId(recategorization.getUser());
-                    redactionLogEntry.setReason(manualOverrideReason);
-                    redactionLogEntry.setManual(true);
-                    redactionLogEntry.setManualRedactionType(ManualRedactionType.RECATEGORIZE);
-                }
+        manualRedactions.getImageRecategorizations().forEach(item -> {
+            if (item.getSoftDeletedTime() == null) {
+                manualRedactionWrappers.add(new ManualRedactionWrapper(item.getId(), item.getRequestDate(), item));
            }
-        }
+        });

-        if (manualRedactions != null && !manualRedactions.getIdsToRemove().isEmpty()) {
-            for (IdRemoval manualRemoval : manualRedactions.getIdsToRemove()) {
-                if (manualRemoval.getId().equals(redactionLogEntry.getId())) {
-                    comments = manualRedactions.getComments().get(manualRemoval.getId());
-                    String manualOverrideReason = null;
-                    if (manualRemoval.getStatus().equals(Status.APPROVED)) {
-                        redactionLogEntry.setRedacted(false);
-                        redactionLogEntry.setStatus(Status.APPROVED);
-                        manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", removed by manual override");
-                        redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry.isRedacted(), true));
-                    } else if (manualRemoval.getStatus().equals(Status.REQUESTED)) {
-                        manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to remove");
-                        redactionLogEntry.setStatus(Status.REQUESTED);
-                        redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry.isRedacted(), false));
-                    } else {
-                        redactionLogEntry.setStatus(Status.DECLINED);
-                    }
-
-                    redactionLogEntry.setReason(manualOverrideReason);
-                    redactionLogEntry.setManual(true);
-                    redactionLogEntry.setManualRedactionUserId(manualRemoval.getUser());
-                    redactionLogEntry.setManualRedactionType(ManualRedactionType.REMOVE);
-                    redactionLogEntry.setDictionaryEntry(manualRemoval.isRemoveFromDictionary());
-                    redactionLogEntry.setDossierDictionaryEntry(manualRemoval.isRemoveFromDictionary());
-                }
+        manualRedactions.getIdsToRemove().forEach(item -> {
+            if (item.getSoftDeletedTime() == null) {
+                manualRedactionWrappers.add(new ManualRedactionWrapper(item.getId(), item.getRequestDate(), item));
            }
-        }
+        });

-        if (manualRedactions != null && !manualRedactions.getForceRedacts().isEmpty()) {
-            for (ManualForceRedact manualForceRedact : manualRedactions.getForceRedacts()) {
-                if (manualForceRedact.getId().equals(redactionLogEntry.getId())) {
-                    String manualOverrideReason = null;
-                    if (manualForceRedact.getStatus().equals(Status.APPROVED)) {
-                        redactionLogEntry.setRedacted(true);
-                        redactionLogEntry.setStatus(Status.APPROVED);
-                        redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry.isRedacted(), false));
-                        manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", forced by manual override");
-                        redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
-                    } else if (manualForceRedact.getStatus().equals(Status.REQUESTED)) {
-                        manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to force redact");
-                        redactionLogEntry.setStatus(Status.REQUESTED);
-                        redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry.isRedacted(), false));
-                        redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
-                    } else {
-                        redactionLogEntry.setStatus(Status.DECLINED);
-                    }
-
-                    redactionLogEntry.setManualRedactionUserId(manualForceRedact.getUser());
-                    redactionLogEntry.setReason(manualOverrideReason);
-                    redactionLogEntry.setManual(true);
-                    redactionLogEntry.setManualRedactionType(ManualRedactionType.FORCE_REDACT);
-
-                }
+        manualRedactions.getForceRedacts().forEach(item -> {
+            if (item.getSoftDeletedTime() == null) {
+                manualRedactionWrappers.add(new ManualRedactionWrapper(item.getId(), item.getRequestDate(), item));
            }
-        }
+        });

-        if (manualRedactions != null && !manualRedactions.getManualLegalBasisChanges().isEmpty()) {
-            for (ManualLegalBasisChange manualLegalBasisChange : manualRedactions.getManualLegalBasisChanges()) {
-                if (manualLegalBasisChange.getId().equals(redactionLogEntry.getId())) {
-                    String manualOverrideReason = null;
-                    if (manualLegalBasisChange.getStatus().equals(Status.APPROVED)) {
-                        redactionLogEntry.setStatus(Status.APPROVED);
-                        manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", legal basis was manually changed");
-                        redactionLogEntry.setLegalBasis(manualLegalBasisChange.getLegalBasis());
-                    } else if (manualLegalBasisChange.getStatus().equals(Status.REQUESTED)) {
-                        manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", legal basis change requested");
-                        redactionLogEntry.setStatus(Status.REQUESTED);
-                        redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry.isRedacted(), false));
-                        redactionLogEntry.setLegalBasisChangeValue(manualLegalBasisChange.getLegalBasis());
-                    } else {
-                        redactionLogEntry.setStatus(Status.DECLINED);
-                    }
-
-                    redactionLogEntry.setManualRedactionUserId(manualLegalBasisChange.getUser());
-                    redactionLogEntry.setReason(manualOverrideReason);
-                    redactionLogEntry.setManual(true);
-                    redactionLogEntry.setManualRedactionType(ManualRedactionType.LEGAL_BASIS_CHANGE);
-                }
+        manualRedactions.getManualLegalBasisChanges().forEach(item -> {
+            if (item.getSoftDeletedTime() == null) {
+                manualRedactionWrappers.add(new ManualRedactionWrapper(item.getId(), item.getRequestDate(), item));
            }
-        }
+        });

+        Collections.sort(manualRedactionWrappers);

-        if (manualRedactions != null) {
-            comments = manualRedactions.getComments().get(redactionLogEntry.getId());
-        }
-
-        redactionLogEntry.setComments(comments);
+        return manualRedactionWrappers;
    }

+
+    private void processRedactionLogEntry(List<ManualRedactionWrapper> manualRedactionWrappers,
+                                          String dossierTemplateId, RedactionLogEntry redactionLogEntry) {
+
+        manualRedactionWrappers.forEach(mrw -> {
+
+            if (mrw.getItem() instanceof ManualImageRecategorization) {
+                var imageRecategorization = (ManualImageRecategorization) mrw.getItem();
+                String manualOverrideReason = null;
+                if (imageRecategorization.getStatus().equals(Status.APPROVED)) {
+                    redactionLogEntry.setStatus(Status.APPROVED);
+                    redactionLogEntry.setType(imageRecategorization.getType());
+                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", recategorized by manual override");
+                } else if (imageRecategorization.getStatus().equals(Status.REQUESTED)) {
+                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to recategorize");
+                    redactionLogEntry.setStatus(Status.REQUESTED);
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry
+                            .isRedacted(), false));
+                    redactionLogEntry.setRecategorizationType(imageRecategorization.getType());
+                } else {
+                    redactionLogEntry.setStatus(Status.DECLINED);
+                }
+
+                redactionLogEntry.setManualRedactionUserId(imageRecategorization.getUser());
+                redactionLogEntry.setReason(manualOverrideReason);
+                redactionLogEntry.setManual(true);
+                redactionLogEntry.setManualRedactionType(ManualRedactionType.RECATEGORIZE);
+            }
+
+            if (mrw.getItem() instanceof IdRemoval) {
+                var manualRemoval = (IdRemoval) mrw.getItem();
+                String manualOverrideReason = null;
+                if (manualRemoval.getStatus().equals(Status.APPROVED)) {
+                    redactionLogEntry.setRedacted(false);
+                    redactionLogEntry.setStatus(Status.APPROVED);
+                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", removed by manual override");
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry
+                            .isRedacted(), true));
+                } else if (manualRemoval.getStatus().equals(Status.REQUESTED)) {
+                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to remove");
+                    redactionLogEntry.setStatus(Status.REQUESTED);
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry
+                            .isRedacted(), false));
+                } else {
+                    redactionLogEntry.setStatus(Status.DECLINED);
+                }
+
+                redactionLogEntry.setReason(manualOverrideReason);
+                redactionLogEntry.setManual(true);
+                redactionLogEntry.setManualRedactionUserId(manualRemoval.getUser());
+                redactionLogEntry.setManualRedactionType(ManualRedactionType.REMOVE);
+                redactionLogEntry.setDictionaryEntry(manualRemoval.isRemoveFromDictionary());
+                redactionLogEntry.setDossierDictionaryEntry(manualRemoval.isRemoveFromDictionary());
+            }
+
+            if (mrw.getItem() instanceof ManualForceRedact) {
+                var manualForceRedact = (ManualForceRedact) mrw.getItem();
+                String manualOverrideReason = null;
+                if (manualForceRedact.getStatus().equals(Status.APPROVED)) {
+                    redactionLogEntry.setRedacted(true);
+                    redactionLogEntry.setStatus(Status.APPROVED);
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry
+                            .isRedacted(), false));
+                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", forced by manual override");
+                    redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
+                } else if (manualForceRedact.getStatus().equals(Status.REQUESTED)) {
+                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to force redact");
+                    redactionLogEntry.setStatus(Status.REQUESTED);
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry
+                            .isRedacted(), false));
+                    redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
+                } else {
+                    redactionLogEntry.setStatus(Status.DECLINED);
+                }
+
+                redactionLogEntry.setManualRedactionUserId(manualForceRedact.getUser());
+                redactionLogEntry.setReason(manualOverrideReason);
+                redactionLogEntry.setManual(true);
+                redactionLogEntry.setManualRedactionType(ManualRedactionType.FORCE_REDACT);
+
+            }
+
+            if (mrw.getItem() instanceof ManualLegalBasisChange) {
+                var manualLegalBasisChange = (ManualLegalBasisChange) mrw.getItem();
+                String manualOverrideReason = null;
+                if (manualLegalBasisChange.getStatus().equals(Status.APPROVED)) {
+                    redactionLogEntry.setStatus(Status.APPROVED);
+                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", legal basis was manually changed");
+                    redactionLogEntry.setLegalBasis(manualLegalBasisChange.getLegalBasis());
+                } else if (manualLegalBasisChange.getStatus().equals(Status.REQUESTED)) {
+                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", legal basis change requested");
+                    redactionLogEntry.setStatus(Status.REQUESTED);
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry
+                            .isRedacted(), false));
+                    redactionLogEntry.setLegalBasisChangeValue(manualLegalBasisChange.getLegalBasis());
+                } else {
+                    redactionLogEntry.setStatus(Status.DECLINED);
+                }
+
+                redactionLogEntry.setManualRedactionUserId(manualLegalBasisChange.getUser());
+                redactionLogEntry.setReason(manualOverrideReason);
+                redactionLogEntry.setManual(true);
+                redactionLogEntry.setManualRedactionType(ManualRedactionType.LEGAL_BASIS_CHANGE);
+            }
+
+        });
+
+    }
+
+
    private String mergeReasonIfNecessary(String currentReason, String addition) {
+
        if (currentReason != null) {
            if (!currentReason.contains(addition)) {
                return currentReason + addition;
@@ -170,14 +226,16 @@ public class RedactionLogMergeService {
    }


-    public List<RedactionLogEntry> addManualAddEntries(Set<ManualRedactionEntry> manualAdds, Map<String, List<Comment>> comments, String dossierTemplateId) {
+    public List<RedactionLogEntry> addManualAddEntries(Set<ManualRedactionEntry> manualAdds,
+                                                       Map<String, List<Comment>> comments, String dossierTemplateId) {

        List<RedactionLogEntry> redactionLogEntries = new ArrayList<>();

        for (ManualRedactionEntry manualRedactionEntry : manualAdds) {

            if (!approvedAndShouldBeInDictionary(manualRedactionEntry)) {
-                RedactionLogEntry redactionLogEntry = createRedactionLogEntry(manualRedactionEntry, manualRedactionEntry.getId(), dossierTemplateId);
+                RedactionLogEntry redactionLogEntry = createRedactionLogEntry(manualRedactionEntry, manualRedactionEntry
+                        .getId(), dossierTemplateId);
                redactionLogEntry.setPositions(manualRedactionEntry.getPositions());
                redactionLogEntry.setComments(comments.get(manualRedactionEntry.getId()));
                redactionLogEntries.add(redactionLogEntry);
@@ -190,7 +248,8 @@ public class RedactionLogMergeService {

    private boolean approvedAndShouldBeInDictionary(ManualRedactionEntry manualRedactionEntry) {

-        return manualRedactionEntry.getStatus().equals(Status.APPROVED) && (manualRedactionEntry.isAddToDictionary() || manualRedactionEntry.isAddToDossierDictionary());
+        return manualRedactionEntry.getStatus()
+                .equals(Status.APPROVED) && (manualRedactionEntry.isAddToDictionary() || manualRedactionEntry.isAddToDossierDictionary());
    }


@@ -218,7 +277,9 @@ public class RedactionLogMergeService {
    }


-    private float[] getColor(String type, String dossierTemplateId, boolean requested, boolean isRedaction, boolean skipped) {
+    private float[] getColor(String type, String dossierTemplateId, boolean requested, boolean isRedaction,
+                             boolean skipped) {
+
        if (requested) {
            return dictionaryService.getRequestRemoveColor(dossierTemplateId);
        }
@@ -246,4 +307,22 @@ public class RedactionLogMergeService {
    }


+    @Data
+    @AllArgsConstructor
+    private static class ManualRedactionWrapper implements Comparable<ManualRedactionWrapper> {
+
+        private String id;
+        private OffsetDateTime date;
+        private Object item;
+
+
+        @Override
+        public int compareTo(ManualRedactionWrapper o) {
+
+            return this.date.compareTo(o.date);
+        }
+
+    }
+
 }
+
@@ -714,10 +714,13 @@ public class RedactionIntegrationTest {
        reanlysisVersions.put("physical", 2L);

        deleted.add("David Chubb");
+        deleted.add("mouse");

        dictionary.get(FALSE_POSITIVE).add("David Chubb");
        reanlysisVersions.put("David Chubb", 3L);

+        reanlysisVersions.put("mouse", 3L);
+
        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(3L);

        when(dictionaryClient.getDictionaryForType(VERTEBRATE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
@@ -754,6 +757,20 @@ public class RedactionIntegrationTest {
            fileOutputStream.write(annotateResponse.getDocument());
        }

+
+        deleted.remove("mouse");
+        reanlysisVersions.put("mouse", 4L);
+
+        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(4L);
+
+        when(dictionaryClient.getDictionaryForType(VERTEBRATE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(VERTEBRATE, false));
+
+        reanalyzeService.reanalyze(request);
+
+        redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID);
+
+        System.out.println("hi");
    }
Author	SHA1	Message	Date
Dominique Eifländer	bcd469bb65	Added equalsIgnoreCase fileattributes methods for rules	2021-08-20 14:58:56 +02:00
Dominique Eifländer	078dc2c3c3	RED-1755: Calculate falgs in file-management-service async	2021-08-18 16:02:38 +02:00
Dominique Eiflaender	4dda7ae543	Pull request #211 : RED-2015: Fixed (Manual) Redactions in download reports/files for excluded pages Merge in RED/redaction-service from RED-2015-master to master * commit '4d514d0e5ed1c22436bd8ba58578022d5fb8c4db': RED-2015: Fixed (Manual) Redactions in download reports/files for excluded pages	2021-08-17 12:39:11 +02:00
Dominique Eifländer	4d514d0e5e	RED-2015: Fixed (Manual) Redactions in download reports/files for excluded pages	2021-08-17 11:34:03 +02:00
Timo Bejan	1f12f9571f	RedactionLogMergeService.java edited online with Bitbucket	2021-08-13 13:56:13 +02:00
Timo Bejan	5312d5ffdf	RedactionLogMergeService.java edited online with Bitbucket	2021-08-13 13:19:42 +02:00
Timo Bejan	e43e8bccbf	RedactionLogMergeService.java edited online with Bitbucket	2021-08-13 13:00:32 +02:00
Timo Bejan	54250583b1	Pull request #207 : Proper Order of manual actions based on time Merge in RED/redaction-service from RED-1788 to master * commit 'bb80b7ae7550d70a98b4d500d3870a13585b57e8': Proper Order of manual actions based on time	2021-08-13 10:27:23 +02:00
Timo Bejan	bb80b7ae75	Proper Order of manual actions based on time	2021-08-13 11:19:54 +03:00
Dominique Eiflaender	25264f1450	Pull request #206 : RED-1908: Removed RedactionChangeLog added changes to RedactionLog Merge in RED/redaction-service from RED-1908 to master * commit 'e8a4ef172c994ab8dd99f84f7a725e3dddfaca5f': RED-1908: Removed RedactionChangeLog added changes to RedactionLog	2021-08-11 10:00:48 +02:00
Dominique Eifländer	e8a4ef172c	RED-1908: Removed RedactionChangeLog added changes to RedactionLog	2021-08-11 09:45:00 +02:00