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-image-v1/src/main/docker/Dockerfile

@@ -13,6 +13,6 @@ RUN apt-get update \
     wget cabextract xfonts-utils fonts-liberation \
  && rm -rf /var/lib/apt/lists/*
 
-RUN curl http://ftp.br.debian.org/debian/pool/contrib/m/msttcorefonts/ttf-mscorefonts-installer_3.7_all.deb -o /tmp/ttf-mscorefonts-installer_3.7_all.deb \
- && dpkg -i /tmp/ttf-mscorefonts-installer_3.7_all.deb \
- && rm /tmp/ttf-mscorefonts-installer_3.7_all.deb \
+RUN curl http://ftp.br.debian.org/debian/pool/contrib/m/msttcorefonts/ttf-mscorefonts-installer_3.8_all.deb -o /tmp/ttf-mscorefonts-installer_3.8_all.deb \
+ && dpkg -i /tmp/ttf-mscorefonts-installer_3.8_all.deb \
+ && rm /tmp/ttf-mscorefonts-installer_3.8_all.deb \

redaction-service-v1/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>platform-dependency</artifactId>
         <groupId>com.iqser.red</groupId>
-        <version>1.1.2</version>
+        <version>1.1.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -32,7 +32,7 @@
             <dependency>
                 <groupId>com.iqser.red</groupId>
                 <artifactId>platform-commons-dependency</artifactId>
-                <version>1.3.1</version>
+                <version>1.3.6</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

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

@@ -6,6 +6,10 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.time.OffsetDateTime;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 @Data
 @Builder
@@ -20,5 +24,13 @@ public class AnalyzeRequest {
     private ManualRedactions manualRedactions;
     private OffsetDateTime lastProcessed;
 
+    @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,16 +15,16 @@ 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;
     private long rulesVersion;
     private long legalBasisVersion;
 
+    private boolean wasReanalyzed;
+
+    private int analysisVersion;
+
 
 }
 

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

@@ -0,0 +1,19 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class FileAttribute {
+
+    private String id;
+    private String label;
+    private String placeholder;
+    private String value;
+
+}

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

@@ -5,6 +5,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.OffsetDateTime;
+
 @Data
 @Builder
 @AllArgsConstructor
@@ -16,4 +18,8 @@ public class IdRemoval {
     private Status status;
     private boolean removeFromDictionary;
 
-}
+    private OffsetDateTime requestDate;
+    private OffsetDateTime processedDate;
+    private OffsetDateTime softDeletedTime;
+
+}

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

@@ -5,6 +5,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.OffsetDateTime;
+
 @Data
 @Builder
 @AllArgsConstructor
@@ -16,4 +18,8 @@ public class ManualForceRedact {
     private Status status;
     private String legalBasis;
 
-}
+    private OffsetDateTime requestDate;
+    private OffsetDateTime processedDate;
+    private OffsetDateTime softDeletedTime;
+
+}

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

@@ -0,0 +1,25 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.OffsetDateTime;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ManualImageRecategorization {
+
+    private String id;
+    private String user;
+    private Status status;
+    private String type;
+
+    private OffsetDateTime requestDate;
+    private OffsetDateTime processedDate;
+    private OffsetDateTime softDeletedTime;
+
+}

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

@@ -0,0 +1,25 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.OffsetDateTime;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ManualLegalBasisChange {
+
+    private String id;
+    private String user;
+    private Status status;
+    private String legalBasis;
+
+    private OffsetDateTime requestDate;
+    private OffsetDateTime processedDate;
+    private OffsetDateTime softDeletedTime;
+
+}

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

@@ -5,6 +5,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -22,11 +23,12 @@ public class ManualRedactionEntry {
     private String legalBasis;
     private List<Rectangle> positions = new ArrayList<>();
     private Status status;
+
     private boolean addToDictionary;
-
-    private String section;
-    private int sectionNumber;
-
     private boolean addToDossierDictionary;
 
+    private OffsetDateTime requestDate;
+    private OffsetDateTime processedDate;
+    private OffsetDateTime softDeletedTime;
+
 }

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

@@ -1,5 +1,5 @@
 package com.iqser.red.service.redaction.v1.model;
 
 public enum ManualRedactionType {
-    ADD, REMOVE, FORCE_REDACT
+    ADD, REMOVE, FORCE_REDACT, RECATEGORIZE, LEGAL_BASIS_CHANGE
 }

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

@@ -26,6 +26,12 @@ public class ManualRedactions {
     @Builder.Default
     private Set<ManualRedactionEntry> entriesToAdd = new HashSet<>();
 
+    @Builder.Default
+    private Set<ManualImageRecategorization> imageRecategorizations = new HashSet<>();
+
+    @Builder.Default
+    private Set<ManualLegalBasisChange> manualLegalBasisChanges = new HashSet<>();
+
     @Builder.Default
     private Map<String, List<Comment>> comments = new HashMap<>();
 

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

@@ -44,4 +44,6 @@ public class RedactionChangeLogEntry {
 
     private boolean isDossierDictionaryEntry;
 
+    private boolean excluded;
+
 }

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

@@ -10,6 +10,13 @@ import java.util.List;
 @AllArgsConstructor
 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 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

@@ -9,6 +9,8 @@ import lombok.NoArgsConstructor;
 import java.util.ArrayList;
 import java.util.List;
 
+
+
 @Data
 @Builder
 @NoArgsConstructor
@@ -34,6 +36,7 @@ public class RedactionLogEntry {
     private boolean manual;
     private Status status;
     private ManualRedactionType manualRedactionType;
+    private String manualRedactionUserId;
     private boolean isDictionaryEntry;
 
     private String textBefore;
@@ -46,7 +49,13 @@ public class RedactionLogEntry {
     private int endOffset;
 
     private boolean isImage;
+    private boolean imageHasTransparency;
 
     private boolean isDossierDictionaryEntry;
 
+    private boolean excluded;
+
+    private String recategorizationType;
+    private String legalBasisChangeValue;
+
 }

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/model/SectionRectangle.java

@@ -30,4 +30,5 @@ public class SectionRectangle {
     private int numberOfParts;
 
     private List<CellRectangle> tableCells;
+
 }

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

@@ -8,12 +8,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 
 public interface RedactionResource {
 
-    String SERVICE_NAME = "redaction-service-v1";
-
-    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);
 
@@ -26,10 +20,10 @@ 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);
 
+    @PostMapping(value = "/redaction-log/preview", consumes = MediaType.APPLICATION_JSON_VALUE)
+    RedactionLog getRedactionLog(@RequestBody RedactionRequest redactionRequest);
+
 }

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

@@ -1,10 +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.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;
@@ -12,7 +9,9 @@ import com.iqser.red.service.redaction.v1.server.exception.RedactionException;
 import com.iqser.red.service.redaction.v1.server.redaction.service.AnnotationService;
 import com.iqser.red.service.redaction.v1.server.redaction.service.DictionaryService;
 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;
@@ -39,7 +38,7 @@ public class RedactionController implements RedactionResource {
     private final AnnotationService annotationService;
     private final PdfSegmentationService pdfSegmentationService;
     private final RedactionStorageService redactionStorageService;
-
+    private final RedactionLogMergeService redactionLogMergeService;
 
     public AnnotateResponse annotate(@RequestBody AnnotateRequest annotateRequest) {
 
@@ -141,20 +140,28 @@ 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) {
 
         droolsExecutionService.testRules(rules);
     }
 
+    @Override
+    public RedactionLog getRedactionLog(RedactionRequest redactionRequest) {
+
+        log.info("Requested preview for: {}", redactionRequest);
+        dictionaryService.updateDictionary(redactionRequest.getDossierTemplateId(), redactionRequest.getDossierId());
+
+        var redactionLog = redactionStorageService.getRedactionLog(redactionRequest.getDossierId(), redactionRequest.getFileId());
+
+        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(), redactionRequest.getExcludedPages());
+        }
+    }
 
     private RedactionResult convert(PDDocument document, int numberOfPages) throws IOException {
 

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

@@ -189,18 +189,16 @@ public class PDFLinesTextStripper extends PDFTextStripper {
             COSName objectName = (COSName) arguments.get(0);
             PDXObject xobject = getResources().getXObject(objectName);
             if (xobject instanceof PDImageXObject) {
-                PDImageXObject pdfImage = (PDImageXObject) xobject;
+                PDImageXObject image = (PDImageXObject)xobject;
+                Matrix ctmNew = getGraphicsState().getCurrentTransformationMatrix();
 
-                Rectangle2D imageBounds = calculateImagePosition(pdfImage);
-
-                Rectangle2D rect = new Rectangle2D.Float((float) imageBounds.getX(), (float) imageBounds.getY(), (float) imageBounds
-                        .getWidth(), (float) imageBounds.getHeight());
+                Rectangle2D rect = new Rectangle2D.Float(ctmNew.getTranslateX(), ctmNew.getTranslateY(), ctmNew.getScaleX(), ctmNew.getScaleY());
 
                 // Memory Hack - sofReference kills me
-                FieldUtils.writeField(pdfImage, "cachedImageSubsampling", -1, true);
+                FieldUtils.writeField(image, "cachedImageSubsampling", -1, true);
 
                 if (rect.getHeight() > 2 && rect.getWidth() > 2) {
-                    this.images.add(new PdfImage(pdfImage.getImage(), rect, pageNumber));
+                    this.images.add(new PdfImage(image.getImage(), rect, pageNumber, image.getImage().getColorModel().hasAlpha()));
                 }
             }
         } catch (Exception e) {
@@ -209,21 +207,6 @@ public class PDFLinesTextStripper extends PDFTextStripper {
     }
 
 
-    private Rectangle2D calculateImagePosition(PDImageXObject pdfImage) throws IOException {
-
-        Matrix ctm = getGraphicsState().getCurrentTransformationMatrix();
-
-        Rectangle2D imageBounds = pdfImage.getImage().getRaster().getBounds();
-
-        AffineTransform imageTransform = new AffineTransform(ctm.createAffineTransform());
-        imageTransform.scale(1.0 / pdfImage.getWidth(), -1.0 / pdfImage.getHeight());
-        imageTransform.translate(0, -pdfImage.getHeight());
-
-        AffineTransform pageTransform = new AffineTransform();
-        pageTransform.concatenate(imageTransform);
-
-        return pageTransform.createTransformedShape(imageBounds).getBounds2D();
-    }
 
 
     private float floatValue(COSBase value) {

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

@@ -9,7 +9,7 @@ import java.util.List;
 
 @Data
 @EqualsAndHashCode(onlyExplicitlyIncluded = true)
-public class Entity {
+public class Entity implements ReasonHolder {
 
 
     private final String word;

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

@@ -9,7 +9,7 @@ import lombok.NoArgsConstructor;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class Image {
+public class Image implements ReasonHolder {
 
     private String type;
     private RedRectangle2D position;
@@ -20,5 +20,6 @@ public class Image {
     private int sectionNumber;
     private String section;
     private int page;
+    private boolean hasTransparency;
 
 }

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

@@ -18,14 +18,16 @@ public class PdfImage {
     private RedRectangle2D position;
     private ImageType imageType;
     private boolean isAppendedToParagraph;
+    private boolean hasTransparency;
 
     @NonNull
     private int page;
 
-    public PdfImage(BufferedImage image, Rectangle2D position, int page) {
+    public PdfImage(BufferedImage image, Rectangle2D position, int page, boolean hasTransparency) {
         this.image = image;
         this.position = new RedRectangle2D(position.getX(), position.getY(), position.getWidth(), position.getHeight());
         this.page = page;
+        this.hasTransparency = hasTransparency;
     }
 
 }

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

@@ -0,0 +1,14 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+public interface ReasonHolder {
+
+    String getRedactionReason();
+
+    void setRedactionReason(String reason);
+
+    boolean isRedaction();
+
+    void setRedaction(boolean value);
+
+
+}

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

@@ -1,5 +1,6 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;
 
+import com.iqser.red.service.redaction.v1.model.FileAttribute;
 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.Patterns;
@@ -8,9 +9,11 @@ import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.regex.Matcher;
@@ -52,6 +55,35 @@ public class Section {
     @Builder.Default
     private Set<Image> images = new HashSet<>();
 
+    @Builder.Default
+    private List<FileAttribute> fileAttributes = new ArrayList<>();
+
+
+    public boolean fileAttributeByIdEquals(String id, String value){
+        return fileAttributes != null && fileAttributes.stream().filter(attribute -> id.equals(attribute.getId()) && value.equals(attribute.getValue())).findFirst().isPresent();
+    }
+
+    public boolean fileAttributeByPlaceholderEquals(String placeholder, String value){
+        return fileAttributes != null && fileAttributes.stream().filter(attribute -> placeholder.equals(attribute.getPlaceholder()) && value.equals(attribute.getValue())).findFirst().isPresent();
+    }
+
+    public boolean fileAttributeByLabelEquals(String label, String value){
+        return fileAttributes != null && fileAttributes.stream().filter(attribute -> label.equals(attribute.getLabel()) && value.equals(attribute.getValue())).findFirst().isPresent();
+    }
+
+
+    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) {
 

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

@@ -4,46 +4,40 @@ 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;
 
 @Service
+@RequiredArgsConstructor
 public class AnalyzeResponseService {
 
-    public AnalyzeResult createAnalyzeResponse(String dossierId, String fileId, long duration, int pageCount, RedactionLog redactionLog, RedactionChangeLog redactionChangeLog) {
-        boolean hasHints = redactionLog.getRedactionLogEntry().stream().anyMatch(RedactionLogEntry::isHint);
+    private final RedactionServiceSettings redactionServiceSettings;
 
-        boolean hasRequests = redactionLog.getRedactionLogEntry()
-                .stream()
-                .anyMatch(entry -> entry.isManual() && entry.getStatus()
-                        .equals(com.iqser.red.service.redaction.v1.model.Status.REQUESTED));
+    public AnalyzeResult createAnalyzeResponse(String dossierId, String fileId, long duration, int pageCount,
+                                               RedactionLog redactionLog, RedactionChangeLog redactionChangeLog) {
 
-        boolean hasRedactions = redactionLog.getRedactionLogEntry()
-                .stream()
-                .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()
-                .anyMatch(entry -> entry.isHint() && entry.getType().equals("image"));
 
         boolean hasUpdates = redactionChangeLog != null && redactionChangeLog.getRedactionLogEntry() != null && !redactionChangeLog
                 .getRedactionLogEntry()
-                .isEmpty() && redactionChangeLog.getRedactionLogEntry().stream().anyMatch(entry -> !entry.getType().equals("false_positive"));
+                .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())
                 .dictionaryVersion(redactionLog.getDictionaryVersion())
                 .legalBasisVersion(redactionLog.getLegalBasisVersion())
                 .dossierDictionaryVersion(redactionLog.getDossierDictionaryVersion())
                 .build();
     }
+
 }

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

@@ -33,6 +33,7 @@ public class DictionaryService {
 
     public DictionaryVersion updateDictionary(String dossierTemplateId, String dossierId) {
 
+        log.info("Updating dictionary data for: {} / {}", dossierTemplateId, dossierId);
         long dossierTemplateDictionaryVersion = dictionaryClient.getVersion(dossierTemplateId, GLOBAL_DOSSIER);
         var dossierTemplateDictionary = dictionariesByDossierTemplate.get(dossierTemplateId);
         if (dossierTemplateDictionary == null || dossierTemplateDictionaryVersion > dossierTemplateDictionary.getDictionaryVersion()) {
@@ -163,6 +164,7 @@ public class DictionaryService {
 
     public float[] getColor(String type, String dossierTemplateId) {
 
+        log.info("requested : {} / {}",type,dossierTemplateId);
         DictionaryModel model = dictionariesByDossierTemplate.get(dossierTemplateId).getLocalAccessMap().get(type);
         if (model != null) {
             return model.getColor();
@@ -210,13 +212,13 @@ 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());
     }
 
 
     public float[] getRequestRemoveColor(String dossierTemplateId) {
 
-        return dictionariesByDossierTemplate.get(dossierTemplateId).getRequestAddColor();
+        return dictionariesByDossierTemplate.get(dossierTemplateId).getRequestRemoveColor();
     }
 
 

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

@@ -1,14 +1,11 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;
 
-import com.iqser.red.service.redaction.v1.model.ManualRedactionEntry;
-import com.iqser.red.service.redaction.v1.model.ManualRedactions;
-import com.iqser.red.service.redaction.v1.model.Point;
-import com.iqser.red.service.redaction.v1.model.Rectangle;
-import com.iqser.red.service.redaction.v1.model.SectionArea;
+import com.iqser.red.service.redaction.v1.model.*;
 import com.iqser.red.service.redaction.v1.server.classification.model.*;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
 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.tableextraction.model.Cell;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
 import lombok.RequiredArgsConstructor;
@@ -33,7 +30,8 @@ public class EntityRedactionService {
     private final SurroundingWordsService surroundingWordsService;
 
 
-    public void processDocument(Document classifiedDoc, String dossierTemplateId, ManualRedactions manualRedactions, String dossierId) {
+    public void processDocument(Document classifiedDoc, String dossierTemplateId, ManualRedactions manualRedactions,
+                                String dossierId, List<FileAttribute> fileAttributes) {
 
         dictionaryService.updateDictionary(dossierTemplateId, dossierId);
         KieContainer container = droolsExecutionService.updateRules(dossierTemplateId);
@@ -41,39 +39,17 @@ public class EntityRedactionService {
 
         Dictionary dictionary = dictionaryService.getDeepCopyDictionary(dossierTemplateId, dossierId);
 
-        Set<Entity> documentEntities = new HashSet<>(findEntities(classifiedDoc, container, manualRedactions, dictionary, false, null));
+        Set<Entity> documentEntities = new HashSet<>(findEntities(classifiedDoc, container, manualRedactions, dictionary, false, null, fileAttributes));
 
         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);
-                }
-            });
-
-            Set<Entity> foundByLocal = findEntities(classifiedDoc, container, manualRedactions, dictionary, true, hintsPerSectionNumber);
+            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);
 
@@ -82,9 +58,43 @@ 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) {
+                                     Map<Integer, Set<Entity>> hintsPerSectionNumber,
+                                     List<FileAttribute> fileAttributes) {
 
         Set<Entity> documentEntities = new HashSet<>();
 
@@ -95,76 +105,80 @@ public class EntityRedactionService {
             List<Table> tables = paragraph.getTables();
             for (Table table : tables) {
                 if (table.getColCount() == 2) {
-                    sectionSearchableTextPairs.addAll(processTableAsOneText(classifiedDoc, table, manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber));
+                    sectionSearchableTextPairs.addAll(processTableAsOneText(classifiedDoc, table, sectionNumber, dictionary, local, hintsPerSectionNumber, fileAttributes));
                 } else {
-                    sectionSearchableTextPairs.addAll(processTablePerRow(classifiedDoc, table, manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber));
+                    sectionSearchableTextPairs.addAll(processTablePerRow(classifiedDoc, table, sectionNumber, dictionary, local, hintsPerSectionNumber, fileAttributes));
                 }
                 sectionNumber.incrementAndGet();
             }
             sectionSearchableTextPairs.add(processText(classifiedDoc, paragraph.getSearchableText(), paragraph.getTextBlocks(), paragraph
                     .getHeadline(), manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber, paragraph
-                    .getImages()));
+                    .getImages(), fileAttributes));
             sectionNumber.incrementAndGet();
         }
 
         for (Header header : classifiedDoc.getHeaders()) {
-            sectionSearchableTextPairs.add(processText(classifiedDoc, header.getSearchableText(), header.getTextBlocks(), "Header", manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber, new ArrayList<>()));
+            sectionSearchableTextPairs.add(processText(classifiedDoc, header.getSearchableText(), header.getTextBlocks(), "Header", manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber, new ArrayList<>(), fileAttributes));
             sectionNumber.incrementAndGet();
         }
 
         for (Footer footer : classifiedDoc.getFooters()) {
-            sectionSearchableTextPairs.add(processText(classifiedDoc, footer.getSearchableText(), footer.getTextBlocks(), "Footer", manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber, new ArrayList<>()));
+            sectionSearchableTextPairs.add(processText(classifiedDoc, footer.getSearchableText(), footer.getTextBlocks(), "Footer", manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber, new ArrayList<>(), fileAttributes));
             sectionNumber.incrementAndGet();
         }
 
         for (UnclassifiedText unclassifiedText : classifiedDoc.getUnclassifiedTexts()) {
             sectionSearchableTextPairs.add(processText(classifiedDoc, unclassifiedText.getSearchableText(), unclassifiedText
-                    .getTextBlocks(), "", manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber, new ArrayList<>()));
+                    .getTextBlocks(), "", manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber, new ArrayList<>(), fileAttributes));
             sectionNumber.incrementAndGet();
         }
 
         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,
-                                                               ManualRedactions manualRedactions,
                                                                AtomicInteger sectionNumber, Dictionary dictionary,
                                                                boolean local,
-                                                               Map<Integer, Set<Entity>> hintsPerSectionNumber) {
+                                                               Map<Integer, Set<Entity>> hintsPerSectionNumber,
+                                                               List<FileAttribute> fileAttributes) {
 
         List<SectionSearchableTextPair> sectionSearchableTextPairs = new ArrayList<>();
 
@@ -189,7 +203,6 @@ public class EntityRedactionService {
                 sectionText.getSectionAreas().add(sectionArea);
                 sectionText.getTextBlocks().addAll(cell.getTextBlocks());
 
-                addSectionToManualRedactions(cell.getTextBlocks(), manualRedactions, table.getHeadline(), sectionNumber.intValue());
                 int cellStart = start;
 
                 if (!cell.isHeaderCell()) {
@@ -229,6 +242,7 @@ public class EntityRedactionService {
                     .tabularData(tabularData)
                     .searchableText(searchableRow)
                     .dictionary(dictionary)
+                    .fileAttributes(fileAttributes)
                     .build(), searchableRow));
 
             if (!local) {
@@ -249,10 +263,10 @@ public class EntityRedactionService {
 
 
     private List<SectionSearchableTextPair> processTableAsOneText(Document classifiedDoc, Table table,
-                                                                  ManualRedactions manualRedactions,
                                                                   AtomicInteger sectionNumber, Dictionary dictionary,
                                                                   boolean local,
-                                                                  Map<Integer, Set<Entity>> hintsPerSectionNumber) {
+                                                                  Map<Integer, Set<Entity>> hintsPerSectionNumber,
+                                                                  List<FileAttribute> fileAttributes) {
 
         List<SectionSearchableTextPair> sectionSearchableTextPairs = new ArrayList<>();
         SearchableText entireTableText = new SearchableText();
@@ -277,7 +291,6 @@ public class EntityRedactionService {
                 for (TextBlock textBlock : cell.getTextBlocks()) {
                     entireTableText.addAll(textBlock.getSequences());
                 }
-                addSectionToManualRedactions(cell.getTextBlocks(), manualRedactions, table.getHeadline(), sectionNumber.intValue());
             }
         }
 
@@ -296,6 +309,7 @@ public class EntityRedactionService {
                 .sectionNumber(sectionNumber.intValue())
                 .searchableText(entireTableText)
                 .dictionary(dictionary)
+                .fileAttributes(fileAttributes)
                 .build(), entireTableText));
 
         if (!local) {
@@ -315,7 +329,7 @@ public class EntityRedactionService {
                                                   ManualRedactions manualRedactions, AtomicInteger sectionNumber,
                                                   Dictionary dictionary, boolean local,
                                                   Map<Integer, Set<Entity>> hintsPerSectionNumber,
-                                                  List<PdfImage> images) {
+                                                  List<PdfImage> images, List<FileAttribute> fileAttributes) {
 
         if (!local) {
             SectionText sectionText = new SectionText();
@@ -330,13 +344,12 @@ public class EntityRedactionService {
             sectionText.setSectionNumber(sectionNumber.intValue());
             sectionText.setTable(false);
             sectionText.setImages(images.stream()
-                    .map(image -> convert(image, sectionNumber.intValue(), headline))
+                    .map(image -> convertAndRecategorize(image, sectionNumber.intValue(), headline, manualRedactions))
                     .collect(Collectors.toSet()));
             sectionText.setTextBlocks(paragraphTextBlocks);
             classifiedDoc.getSectionText().add(sectionText);
         }
 
-        addSectionToManualRedactions(paragraphTextBlocks, manualRedactions, headline, sectionNumber.intValue());
         Set<Entity> entities = findEntities(searchableText, headline, sectionNumber.intValue(), dictionary, local);
         surroundingWordsService.addSurroundingText(entities, searchableText, dictionary);
 
@@ -353,8 +366,9 @@ public class EntityRedactionService {
                 .searchableText(searchableText)
                 .dictionary(dictionary)
                 .images(images.stream()
-                        .map(image -> convert(image, sectionNumber.intValue(), headline))
+                        .map(image -> convertAndRecategorize(image, sectionNumber.intValue(), headline, manualRedactions))
                         .collect(Collectors.toSet()))
+                .fileAttributes(fileAttributes)
                 .build(), searchableText);
     }
 
@@ -371,9 +385,11 @@ public class EntityRedactionService {
         String lowercaseInputString = searchableString.toLowerCase();
         for (DictionaryModel model : dictionary.getDictionaryModels()) {
             if (model.isCaseInsensitive()) {
-                found.addAll(EntitySearchUtils.find(lowercaseInputString, model.getValues(local), model.getType(), headline, sectionNumber, local, model.isDossierDictionary()));
+                found.addAll(EntitySearchUtils.find(lowercaseInputString, model.getValues(local), model.getType(), headline, sectionNumber, local, model
+                        .isDossierDictionary()));
             } else {
-                found.addAll(EntitySearchUtils.find(searchableString, model.getValues(local), model.getType(), headline, sectionNumber, local, model.isDossierDictionary()));
+                found.addAll(EntitySearchUtils.find(searchableString, model.getValues(local), model.getType(), headline, sectionNumber, local, model
+                        .isDossierDictionary()));
             }
         }
 
@@ -381,29 +397,9 @@ public class EntityRedactionService {
     }
 
 
-    private void addSectionToManualRedactions(List<TextBlock> textBlocks, ManualRedactions manualRedactions,
-                                              String section, int sectionNumber) {
+    private Image convertAndRecategorize(PdfImage pdfImage, int sectionNumber, String headline, ManualRedactions manualRedactions) {
 
-        if (manualRedactions == null || manualRedactions.getEntriesToAdd().isEmpty()) {
-            return;
-        }
-
-        for (TextBlock textBlock : textBlocks) {
-            for (ManualRedactionEntry manualRedactionEntry : manualRedactions.getEntriesToAdd()) {
-                for (Rectangle rectangle : manualRedactionEntry.getPositions()) {
-                    if (textBlock.contains(rectangle)) {
-                        manualRedactionEntry.setSection(section);
-                        manualRedactionEntry.setSectionNumber(sectionNumber);
-                    }
-                }
-            }
-        }
-    }
-
-
-    private Image convert(PdfImage pdfImage, int sectionNumber, String headline) {
-
-        return Image.builder()
+        Image image = Image.builder()
                 .type(pdfImage.getImageType().equals(ImageType.OTHER) ? "image" : pdfImage.getImageType()
                         .name()
                         .toLowerCase(Locale.ROOT))
@@ -411,7 +407,20 @@ public class EntityRedactionService {
                 .sectionNumber(sectionNumber)
                 .section(headline)
                 .page(pdfImage.getPage())
+                .hasTransparency(pdfImage.isHasTransparency())
                 .build();
+
+        String imageId = IdBuilder.buildId(image.getPosition(), image.getPage());
+        if (manualRedactions != null && manualRedactions.getImageRecategorizations() != null) {
+            for (ManualImageRecategorization imageRecategorization : manualRedactions.getImageRecategorizations()) {
+                if (imageRecategorization.getStatus().equals(Status.APPROVED) && imageRecategorization.getId()
+                        .equals(imageId)) {
+                    image.setType(imageRecategorization.getType());
+                }
+            }
+        }
+
+        return image;
     }
 
 }

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

@@ -10,7 +10,9 @@ import com.iqser.red.service.redaction.v1.server.exception.RedactionException;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
 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;
@@ -40,6 +42,8 @@ public class ReanalyzeService {
     private final RedactionChangeLogService redactionChangeLogService;
     private final AnalyzeResponseService analyzeResponseService;
     private final LegalBasisClient legalBasisClient;
+    private final RedactionServiceSettings redactionServiceSettings;
+
 
     public AnalyzeResult analyze(AnalyzeRequest analyzeRequest) {
 
@@ -59,18 +63,17 @@ public class ReanalyzeService {
         log.info("Document structure analysis successful, starting redaction analysis...");
 
         entityRedactionService.processDocument(classifiedDoc, analyzeRequest.getDossierTemplateId(), analyzeRequest.getManualRedactions(), analyzeRequest
-                .getDossierId());
-        redactionLogCreatorService.createRedactionLog(classifiedDoc, pageCount, analyzeRequest.getManualRedactions(), analyzeRequest
-                .getDossierTemplateId());
+                .getDossierId(), analyzeRequest.getFileAttributes());
+        redactionLogCreatorService.createRedactionLog(classifiedDoc, pageCount, analyzeRequest.getDossierTemplateId());
 
         log.info("Redaction analysis successful...");
 
         var legalBasis = legalBasisClient.getLegalBasisMapping(analyzeRequest.getDossierTemplateId());
-        var redactionLog = new RedactionLog(classifiedDoc.getRedactionLogEntities(),legalBasis,
-                classifiedDoc.getDictionaryVersion().getDossierTemplateVersion(),
-                classifiedDoc.getDictionaryVersion().getDossierVersion(),
-                classifiedDoc.getRulesVersion(),
-                legalBasisClient.getVersion(analyzeRequest.getDossierTemplateId()));
+        var redactionLog = new RedactionLog(redactionServiceSettings.getAnalysisVersion(), classifiedDoc.getRedactionLogEntities(), legalBasis, classifiedDoc.getDictionaryVersion()
+                .getDossierTemplateVersion(), classifiedDoc.getDictionaryVersion()
+                .getDossierVersion(), classifiedDoc.getRulesVersion(), legalBasisClient.getVersion(analyzeRequest.getDossierTemplateId()));
+
+        excludeExcludedPages(redactionLog, analyzeRequest.getExcludedPages());
 
         log.info("Analyzed with rules {} and dictionary {} for dossierTemplate: {}", classifiedDoc.getRulesVersion(), classifiedDoc
                 .getDictionaryVersion(), analyzeRequest.getDossierTemplateId());
@@ -105,20 +108,66 @@ public class ReanalyzeService {
         DictionaryIncrement dictionaryIncrement = dictionaryService.getDictionaryIncrements(analyzeRequest.getDossierTemplateId(), new DictionaryVersion(redactionLog
                 .getDictionaryVersion(), redactionLog.getDossierDictionaryVersion()), analyzeRequest.getDossierId());
 
-        Set<String> manualForceAndRemoveIds = getForceAndRemoveIds(analyzeRequest.getManualRedactions());
-        Map<String, List<Comment>> comments = null;
-        Set<ManualRedactionEntry> manualAdds = null;
+        Set<Integer> sectionsToReanalyse = !analyzeRequest.getSectionsToReanalyse().isEmpty() ? analyzeRequest.getSectionsToReanalyse() :
+                findSectionsToReanalyse(dictionaryIncrement, redactionLog, text, analyzeRequest);
 
-        if (analyzeRequest.getManualRedactions() != null) {
-            // TODO comments will be removed from redactionLog, so we ignore this first.
-            comments = analyzeRequest.getManualRedactions().getComments();
-            manualAdds = analyzeRequest.getManualRedactions().getEntriesToAdd();
+        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<>();
         Map<Integer, Set<Image>> imageEntries = new HashMap<>();
         for (RedactionLogEntry entry : redactionLog.getRedactionLogEntry()) {
-            if (entry.isManual() || manualForceAndRemoveIds.contains(entry.getId())) {
+            if (entry.isManual() || relevantManuallyModifiedAnnotationIds.contains(entry.getId())) {
                 sectionsToReanalyse.add(entry.getSectionNumber());
             }
             if (entry.isImage() || entry.getType().equals("image")) {
@@ -132,57 +181,53 @@ public class ReanalyzeService {
                 sectionsToReanalyse.add(sectionText.getSectionNumber());
             }
 
-            if (manualAdds != null) {
-                for (SectionArea sectionArea : sectionText.getSectionAreas()) {
-                    for (ManualRedactionEntry manualAdd : manualAdds) {
-                        for (Rectangle manualPosition : manualAdd.getPositions()) {
-                            if (sectionArea.contains(manualPosition)) {
-                                manualAdd.setSection(sectionText.getHeadline());
-                                manualAdd.setSectionNumber(sectionText.getSectionNumber());
-                            }
-                        }
-                    }
-                }
-            }
         }
 
         log.info("Should reanalyze {} sections for request: {}", sectionsToReanalyse.size(), analyzeRequest);
 
-        if (sectionsToReanalyse.isEmpty() && (manualAdds == null || manualAdds.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);
-            if (reanalysisSection.getCellStarts() != null) {
+                    .getHeadline(), reanalysisSection.getSectionNumber(), dictionary, local);
+            if (reanalysisSection.getCellStarts() != null && !reanalysisSection.getCellStarts().isEmpty()) {
                 surroundingWordsService.addSurroundingText(entities, reanalysisSection.getSearchableText(), dictionary, reanalysisSection
                         .getCellStarts());
             } else {
                 surroundingWordsService.addSurroundingText(entities, reanalysisSection.getSearchableText(), dictionary);
             }
 
+            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)) {
+                            image.setType(imageRecategorization.getType());
+                        }
+                    }
+                }
+            }
+
             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,60 +236,24 @@ public class ReanalyzeService {
                     .searchableText(reanalysisSection.getSearchableText())
                     .dictionary(dictionary)
                     .images(reanalysisSection.getImages())
+                    .fileAttributes(analyzeRequest.getFileAttributes())
                     .build(), reanalysisSection.getSearchableText()));
         }
 
         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, analyzeRequest.getManualRedactions(), page, analyzeRequest
-                        .getDossierTemplateId()));
-            }
-
-            if (imagesPerPage.get(page) != null) {
-                newRedactionLogEntries.addAll(redactionLogCreatorService.addImageEntries(imagesPerPage, analyzeRequest.getManualRedactions(), page, analyzeRequest
-                        .getDossierTemplateId()));
-            }
-
-            newRedactionLogEntries.addAll(redactionLogCreatorService.addManualAddEntries(manualAdds, comments, page, analyzeRequest
-                    .getDossierTemplateId()));
-        }
-
-        redactionLog.getRedactionLogEntry()
-                .removeIf(entry -> sectionsToReanalyse.contains(entry.getSectionNumber()));
-        redactionLog.getRedactionLogEntry().addAll(newRedactionLogEntries);
-        return finalizeAnalysis(analyzeRequest, startTime, redactionLog, text, dictionaryIncrement);
-
+        return entities;
     }
 
 
@@ -255,6 +264,8 @@ public class ReanalyzeService {
         redactionLog.setDictionaryVersion(dictionaryIncrement.getDictionaryVersion().getDossierTemplateVersion());
         redactionLog.setDossierDictionaryVersion(dictionaryIncrement.getDictionaryVersion().getDossierVersion());
 
+        excludeExcludedPages(redactionLog, analyzeRequest.getExcludedPages());
+
         var changeLog = redactionChangeLogService.createAndStoreChangeLog(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), redactionLog);
         redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.REDACTION_LOG, redactionLog);
 
@@ -265,15 +276,19 @@ public class ReanalyzeService {
     }
 
 
-    private Set<String> getForceAndRemoveIds(ManualRedactions manualRedactions) {
+    private Set<String> getRelevantManuallyModifiedAnnotationIds(ManualRedactions manualRedactions) {
 
         if (manualRedactions == null) {
             return new HashSet<>();
         }
 
-        return Stream.concat(manualRedactions.getIdsToRemove()
+        return Stream.concat(manualRedactions.getManualLegalBasisChanges()
                 .stream()
-                .map(IdRemoval::getId), manualRedactions.getForceRedacts().stream().map(ManualForceRedact::getId))
+                .map(ManualLegalBasisChange::getId), Stream.concat(manualRedactions.getImageRecategorizations()
+                .stream()
+                .map(ManualImageRecategorization::getId), Stream.concat(manualRedactions.getIdsToRemove()
+                .stream()
+                .map(IdRemoval::getId), manualRedactions.getForceRedacts().stream().map(ManualForceRedact::getId))))
                 .collect(Collectors.toSet());
     }
 
@@ -289,7 +304,18 @@ public class ReanalyzeService {
                 .sectionNumber(entry.getSectionNumber())
                 .section(entry.getSection())
                 .page(position.getPage())
+                .hasTransparency(entry.isImageHasTransparency())
                 .build();
     }
 
+
+    private void excludeExcludedPages(RedactionLog redactionLog, Set<Integer> excludedPages) {
+
+        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/RedactionChangeLogService.java

@@ -90,6 +90,7 @@ public class RedactionChangeLogService {
                 .comments(entry.getComments())
                 .changeType(changeType)
                 .isDossierDictionaryEntry(entry.isDossierDictionaryEntry())
+                .excluded(entry.isExcluded())
                 .build();
     }
 

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

@@ -1,6 +1,10 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;
 
-import com.iqser.red.service.redaction.v1.model.*;
+import com.iqser.red.service.redaction.v1.model.CellRectangle;
+import com.iqser.red.service.redaction.v1.model.Point;
+import com.iqser.red.service.redaction.v1.model.Rectangle;
+import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
+import com.iqser.red.service.redaction.v1.model.SectionRectangle;
 import com.iqser.red.service.redaction.v1.server.classification.model.Document;
 import com.iqser.red.service.redaction.v1.server.classification.model.Paragraph;
 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
@@ -31,10 +35,7 @@ public class RedactionLogCreatorService {
     private final DictionaryService dictionaryService;
 
 
-    public void createRedactionLog(Document classifiedDoc, int numberOfPages, ManualRedactions manualRedactions,
-                                   String dossierTemplateId) {
-
-        Set<Integer> manualRedactionPages = getManualRedactionPages(manualRedactions);
+    public void createRedactionLog(Document classifiedDoc, int numberOfPages, String dossierTemplateId) {
 
         for (int page = 1; page <= numberOfPages; page++) {
 
@@ -42,24 +43,18 @@ public class RedactionLogCreatorService {
 
             if (classifiedDoc.getEntities().get(page) != null) {
                 classifiedDoc.getRedactionLogEntities()
-                        .addAll(addEntries(classifiedDoc.getEntities(), manualRedactions, page, dossierTemplateId));
-            }
-
-            if (manualRedactionPages.contains(page)) {
-                classifiedDoc.getRedactionLogEntities()
-                        .addAll(addManualAddEntries(manualRedactions.getEntriesToAdd(), manualRedactions.getComments(), page, dossierTemplateId));
+                        .addAll(addEntries(classifiedDoc.getEntities(), page, dossierTemplateId));
             }
 
             if (classifiedDoc.getImages().get(page) != null && !classifiedDoc.getImages().get(page).isEmpty()) {
                 classifiedDoc.getRedactionLogEntities()
-                        .addAll(addImageEntries(classifiedDoc.getImages(), manualRedactions, page, dossierTemplateId));
+                        .addAll(addImageEntries(classifiedDoc.getImages(), page, dossierTemplateId));
             }
         }
     }
 
 
-    public List<RedactionLogEntry> addImageEntries(Map<Integer, Set<Image>> images, ManualRedactions manualRedactions,
-                                                   int pageNumber, String dossierTemplateId) {
+    public List<RedactionLogEntry> addImageEntries(Map<Integer, Set<Image>> images, int pageNumber, String dossierTemplateId) {
 
         List<RedactionLogEntry> redactionLogEntities = new ArrayList<>();
 
@@ -69,7 +64,7 @@ public class RedactionLogCreatorService {
 
             RedactionLogEntry redactionLogEntry = RedactionLogEntry.builder()
                     .id(id)
-                    .color(getColorForImage(image, dossierTemplateId, false))
+                    .color(getColor(image.getType(), dossierTemplateId, image.isRedaction()))
                     .isImage(true)
                     .type(image.getType())
                     .redacted(image.isRedaction())
@@ -85,61 +80,9 @@ public class RedactionLogCreatorService {
                             .getWidth(), (float) image.getPosition().getHeight(), pageNumber)))
                     .sectionNumber(image.getSectionNumber())
                     .section(image.getSection())
+                    .imageHasTransparency(image.isHasTransparency())
                     .build();
 
-            if (manualRedactions != null && !manualRedactions.getIdsToRemove().isEmpty()) {
-                for (IdRemoval manualRemoval : manualRedactions.getIdsToRemove()) {
-                    if (manualRemoval.getId().equals(id)) {
-                        String manualOverrideReason = null;
-                        if (manualRemoval.getStatus().equals(Status.APPROVED)) {
-                            image.setRedaction(false);
-                            redactionLogEntry.setRedacted(false);
-                            redactionLogEntry.setStatus(Status.APPROVED);
-                            manualOverrideReason = image.getRedactionReason() + ", removed by manual override";
-                            redactionLogEntry.setColor(getColorForImage(image, dossierTemplateId, false));
-                        } else if (manualRemoval.getStatus().equals(Status.REQUESTED)) {
-                            manualOverrideReason = image.getRedactionReason() + ", requested to remove";
-                            redactionLogEntry.setStatus(Status.REQUESTED);
-                            redactionLogEntry.setColor(getColorForImage(image, dossierTemplateId, true));
-                        } else {
-                            redactionLogEntry.setStatus(Status.DECLINED);
-                        }
-
-                        image.setRedactionReason(manualOverrideReason != null ? manualOverrideReason : image.getRedactionReason());
-                        redactionLogEntry.setReason(manualOverrideReason);
-                        redactionLogEntry.setManual(true);
-                        redactionLogEntry.setManualRedactionType(ManualRedactionType.REMOVE);
-                    }
-                }
-            }
-
-            if (manualRedactions != null && !manualRedactions.getForceRedacts().isEmpty()) {
-                for (ManualForceRedact manualForceRedact : manualRedactions.getForceRedacts()) {
-                    if (manualForceRedact.getId().equals(id)) {
-                        String manualOverrideReason = null;
-                        if (manualForceRedact.getStatus().equals(Status.APPROVED)) {
-                            image.setRedaction(true);
-                            redactionLogEntry.setRedacted(true);
-                            redactionLogEntry.setStatus(Status.APPROVED);
-                            redactionLogEntry.setColor(getColorForImage(image, dossierTemplateId, false));
-                            manualOverrideReason = image.getRedactionReason() + ", forced by manual override";
-                            redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
-                        } else if (manualForceRedact.getStatus().equals(Status.REQUESTED)) {
-                            manualOverrideReason = image.getRedactionReason() + ", requested to force redact";
-                            redactionLogEntry.setStatus(Status.REQUESTED);
-                            redactionLogEntry.setColor(getColorForImage(image, dossierTemplateId, true));
-                            redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
-                        } else {
-                            redactionLogEntry.setStatus(Status.DECLINED);
-                        }
-
-                        image.setRedactionReason(manualOverrideReason != null ? manualOverrideReason : image.getRedactionReason());
-                        redactionLogEntry.setReason(manualOverrideReason);
-                        redactionLogEntry.setManual(true);
-                        redactionLogEntry.setManualRedactionType(ManualRedactionType.FORCE_REDACT);
-                    }
-                }
-            }
 
             redactionLogEntities.add(redactionLogEntry);
         }
@@ -148,25 +91,7 @@ public class RedactionLogCreatorService {
     }
 
 
-    private Set<Integer> getManualRedactionPages(ManualRedactions manualRedactions) {
-
-        Set<Integer> manualRedactionPages = new HashSet<>();
-
-        if (manualRedactions == null) {
-            return manualRedactionPages;
-        }
-
-        manualRedactions.getEntriesToAdd().forEach(entry -> {
-            entry.getPositions().forEach(pos -> {
-                manualRedactionPages.add(pos.getPage());
-            });
-        });
-        return manualRedactionPages;
-    }
-
-
-    public List<RedactionLogEntry> addEntries(Map<Integer, List<Entity>> entities, ManualRedactions manualRedactions,
-                                              int page, String dossierTemplateId) {
+    public List<RedactionLogEntry> addEntries(Map<Integer, List<Entity>> entities, int page, String dossierTemplateId) {
 
         List<RedactionLogEntry> redactionLogEntities = new ArrayList<>();
 
@@ -176,7 +101,6 @@ public class RedactionLogCreatorService {
         entityLoop:
         for (Entity entity : entities.get(page)) {
 
-            List<Comment> comments = null;
 
             for (EntityPositionSequence entityPositionSequence : entity.getPositionSequences()) {
 
@@ -189,60 +113,7 @@ public class RedactionLogCreatorService {
                     processedIds.add(entityPositionSequence.getId());
                 }
 
-                if (manualRedactions != null && !manualRedactions.getIdsToRemove().isEmpty()) {
-                    for (IdRemoval manualRemoval : manualRedactions.getIdsToRemove()) {
-                        if (manualRemoval.getId().equals(entityPositionSequence.getId())) {
-                            comments = manualRedactions.getComments().get(manualRemoval.getId());
-                            String manualOverrideReason = null;
-                            if (manualRemoval.getStatus().equals(Status.APPROVED)) {
-                                entity.setRedaction(false);
-                                redactionLogEntry.setRedacted(false);
-                                redactionLogEntry.setStatus(Status.APPROVED);
-                                manualOverrideReason = entity.getRedactionReason() + ", removed by manual override";
-                                redactionLogEntry.setColor(getColor(entity, dossierTemplateId, false));
-                            } else if (manualRemoval.getStatus().equals(Status.REQUESTED)) {
-                                manualOverrideReason = entity.getRedactionReason() + ", requested to remove";
-                                redactionLogEntry.setStatus(Status.REQUESTED);
-                                redactionLogEntry.setColor(getColor(entity, dossierTemplateId, true));
-                            } else {
-                                redactionLogEntry.setStatus(Status.DECLINED);
-                            }
-
-                            entity.setRedactionReason(manualOverrideReason != null ? manualOverrideReason : entity.getRedactionReason());
-                            redactionLogEntry.setReason(manualOverrideReason);
-                            redactionLogEntry.setManual(true);
-                            redactionLogEntry.setManualRedactionType(ManualRedactionType.REMOVE);
-                        }
-                    }
-                }
-
-                if (manualRedactions != null && !manualRedactions.getForceRedacts().isEmpty()) {
-                    for (ManualForceRedact manualForceRedact : manualRedactions.getForceRedacts()) {
-                        if (manualForceRedact.getId().equals(entityPositionSequence.getId())) {
-                            String manualOverrideReason = null;
-                            if (manualForceRedact.getStatus().equals(Status.APPROVED)) {
-                                entity.setRedaction(true);
-                                redactionLogEntry.setRedacted(true);
-                                redactionLogEntry.setStatus(Status.APPROVED);
-                                redactionLogEntry.setColor(getColor(entity, dossierTemplateId, false));
-                                manualOverrideReason = entity.getRedactionReason() + ", forced by manual override";
-                                redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
-                            } else if (manualForceRedact.getStatus().equals(Status.REQUESTED)) {
-                                manualOverrideReason = entity.getRedactionReason() + ", requested to force redact";
-                                redactionLogEntry.setStatus(Status.REQUESTED);
-                                redactionLogEntry.setColor(getColor(entity, dossierTemplateId, true));
-                                redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
-                            } else {
-                                redactionLogEntry.setStatus(Status.DECLINED);
-                            }
-
-                            entity.setRedactionReason(manualOverrideReason != null ? manualOverrideReason : entity.getRedactionReason());
-                            redactionLogEntry.setReason(manualOverrideReason);
-                            redactionLogEntry.setManual(true);
-                            redactionLogEntry.setManualRedactionType(ManualRedactionType.FORCE_REDACT);
-                        }
-                    }
-                }
+                redactionLogEntry.setId(entityPositionSequence.getId());
 
                 if (CollectionUtils.isNotEmpty(entityPositionSequence.getSequences())) {
                     List<Rectangle> rectanglesPerLine = getRectanglesPerLine(entityPositionSequence.getSequences()
@@ -250,16 +121,11 @@ public class RedactionLogCreatorService {
                             .flatMap(seq -> seq.getTextPositions().stream())
                             .collect(Collectors.toList()), page);
 
-                    if (manualRedactions != null) {
-                        comments = manualRedactions.getComments().get(entityPositionSequence.getId());
-                    }
 
-                    redactionLogEntry.setComments(comments);
                     redactionLogEntry.getPositions().addAll(rectanglesPerLine);
 
                 }
 
-                redactionLogEntry.setId(entityPositionSequence.getId());
 
                 // FIXME ids should never be null. Figure out why this happens.
                 if (redactionLogEntry.getId() != null) {
@@ -276,20 +142,22 @@ public class RedactionLogCreatorService {
 
         List<Rectangle> rectangles = new ArrayList<>();
         if (textPositions.size() == 1) {
-            rectangles.add( TextPositionSequence.fromData(textPositions, page).getRectangle());
+            rectangles.add(TextPositionSequence.fromData(textPositions, page).getRectangle());
         } else {
             float y = textPositions.get(0).getYDirAdj();
             int startIndex = 0;
             for (int i = 1; i < textPositions.size(); i++) {
                 float yDirAdj = textPositions.get(i).getYDirAdj();
                 if (yDirAdj != y) {
-                    rectangles.add( TextPositionSequence.fromData(textPositions.subList(startIndex, i), page).getRectangle());
+                    rectangles.add(TextPositionSequence.fromData(textPositions.subList(startIndex, i), page)
+                            .getRectangle());
                     y = yDirAdj;
                     startIndex = i;
                 }
             }
             if (startIndex != textPositions.size()) {
-                rectangles.add( TextPositionSequence.fromData(textPositions.subList(startIndex, textPositions.size()), page).getRectangle());
+                rectangles.add(TextPositionSequence.fromData(textPositions.subList(startIndex, textPositions.size()), page)
+                        .getRectangle());
             }
         }
 
@@ -297,80 +165,17 @@ public class RedactionLogCreatorService {
     }
 
 
-    public List<RedactionLogEntry> addManualAddEntries(Set<ManualRedactionEntry> manualAdds,
-                                                       Map<String, List<Comment>> comments, int page,
-                                                       String dossierTemplateId) {
-
-        List<RedactionLogEntry> redactionLogEntities = new ArrayList<>();
-
-        if (manualAdds == null) {
-            return redactionLogEntities;
-        }
-
-        for (ManualRedactionEntry manualRedactionEntry : manualAdds) {
-
-            String id = manualRedactionEntry.getId();
-
-            RedactionLogEntry redactionLogEntry = createRedactionLogEntry(manualRedactionEntry, id, dossierTemplateId);
-
-            List<Rectangle> rectanglesOnPage = new ArrayList<>();
-            for (Rectangle rectangle : manualRedactionEntry.getPositions()) {
-                if (page == rectangle.getPage()) {
-                    rectanglesOnPage.add(rectangle);
-                    redactionLogEntry.getPositions().add(rectangle);
-                }
-            }
-
-            redactionLogEntry.setComments(comments.get(id));
-            if (!rectanglesOnPage.isEmpty() && !approvedAndShouldBeInDictionary(manualRedactionEntry)) {
-                redactionLogEntities.add(redactionLogEntry);
-            }
-        }
-
-        return redactionLogEntities;
-    }
-
-
-    private boolean approvedAndShouldBeInDictionary(ManualRedactionEntry manualRedactionEntry) {
-
-        return manualRedactionEntry.getStatus().equals(Status.APPROVED) && manualRedactionEntry.isAddToDictionary();
-    }
-
-
-    private RedactionLogEntry createRedactionLogEntry(ManualRedactionEntry manualRedactionEntry, String id,
-                                                      String dossierTemplateId) {
-
-        return RedactionLogEntry.builder()
-                .id(id)
-                .color(getColorForManualAdd(manualRedactionEntry.getType(), dossierTemplateId, manualRedactionEntry.getStatus()))
-                .reason(manualRedactionEntry.getReason())
-                .legalBasis(manualRedactionEntry.getLegalBasis())
-                .value(manualRedactionEntry.getValue())
-                .type(manualRedactionEntry.getType())
-                .redacted(true)
-                .isHint(false)
-                .section(manualRedactionEntry.getSection())
-                .sectionNumber(manualRedactionEntry.getSectionNumber())
-                .manual(true)
-                .status(manualRedactionEntry.getStatus())
-                .manualRedactionType(ManualRedactionType.ADD)
-                .isDictionaryEntry(false)
-                .isDossierDictionaryEntry(manualRedactionEntry.isAddToDossierDictionary())
-                .build();
-    }
-
-
     private RedactionLogEntry createRedactionLogEntry(Entity entity, String dossierTemplateId) {
 
         return RedactionLogEntry.builder()
-                .color(getColor(entity, dossierTemplateId, false))
+                .color(getColor(entity.getType(), dossierTemplateId, entity.isRedaction()))
                 .reason(entity.getRedactionReason())
                 .legalBasis(entity.getLegalBasis())
                 .value(entity.getWord())
                 .type(entity.getType())
                 .redacted(entity.isRedaction())
-                .isHint(isHint(entity, dossierTemplateId))
-                .isRecommendation(isRecommendation(entity, dossierTemplateId))
+                .isHint(isHint(entity.getType(), dossierTemplateId))
+                .isRecommendation(isRecommendation(entity.getType(), dossierTemplateId))
                 .section(entity.getHeadline())
                 .sectionNumber(entity.getSectionNumber())
                 .matchedRule(entity.getMatchedRule())
@@ -384,59 +189,6 @@ public class RedactionLogCreatorService {
     }
 
 
-    private float[] getColor(Entity entity, String dossierTemplateId, boolean requestedToRemove) {
-
-        if (requestedToRemove) {
-            return dictionaryService.getRequestRemoveColor(dossierTemplateId);
-        }
-        if (!entity.isRedaction() && !isHint(entity, dossierTemplateId)) {
-            return dictionaryService.getNotRedactedColor(dossierTemplateId);
-        }
-        return dictionaryService.getColor(entity.getType(), dossierTemplateId);
-    }
-
-
-    private float[] getColorForManualAdd(String type, String dossierTemplateId, Status status) {
-
-        if (status.equals(Status.REQUESTED)) {
-            return dictionaryService.getRequestAddColor(dossierTemplateId);
-        } else if (status.equals(Status.DECLINED)) {
-            return dictionaryService.getNotRedactedColor(dossierTemplateId);
-        }
-        return getColor(type, dossierTemplateId);
-    }
-
-
-    private float[] getColor(String type, String dossierTemplateId) {
-
-        return dictionaryService.getColor(type, dossierTemplateId);
-    }
-
-
-    private float[] getColorForImage(Image image, String dossierTemplateId, boolean requestedToRemove) {
-
-        if (requestedToRemove) {
-            return dictionaryService.getRequestRemoveColor(dossierTemplateId);
-        }
-        if (!image.isRedaction() && !dictionaryService.isHint(image.getType(), dossierTemplateId)) {
-            return dictionaryService.getNotRedactedColor(dossierTemplateId);
-        }
-        return dictionaryService.getColor(image.getType(), dossierTemplateId);
-    }
-
-
-    private boolean isHint(Entity entity, String dossierTemplateId) {
-
-        return dictionaryService.isHint(entity.getType(), dossierTemplateId);
-    }
-
-
-    private boolean isRecommendation(Entity entity, String dossierTemplateId) {
-
-        return dictionaryService.isRecommendation(entity.getType(), dossierTemplateId);
-    }
-
-
     private void addSectionGrid(Document classifiedDoc, int page) {
 
         for (Paragraph paragraph : classifiedDoc.getParagraphs()) {
@@ -480,4 +232,26 @@ public class RedactionLogCreatorService {
         }
     }
 
+
+    private float[] getColor(String type, String dossierTemplateId, boolean isRedaction) {
+
+        if (!isRedaction && !isHint(type, dossierTemplateId)) {
+            return dictionaryService.getNotRedactedColor(dossierTemplateId);
+        }
+        return dictionaryService.getColor(type, dossierTemplateId);
+    }
+
+
+    private boolean isHint(String type, String dossierTemplateId) {
+
+        return dictionaryService.isHint(type, dossierTemplateId);
+    }
+
+
+    private boolean isRecommendation(String type, String dossierTemplateId) {
+
+        return dictionaryService.isRecommendation(type, dossierTemplateId);
+    }
+
+
 }

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

@@ -0,0 +1,328 @@
+package com.iqser.red.service.redaction.v1.server.redaction.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
+@RequiredArgsConstructor
+public class RedactionLogMergeService {
+
+    private final DictionaryService dictionaryService;
+
+
+    public RedactionLog mergeRedactionLogData(RedactionLog redactionLog, String dossierTemplateId,
+                                              ManualRedactions manualRedactions, Set<Integer> excludedPages) {
+
+        log.info("Merging Redaction log with manual redactions {}", manualRedactions);
+        if (manualRedactions != null) {
+
+            var manualRedactionLogEntries = addManualAddEntries(manualRedactions.getEntriesToAdd(), manualRedactions.getComments(), dossierTemplateId);
+
+            redactionLog.getRedactionLogEntry().addAll(manualRedactionLogEntries);
+
+            var manualRedactionWrappers = createManualRedactionWrappers(manualRedactions);
+
+            for (RedactionLogEntry entry : redactionLog.getRedactionLogEntry()) {
+
+                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);
+                        }
+                    });
+                }
+            }
+
+        }
+
+        return redactionLog;
+    }
+
+
+    private List<ManualRedactionWrapper> createManualRedactionWrappers(ManualRedactions manualRedactions) {
+
+        List<ManualRedactionWrapper> manualRedactionWrappers = new ArrayList<>();
+
+        manualRedactions.getImageRecategorizations().forEach(item -> {
+            if (item.getSoftDeletedTime() == null) {
+                manualRedactionWrappers.add(new ManualRedactionWrapper(item.getId(), item.getRequestDate(), item));
+            }
+        });
+
+        manualRedactions.getIdsToRemove().forEach(item -> {
+            if (item.getSoftDeletedTime() == null) {
+                manualRedactionWrappers.add(new ManualRedactionWrapper(item.getId(), item.getRequestDate(), item));
+            }
+        });
+
+        manualRedactions.getForceRedacts().forEach(item -> {
+            if (item.getSoftDeletedTime() == null) {
+                manualRedactionWrappers.add(new ManualRedactionWrapper(item.getId(), item.getRequestDate(), item));
+            }
+        });
+
+        manualRedactions.getManualLegalBasisChanges().forEach(item -> {
+            if (item.getSoftDeletedTime() == null) {
+                manualRedactionWrappers.add(new ManualRedactionWrapper(item.getId(), item.getRequestDate(), item));
+            }
+        });
+
+        Collections.sort(manualRedactionWrappers);
+
+        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;
+            }
+            return currentReason;
+        } else {
+            return "";
+        }
+    }
+
+
+    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.setPositions(manualRedactionEntry.getPositions());
+                redactionLogEntry.setComments(comments.get(manualRedactionEntry.getId()));
+                redactionLogEntries.add(redactionLogEntry);
+            }
+        }
+
+        return redactionLogEntries;
+    }
+
+
+    private boolean approvedAndShouldBeInDictionary(ManualRedactionEntry manualRedactionEntry) {
+
+        return manualRedactionEntry.getStatus()
+                .equals(Status.APPROVED) && (manualRedactionEntry.isAddToDictionary() || manualRedactionEntry.isAddToDossierDictionary());
+    }
+
+
+    private RedactionLogEntry createRedactionLogEntry(ManualRedactionEntry manualRedactionEntry, String id,
+                                                      String dossierTemplateId) {
+
+        return RedactionLogEntry.builder()
+                .id(id)
+                .color(getColorForManualAdd(manualRedactionEntry.getType(), dossierTemplateId, manualRedactionEntry.getStatus()))
+                .reason(manualRedactionEntry.getReason())
+                .isDictionaryEntry(manualRedactionEntry.isAddToDictionary())
+                .isDossierDictionaryEntry(manualRedactionEntry.isAddToDossierDictionary())
+                .legalBasis(manualRedactionEntry.getLegalBasis())
+                .value(manualRedactionEntry.getValue())
+                .type(manualRedactionEntry.getType())
+                .redacted(true)
+                .isHint(false)
+                .section(null)
+                .sectionNumber(-1)
+                .manual(true)
+                .status(manualRedactionEntry.getStatus())
+                .manualRedactionType(ManualRedactionType.ADD)
+                .manualRedactionUserId(manualRedactionEntry.getUser())
+                .build();
+    }
+
+
+    private float[] getColor(String type, String dossierTemplateId, boolean requested, boolean isRedaction,
+                             boolean skipped) {
+
+        if (requested) {
+            return dictionaryService.getRequestRemoveColor(dossierTemplateId);
+        }
+        if (skipped || !isRedaction && !dictionaryService.isHint(type, dossierTemplateId)) {
+            return dictionaryService.getNotRedactedColor(dossierTemplateId);
+        }
+        return dictionaryService.getColor(type, dossierTemplateId);
+    }
+
+
+    private float[] getColorForManualAdd(String type, String dossierTemplateId, Status status) {
+
+        if (status.equals(Status.REQUESTED)) {
+            return dictionaryService.getRequestAddColor(dossierTemplateId);
+        } else if (status.equals(Status.DECLINED)) {
+            return dictionaryService.getNotRedactedColor(dossierTemplateId);
+        }
+        return getColor(type, dossierTemplateId);
+    }
+
+
+    private float[] getColor(String type, String dossierTemplateId) {
+
+        return dictionaryService.getColor(type, dossierTemplateId);
+    }
+
+
+    @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/EntitySearchUtils.java

@@ -5,6 +5,7 @@ import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryIncre
 import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
 import com.iqser.red.service.redaction.v1.server.redaction.model.EntityPositionSequence;
 import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
+
 import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
 
@@ -17,7 +18,6 @@ import java.util.stream.Collectors;
 @SuppressWarnings("PMD")
 public class EntitySearchUtils {
 
-
     public boolean sectionContainsAny(String sectionText, Set<DictionaryIncrementValue> values) {
 
         String inputString = sectionText.toLowerCase(Locale.ROOT);
@@ -38,9 +38,7 @@ public class EntitySearchUtils {
 
                 if (startIndex > -1 && (startIndex == 0 || Character.isWhitespace(inputString.charAt(startIndex - 1)) || isSeparator(inputString
                         .charAt(startIndex - 1))) && (stopIndex == inputString.length() || isSeparator(inputString.charAt(stopIndex)))) {
-                    if (value.isCaseinsensitive() || !value.isCaseinsensitive() && sectionText.substring(startIndex, stopIndex).equals(value.getValue())) {
-                        return true;
-                    }
+                    return true;
                 }
             } while (startIndex > -1);
         }
@@ -98,8 +96,8 @@ public class EntitySearchUtils {
                     .sorted(Comparator.comparing(Entity::getStart))
                     .collect(Collectors.toList());
             Entity firstEntity = orderedEntities.get(0);
-            List<EntityPositionSequence> positionSequences = text.getSequences(firstEntity.getWord().trim(), dictionary.isCaseInsensitiveDictionary(firstEntity
-                    .getType()), firstEntity.getTargetSequences());
+            List<EntityPositionSequence> positionSequences = text.getSequences(firstEntity.getWord()
+                    .trim(), dictionary.isCaseInsensitiveDictionary(firstEntity.getType()), firstEntity.getTargetSequences());
 
             for (int i = 0; i <= orderedEntities.size() - 1; i++) {
                 try {
@@ -133,6 +131,7 @@ public class EntitySearchUtils {
 
 
     public void addEntitiesWithHigherRank(Set<Entity> entities, Set<Entity> found, Dictionary dictionary) {
+
         found.forEach(f -> addEntitiesWithHigherRank(entities, f, dictionary));
     }
 
@@ -148,9 +147,11 @@ public class EntitySearchUtils {
         entities.add(found);
     }
 
+
     public void addEntitiesIgnoreRank(Set<Entity> entities, Set<Entity> found) {
         // HashSet keeps old value but we want the new.
         entities.removeAll(found);
         entities.addAll(found);
     }
+
 }

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/segmentation/ImageMergeService.java

@@ -0,0 +1,165 @@
+package com.iqser.red.service.redaction.v1.server.segmentation;
+
+import java.awt.Graphics;
+import java.awt.geom.Rectangle2D;
+import java.awt.image.BufferedImage;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class ImageMergeService {
+
+
+    public List<PdfImage> mergeImages(List<PdfImage> images, int rotation){
+
+        List<PdfImage> mergedList = processImages(images, rotation);
+
+        List<PdfImage> imagesInImage = new ArrayList<>();
+        for(PdfImage image: mergedList){
+            for (PdfImage inner: mergedList){
+                if(image != inner && image.getPosition().contains(inner.getPosition().getX(), inner.getPosition().getY(), inner.getPosition().getWidth(), inner.getPosition().getHeight())){
+                    imagesInImage.add(inner);
+                }
+            }
+        }
+        mergedList.removeAll(imagesInImage);
+
+        return mergedList;
+    }
+
+
+    //merge images, if they are separated during pdf import, return new list of Pdfimages
+    private List<PdfImage> processImages(List<PdfImage> imageList, int rotation) {
+        if (imageList.size() > 1) {
+            List<PdfImage> mergedList = new ArrayList<>();
+            int countElementsInList = 0;
+            boolean beginImage = true;
+
+            // a List of Boolean, true = candidate for merging, false = no merging
+            List<Boolean> candidatesList = getCandidatesList(imageList, rotation);
+
+            // loop through list, if there are candidates for merging (true), merge images and add it to mergedList
+            for (int i = 0; i < candidatesList.size(); i++) {
+                if (candidatesList.get(i)) {
+                    if (beginImage) {
+                        //begin of image, merge two parts of imageList
+                        PdfImage mergedImage = mergeTwoImages(imageList.get(i), imageList.get(i + 1), rotation);
+                        // image merge successful
+                        if (mergedImage != null) {
+                            mergedList.add(mergedImage);
+                            countElementsInList++;
+                        }
+                    } else {
+                        //middle of an image, merge current piece auf mergedList with image of imageList
+                        PdfImage mergedImage = mergeTwoImages(mergedList.get(countElementsInList - 1), imageList.get(i + 1), rotation);
+                        // image merge successful
+                        if (mergedImage != null) {
+                            mergedList.set(countElementsInList - 1, mergedImage);
+                        }
+                    }
+                    beginImage = false;
+                } else {
+                    // if the last candidate is false, then both images i and i+1 must be added
+                    if (i == candidatesList.size() - 1) {
+                        if (countElementsInList > 0 && mergedList.get(countElementsInList - 1) == imageList.get(i)) {
+                            mergedList.add(imageList.get(i + 1));
+                        } else {
+                            mergedList.add(imageList.get(i));
+                            mergedList.add(imageList.get(i + 1));
+                        }
+                    } else {
+                        //first image is not splitted, add i to resultlist
+                        if (beginImage) {
+                            mergedList.add(imageList.get(i));
+                            countElementsInList++;
+                        } else {
+                            // i is the end of an image, add begin of new image
+                            mergedList.add(imageList.get(i + 1));
+                            countElementsInList++;
+                            beginImage = false;
+                        }
+                    }
+                }
+            }
+            return mergedList;
+        } else {
+            return imageList;
+        }
+    }
+
+    private PdfImage mergeTwoImages(PdfImage image1, PdfImage image2, int rotation) {
+
+        // diese Angaben von getPosition scheinen nicht richtig zu sein, damit werden teile des Bildes abgeschnitten
+        double width = image1.getPosition().getWidth();
+        double width2 = image2.getPosition().getWidth();
+        double height1 = image1.getPosition().getHeight();
+        double height2 = image2.getPosition().getHeight();
+        // mit  den Werten, die unter Image gespeichert sind, funktioniert es
+        double img1height = image1.getImage().getHeight();
+        double img1width = image1.getImage().getWidth();
+        double img2height = image2.getImage().getHeight();
+
+        BufferedImage mergedImage = new BufferedImage((int) img1width, (int) (img1height + img2height), BufferedImage.TYPE_INT_RGB);
+        Graphics mergedImageGraphics = mergedImage.getGraphics();
+        try {
+            mergedImageGraphics.drawImage(image1.getImage(), 0, 0, null);
+            mergedImageGraphics.drawImage(image2.getImage(), 0, (int) (img1height), null);
+
+            // set Image, Position and type for merged Image
+            //set position for merged image with values of image1 and the height of both
+            Rectangle2D pos = new Rectangle2D.Float();
+            pos.setRect(image1.getPosition().getX(), image2.getPosition().getY(), rotation == 90 ? width + width2: width, rotation == 90 ? height1 : height1 + height2);
+            PdfImage newPdfImage = new PdfImage(mergedImage, pos, image1.getPage(), image1.isHasTransparency() || image2.isHasTransparency());
+            // Graphics need to be disposed
+
+            image1.getImage().flush();
+            image2.getImage().flush();
+
+            mergedImage.flush();
+            mergedImageGraphics.dispose();
+
+            return newPdfImage;
+        } catch (Exception e) {
+            // failed to merge image
+            log.error("Failed to merge image", e);
+            return null;
+        }
+
+
+    }
+
+    //make a list of true and false, if the image is a candidate for merging
+    private List<Boolean> getCandidatesList(List<PdfImage> imageList, int rotation) {
+        List<Boolean> candidatesList = new ArrayList<>();
+        for (int i = 0; i < imageList.size(); i++) {
+            if (i >= 1) {
+                candidatesList.add(isCandidateForMerging(imageList.get(i - 1), imageList.get(i), rotation));
+            }
+        }
+        return candidatesList;
+    }
+
+    // evaluate if two images are candidates for merging, depending on their coordinates, width and height
+    private boolean isCandidateForMerging(PdfImage image1, PdfImage image2, int rotation) {
+        double x1 = rotation == 90 ? image1.getPosition().getY() : image1.getPosition().getX();
+        double y1 = rotation == 90 ? image1.getPosition().getX() : image1.getPosition().getY();
+        double width1 = rotation == 90 ? image1.getPosition().getHeight() : image1.getPosition().getWidth();
+        double x2 = rotation == 90 ? image2.getPosition().getY() : image2.getPosition().getX();
+        double y2 = rotation == 90 ? image2.getPosition().getX() : image2.getPosition().getY();
+        double width2 = rotation == 90 ? image2.getPosition().getHeight() : image2.getPosition().getWidth();
+        double height2 = rotation == 90 ? image2.getPosition().getWidth() : image2.getPosition().getHeight();
+        //if the x-coordinates and widths of images are equal and the height is equal to difference between y-coordinates,
+        // then it is the same picture and has to be merged -> return true
+        return x1 == x2 && width1 == width2 && Math.ceil(height2) == Math.ceil(rotation == 90 ? y2 - y1 : y1 - y2) && width2 > (height2 / 6);
+    }
+
+}

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

@@ -1,6 +1,19 @@
 package com.iqser.red.service.redaction.v1.server.segmentation;
 
-import com.iqser.red.service.redaction.v1.model.Rectangle;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.pdfbox.io.MemoryUsageSetting;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.springframework.stereotype.Service;
+
 import com.iqser.red.service.redaction.v1.server.classification.model.Document;
 import com.iqser.red.service.redaction.v1.server.classification.model.Page;
 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
@@ -15,24 +28,9 @@ import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractT
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.CleanRulings;
 import com.iqser.red.service.redaction.v1.server.tableextraction.service.RulingCleaningService;
 import com.iqser.red.service.redaction.v1.server.tableextraction.service.TableExtractionService;
+
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.IOUtils;
-import org.apache.pdfbox.io.MemoryUsageSetting;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.common.PDRectangle;
-import org.springframework.stereotype.Service;
-
-import java.awt.Graphics;
-import java.awt.geom.Rectangle2D;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
 
 @Slf4j
 @Service
@@ -47,13 +45,17 @@ public class PdfSegmentationService {
     private final ClassificationService classificationService;
     private final SectionsBuilderService sectionsBuilderService;
     private final ImageClassificationService imageClassificationService;
+    private final ImageMergeService imageMergeService;
 
 
     public Document parseDocument(InputStream documentInputStream) throws IOException {
+
         return parseDocument(documentInputStream, false);
     }
 
+
     public Document parseDocument(InputStream documentInputStream, boolean ignoreImages) throws IOException {
+
         PDDocument pdDocument = null;
         try {
             //create tempFile
@@ -64,7 +66,6 @@ public class PdfSegmentationService {
             Document document = new Document();
             List<Page> pages = new ArrayList<>();
 
-
             pdDocument = reinitializePDDocument(tempFile, null);
             long pageCount = pdDocument.getNumberOfPages();
 
@@ -101,32 +102,19 @@ public class PdfSegmentationService {
                 page.setRotation(rotation);
                 page.setLandscape(isLandscape || isRotated);
                 page.setPageNumber(pageNumber);
-                List<PdfImage> mergedList = processImages(stripper.getImages());
-
-                List<PdfImage> imagesInImage = new ArrayList<>();
-                for(PdfImage image: mergedList){
-                    for (PdfImage inner: mergedList){
-                        if(image != inner && image.getPosition().contains(inner.getPosition().getX(), inner.getPosition().getY(), inner.getPosition().getWidth(), inner.getPosition().getHeight())){
-                            imagesInImage.add(inner);
-                        }
-                    }
-                }
-                mergedList.removeAll(imagesInImage);
 
+                List<PdfImage> mergedList = imageMergeService.mergeImages(stripper.getImages(), rotation);
                 page.setImages(mergedList);
 
                 tableExtractionService.extractTables(cleanRulings, page);
                 buildPageStatistics(page);
                 increaseDocumentStatistics(page, document);
 
-
                 if (!ignoreImages) {
                     imageClassificationService.classifyImages(page);
                 }
 
                 pages.add(page);
-
-
             }
 
             document.setPages(pages);
@@ -149,7 +137,9 @@ public class PdfSegmentationService {
         }
     }
 
+
     private PDDocument reinitializePDDocument(File tempFile, PDDocument pdDocument) throws IOException {
+
         if (pdDocument != null) {
             pdDocument.close();
         }
@@ -164,130 +154,6 @@ public class PdfSegmentationService {
         return newPDDocument;
     }
 
-    //merge images, if they are separated during pdf import, return new list of Pdfimages
-    private List<PdfImage> processImages(List<PdfImage> imageList) {
-        if (imageList.size() > 1) {
-            List<PdfImage> mergedList = new ArrayList<>();
-            int countElementsInList = 0;
-            boolean beginImage = true;
-
-            // a List of Boolean, true = candidate for merging, false = no merging
-            List<Boolean> candidatesList = getCandidatesList(imageList);
-
-            // loop through list, if there are candidates for merging (true), merge images and add it to mergedList
-            for (int i = 0; i < candidatesList.size(); i++) {
-                if (candidatesList.get(i)) {
-                    if (beginImage) {
-                        //begin of image, merge two parts of imageList
-                        PdfImage mergedImage = mergeTwoImages(imageList.get(i), imageList.get(i + 1));
-                        // image merge successful
-                        if (mergedImage != null) {
-                            mergedList.add(mergedImage);
-                            countElementsInList++;
-                        }
-                    } else {
-                        //middle of an image, merge current piece auf mergedList with image of imageList
-                        PdfImage mergedImage = mergeTwoImages(mergedList.get(countElementsInList - 1), imageList.get(i + 1));
-                        // image merge successful
-                        if (mergedImage != null) {
-                            mergedList.set(countElementsInList - 1, mergedImage);
-                        }
-                    }
-                    beginImage = false;
-                } else {
-                    // if the last candidate is false, then both images i and i+1 must be added
-                    if (i == candidatesList.size() - 1) {
-                        if (countElementsInList > 0 && mergedList.get(countElementsInList - 1) == imageList.get(i)) {
-                            mergedList.add(imageList.get(i + 1));
-                        } else {
-                            mergedList.add(imageList.get(i));
-                            mergedList.add(imageList.get(i + 1));
-                        }
-                    } else {
-                        //first image is not splitted, add i to resultlist
-                        if (beginImage) {
-                            mergedList.add(imageList.get(i));
-                            countElementsInList++;
-                        } else {
-                            // i is the end of an image, add begin of new image
-                            mergedList.add(imageList.get(i + 1));
-                            countElementsInList++;
-                            beginImage = false;
-                        }
-                    }
-                }
-            }
-            return mergedList;
-        } else {
-            return imageList;
-        }
-    }
-
-    private PdfImage mergeTwoImages(PdfImage image1, PdfImage image2) {
-
-        // diese Angaben von getPosition scheinen nicht richtig zu sein, damit werden teile des Bildes abgeschnitten
-        double width = image1.getPosition().getWidth();
-        double height1 = image1.getPosition().getHeight();
-        double height2 = image2.getPosition().getHeight();
-        // mit  den Werten, die unter Image gespeichert sind, funktioniert es
-        double img1height = image1.getImage().getHeight();
-        double img1width = image1.getImage().getWidth();
-        double img2height = image2.getImage().getHeight();
-
-        BufferedImage mergedImage = new BufferedImage((int) img1width, (int) (img1height + img2height), BufferedImage.TYPE_INT_RGB);
-        Graphics mergedImageGraphics = mergedImage.getGraphics();
-        try {
-            mergedImageGraphics.drawImage(image1.getImage(), 0, 0, null);
-            mergedImageGraphics.drawImage(image2.getImage(), 0, (int) (img1height), null);
-
-            // set Image, Position and type for merged Image
-            //set position for merged image with values of image1 and the height of both
-            Rectangle2D pos = new Rectangle2D.Float();
-            pos.setRect(image1.getPosition().getX(), image2.getPosition().getY(), width, height1 + height2);
-            PdfImage newPdfImage = new PdfImage(mergedImage, pos, image1.getPage());
-            // Graphics need to be disposed
-
-            image1.getImage().flush();
-            image2.getImage().flush();
-
-            mergedImage.flush();
-            mergedImageGraphics.dispose();
-
-            return newPdfImage;
-        } catch (Exception e) {
-            // failed to merge image
-            log.error("Failed to merge image", e);
-            return null;
-        }
-
-
-    }
-
-    //make a list of true and false, if the image is a candidate for merging
-    private List<Boolean> getCandidatesList(List<PdfImage> imageList) {
-        List<Boolean> candidatesList = new ArrayList<>();
-        for (int i = 0; i < imageList.size(); i++) {
-            if (i >= 1) {
-                candidatesList.add(isCandidateForMerging(imageList.get(i - 1), imageList.get(i)));
-            }
-        }
-        return candidatesList;
-    }
-
-    // evaluate if two images are candidates for merging, depending on their coordinates, width and height
-    private boolean isCandidateForMerging(PdfImage image1, PdfImage image2) {
-        double x1 = image1.getPosition().getX();
-        double y1 = image1.getPosition().getY();
-        double width1 = image1.getPosition().getWidth();
-        double x2 = image2.getPosition().getX();
-        double y2 = image2.getPosition().getY();
-        double width2 = image2.getPosition().getWidth();
-        double height2 = image2.getPosition().getHeight();
-        //if the x-coordinates and widths of images are equal and the height is equal to difference between y-coordinates,
-        // then it is the same picture and has to be merged -> return true
-        return x1 == x2 && width1 == width2 && Math.ceil(height2) == Math.ceil(y1 - y2) && width2 > (height2 / 6);
-    }
-
 
     private void increaseDocumentStatistics(Page page, Document document) {
 
@@ -319,5 +185,4 @@ public class PdfSegmentationService {
 
     }
 
-
 }

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 {
@@ -633,6 +658,14 @@ public class RedactionIntegrationTest {
         long start = System.currentTimeMillis();
         ClassPathResource pdfFileResource = new ClassPathResource("files/new/Single Study - Oral (Gavage) Mouse.pdf");
         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()));
 
         AnalyzeResult result = reanalyzeService.analyze(request);
 
@@ -680,16 +713,35 @@ 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();
+
+        ManualRedactions manualRedactions = new ManualRedactions();
+
+        manualRedactions.setImageRecategorizations(Set.of(ManualImageRecategorization.builder()
+                .id("37eee3e9d589a5cc529bfec38c3ba479")
+                .status(Status.APPROVED)
+                .type("signature")
+                .build()));
+
+        request.setManualRedactions(manualRedactions);
+
         AnalyzeResult reanalyzeResult = reanalyzeService.reanalyze(request);
 
+        redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID);
+
         end = System.currentTimeMillis();
         System.out.println("reanalysis analysis duration: " + (end - start));
 
@@ -771,7 +823,6 @@ public class RedactionIntegrationTest {
 
 //        manualRedactions.getEntriesToAdd().add(manualRedactionEntry);
 
-
         AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());
         request.setManualRedactions(manualRedactions);
         AnalyzeResult result = reanalyzeService.analyze(request);
@@ -781,16 +832,21 @@ public class RedactionIntegrationTest {
                 .id("5b940b2cb401ed9f5be6fc24f6e77bcf")
                 .status(Status.APPROVED)
                 .build()));
+        manualRedactions.setManualLegalBasisChanges(Set.of(ManualLegalBasisChange.builder()
+                .id("675eba69b0c2917de55462c817adaa05")
+                .legalBasis("Manual Legal Basis Change")
+                .status(Status.APPROVED)
+                .build()));
 
         reanalyzeService.reanalyze(request);
 
+        var redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID);
 
         AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
                 .dossierId(TEST_DOSSIER_ID)
                 .fileId(TEST_FILE_ID)
                 .build());
 
-
         try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Annotated.pdf")) {
             fileOutputStream.write(annotateResponse.getDocument());
         }
@@ -807,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()
@@ -908,8 +963,10 @@ public class RedactionIntegrationTest {
         });
     }
 
+
     @SneakyThrows
     private AnalyzeRequest prepareStorage(String file) {
+
         ClassPathResource pdfFileResource = new ClassPathResource(file);
 
         return prepareStorage(pdfFileResource.getInputStream());
@@ -941,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/java/com/iqser/red/service/redaction/v1/server/redaction/service/EntityRedactionServiceTest.java

@@ -151,7 +151,7 @@ public class EntityRedactionServiceTest {
         when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(sponsorResponse);
 
         Document classifiedDoc = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
-        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId");
+        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId", null);
         assertThat(classifiedDoc.getEntities()).hasSize(1); // one page
         assertThat(classifiedDoc.getEntities().get(1)).hasSize(7);// 3 author cells, 1 address, 1 Y and 2 N entities
     }
@@ -177,7 +177,7 @@ public class EntityRedactionServiceTest {
         when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(sponsorResponse);
 
         Document classifiedDoc = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
-        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId");
+        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId", null);
         assertThat(classifiedDoc.getEntities()).hasSize(1); // one page
         assertThat(classifiedDoc.getEntities().get(1)).hasSize(7);// 3 author cells, 1 address, 1 Y and 2 N entities
     }
@@ -202,7 +202,7 @@ public class EntityRedactionServiceTest {
                 .build();
         when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(sponsorResponse);
         Document classifiedDoc = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
-        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId");
+        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId", null);
         assertThat(classifiedDoc.getEntities()
                 .entrySet()
                 .stream()
@@ -210,7 +210,7 @@ public class EntityRedactionServiceTest {
         pdfFileResource = new ClassPathResource("files/Compounds/27 A8637C - EU AIR3 - MCP Section 1 - Identity of " +
                 "the plant protection product.pdf");
         classifiedDoc = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
-        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId");
+        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId", null);
         assertThat(classifiedDoc.getEntities()
                 .entrySet()
                 .stream()
@@ -235,7 +235,7 @@ public class EntityRedactionServiceTest {
                 .build();
         when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(sponsorResponse);
         Document classifiedDoc = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
-        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId");
+        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId", null);
         assertThat(classifiedDoc.getEntities()).hasSize(1); // one page
         assertThat(classifiedDoc.getEntities().get(1).stream()
                 .filter(entity -> entity.getMatchedRule() == 9)
@@ -302,7 +302,7 @@ public class EntityRedactionServiceTest {
                 .build();
         when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(sponsorResponse);
         Document classifiedDoc = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
-        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId");
+        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId", null);
         assertThat(classifiedDoc.getEntities()).hasSize(1); // one page
         assertThat(classifiedDoc.getEntities().get(1).stream()
                 .filter(entity -> entity.getMatchedRule() == 6)
@@ -341,7 +341,7 @@ public class EntityRedactionServiceTest {
                 .build();
         when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(dictionaryResponse);
         Document classifiedDoc = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
-        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId");
+        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId", null);
         assertThat(classifiedDoc.getEntities()).hasSize(1); // one page
         assertThat(classifiedDoc.getEntities().get(1).stream()
                 .filter(entity -> entity.getMatchedRule() == 11)
@@ -371,7 +371,7 @@ public class EntityRedactionServiceTest {
                 .build();
         when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(sponsorResponse);
         Document classifiedDoc = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
-        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId");
+        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId", null);
         assertThat(classifiedDoc.getEntities()).hasSize(2); // two pages
         assertThat(classifiedDoc.getEntities().get(1).stream().filter(entity -> entity.getMatchedRule() == 9).count()).isEqualTo(8);
         assertThat(classifiedDoc.getEntities().get(2).stream().filter(entity -> entity.getMatchedRule() == 9).count()).isEqualTo(5); // 2 names, 1 address, 2 Y
@@ -390,7 +390,7 @@ public class EntityRedactionServiceTest {
         when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(addressResponse);
 
         classifiedDoc = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
-        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId");
+        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId", null);
         assertThat(classifiedDoc.getEntities()).hasSize(1); // one page
         assertThat(classifiedDoc.getEntities().get(1).stream().filter(entity -> entity.getMatchedRule() == 9).count()).isEqualTo(3);
         assertThat(classifiedDoc.getEntities().get(1).stream().filter(entity -> entity.getMatchedRule() == 8).count()).isEqualTo(9);
@@ -419,7 +419,7 @@ public class EntityRedactionServiceTest {
                 .build();
         when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(sponsorResponse);
         Document classifiedDoc = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
-        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId");
+        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId", null);
         assertThat(classifiedDoc.getEntities()).hasSize(1); // one page
         assertThat(classifiedDoc.getEntities().get(1).stream().filter(entity -> entity.getMatchedRule() == 8).count()).isEqualTo(6);
     }

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

redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules.drl

@@ -268,7 +268,7 @@ rule "18: Redact contact information if Producer is found"
 
 rule "19: Redact AUTHOR(S)"
     when
-        Section(searchText.contains("AUTHOR(S):"))
+        Section(searchText.contains("AUTHOR(S):") && fileAttributeByPlaceholderEquals("{fileattributes.vertebrateStudy}", "true"))
     then
         section.redactLinesBetween("AUTHOR(S):", "COMPLETION DATE:", "PII", 19, true, "AUTHOR(S) was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
     end