Added equalsIgnoreCase fileattributes methods for rules

Merge in RED/redaction-service from RED-1755-2 to release/2.52.x

* commit 'dd585a13fd8d37319ce695eeb39a87ff197bec15':
  RED-1755: Calculate falgs in file-management-service async

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/AnalyzeRequest.java

@@ -7,6 +7,7 @@ import lombok.NoArgsConstructor;
 
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
@@ -22,7 +23,11 @@ public class AnalyzeRequest {
     private boolean reanalyseOnlyIfPossible;
     private ManualRedactions manualRedactions;
     private OffsetDateTime lastProcessed;
-    private Set<Integer> excludedPages;
+
+    @Builder.Default
+    private Set<Integer> excludedPages = new HashSet<>();
+    @Builder.Default
+    private Set<Integer> sectionsToReanalyse = new HashSet<>();
 
     @Builder.Default
     private List<FileAttribute> fileAttributes = new ArrayList<>();

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/AnalyzeResult.java

@@ -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;
@@ -27,6 +23,8 @@ public class AnalyzeResult {
 
     private boolean wasReanalyzed;
 
+    private int analysisVersion;
+
 
 }
 

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/RedactionLog.java

@@ -15,7 +15,7 @@ public class RedactionLog {
      * Version 0 Redaction Logs have manual redactions merged inside them
      * Version 1 Redaction Logs only contain system ( rule/dictionary ) redactions. Manual Redactions are merged in at runtime.
      */
-    private long computationalVersion;
+    private long analysisVersion;
 
     private List<RedactionLogEntry> redactionLogEntry;
     private List<LegalBasisMapping> legalBasis;

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/RedactionLogEntry.java

@@ -36,6 +36,7 @@ public class RedactionLogEntry {
     private boolean manual;
     private Status status;
     private ManualRedactionType manualRedactionType;
+    private String manualRedactionUserId;
     private boolean isDictionaryEntry;
 
     private String textBefore;

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/RedactionRequest.java

@@ -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<>();
 }

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/resources/RedactionResource.java

@@ -8,10 +8,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 
 public interface RedactionResource {
 
-    String RULE_SET_PARAMETER_NAME = "dossierTemplateId";
-    String RULE_SET_PATH_VARIABLE = "/{" + RULE_SET_PARAMETER_NAME + "}";
-
-
     @PostMapping(value = "/annotate", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
     AnnotateResponse annotate(@RequestBody AnnotateRequest annotateRequest);
 
@@ -24,9 +20,6 @@ public interface RedactionResource {
     @PostMapping(value = "/debug/htmlTables", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
     RedactionResult htmlTables(@RequestBody RedactionRequest redactionRequest);
 
-    @PostMapping(value = "/rules/update" + RULE_SET_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    void updateRules(@PathVariable(RULE_SET_PARAMETER_NAME) String dossierTemplateId);
-
     @PostMapping(value = "/rules/test", consumes = MediaType.APPLICATION_JSON_VALUE)
     void testRules(@RequestBody String rules);
 

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/controller/RedactionController.java

@@ -1,11 +1,7 @@
 package com.iqser.red.service.redaction.v1.server.controller;
 
 import com.iqser.red.service.file.management.v1.api.model.FileType;
-import com.iqser.red.service.redaction.v1.model.AnnotateRequest;
-import com.iqser.red.service.redaction.v1.model.AnnotateResponse;
-import com.iqser.red.service.redaction.v1.model.RedactionLog;
-import com.iqser.red.service.redaction.v1.model.RedactionRequest;
-import com.iqser.red.service.redaction.v1.model.RedactionResult;
+import com.iqser.red.service.redaction.v1.model.*;
 import com.iqser.red.service.redaction.v1.resources.RedactionResource;
 import com.iqser.red.service.redaction.v1.server.classification.model.Document;
 import com.iqser.red.service.redaction.v1.server.classification.model.Page;
@@ -15,6 +11,7 @@ import com.iqser.red.service.redaction.v1.server.redaction.service.DictionarySer
 import com.iqser.red.service.redaction.v1.server.redaction.service.DroolsExecutionService;
 import com.iqser.red.service.redaction.v1.server.redaction.service.RedactionLogMergeService;
 import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
+import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
@@ -143,14 +140,6 @@ public class RedactionController implements RedactionResource {
 
     }
 
-
-    @Override
-    public void updateRules(@PathVariable(RULE_SET_PARAMETER_NAME) String dossierTemplateId) {
-
-        droolsExecutionService.updateRules(dossierTemplateId);
-    }
-
-
     @Override
     public void testRules(@RequestBody String rules) {
 
@@ -165,16 +154,15 @@ public class RedactionController implements RedactionResource {
 
         var redactionLog = redactionStorageService.getRedactionLog(redactionRequest.getDossierId(), redactionRequest.getFileId());
 
-        log.info("Loaded redaction log with computationalVersion: {}",redactionLog.getComputationalVersion());
-        if (redactionLog.getComputationalVersion() == 0) {
+        log.info("Loaded redaction log with computationalVersion: {}", redactionLog.getAnalysisVersion());
+        if (redactionLog.getAnalysisVersion() == 0) {
             // 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());
         }
     }
 
-
     private RedactionResult convert(PDDocument document, int numberOfPages) throws IOException {
 
         try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Section.java

@@ -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("-", "");

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/AnalyzeResponseService.java

@@ -5,35 +5,20 @@ 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;
 
 @Service
+@RequiredArgsConstructor
 public class AnalyzeResponseService {
 
+    private final RedactionServiceSettings redactionServiceSettings;
+
     public AnalyzeResult createAnalyzeResponse(String dossierId, String fileId, long duration, int pageCount,
                                                RedactionLog redactionLog, RedactionChangeLog redactionChangeLog) {
 
-        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()
@@ -46,11 +31,8 @@ public class AnalyzeResponseService {
                 .fileId(fileId)
                 .duration(duration)
                 .numberOfPages(pageCount)
-                .hasHints(hasHints)
-                .hasRedactions(hasRedactions)
-                .hasRequests(hasRequests)
-                .hasImages(hasImages)
                 .hasUpdates(hasUpdates)
+                .analysisVersion(redactionServiceSettings.getAnalysisVersion())
                 .rulesVersion(redactionLog.getRulesVersion())
                 .dictionaryVersion(redactionLog.getDictionaryVersion())
                 .legalBasisVersion(redactionLog.getLegalBasisVersion())

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/DictionaryService.java

@@ -212,7 +212,7 @@ public class DictionaryService {
             dossierDictionaryVersion = dossierRepresentation.getDictionaryVersion();
         }
 
-        return new Dictionary(copy, DictionaryVersion.builder().dossierTemplateVersion(dossierTemplateRepresentation.getDictionaryVersion()).dossierVersion(dossierDictionaryVersion).build());
+        return new Dictionary(copy.stream().sorted(Comparator.comparingInt(DictionaryModel::getRank).reversed()).collect(Collectors.toList()), DictionaryVersion.builder().dossierTemplateVersion(dossierTemplateRepresentation.getDictionaryVersion()).dossierVersion(dossierDictionaryVersion).build());
     }
 
 

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/DroolsExecutionService.java

@@ -63,7 +63,7 @@ public class DroolsExecutionService {
             rulesVersion = -1L;
         }
 
-        if (version > rulesVersion.longValue()) {
+        if (version > rulesVersion) {
             rulesVersionPerDossierTemplateId.put(dossierTemplateId, version);
             return createOrUpdateKieContainer(dossierTemplateId);
         }
@@ -128,7 +128,7 @@ public class DroolsExecutionService {
         if (rulesVersion == null) {
             return -1;
         }
-        return rulesVersion.longValue();
+        return rulesVersion;
     }
 
 }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/EntityRedactionService.java

@@ -43,35 +43,13 @@ public class EntityRedactionService {
 
         if (dictionary.hasLocalEntries()) {
 
-            Map<Integer, Set<Entity>> hintsPerSectionNumber = new HashMap<>();
-            documentEntities.stream().forEach(entity -> {
-                if (dictionary.isHint(entity.getType()) && entity.isDictionaryEntry()) {
-                    hintsPerSectionNumber.computeIfAbsent(entity.getSectionNumber(), (x) -> new HashSet<>())
-                            .add(entity);
-                }
-            });
-
+            Map<Integer, Set<Entity>> hintsPerSectionNumber = getHintsPerSection(documentEntities, dictionary);
             Set<Entity> foundByLocal = findEntities(classifiedDoc, container, manualRedactions, dictionary, true, hintsPerSectionNumber, fileAttributes);
             EntitySearchUtils.addEntitiesWithHigherRank(documentEntities, foundByLocal, dictionary);
             EntitySearchUtils.removeEntitiesContainedInLarger(documentEntities);
         }
 
-        for (Entity entity : documentEntities) {
-            Map<Integer, List<EntityPositionSequence>> sequenceOnPage = new HashMap<>();
-            for (EntityPositionSequence entityPositionSequence : entity.getPositionSequences()) {
-                sequenceOnPage.computeIfAbsent(entityPositionSequence.getPageNumber(), (x) -> new ArrayList<>())
-                        .add(entityPositionSequence);
-            }
-
-            for (Map.Entry<Integer, List<EntityPositionSequence>> entry : sequenceOnPage.entrySet()) {
-                classifiedDoc.getEntities()
-                        .computeIfAbsent(entry.getKey(), (x) -> new ArrayList<>())
-                        .add(new Entity(entity.getWord(), entity.getType(), entity.isRedaction(), entity.getRedactionReason(), entry
-                                .getValue(), entity.getHeadline(), entity.getMatchedRule(), entity.getSectionNumber(), entity
-                                .getLegalBasis(), entity.isDictionaryEntry(), entity.getTextBefore(), entity.getTextAfter(), entity
-                                .getStart(), entity.getEnd(), entity.isDossierDictionaryEntry()));
-            }
-        }
+        classifiedDoc.setEntities(convertToEnititesPerPage(documentEntities));
 
         dictionaryService.updateExternalDictionary(dictionary, dossierTemplateId);
 
@@ -80,6 +58,39 @@ public class EntityRedactionService {
     }
 
 
+    public Map<Integer, List<Entity>> convertToEnititesPerPage(Set<Entity> entities){
+        Map<Integer, List<Entity>> entitiesPerPage = new HashMap<>();
+        for (Entity entity : entities) {
+            Map<Integer, List<EntityPositionSequence>> sequenceOnPage = new HashMap<>();
+            for (EntityPositionSequence entityPositionSequence : entity.getPositionSequences()) {
+                sequenceOnPage.computeIfAbsent(entityPositionSequence.getPageNumber(), (x) -> new ArrayList<>())
+                        .add(entityPositionSequence);
+            }
+
+            for (Map.Entry<Integer, List<EntityPositionSequence>> entry : sequenceOnPage.entrySet()) {
+                entitiesPerPage
+                        .computeIfAbsent(entry.getKey(), (x) -> new ArrayList<>())
+                        .add(new Entity(entity.getWord(), entity.getType(), entity.isRedaction(), entity.getRedactionReason(), entry
+                                .getValue(), entity.getHeadline(), entity.getMatchedRule(), entity.getSectionNumber(), entity
+                                .getLegalBasis(), entity.isDictionaryEntry(), entity.getTextBefore(), entity.getTextAfter(), entity
+                                .getStart(), entity.getEnd(), entity.isDossierDictionaryEntry()));
+            }
+        }
+        return entitiesPerPage;
+    }
+
+
+    public Map<Integer, Set<Entity>> getHintsPerSection(Set<Entity> entities, Dictionary dictionary){
+        Map<Integer, Set<Entity>> hintsPerSectionNumber = new HashMap<>();
+        entities.stream().forEach(entity -> {
+            if (dictionary.isHint(entity.getType()) && entity.isDictionaryEntry()) {
+                hintsPerSectionNumber.computeIfAbsent(entity.getSectionNumber(), (x) -> new HashSet<>())
+                        .add(entity);
+            }
+        });
+        return hintsPerSectionNumber;
+    }
+
     private Set<Entity> findEntities(Document classifiedDoc, KieContainer kieContainer,
                                      ManualRedactions manualRedactions, Dictionary dictionary, boolean local,
                                      Map<Integer, Set<Entity>> hintsPerSectionNumber,
@@ -123,42 +134,46 @@ public class EntityRedactionService {
         }
 
         sectionSearchableTextPairs.forEach(sectionSearchableTextPair -> {
-            Section analysedRowSection = droolsExecutionService.executeRules(kieContainer, sectionSearchableTextPair.getSection());
-            documentEntities.addAll(analysedRowSection.getEntities());
+            Section analysedSection = droolsExecutionService.executeRules(kieContainer, sectionSearchableTextPair.getSection());
+            documentEntities.addAll(analysedSection.getEntities());
 
-            for (Image image : analysedRowSection.getImages()) {
+            for (Image image : analysedSection.getImages()) {
                 classifiedDoc.getImages().computeIfAbsent(image.getPage(), (a) -> new HashSet<>()).add(image);
             }
 
-            analysedRowSection.getLocalDictionaryAdds().keySet().forEach(key -> {
-                if (dictionary.isRecommendation(key)) {
-                    analysedRowSection.getLocalDictionaryAdds().get(key).forEach(value -> {
-                        if (!dictionary.containsValue(key, value)) {
-                            dictionary.getLocalAccessMap().get(key).getLocalEntries().add(value);
-                        }
-                    });
-                } else {
-                    analysedRowSection.getLocalDictionaryAdds().get(key).forEach(value -> {
-
-                        if (dictionary.getLocalAccessMap().get(key) == null) {
-                            log.warn("Dictionary {} is null", key);
-                        }
-
-                        if (dictionary.getLocalAccessMap().get(key).getLocalEntries() == null) {
-                            log.warn("Dictionary {} localEntries is null", key);
-                        }
-
-                        dictionary.getLocalAccessMap().get(key).getLocalEntries().add(value);
-                    });
-                }
-            });
-
+            addLocalValuesToDictionary(analysedSection, dictionary);
         });
 
         return documentEntities;
     }
 
 
+    public void addLocalValuesToDictionary(Section analysedSection, Dictionary dictionary){
+        analysedSection.getLocalDictionaryAdds().keySet().forEach(key -> {
+            if (dictionary.isRecommendation(key)) {
+                analysedSection.getLocalDictionaryAdds().get(key).forEach(value -> {
+                    if (!dictionary.containsValue(key, value)) {
+                        dictionary.getLocalAccessMap().get(key).getLocalEntries().add(value);
+                    }
+                });
+            } else {
+                analysedSection.getLocalDictionaryAdds().get(key).forEach(value -> {
+
+                    if (dictionary.getLocalAccessMap().get(key) == null) {
+                        log.warn("Dictionary {} is null", key);
+                    }
+
+                    if (dictionary.getLocalAccessMap().get(key).getLocalEntries() == null) {
+                        log.warn("Dictionary {} localEntries is null", key);
+                    }
+
+                    dictionary.getLocalAccessMap().get(key).getLocalEntries().add(value);
+                });
+            }
+        });
+    }
+
+
     private List<SectionSearchableTextPair> processTablePerRow(Document classifiedDoc, Table table,
                                                                AtomicInteger sectionNumber, Dictionary dictionary,
                                                                boolean local,

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/ReanalyzeService.java

@@ -12,10 +12,13 @@ import com.iqser.red.service.redaction.v1.server.redaction.model.*;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
 import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
+import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
+
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
+
 import org.kie.api.runtime.KieContainer;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -39,6 +42,7 @@ public class ReanalyzeService {
     private final RedactionChangeLogService redactionChangeLogService;
     private final AnalyzeResponseService analyzeResponseService;
     private final LegalBasisClient legalBasisClient;
+    private final RedactionServiceSettings redactionServiceSettings;
 
 
     public AnalyzeResult analyze(AnalyzeRequest analyzeRequest) {
@@ -60,13 +64,12 @@ public class ReanalyzeService {
 
         entityRedactionService.processDocument(classifiedDoc, analyzeRequest.getDossierTemplateId(), analyzeRequest.getManualRedactions(), analyzeRequest
                 .getDossierId(), analyzeRequest.getFileAttributes());
-        redactionLogCreatorService.createRedactionLog(classifiedDoc, pageCount, analyzeRequest
-                .getDossierTemplateId());
+        redactionLogCreatorService.createRedactionLog(classifiedDoc, pageCount, analyzeRequest.getDossierTemplateId());
 
         log.info("Redaction analysis successful...");
 
         var legalBasis = legalBasisClient.getLegalBasisMapping(analyzeRequest.getDossierTemplateId());
-        var redactionLog = new RedactionLog(1, classifiedDoc.getRedactionLogEntities(), legalBasis, classifiedDoc.getDictionaryVersion()
+        var redactionLog = new RedactionLog(redactionServiceSettings.getAnalysisVersion(), classifiedDoc.getRedactionLogEntities(), legalBasis, classifiedDoc.getDictionaryVersion()
                 .getDossierTemplateVersion(), classifiedDoc.getDictionaryVersion()
                 .getDossierVersion(), classifiedDoc.getRulesVersion(), legalBasisClient.getVersion(analyzeRequest.getDossierTemplateId()));
 
@@ -105,6 +108,60 @@ public class ReanalyzeService {
         DictionaryIncrement dictionaryIncrement = dictionaryService.getDictionaryIncrements(analyzeRequest.getDossierTemplateId(), new DictionaryVersion(redactionLog
                 .getDictionaryVersion(), redactionLog.getDossierDictionaryVersion()), analyzeRequest.getDossierId());
 
+        Set<Integer> sectionsToReanalyse = !analyzeRequest.getSectionsToReanalyse().isEmpty() ? analyzeRequest.getSectionsToReanalyse() :
+                findSectionsToReanalyse(dictionaryIncrement, redactionLog, text, analyzeRequest);
+
+        if (sectionsToReanalyse.isEmpty()) {
+            return finalizeAnalysis(analyzeRequest, startTime, redactionLog, text, dictionaryIncrement);
+        }
+
+        List<SectionText> reanalysisSections = text.getSectionTexts()
+                .stream()
+                .filter(sectionText -> sectionsToReanalyse.contains(sectionText.getSectionNumber()))
+                .collect(Collectors.toList());
+
+        KieContainer kieContainer = droolsExecutionService.updateRules(analyzeRequest.getDossierTemplateId());
+
+        Dictionary dictionary = dictionaryService.getDeepCopyDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest
+                .getDossierId());
+
+        Map<Integer, Set<Image>> imagesPerPage = new HashMap<>();
+        Set<Entity> entities = findEntities(reanalysisSections, dictionary, kieContainer, analyzeRequest, false, null, imagesPerPage);
+
+        if (dictionary.hasLocalEntries()) {
+            Map<Integer, Set<Entity>> hintsPerSectionNumber = entityRedactionService.getHintsPerSection(entities, dictionary);
+            Set<Entity> foundByLocal = findEntities(reanalysisSections, dictionary, kieContainer, analyzeRequest, true, hintsPerSectionNumber, imagesPerPage);
+            EntitySearchUtils.addEntitiesWithHigherRank(entities, foundByLocal, dictionary);
+            EntitySearchUtils.removeEntitiesContainedInLarger(entities);
+        }
+
+        Map<Integer, List<Entity>> entitiesPerPage = entityRedactionService.convertToEnititesPerPage(entities);
+
+        List<RedactionLogEntry> newRedactionLogEntries = new ArrayList<>();
+        for (int page = 1; page <= text.getNumberOfPages(); page++) {
+            if (entitiesPerPage.get(page) != null) {
+                newRedactionLogEntries.addAll(redactionLogCreatorService.addEntries(entitiesPerPage, page, analyzeRequest
+                        .getDossierTemplateId()));
+            }
+
+            if (imagesPerPage.get(page) != null) {
+                newRedactionLogEntries.addAll(redactionLogCreatorService.addImageEntries(imagesPerPage, page, analyzeRequest
+                        .getDossierTemplateId()));
+            }
+
+        }
+
+        redactionLog.getRedactionLogEntry().removeIf(entry -> sectionsToReanalyse.contains(entry.getSectionNumber()));
+        redactionLog.getRedactionLogEntry().addAll(newRedactionLogEntries);
+        AnalyzeResult analyzeResult = finalizeAnalysis(analyzeRequest, startTime, redactionLog, text, dictionaryIncrement);
+        analyzeResult.setWasReanalyzed(true);
+        return analyzeResult;
+    }
+
+
+    private Set<Integer> findSectionsToReanalyse(DictionaryIncrement dictionaryIncrement, RedactionLog redactionLog,
+                                                 Text text, AnalyzeRequest analyzeRequest) {
+
         Set<String> relevantManuallyModifiedAnnotationIds = getRelevantManuallyModifiedAnnotationIds(analyzeRequest.getManualRedactions());
 
         Set<Integer> sectionsToReanalyse = new HashSet<>();
@@ -128,31 +185,20 @@ public class ReanalyzeService {
 
         log.info("Should reanalyze {} sections for request: {}", sectionsToReanalyse.size(), analyzeRequest);
 
-        if (sectionsToReanalyse.isEmpty()) {
-            return finalizeAnalysis(analyzeRequest, startTime, redactionLog, text, dictionaryIncrement);
-        }
+        return sectionsToReanalyse;
+    }
 
-        List<SectionText> reanalysisSections = new ArrayList<>();
 
-        for (SectionText sectionText : text.getSectionTexts()) {
-
-            if (sectionsToReanalyse.contains(sectionText.getSectionNumber())) {
-                reanalysisSections.add(sectionText);
-            }
-        }
-
-        //--
-
-        KieContainer kieContainer = droolsExecutionService.updateRules(analyzeRequest.getDossierTemplateId());
-
-        Dictionary dictionary = dictionaryService.getDeepCopyDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest
-                .getDossierId());
+    private Set<Entity> findEntities(List<SectionText> reanalysisSections, Dictionary dictionary,
+                                     KieContainer kieContainer, AnalyzeRequest analyzeRequest, boolean local,
+                                     Map<Integer, Set<Entity>> hintsPerSectionNumber,
+                                     Map<Integer, Set<Image>> imagesPerPage) {
 
         List<SectionSearchableTextPair> sectionSearchableTextPairs = new ArrayList<>();
         for (SectionText reanalysisSection : reanalysisSections) {
 
             Set<Entity> entities = entityRedactionService.findEntities(reanalysisSection.getSearchableText(), reanalysisSection
-                    .getHeadline(), reanalysisSection.getSectionNumber(), dictionary, false);
+                    .getHeadline(), reanalysisSection.getSectionNumber(), dictionary, local);
             if (reanalysisSection.getCellStarts() != null && !reanalysisSection.getCellStarts().isEmpty()) {
                 surroundingWordsService.addSurroundingText(entities, reanalysisSection.getSearchableText(), dictionary, reanalysisSection
                         .getCellStarts());
@@ -160,14 +206,15 @@ public class ReanalyzeService {
                 surroundingWordsService.addSurroundingText(entities, reanalysisSection.getSearchableText(), dictionary);
             }
 
-            if (reanalysisSection.getImages() != null && !reanalysisSection.getImages()
+            if (!local && reanalysisSection.getImages() != null && !reanalysisSection.getImages()
                     .isEmpty() && analyzeRequest.getManualRedactions() != null && analyzeRequest.getManualRedactions()
                     .getImageRecategorizations() != null) {
                 for (Image image : reanalysisSection.getImages()) {
                     String imageId = IdBuilder.buildId(image.getPosition(), image.getPage());
                     for (ManualImageRecategorization imageRecategorization : analyzeRequest.getManualRedactions()
                             .getImageRecategorizations()) {
-                        if (imageRecategorization.getStatus().equals(Status.APPROVED) && imageRecategorization.getId().equals(imageId)) {
+                        if (imageRecategorization.getStatus().equals(Status.APPROVED) && imageRecategorization.getId()
+                                .equals(imageId)) {
                             image.setType(imageRecategorization.getType());
                         }
                     }
@@ -177,7 +224,10 @@ public class ReanalyzeService {
             sectionSearchableTextPairs.add(new SectionSearchableTextPair(Section.builder()
                     .isLocal(false)
                     .dictionaryTypes(dictionary.getTypes())
-                    .entities(entities)
+                    .entities(hintsPerSectionNumber != null && hintsPerSectionNumber.containsKey(reanalysisSection.getSectionNumber()) ? Stream
+                            .concat(entities.stream(), hintsPerSectionNumber.get(reanalysisSection.getSectionNumber())
+                                    .stream())
+                            .collect(Collectors.toSet()) : entities)
                     .text(reanalysisSection.getSearchableText().getAsStringWithLinebreaks())
                     .searchText(reanalysisSection.getSearchableText().toString())
                     .headline(reanalysisSection.getHeadline())
@@ -191,54 +241,19 @@ public class ReanalyzeService {
         }
 
         Set<Entity> entities = new HashSet<>();
-        Map<Integer, Set<Image>> imagesPerPage = new HashMap<>();
         sectionSearchableTextPairs.forEach(sectionSearchableTextPair -> {
-            Section analysedRowSection = droolsExecutionService.executeRules(kieContainer, sectionSearchableTextPair.getSection());
-            entities.addAll(analysedRowSection.getEntities());
+            Section analysedSection = droolsExecutionService.executeRules(kieContainer, sectionSearchableTextPair.getSection());
+            entities.addAll(analysedSection.getEntities());
             EntitySearchUtils.removeEntitiesContainedInLarger(entities);
 
-            for (Image image : analysedRowSection.getImages()) {
+            for (Image image : analysedSection.getImages()) {
                 imagesPerPage.computeIfAbsent(image.getPage(), (a) -> new HashSet<>()).add(image);
             }
 
+            entityRedactionService.addLocalValuesToDictionary(analysedSection, dictionary);
         });
 
-        Map<Integer, List<Entity>> entitiesPerPage = new HashMap<>();
-        for (Entity entity : entities) {
-            Map<Integer, List<EntityPositionSequence>> sequenceOnPage = new HashMap<>();
-            for (EntityPositionSequence entityPositionSequence : entity.getPositionSequences()) {
-                sequenceOnPage.computeIfAbsent(entityPositionSequence.getPageNumber(), (x) -> new ArrayList<>())
-                        .add(entityPositionSequence);
-            }
-
-            for (Map.Entry<Integer, List<EntityPositionSequence>> entry : sequenceOnPage.entrySet()) {
-                entitiesPerPage.computeIfAbsent(entry.getKey(), (x) -> new ArrayList<>())
-                        .add(new Entity(entity.getWord(), entity.getType(), entity.isRedaction(), entity.getRedactionReason(), entry
-                                .getValue(), entity.getHeadline(), entity.getMatchedRule(), entity.getSectionNumber(), entity
-                                .getLegalBasis(), entity.isDictionaryEntry(), entity.getTextBefore(), entity.getTextAfter(), entity
-                                .getStart(), entity.getEnd(), entity.isDossierDictionaryEntry()));
-            }
-        }
-
-        List<RedactionLogEntry> newRedactionLogEntries = new ArrayList<>();
-        for (int page = 1; page <= text.getNumberOfPages(); page++) {
-            if (entitiesPerPage.get(page) != null) {
-                newRedactionLogEntries.addAll(redactionLogCreatorService.addEntries(entitiesPerPage, page, analyzeRequest
-                        .getDossierTemplateId()));
-            }
-
-            if (imagesPerPage.get(page) != null) {
-                newRedactionLogEntries.addAll(redactionLogCreatorService.addImageEntries(imagesPerPage, page, analyzeRequest
-                        .getDossierTemplateId()));
-            }
-
-        }
-
-        redactionLog.getRedactionLogEntry().removeIf(entry -> sectionsToReanalyse.contains(entry.getSectionNumber()));
-        redactionLog.getRedactionLogEntry().addAll(newRedactionLogEntries);
-        AnalyzeResult analyzeResult = finalizeAnalysis(analyzeRequest, startTime, redactionLog, text, dictionaryIncrement);
-        analyzeResult.setWasReanalyzed(true);
-        return analyzeResult;
+        return entities;
     }
 
 
@@ -296,10 +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);
+            }}));
+        }
     }
 
 }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogMergeService.java

@@ -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,122 +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.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.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.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.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;
@@ -166,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);
@@ -186,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());
     }
 
 
@@ -209,13 +272,14 @@ public class RedactionLogMergeService {
                 .manual(true)
                 .status(manualRedactionEntry.getStatus())
                 .manualRedactionType(ManualRedactionType.ADD)
-                .isDictionaryEntry(false)
-                .isDossierDictionaryEntry(manualRedactionEntry.isAddToDossierDictionary())
+                .manualRedactionUserId(manualRedactionEntry.getUser())
                 .build();
     }
 
 
-    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);
         }
@@ -243,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);
+        }
+
+    }
+
 }
+

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/utils/TextNormalizationUtilities.java

@@ -12,7 +12,7 @@ public class TextNormalizationUtilities {
      * @return Text without line-break hyphenation.
      */
     public static String removeHyphenLineBreaks(String text) {
-        return text.replaceAll("([^\\s\\d\\-]{2,})[\\-\\u00AD]\\R|\n\r(.+ )", "$1$2");
+        return text.replaceAll("([^\\s\\d\\-]{2,})[\\-\\u00AD]\\R", "$1");
     }
 
 }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/settings/RedactionServiceSettings.java

@@ -15,4 +15,6 @@ public class RedactionServiceSettings {
 
     private float maxImageCropboxRatio = 0.9f;
 
+    private int analysisVersion = 1;
+
 }

redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java

@@ -18,7 +18,9 @@ import com.iqser.red.service.redaction.v1.server.redaction.utils.ResourceLoader;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
 import com.iqser.red.storage.commons.service.StorageService;
+
 import lombok.SneakyThrows;
+
 import org.apache.commons.io.IOUtils;
 import org.junit.After;
 import org.junit.Before;
@@ -84,7 +86,6 @@ public class RedactionIntegrationTest {
 
     private static final String PII = "PII";
 
-
     @Autowired
     private RedactionController redactionController;
 
@@ -127,6 +128,7 @@ public class RedactionIntegrationTest {
     private final Map<String, Integer> rankTypeMap = new HashMap<>();
     private final Colors colors = new Colors();
     private final Map<String, Long> reanlysisVersions = new HashMap<>();
+    private final Set<String> deleted = new HashSet<>();
 
     private final static String TEST_DOSSIER_TEMPLATE_ID = "123";
     private final static String TEST_DOSSIER_ID = "123";
@@ -152,18 +154,20 @@ public class RedactionIntegrationTest {
             return kieServices.newKieContainer(kieModule.getReleaseId());
         }
 
+
         @Bean
         @Primary
         public StorageService inmemoryStorage() {
+
             return new FileSystemBackedStorageService();
         }
 
-
     }
 
 
     @After
     public void cleanupStorage() {
+
         if (this.storageService instanceof FileSystemBackedStorageService) {
             ((FileSystemBackedStorageService) this.storageService).clearStorage();
         }
@@ -179,7 +183,8 @@ public class RedactionIntegrationTest {
         loadDictionaryForTest();
         loadTypeForTest();
         when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(0L);
-        when(dictionaryClient.getAllTypes(TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(TypeResponse.builder()
+        when(dictionaryClient.getAllTypes(TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(TypeResponse
+                .builder()
                 .types(getTypeResponse())
                 .build());
 
@@ -188,7 +193,7 @@ public class RedactionIntegrationTest {
                 .types(List.of(TypeResult.builder()
                         .type(DOSSIER_REDACTIONS)
                         .dossierTemplateId(TEST_DOSSIER_TEMPLATE_ID)
-                        .hexColor( "#ffe187")
+                        .hexColor("#ffe187")
                         .isHint(hintTypeMap.get(DOSSIER_REDACTIONS))
                         .isCaseInsensitive(caseInSensitiveMap.get(DOSSIER_REDACTIONS))
                         .isRecommendation(recommendationTypeMap.get(DOSSIER_REDACTIONS))
@@ -196,26 +201,42 @@ public class RedactionIntegrationTest {
                         .build()))
                 .build());
 
-        when(dictionaryClient.getDictionaryForType(VERTEBRATE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(VERTEBRATE, false));
-        when(dictionaryClient.getDictionaryForType(ADDRESS, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(ADDRESS, false));
-        when(dictionaryClient.getDictionaryForType(AUTHOR, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(AUTHOR, false));
-        when(dictionaryClient.getDictionaryForType(SPONSOR, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(SPONSOR, false));
-        when(dictionaryClient.getDictionaryForType(NO_REDACTION_INDICATOR, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(NO_REDACTION_INDICATOR, false));
-        when(dictionaryClient.getDictionaryForType(REDACTION_INDICATOR, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(REDACTION_INDICATOR, false));
-        when(dictionaryClient.getDictionaryForType(HINT_ONLY, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(HINT_ONLY, false));
-        when(dictionaryClient.getDictionaryForType(MUST_REDACT, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(MUST_REDACT, false));
-        when(dictionaryClient.getDictionaryForType(PUBLISHED_INFORMATION, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(PUBLISHED_INFORMATION, false));
-        when(dictionaryClient.getDictionaryForType(TEST_METHOD, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(TEST_METHOD, false));
+        when(dictionaryClient.getDictionaryForType(VERTEBRATE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(VERTEBRATE, false));
+        when(dictionaryClient.getDictionaryForType(ADDRESS, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(ADDRESS, false));
+        when(dictionaryClient.getDictionaryForType(AUTHOR, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(AUTHOR, false));
+        when(dictionaryClient.getDictionaryForType(SPONSOR, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(SPONSOR, false));
+        when(dictionaryClient.getDictionaryForType(NO_REDACTION_INDICATOR, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(NO_REDACTION_INDICATOR, false));
+        when(dictionaryClient.getDictionaryForType(REDACTION_INDICATOR, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(REDACTION_INDICATOR, false));
+        when(dictionaryClient.getDictionaryForType(HINT_ONLY, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(HINT_ONLY, false));
+        when(dictionaryClient.getDictionaryForType(MUST_REDACT, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(MUST_REDACT, false));
+        when(dictionaryClient.getDictionaryForType(PUBLISHED_INFORMATION, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(PUBLISHED_INFORMATION, false));
+        when(dictionaryClient.getDictionaryForType(TEST_METHOD, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(TEST_METHOD, false));
         when(dictionaryClient.getDictionaryForType(PII, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(PII, false));
-        when(dictionaryClient.getDictionaryForType(RECOMMENDATION_AUTHOR, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(RECOMMENDATION_AUTHOR, false));
-        when(dictionaryClient.getDictionaryForType(RECOMMENDATION_ADDRESS, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(RECOMMENDATION_ADDRESS, false));
-        when(dictionaryClient.getDictionaryForType(FALSE_POSITIVE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(FALSE_POSITIVE, false));
-        when(dictionaryClient.getDictionaryForType(PURITY, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(PURITY, false));
+        when(dictionaryClient.getDictionaryForType(RECOMMENDATION_AUTHOR, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(RECOMMENDATION_AUTHOR, false));
+        when(dictionaryClient.getDictionaryForType(RECOMMENDATION_ADDRESS, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(RECOMMENDATION_ADDRESS, false));
+        when(dictionaryClient.getDictionaryForType(FALSE_POSITIVE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(FALSE_POSITIVE, false));
+        when(dictionaryClient.getDictionaryForType(PURITY, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(PURITY, false));
         when(dictionaryClient.getDictionaryForType(IMAGE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(IMAGE, false));
         when(dictionaryClient.getDictionaryForType(OCR, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(OCR, false));
         when(dictionaryClient.getDictionaryForType(LOGO, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(LOGO, false));
-        when(dictionaryClient.getDictionaryForType(SIGNATURE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(SIGNATURE, false));
-        when(dictionaryClient.getDictionaryForType(FORMULA, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(FORMULA, false));
+        when(dictionaryClient.getDictionaryForType(SIGNATURE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(SIGNATURE, false));
+        when(dictionaryClient.getDictionaryForType(FORMULA, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(FORMULA, false));
         when(dictionaryClient.getDictionaryForType(DOSSIER_REDACTIONS, TEST_DOSSIER_TEMPLATE_ID, TEST_DOSSIER_ID)).thenReturn(getDictionaryResponse(DOSSIER_REDACTIONS, true));
         when(dictionaryClient.getColors(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(colors);
     }
@@ -477,7 +498,8 @@ public class RedactionIntegrationTest {
 
         return DictionaryResponse.builder()
                 .hexColor(typeColorMap.get(type))
-                .entries(isDossierDictionary ? toDictionaryEntry(dossierDictionary.get(type)) : toDictionaryEntry(dictionary.get(type)))
+                .entries(isDossierDictionary ? toDictionaryEntry(dossierDictionary.get(type)) : toDictionaryEntry(dictionary
+                        .get(type)))
                 .isHint(hintTypeMap.get(type))
                 .isCaseInsensitive(caseInSensitiveMap.get(type))
                 .isRecommendation(recommendationTypeMap.get(type))
@@ -490,7 +512,8 @@ public class RedactionIntegrationTest {
 
         List<DictionaryEntry> dictionaryEntries = new ArrayList<>();
         entries.forEach(entry -> {
-            dictionaryEntries.add(new DictionaryEntry(entry, reanlysisVersions.containsKey(entry) ? reanlysisVersions.get(entry) : 0L, false));
+            dictionaryEntries.add(new DictionaryEntry(entry, reanlysisVersions.containsKey(entry) ? reanlysisVersions.get(entry) : 0L, deleted
+                    .contains(entry) ? true : false));
         });
         return dictionaryEntries;
     }
@@ -498,6 +521,7 @@ public class RedactionIntegrationTest {
 
     @Test
     public void test270Rotated() {
+
         AnalyzeRequest request = prepareStorage("files/Minimal Examples/270Rotated.pdf");
         MemoryStats.printMemoryStats();
         AnalyzeResult result = reanalyzeService.analyze(request);
@@ -508,12 +532,14 @@ public class RedactionIntegrationTest {
     @Test
     @Ignore
     public void testLargeScannedFileOOM() {
+
         AnalyzeRequest request = prepareStorage("scanned/VV-377031.pdf");
         MemoryStats.printMemoryStats();
         AnalyzeResult result = reanalyzeService.analyze(request);
         assertThat(result).isNotNull();
     }
 
+
     @Test
     public void testMergedImages() throws IOException {
 
@@ -552,14 +578,13 @@ public class RedactionIntegrationTest {
         long rend = System.currentTimeMillis();
         System.out.println("reanalysis analysis duration: " + (rend - rstart));
 
-
         long end = System.currentTimeMillis();
 
         System.out.println("duration: " + (end - start));
 
-
     }
 
+
     @Test
     @Ignore
     public void noExceptionShouldBeThrownForAnyFiles() throws IOException {
@@ -635,7 +660,12 @@ public class RedactionIntegrationTest {
         AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());
         request.setExcludedPages(Set.of(1));
 
-        request.setFileAttributes(List.of(FileAttribute.builder().id("fileAttributeId").label("Vertebrate Study").placeholder("{fileattributes.vertebrateStudy}").value("true").build()));
+        request.setFileAttributes(List.of(FileAttribute.builder()
+                .id("fileAttributeId")
+                .label("Vertebrate Study")
+                .placeholder("{fileattributes.vertebrateStudy}")
+                .value("true")
+                .build()));
 
         AnalyzeResult result = reanalyzeService.analyze(request);
 
@@ -683,12 +713,18 @@ public class RedactionIntegrationTest {
         dictionary.get(AUTHOR).add("physical");
         reanlysisVersions.put("physical", 2L);
 
-//        dictionary.get(VERTEBRATE).add("s-metolachlor");
-//        reanlysisVersions.put("s-metolachlor", 3L);
+        deleted.add("David Chubb");
+
+        dictionary.get(FALSE_POSITIVE).add("David Chubb");
+        reanlysisVersions.put("David Chubb", 3L);
 
         when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(3L);
 
-        when(dictionaryClient.getDictionaryForType(VERTEBRATE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(VERTEBRATE, false));
+        when(dictionaryClient.getDictionaryForType(VERTEBRATE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(VERTEBRATE, false));
+
+        when(dictionaryClient.getDictionaryForType(FALSE_POSITIVE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(FALSE_POSITIVE, false));
 
         start = System.currentTimeMillis();
 
@@ -702,10 +738,8 @@ public class RedactionIntegrationTest {
 
         request.setManualRedactions(manualRedactions);
 
-
         AnalyzeResult reanalyzeResult = reanalyzeService.reanalyze(request);
 
-
         redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID);
 
         end = System.currentTimeMillis();
@@ -775,7 +809,6 @@ public class RedactionIntegrationTest {
                 .status(Status.APPROVED)
                 .build()));
 
-
         manualRedactions.getComments().put("e5be0f1d941bbb92a068e198648d06c4", List.of(comment));
         manualRedactions.getComments().put("0836727c3508a0b2ea271da69c04cc2f", List.of(comment));
         manualRedactions.getComments().put(manualAddId, List.of(comment));
@@ -790,12 +823,10 @@ public class RedactionIntegrationTest {
 
 //        manualRedactions.getEntriesToAdd().add(manualRedactionEntry);
 
-
         AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());
         request.setManualRedactions(manualRedactions);
         AnalyzeResult result = reanalyzeService.analyze(request);
 
-
         manualRedactions.getEntriesToAdd().add(manualRedactionEntry);
         manualRedactions.setIdsToRemove(Set.of(IdRemoval.builder()
                 .id("5b940b2cb401ed9f5be6fc24f6e77bcf")
@@ -816,7 +847,6 @@ public class RedactionIntegrationTest {
                 .fileId(TEST_FILE_ID)
                 .build());
 
-
         try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Annotated.pdf")) {
             fileOutputStream.write(annotateResponse.getDocument());
         }
@@ -833,7 +863,6 @@ public class RedactionIntegrationTest {
         System.out.println("classificationTest");
         ClassPathResource pdfFileResource = new ClassPathResource("files/new/Single Study - Oral (Gavage) Mouse.pdf");
 
-
         AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());
 
         RedactionRequest redactionRequest = RedactionRequest.builder()
@@ -934,8 +963,10 @@ public class RedactionIntegrationTest {
         });
     }
 
+
     @SneakyThrows
     private AnalyzeRequest prepareStorage(String file) {
+
         ClassPathResource pdfFileResource = new ClassPathResource(file);
 
         return prepareStorage(pdfFileResource.getInputStream());
@@ -967,7 +998,6 @@ public class RedactionIntegrationTest {
         long start = System.currentTimeMillis();
         ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/sponsor_companies.pdf");
 
-
         AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());
 
         AnalyzeResult result = reanalyzeService.analyze(request);

redaction-service-v1/redaction-service-server-v1/src/test/resources/dictionaries/CBI_author.txt

@@ -1676,7 +1676,6 @@ da Silva Rejane
 Das R
 Das, R.
 Daughtry, CST
-David Chubb
 David Chubb|Lorraine Britton
 David Clarke
 Davies

redaction-service-v1/redaction-service-server-v1/src/test/resources/dictionaries/false_positive.txt

@@ -235,4 +235,5 @@ N/A
 No details reported
 Not available
 Test facility
-TBD
+TBD
+David Chubb