Pull request #200 : Fixed dossier dictionary and dictionary rank sorting

Merge in RED/redaction-service from RankFix2.1.x to release/2.27.x * commit '94d6fc3e28b377ca2f65802d2bf4ab4e61604991': Fixed dossier dictionary and dictionary rank sorting
Fixed dossier dictionary and dictionary rank sorting
2021-07-29 11:48:14 +02:00 · 2021-07-29 11:40:25 +02:00 · 2021-07-01 15:48:28 +02:00
32 changed files with 548 additions and 556 deletions
@@ -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.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 \
+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 \
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>platform-dependency</artifactId>
        <groupId>com.iqser.red</groupId>
-        <version>1.1.3</version>
+        <version>1.1.2</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.6</version>
+                <version>1.3.1</version>
                <scope>import</scope>
                <type>pom</type>
            </dependency>
@@ -6,8 +6,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;

 import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Set;

@Data
@@ -24,8 +22,5 @@ public class AnalyzeRequest {
    private OffsetDateTime lastProcessed;
    private Set<Integer> excludedPages;

-    @Builder.Default
-    private List<FileAttribute> fileAttributes = new ArrayList<>();
-
 }

@@ -25,8 +25,6 @@ public class AnalyzeResult {
    private long rulesVersion;
    private long legalBasisVersion;

-    private boolean wasReanalyzed;
-

 }

@@ -1,19 +0,0 @@
-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;
-
-}
@@ -5,8 +5,6 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;

-import java.time.OffsetDateTime;
-
@Data
@Builder
@AllArgsConstructor
@@ -18,8 +16,4 @@ public class IdRemoval {
    private Status status;
    private boolean removeFromDictionary;

-    private OffsetDateTime requestDate;
-    private OffsetDateTime processedDate;
-    private OffsetDateTime softDeletedTime;
-
-}
+}
@@ -5,8 +5,6 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;

-import java.time.OffsetDateTime;
-
@Data
@Builder
@AllArgsConstructor
@@ -18,8 +16,4 @@ public class ManualForceRedact {
    private Status status;
    private String legalBasis;

-    private OffsetDateTime requestDate;
-    private OffsetDateTime processedDate;
-    private OffsetDateTime softDeletedTime;
-
-}
+}
@@ -5,8 +5,6 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;

-import java.time.OffsetDateTime;
-
@Data
@Builder
@AllArgsConstructor
@@ -17,9 +15,7 @@ public class ManualImageRecategorization {
    private String user;
    private Status status;
    private String type;
+    private String legalBasis;
+    private boolean redacted;

-    private OffsetDateTime requestDate;
-    private OffsetDateTime processedDate;
-    private OffsetDateTime softDeletedTime;
-
-}
+}
@@ -5,8 +5,6 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;

-import java.time.OffsetDateTime;
-
@Data
@Builder
@AllArgsConstructor
@@ -18,8 +16,4 @@ public class ManualLegalBasisChange {
    private Status status;
    private String legalBasis;

-    private OffsetDateTime requestDate;
-    private OffsetDateTime processedDate;
-    private OffsetDateTime softDeletedTime;
-
-}
+}
@@ -5,7 +5,6 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;

-import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.List;

@@ -23,12 +22,11 @@ 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;
-
 }
@@ -10,13 +10,6 @@ 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 computationalVersion;
-
    private List<RedactionLogEntry> redactionLogEntry;
    private List<LegalBasisMapping> legalBasis;

@@ -9,8 +9,6 @@ import lombok.NoArgsConstructor;
 import java.util.ArrayList;
 import java.util.List;

-
-
@Data
@Builder
@NoArgsConstructor
@@ -48,7 +46,6 @@ public class RedactionLogEntry {
    private int endOffset;

    private boolean isImage;
-    private boolean imageHasTransparency;

    private boolean isDossierDictionaryEntry;

@@ -30,5 +30,4 @@ public class SectionRectangle {
    private int numberOfParts;

    private List<CellRectangle> tableCells;
-
 }
@@ -8,6 +8,8 @@ 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 + "}";

@@ -30,7 +32,4 @@ public interface RedactionResource {
    @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);
-
 }
@@ -3,7 +3,6 @@ package com.iqser.red.service.redaction.v1.server.controller;
 import com.iqser.red.service.file.management.v1.api.model.FileType;
 import com.iqser.red.service.redaction.v1.model.AnnotateRequest;
 import com.iqser.red.service.redaction.v1.model.AnnotateResponse;
-import com.iqser.red.service.redaction.v1.model.RedactionLog;
 import com.iqser.red.service.redaction.v1.model.RedactionRequest;
 import com.iqser.red.service.redaction.v1.model.RedactionResult;
 import com.iqser.red.service.redaction.v1.resources.RedactionResource;
@@ -13,7 +12,6 @@ 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.storage.RedactionStorageService;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
@@ -41,7 +39,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) {

@@ -157,23 +155,6 @@ public class RedactionController implements RedactionResource {
        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.getComputationalVersion());
-        if (redactionLog.getComputationalVersion() == 0) {
-            // old redaction logs are returned directly
-            return redactionLog;
-        } else {
-            return redactionLogMergeService.mergeRedactionLogData(redactionLog, redactionRequest.getDossierTemplateId(), redactionRequest.getManualRedactions());
-        }
-    }
-

    private RedactionResult convert(PDDocument document, int numberOfPages) throws IOException {

@@ -189,16 +189,18 @@ public class PDFLinesTextStripper extends PDFTextStripper {
            COSName objectName = (COSName) arguments.get(0);
            PDXObject xobject = getResources().getXObject(objectName);
            if (xobject instanceof PDImageXObject) {
-                PDImageXObject image = (PDImageXObject)xobject;
-                Matrix ctmNew = getGraphicsState().getCurrentTransformationMatrix();
+                PDImageXObject pdfImage = (PDImageXObject) xobject;

-                Rectangle2D rect = new Rectangle2D.Float(ctmNew.getTranslateX(), ctmNew.getTranslateY(), ctmNew.getScaleX(), ctmNew.getScaleY());
+                Rectangle2D imageBounds = calculateImagePosition(pdfImage);
+
+                Rectangle2D rect = new Rectangle2D.Float((float) imageBounds.getX(), (float) imageBounds.getY(), (float) imageBounds
+                        .getWidth(), (float) imageBounds.getHeight());

                // Memory Hack - sofReference kills me
-                FieldUtils.writeField(image, "cachedImageSubsampling", -1, true);
+                FieldUtils.writeField(pdfImage, "cachedImageSubsampling", -1, true);

                if (rect.getHeight() > 2 && rect.getWidth() > 2) {
-                    this.images.add(new PdfImage(image.getImage(), rect, pageNumber, image.getImage().getColorModel().hasAlpha()));
+                    this.images.add(new PdfImage(pdfImage.getImage(), rect, pageNumber));
                }
            }
        } catch (Exception e) {
@@ -207,6 +209,21 @@ 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) {
@@ -9,7 +9,7 @@ import java.util.List;

@Data
@EqualsAndHashCode(onlyExplicitlyIncluded = true)
-public class Entity implements ReasonHolder {
+public class Entity {


    private final String word;
@@ -9,7 +9,7 @@ import lombok.NoArgsConstructor;
@Builder
@NoArgsConstructor
@AllArgsConstructor
-public class Image implements ReasonHolder {
+public class Image {

    private String type;
    private RedRectangle2D position;
@@ -20,6 +20,5 @@ public class Image implements ReasonHolder {
    private int sectionNumber;
    private String section;
    private int page;
-    private boolean hasTransparency;

 }
@@ -18,16 +18,14 @@ 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, boolean hasTransparency) {
+    public PdfImage(BufferedImage image, Rectangle2D position, int page) {
        this.image = image;
        this.position = new RedRectangle2D(position.getX(), position.getY(), position.getWidth(), position.getHeight());
        this.page = page;
-        this.hasTransparency = hasTransparency;
    }

 }
@@ -1,14 +0,0 @@
-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);
-
-
-}
@@ -1,6 +1,5 @@
 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;
@@ -9,11 +8,9 @@ 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;
@@ -55,22 +52,6 @@ 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 rowEquals(String headerName, String value) {

@@ -4,19 +4,13 @@ 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 org.springframework.stereotype.Service;

@Service
 public class AnalyzeResponseService {

-    public AnalyzeResult createAnalyzeResponse(String dossierId, String fileId, long duration, int pageCount,
-                                               RedactionLog redactionLog, RedactionChangeLog redactionChangeLog) {
-
-        boolean hasHints = redactionLog.getRedactionLogEntry()
-                .stream()
-                .filter(entry -> !entry.isExcluded())
-                .anyMatch(entry -> entry.isHint() && !entry.getType().equals("false_positive"));
+    public AnalyzeResult createAnalyzeResponse(String dossierId, String fileId, long duration, int pageCount, RedactionLog redactionLog, RedactionChangeLog redactionChangeLog) {
+        boolean hasHints = redactionLog.getRedactionLogEntry().stream().anyMatch(entry -> entry.isHint() && !entry.getType().equals("false_positive"));

        boolean hasRequests = redactionLog.getRedactionLogEntry()
                .stream()
@@ -37,9 +31,7 @@ public class AnalyzeResponseService {

        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)
@@ -57,5 +49,4 @@ public class AnalyzeResponseService {
                .dossierDictionaryVersion(redactionLog.getDossierDictionaryVersion())
                .build();
    }
-
 }
@@ -33,7 +33,6 @@ 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()) {
@@ -164,7 +163,6 @@ 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();
@@ -212,13 +210,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).getRequestRemoveColor();
+        return dictionariesByDossierTemplate.get(dossierTemplateId).getRequestAddColor();
    }


@@ -1,11 +1,14 @@
 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.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.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;
@@ -30,8 +33,7 @@ public class EntityRedactionService {
    private final SurroundingWordsService surroundingWordsService;


-    public void processDocument(Document classifiedDoc, String dossierTemplateId, ManualRedactions manualRedactions,
-                                String dossierId, List<FileAttribute> fileAttributes) {
+    public void processDocument(Document classifiedDoc, String dossierTemplateId, ManualRedactions manualRedactions, String dossierId) {

        dictionaryService.updateDictionary(dossierTemplateId, dossierId);
        KieContainer container = droolsExecutionService.updateRules(dossierTemplateId);
@@ -39,7 +41,7 @@ public class EntityRedactionService {

        Dictionary dictionary = dictionaryService.getDeepCopyDictionary(dossierTemplateId, dossierId);

-        Set<Entity> documentEntities = new HashSet<>(findEntities(classifiedDoc, container, manualRedactions, dictionary, false, null, fileAttributes));
+        Set<Entity> documentEntities = new HashSet<>(findEntities(classifiedDoc, container, manualRedactions, dictionary, false, null));

        if (dictionary.hasLocalEntries()) {

@@ -51,7 +53,7 @@ public class EntityRedactionService {
                }
            });

-            Set<Entity> foundByLocal = findEntities(classifiedDoc, container, manualRedactions, dictionary, true, hintsPerSectionNumber, fileAttributes);
+            Set<Entity> foundByLocal = findEntities(classifiedDoc, container, manualRedactions, dictionary, true, hintsPerSectionNumber);
            EntitySearchUtils.addEntitiesWithHigherRank(documentEntities, foundByLocal, dictionary);
            EntitySearchUtils.removeEntitiesContainedInLarger(documentEntities);
        }
@@ -82,8 +84,7 @@ public class EntityRedactionService {

    private Set<Entity> findEntities(Document classifiedDoc, KieContainer kieContainer,
                                     ManualRedactions manualRedactions, Dictionary dictionary, boolean local,
-                                     Map<Integer, Set<Entity>> hintsPerSectionNumber,
-                                     List<FileAttribute> fileAttributes) {
+                                     Map<Integer, Set<Entity>> hintsPerSectionNumber) {

        Set<Entity> documentEntities = new HashSet<>();

@@ -94,31 +95,31 @@ public class EntityRedactionService {
            List<Table> tables = paragraph.getTables();
            for (Table table : tables) {
                if (table.getColCount() == 2) {
-                    sectionSearchableTextPairs.addAll(processTableAsOneText(classifiedDoc, table, sectionNumber, dictionary, local, hintsPerSectionNumber, fileAttributes));
+                    sectionSearchableTextPairs.addAll(processTableAsOneText(classifiedDoc, table, manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber));
                } else {
-                    sectionSearchableTextPairs.addAll(processTablePerRow(classifiedDoc, table, sectionNumber, dictionary, local, hintsPerSectionNumber, fileAttributes));
+                    sectionSearchableTextPairs.addAll(processTablePerRow(classifiedDoc, table, manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber));
                }
                sectionNumber.incrementAndGet();
            }
            sectionSearchableTextPairs.add(processText(classifiedDoc, paragraph.getSearchableText(), paragraph.getTextBlocks(), paragraph
                    .getHeadline(), manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber, paragraph
-                    .getImages(), fileAttributes));
+                    .getImages()));
            sectionNumber.incrementAndGet();
        }

        for (Header header : classifiedDoc.getHeaders()) {
-            sectionSearchableTextPairs.add(processText(classifiedDoc, header.getSearchableText(), header.getTextBlocks(), "Header", manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber, new ArrayList<>(), fileAttributes));
+            sectionSearchableTextPairs.add(processText(classifiedDoc, header.getSearchableText(), header.getTextBlocks(), "Header", manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber, new ArrayList<>()));
            sectionNumber.incrementAndGet();
        }

        for (Footer footer : classifiedDoc.getFooters()) {
-            sectionSearchableTextPairs.add(processText(classifiedDoc, footer.getSearchableText(), footer.getTextBlocks(), "Footer", manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber, new ArrayList<>(), fileAttributes));
+            sectionSearchableTextPairs.add(processText(classifiedDoc, footer.getSearchableText(), footer.getTextBlocks(), "Footer", manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber, new ArrayList<>()));
            sectionNumber.incrementAndGet();
        }

        for (UnclassifiedText unclassifiedText : classifiedDoc.getUnclassifiedTexts()) {
            sectionSearchableTextPairs.add(processText(classifiedDoc, unclassifiedText.getSearchableText(), unclassifiedText
-                    .getTextBlocks(), "", manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber, new ArrayList<>(), fileAttributes));
+                    .getTextBlocks(), "", manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber, new ArrayList<>()));
            sectionNumber.incrementAndGet();
        }

@@ -160,10 +161,10 @@ public class EntityRedactionService {


    private List<SectionSearchableTextPair> processTablePerRow(Document classifiedDoc, Table table,
+                                                               ManualRedactions manualRedactions,
                                                               AtomicInteger sectionNumber, Dictionary dictionary,
                                                               boolean local,
-                                                               Map<Integer, Set<Entity>> hintsPerSectionNumber,
-                                                               List<FileAttribute> fileAttributes) {
+                                                               Map<Integer, Set<Entity>> hintsPerSectionNumber) {

        List<SectionSearchableTextPair> sectionSearchableTextPairs = new ArrayList<>();

@@ -188,6 +189,7 @@ 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()) {
@@ -227,7 +229,6 @@ public class EntityRedactionService {
                    .tabularData(tabularData)
                    .searchableText(searchableRow)
                    .dictionary(dictionary)
-                    .fileAttributes(fileAttributes)
                    .build(), searchableRow));

            if (!local) {
@@ -248,10 +249,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,
-                                                                  List<FileAttribute> fileAttributes) {
+                                                                  Map<Integer, Set<Entity>> hintsPerSectionNumber) {

        List<SectionSearchableTextPair> sectionSearchableTextPairs = new ArrayList<>();
        SearchableText entireTableText = new SearchableText();
@@ -276,6 +277,7 @@ public class EntityRedactionService {
                for (TextBlock textBlock : cell.getTextBlocks()) {
                    entireTableText.addAll(textBlock.getSequences());
                }
+                addSectionToManualRedactions(cell.getTextBlocks(), manualRedactions, table.getHeadline(), sectionNumber.intValue());
            }
        }

@@ -294,7 +296,6 @@ public class EntityRedactionService {
                .sectionNumber(sectionNumber.intValue())
                .searchableText(entireTableText)
                .dictionary(dictionary)
-                .fileAttributes(fileAttributes)
                .build(), entireTableText));

        if (!local) {
@@ -314,7 +315,7 @@ public class EntityRedactionService {
                                                  ManualRedactions manualRedactions, AtomicInteger sectionNumber,
                                                  Dictionary dictionary, boolean local,
                                                  Map<Integer, Set<Entity>> hintsPerSectionNumber,
-                                                  List<PdfImage> images, List<FileAttribute> fileAttributes) {
+                                                  List<PdfImage> images) {

        if (!local) {
            SectionText sectionText = new SectionText();
@@ -329,12 +330,13 @@ public class EntityRedactionService {
            sectionText.setSectionNumber(sectionNumber.intValue());
            sectionText.setTable(false);
            sectionText.setImages(images.stream()
-                    .map(image -> convertAndRecategorize(image, sectionNumber.intValue(), headline, manualRedactions))
+                    .map(image -> convert(image, sectionNumber.intValue(), headline))
                    .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);

@@ -351,9 +353,8 @@ public class EntityRedactionService {
                .searchableText(searchableText)
                .dictionary(dictionary)
                .images(images.stream()
-                        .map(image -> convertAndRecategorize(image, sectionNumber.intValue(), headline, manualRedactions))
+                        .map(image -> convert(image, sectionNumber.intValue(), headline))
                        .collect(Collectors.toSet()))
-                .fileAttributes(fileAttributes)
                .build(), searchableText);
    }

@@ -370,11 +371,9 @@ 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()));
            }
        }

@@ -382,9 +381,29 @@ public class EntityRedactionService {
    }


-    private Image convertAndRecategorize(PdfImage pdfImage, int sectionNumber, String headline, ManualRedactions manualRedactions) {
+    private void addSectionToManualRedactions(List<TextBlock> textBlocks, ManualRedactions manualRedactions,
+                                              String section, int sectionNumber) {

-        Image image = Image.builder()
+        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()
                .type(pdfImage.getImageType().equals(ImageType.OTHER) ? "image" : pdfImage.getImageType()
                        .name()
                        .toLowerCase(Locale.ROOT))
@@ -392,20 +411,7 @@ 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;
    }

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

+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.kie.api.runtime.KieContainer;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
+
 import com.iqser.red.service.file.management.v1.api.model.FileType;
-import com.iqser.red.service.redaction.v1.model.*;
+import com.iqser.red.service.redaction.v1.model.AnalyzeRequest;
+import com.iqser.red.service.redaction.v1.model.AnalyzeResult;
+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.ManualRedactions;
+import com.iqser.red.service.redaction.v1.model.Rectangle;
+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.SectionArea;
 import com.iqser.red.service.redaction.v1.server.classification.model.Document;
 import com.iqser.red.service.redaction.v1.server.classification.model.SectionText;
 import com.iqser.red.service.redaction.v1.server.classification.model.Text;
 import com.iqser.red.service.redaction.v1.server.client.LegalBasisClient;
 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.model.DictionaryIncrement;
+import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryVersion;
+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.Image;
+import com.iqser.red.service.redaction.v1.server.redaction.model.RedRectangle2D;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Section;
+import com.iqser.red.service.redaction.v1.server.redaction.model.SectionSearchableTextPair;
 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.storage.RedactionStorageService;
+
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.kie.api.runtime.KieContainer;
-import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.*;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;

@Slf4j
@Service
@@ -59,14 +84,14 @@ public class ReanalyzeService {
        log.info("Document structure analysis successful, starting redaction analysis...");

        entityRedactionService.processDocument(classifiedDoc, analyzeRequest.getDossierTemplateId(), analyzeRequest.getManualRedactions(), analyzeRequest
-                .getDossierId(), analyzeRequest.getFileAttributes());
-        redactionLogCreatorService.createRedactionLog(classifiedDoc, pageCount, analyzeRequest
+                .getDossierId());
+        redactionLogCreatorService.createRedactionLog(classifiedDoc, pageCount, analyzeRequest.getManualRedactions(), analyzeRequest
                .getDossierTemplateId());

        log.info("Redaction analysis successful...");

        var legalBasis = legalBasisClient.getLegalBasisMapping(analyzeRequest.getDossierTemplateId());
-        var redactionLog = new RedactionLog(1, classifiedDoc.getRedactionLogEntities(), legalBasis, classifiedDoc.getDictionaryVersion()
+        var redactionLog = new RedactionLog(classifiedDoc.getRedactionLogEntities(), legalBasis, classifiedDoc.getDictionaryVersion()
                .getDossierTemplateVersion(), classifiedDoc.getDictionaryVersion()
                .getDossierVersion(), classifiedDoc.getRulesVersion(), legalBasisClient.getVersion(analyzeRequest.getDossierTemplateId()));

@@ -105,12 +130,20 @@ public class ReanalyzeService {
        DictionaryIncrement dictionaryIncrement = dictionaryService.getDictionaryIncrements(analyzeRequest.getDossierTemplateId(), new DictionaryVersion(redactionLog
                .getDictionaryVersion(), redactionLog.getDossierDictionaryVersion()), analyzeRequest.getDossierId());

-        Set<String> relevantManuallyModifiedAnnotationIds = getRelevantManuallyModifiedAnnotationIds(analyzeRequest.getManualRedactions());
+        Set<String> manualForceAndRemoveIds = getForceAndRemoveIds(analyzeRequest.getManualRedactions());
+        Map<String, List<Comment>> comments = null;
+        Set<ManualRedactionEntry> manualAdds = null;
+
+        if (analyzeRequest.getManualRedactions() != null) {
+            // TODO comments will be removed from redactionLog, so we ignore this first.
+            comments = analyzeRequest.getManualRedactions().getComments();
+            manualAdds = analyzeRequest.getManualRedactions().getEntriesToAdd();
+        }

        Set<Integer> sectionsToReanalyse = new HashSet<>();
        Map<Integer, Set<Image>> imageEntries = new HashMap<>();
        for (RedactionLogEntry entry : redactionLog.getRedactionLogEntry()) {
-            if (entry.isManual() || relevantManuallyModifiedAnnotationIds.contains(entry.getId())) {
+            if (entry.isManual() || manualForceAndRemoveIds.contains(entry.getId())) {
                sectionsToReanalyse.add(entry.getSectionNumber());
            }
            if (entry.isImage() || entry.getType().equals("image")) {
@@ -124,11 +157,23 @@ 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()) {
+        if (sectionsToReanalyse.isEmpty() && (manualAdds == null || manualAdds.isEmpty())) {
            return finalizeAnalysis(analyzeRequest, startTime, redactionLog, text, dictionaryIncrement);
        }

@@ -160,20 +205,6 @@ public class ReanalyzeService {
                surroundingWordsService.addSurroundingText(entities, reanalysisSection.getSearchableText(), dictionary);
            }

-            if (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())
@@ -186,7 +217,6 @@ public class ReanalyzeService {
                    .searchableText(reanalysisSection.getSearchableText())
                    .dictionary(dictionary)
                    .images(reanalysisSection.getImages())
-                    .fileAttributes(analyzeRequest.getFileAttributes())
                    .build(), reanalysisSection.getSearchableText()));
        }

@@ -223,22 +253,23 @@ public class ReanalyzeService {
        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
+                newRedactionLogEntries.addAll(redactionLogCreatorService.addEntries(entitiesPerPage, analyzeRequest.getManualRedactions(), page, analyzeRequest
                        .getDossierTemplateId()));
            }

            if (imagesPerPage.get(page) != null) {
-                newRedactionLogEntries.addAll(redactionLogCreatorService.addImageEntries(imagesPerPage, page, analyzeRequest
+                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);
-        AnalyzeResult analyzeResult = finalizeAnalysis(analyzeRequest, startTime, redactionLog, text, dictionaryIncrement);
-        analyzeResult.setWasReanalyzed(true);
-        return analyzeResult;
+        return finalizeAnalysis(analyzeRequest, startTime, redactionLog, text, dictionaryIncrement);
+
    }


@@ -261,19 +292,15 @@ public class ReanalyzeService {
    }


-    private Set<String> getRelevantManuallyModifiedAnnotationIds(ManualRedactions manualRedactions) {
+    private Set<String> getForceAndRemoveIds(ManualRedactions manualRedactions) {

        if (manualRedactions == null) {
            return new HashSet<>();
        }

-        return Stream.concat(manualRedactions.getManualLegalBasisChanges()
-                .stream()
-                .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))))
+        return Stream.concat(manualRedactions.getManualLegalBasisChanges().stream().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,17 +316,21 @@ public class ReanalyzeService {
                .sectionNumber(entry.getSectionNumber())
                .section(entry.getSection())
                .page(position.getPage())
-                .hasTransparency(entry.isImageHasTransparency())
                .build();
    }


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

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

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

-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.model.*;
 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;
@@ -17,7 +13,9 @@ import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
 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;
+
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;

@@ -35,7 +33,10 @@ public class RedactionLogCreatorService {
    private final DictionaryService dictionaryService;


-    public void createRedactionLog(Document classifiedDoc, int numberOfPages, String dossierTemplateId) {
+    public void createRedactionLog(Document classifiedDoc, int numberOfPages, ManualRedactions manualRedactions,
+                                   String dossierTemplateId) {
+
+        Set<Integer> manualRedactionPages = getManualRedactionPages(manualRedactions);

        for (int page = 1; page <= numberOfPages; page++) {

@@ -43,18 +44,24 @@ public class RedactionLogCreatorService {

            if (classifiedDoc.getEntities().get(page) != null) {
                classifiedDoc.getRedactionLogEntities()
-                        .addAll(addEntries(classifiedDoc.getEntities(), page, dossierTemplateId));
+                        .addAll(addEntries(classifiedDoc.getEntities(), manualRedactions, page, dossierTemplateId));
+            }
+
+            if (manualRedactionPages.contains(page)) {
+                classifiedDoc.getRedactionLogEntities()
+                        .addAll(addManualAddEntries(manualRedactions.getEntriesToAdd(), manualRedactions.getComments(), page, dossierTemplateId));
            }

            if (classifiedDoc.getImages().get(page) != null && !classifiedDoc.getImages().get(page).isEmpty()) {
                classifiedDoc.getRedactionLogEntities()
-                        .addAll(addImageEntries(classifiedDoc.getImages(), page, dossierTemplateId));
+                        .addAll(addImageEntries(classifiedDoc.getImages(), manualRedactions, page, dossierTemplateId));
            }
        }
    }


-    public List<RedactionLogEntry> addImageEntries(Map<Integer, Set<Image>> images, int pageNumber, String dossierTemplateId) {
+    public List<RedactionLogEntry> addImageEntries(Map<Integer, Set<Image>> images, ManualRedactions manualRedactions,
+                                                   int pageNumber, String dossierTemplateId) {

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

@@ -64,7 +71,7 @@ public class RedactionLogCreatorService {

            RedactionLogEntry redactionLogEntry = RedactionLogEntry.builder()
                    .id(id)
-                    .color(getColor(image.getType(), dossierTemplateId, image.isRedaction()))
+                    .color(getColorForImage(image, dossierTemplateId, false))
                    .isImage(true)
                    .type(image.getType())
                    .redacted(image.isRedaction())
@@ -80,9 +87,119 @@ public class RedactionLogCreatorService {
                            .getWidth(), (float) image.getPosition().getHeight(), pageNumber)))
                    .sectionNumber(image.getSectionNumber())
                    .section(image.getSection())
-                    .imageHasTransparency(image.isHasTransparency())
                    .build();

+            if (manualRedactions != null && !manualRedactions.getImageRecategorizations().isEmpty()) {
+                for (ManualImageRecategorization recategorization : manualRedactions.getImageRecategorizations()) {
+                    if (recategorization.getId().equals(id)) {
+                        String manualOverrideReason = null;
+                        if (recategorization.getStatus().equals(Status.APPROVED)) {
+                            image.setType(recategorization.getType());
+                            image.setRedaction(recategorization.isRedacted());
+                            image.setLegalBasis(recategorization.getLegalBasis());
+                            redactionLogEntry.setType(recategorization.getType());
+                            redactionLogEntry.setHint(dictionaryService.isHint(recategorization.getType(), dossierTemplateId));
+                            redactionLogEntry.setRedacted(recategorization.isRedacted());
+                            redactionLogEntry.setStatus(Status.APPROVED);
+                            redactionLogEntry.setLegalBasis(recategorization.getLegalBasis());
+                            manualOverrideReason = image.getRedactionReason() + ", recategorized by manual override";
+                            redactionLogEntry.setColor(getColorForImage(image, dossierTemplateId, false));
+                        } else if (recategorization.getStatus().equals(Status.REQUESTED)) {
+                            manualOverrideReason = image.getRedactionReason() + ", requested to recategorize";
+                            redactionLogEntry.setStatus(Status.REQUESTED);
+                            redactionLogEntry.setColor(getColorForImage(image, dossierTemplateId, true));
+                            redactionLogEntry.setRecategorizationType(recategorization.getType());
+                        } else {
+                            redactionLogEntry.setStatus(Status.DECLINED);
+                        }
+
+                        image.setRedactionReason(manualOverrideReason != null ? manualOverrideReason : image.getRedactionReason());
+                        redactionLogEntry.setReason(manualOverrideReason);
+                        redactionLogEntry.setManual(true);
+                        redactionLogEntry.setManualRedactionType(ManualRedactionType.RECATEGORIZE);
+                    }
+                }
+            }
+
+            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);
+                    }
+                }
+            }
+
+
+            if (manualRedactions != null && !manualRedactions.getManualLegalBasisChanges().isEmpty()) {
+                for (ManualLegalBasisChange manualLegalBasisChange : manualRedactions.getManualLegalBasisChanges()) {
+                    if (manualLegalBasisChange.getId().equals(id)) {
+                        String manualOverrideReason = null;
+                        if (manualLegalBasisChange.getStatus().equals(Status.APPROVED)) {
+                            redactionLogEntry.setStatus(Status.APPROVED);
+                            manualOverrideReason = image.getRedactionReason() + ", legal basis was manually changed";
+                            redactionLogEntry.setLegalBasis(manualLegalBasisChange.getLegalBasis());
+                        } else if (manualLegalBasisChange.getStatus().equals(Status.REQUESTED)) {
+                            manualOverrideReason = image.getRedactionReason() + ", legal basis change requested";
+                            redactionLogEntry.setStatus(Status.REQUESTED);
+                            redactionLogEntry.setColor(getColorForImage(image, dossierTemplateId, true));
+                            redactionLogEntry.setLegalBasisChangeValue(manualLegalBasisChange.getLegalBasis());
+                        } else {
+                            redactionLogEntry.setStatus(Status.DECLINED);
+                        }
+
+                        image.setRedactionReason(manualOverrideReason != null ? manualOverrideReason : image.getRedactionReason());
+                        redactionLogEntry.setReason(manualOverrideReason);
+                        redactionLogEntry.setManual(true);
+                        redactionLogEntry.setManualRedactionType(ManualRedactionType.LEGAL_BASIS_CHANGE);
+                    }
+                }
+            }

            redactionLogEntities.add(redactionLogEntry);
        }
@@ -91,7 +208,25 @@ public class RedactionLogCreatorService {
    }


-    public List<RedactionLogEntry> addEntries(Map<Integer, List<Entity>> entities, int page, String dossierTemplateId) {
+    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) {

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

@@ -101,6 +236,7 @@ public class RedactionLogCreatorService {
        entityLoop:
        for (Entity entity : entities.get(page)) {

+            List<Comment> comments = null;

            for (EntityPositionSequence entityPositionSequence : entity.getPositionSequences()) {

@@ -113,7 +249,85 @@ public class RedactionLogCreatorService {
                    processedIds.add(entityPositionSequence.getId());
                }

-                redactionLogEntry.setId(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);
+                        }
+                    }
+                }
+
+                if (manualRedactions != null && !manualRedactions.getManualLegalBasisChanges().isEmpty()) {
+                    for (ManualLegalBasisChange manualLegalBasisChange : manualRedactions.getManualLegalBasisChanges()) {
+                        if (manualLegalBasisChange.getId().equals(entityPositionSequence.getId())) {
+                            String manualOverrideReason = null;
+                            if (manualLegalBasisChange.getStatus().equals(Status.APPROVED)) {
+                                redactionLogEntry.setStatus(Status.APPROVED);
+                                manualOverrideReason = entity.getRedactionReason() + ", legal basis was manually changed";
+                                redactionLogEntry.setLegalBasis(manualLegalBasisChange.getLegalBasis());
+                            } else if (manualLegalBasisChange.getStatus().equals(Status.REQUESTED)) {
+                                manualOverrideReason = entity.getRedactionReason() + ", legal basis change requested";
+                                redactionLogEntry.setStatus(Status.REQUESTED);
+                                redactionLogEntry.setColor(getColor(entity, dossierTemplateId, true));
+                                redactionLogEntry.setLegalBasisChangeValue(manualLegalBasisChange.getLegalBasis());
+                            } else {
+                                redactionLogEntry.setStatus(Status.DECLINED);
+                            }
+
+                            entity.setRedactionReason(manualOverrideReason != null ? manualOverrideReason : entity.getRedactionReason());
+                            redactionLogEntry.setReason(manualOverrideReason);
+                            redactionLogEntry.setManual(true);
+                            redactionLogEntry.setManualRedactionType(ManualRedactionType.LEGAL_BASIS_CHANGE);
+                        }
+                    }
+                }

                if (CollectionUtils.isNotEmpty(entityPositionSequence.getSequences())) {
                    List<Rectangle> rectanglesPerLine = getRectanglesPerLine(entityPositionSequence.getSequences()
@@ -121,11 +335,16 @@ 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) {
@@ -165,17 +384,80 @@ 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.getType(), dossierTemplateId, entity.isRedaction()))
+                .color(getColor(entity, dossierTemplateId, false))
                .reason(entity.getRedactionReason())
                .legalBasis(entity.getLegalBasis())
                .value(entity.getWord())
                .type(entity.getType())
                .redacted(entity.isRedaction())
-                .isHint(isHint(entity.getType(), dossierTemplateId))
-                .isRecommendation(isRecommendation(entity.getType(), dossierTemplateId))
+                .isHint(isHint(entity, dossierTemplateId))
+                .isRecommendation(isRecommendation(entity, dossierTemplateId))
                .section(entity.getHeadline())
                .sectionNumber(entity.getSectionNumber())
                .matchedRule(entity.getMatchedRule())
@@ -189,6 +471,59 @@ 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()) {
@@ -232,26 +567,4 @@ 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);
-    }
-
-
 }
@@ -1,246 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.service;
-
-import com.iqser.red.service.redaction.v1.model.*;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class RedactionLogMergeService {
-
-    private final DictionaryService dictionaryService;
-
-
-    public RedactionLog mergeRedactionLogData(RedactionLog redactionLog, String dossierTemplateId, ManualRedactions manualRedactions) {
-
-        log.info("Merging Redaction log with manual redactions {}", manualRedactions);
-        if (manualRedactions != null) {
-
-            var manualRedactionLogEntries = addManualAddEntries(manualRedactions.getEntriesToAdd(), manualRedactions.getComments(), dossierTemplateId);
-
-            redactionLog.getRedactionLogEntry().addAll(manualRedactionLogEntries);
-
-            log.info("Adding {}", manualRedactionLogEntries);
-            for (RedactionLogEntry entry : redactionLog.getRedactionLogEntry()) {
-                processRedactionLogEntry(manualRedactions, dossierTemplateId, entry);
-                entry.setComments(manualRedactions.getComments().get(entry.getId()));
-            }
-
-        }
-
-        return redactionLog;
-    }
-
-
-    private void processRedactionLogEntry(ManualRedactions manualRedactions, String dossierTemplateId, RedactionLogEntry redactionLogEntry) {
-
-        List<Comment> comments = null;
-
-
-        if (manualRedactions != null && !manualRedactions.getImageRecategorizations().isEmpty()) {
-            for (ManualImageRecategorization recategorization : manualRedactions.getImageRecategorizations()) {
-                if (recategorization.getId().equals(redactionLogEntry.getId())) {
-                    String manualOverrideReason = null;
-                    if (recategorization.getStatus().equals(Status.APPROVED)) {
-                        redactionLogEntry.setStatus(Status.APPROVED);
-                        redactionLogEntry.setType(recategorization.getType());
-                        manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", recategorized by manual override");
-                    } else if (recategorization.getStatus().equals(Status.REQUESTED)) {
-                        manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to recategorize");
-                        redactionLogEntry.setStatus(Status.REQUESTED);
-                        redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry.isRedacted(), false));
-                        redactionLogEntry.setRecategorizationType(recategorization.getType());
-                    } else {
-                        redactionLogEntry.setStatus(Status.DECLINED);
-                    }
-
-                    redactionLogEntry.setReason(manualOverrideReason);
-                    redactionLogEntry.setManual(true);
-                    redactionLogEntry.setManualRedactionType(ManualRedactionType.RECATEGORIZE);
-                }
-            }
-        }
-
-        if (manualRedactions != null && !manualRedactions.getIdsToRemove().isEmpty()) {
-            for (IdRemoval manualRemoval : manualRedactions.getIdsToRemove()) {
-                if (manualRemoval.getId().equals(redactionLogEntry.getId())) {
-                    comments = manualRedactions.getComments().get(manualRemoval.getId());
-                    String manualOverrideReason = null;
-                    if (manualRemoval.getStatus().equals(Status.APPROVED)) {
-                        redactionLogEntry.setRedacted(false);
-                        redactionLogEntry.setStatus(Status.APPROVED);
-                        manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", removed by manual override");
-                        redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry.isRedacted(), true));
-                    } else if (manualRemoval.getStatus().equals(Status.REQUESTED)) {
-                        manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to remove");
-                        redactionLogEntry.setStatus(Status.REQUESTED);
-                        redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry.isRedacted(), false));
-                    } else {
-                        redactionLogEntry.setStatus(Status.DECLINED);
-                    }
-
-                    redactionLogEntry.setReason(manualOverrideReason);
-                    redactionLogEntry.setManual(true);
-                    redactionLogEntry.setManualRedactionType(ManualRedactionType.REMOVE);
-                    redactionLogEntry.setDictionaryEntry(manualRemoval.isRemoveFromDictionary());
-                    redactionLogEntry.setDossierDictionaryEntry(manualRemoval.isRemoveFromDictionary());
-                }
-            }
-        }
-
-        if (manualRedactions != null && !manualRedactions.getForceRedacts().isEmpty()) {
-            for (ManualForceRedact manualForceRedact : manualRedactions.getForceRedacts()) {
-                if (manualForceRedact.getId().equals(redactionLogEntry.getId())) {
-                    String manualOverrideReason = null;
-                    if (manualForceRedact.getStatus().equals(Status.APPROVED)) {
-                        redactionLogEntry.setRedacted(true);
-                        redactionLogEntry.setStatus(Status.APPROVED);
-                        redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry.isRedacted(), false));
-                        manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", forced by manual override");
-                        redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
-                    } else if (manualForceRedact.getStatus().equals(Status.REQUESTED)) {
-                        manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to force redact");
-                        redactionLogEntry.setStatus(Status.REQUESTED);
-                        redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry.isRedacted(), false));
-                        redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
-                    } else {
-                        redactionLogEntry.setStatus(Status.DECLINED);
-                    }
-
-                    redactionLogEntry.setReason(manualOverrideReason);
-                    redactionLogEntry.setManual(true);
-                    redactionLogEntry.setManualRedactionType(ManualRedactionType.FORCE_REDACT);
-
-                }
-            }
-        }
-
-        if (manualRedactions != null && !manualRedactions.getManualLegalBasisChanges().isEmpty()) {
-            for (ManualLegalBasisChange manualLegalBasisChange : manualRedactions.getManualLegalBasisChanges()) {
-                if (manualLegalBasisChange.getId().equals(redactionLogEntry.getId())) {
-                    String manualOverrideReason = null;
-                    if (manualLegalBasisChange.getStatus().equals(Status.APPROVED)) {
-                        redactionLogEntry.setStatus(Status.APPROVED);
-                        manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", legal basis was manually changed");
-                        redactionLogEntry.setLegalBasis(manualLegalBasisChange.getLegalBasis());
-                    } else if (manualLegalBasisChange.getStatus().equals(Status.REQUESTED)) {
-                        manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", legal basis change requested");
-                        redactionLogEntry.setStatus(Status.REQUESTED);
-                        redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry.isRedacted(), false));
-                        redactionLogEntry.setLegalBasisChangeValue(manualLegalBasisChange.getLegalBasis());
-                    } else {
-                        redactionLogEntry.setStatus(Status.DECLINED);
-                    }
-
-                    redactionLogEntry.setReason(manualOverrideReason);
-                    redactionLogEntry.setManual(true);
-                    redactionLogEntry.setManualRedactionType(ManualRedactionType.LEGAL_BASIS_CHANGE);
-                }
-            }
-        }
-
-
-        if (manualRedactions != null) {
-            comments = manualRedactions.getComments().get(redactionLogEntry.getId());
-        }
-
-        redactionLogEntry.setComments(comments);
-    }
-
-    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)
-                .isDictionaryEntry(false)
-                .isDossierDictionaryEntry(manualRedactionEntry.isAddToDossierDictionary())
-                .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);
-    }
-
-
-}
@@ -5,7 +5,6 @@ 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;

@@ -18,6 +17,7 @@ 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,7 +38,9 @@ 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)))) {
-                    return true;
+                    if (value.isCaseinsensitive() || !value.isCaseinsensitive() && sectionText.substring(startIndex, stopIndex).equals(value.getValue())) {
+                        return true;
+                    }
                }
            } while (startIndex > -1);
        }
@@ -96,8 +98,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 {
@@ -131,7 +133,6 @@ public class EntitySearchUtils {


    public void addEntitiesWithHigherRank(Set<Entity> entities, Set<Entity> found, Dictionary dictionary) {
-
        found.forEach(f -> addEntitiesWithHigherRank(entities, f, dictionary));
    }

@@ -147,11 +148,9 @@ 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);
    }
-
 }
@@ -118,7 +118,7 @@ public class ImageMergeService {
            //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());
+            PdfImage newPdfImage = new PdfImage(mergedImage, pos, image1.getPage());
            // Graphics need to be disposed

            image1.getImage().flush();
@@ -635,8 +635,6 @@ public class RedactionIntegrationTest {
        AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());
        request.setExcludedPages(Set.of(1));

-        request.setFileAttributes(List.of(FileAttribute.builder().id("fileAttributeId").label("Vertebrate Study").placeholder("{fileattributes.vertebrateStudy}").value("true").build()));
-
        AnalyzeResult result = reanalyzeService.analyze(request);

        var redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID);
@@ -698,6 +696,8 @@ public class RedactionIntegrationTest {
                .id("37eee3e9d589a5cc529bfec38c3ba479")
                .status(Status.APPROVED)
                .type("signature")
+                .redacted(true)
+                .legalBasis("Article 39(e)(1) and Article 39(e)(2) of Regulation (EC) No 178/2002")
                .build()));

        request.setManualRedactions(manualRedactions);
@@ -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", null);
+        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId");
        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", null);
+        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId");
        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", null);
+        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId");
        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", null);
+        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId");
        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", null);
+        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId");
        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", null);
+        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId");
        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", null);
+        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId");
        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", null);
+        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId");
        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", null);
+        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId");
        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", null);
+        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId");
        assertThat(classifiedDoc.getEntities()).hasSize(1); // one page
        assertThat(classifiedDoc.getEntities().get(1).stream().filter(entity -> entity.getMatchedRule() == 8).count()).isEqualTo(6);
    }
@@ -268,7 +268,7 @@ rule "18: Redact contact information if Producer is found"

 rule "19: Redact AUTHOR(S)"
    when
-        Section(searchText.contains("AUTHOR(S):") && fileAttributeByPlaceholderEquals("{fileattributes.vertebrateStudy}", "true"))
+        Section(searchText.contains("AUTHOR(S):"))
    then
        section.redactLinesBetween("AUTHOR(S):", "COMPLETION DATE:", "PII", 19, true, "AUTHOR(S) was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
    end
Author	SHA1	Message	Date
Dominique Eiflaender	d2a650e043	Pull request #200 : Fixed dossier dictionary and dictionary rank sorting Merge in RED/redaction-service from RankFix2.1.x to release/2.27.x * commit '94d6fc3e28b377ca2f65802d2bf4ab4e61604991': Fixed dossier dictionary and dictionary rank sorting	2021-07-29 11:48:14 +02:00
Dominique Eifländer	94d6fc3e28	Fixed dossier dictionary and dictionary rank sorting	2021-07-29 11:40:25 +02:00
Dominique Eifländer	9d89cf20c8	RED-1728: Do not show isHint flag if only false_positive entries are included in redactionlog	2021-07-01 15:48:28 +02:00