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
18 changed files with 255 additions and 451 deletions
@@ -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,10 +6,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;

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

@Data
@@ -26,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;
-
-}
@@ -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 getRedactionLogPreview(@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.RedactionLogCreatorService;
 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 RedactionLogCreatorService redactionLogCreatorService;
+

    public AnnotateResponse annotate(@RequestBody AnnotateRequest annotateRequest) {

@@ -157,14 +155,6 @@ public class RedactionController implements RedactionResource {
        droolsExecutionService.testRules(rules);
    }

-    @Override
-    public RedactionLog getRedactionLogPreview(RedactionRequest redactionRequest) {
-
-        var redactionLog = redactionStorageService.getRedactionLog(redactionRequest.getDossierId(), redactionRequest.getFileId());
-
-        return redactionLogCreatorService.getRedactionLogPreview(redactionLog, redactionRequest.getDossierTemplateId(), redactionRequest.getManualRedactions());
-    }
-

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

@@ -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;
@@ -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();
    }
-
 }
@@ -210,7 +210,7 @@ public class DictionaryService {
            dossierDictionaryVersion = dossierRepresentation.getDictionaryVersion();
        }

-        return new Dictionary(copy, DictionaryVersion.builder().dossierTemplateVersion(dossierTemplateRepresentation.getDictionaryVersion()).dossierVersion(dossierDictionaryVersion).build());
+        return new Dictionary(copy.stream().sorted(Comparator.comparingInt(DictionaryModel::getRank).reversed()).collect(Collectors.toList()), DictionaryVersion.builder().dossierTemplateVersion(dossierTemplateRepresentation.getDictionaryVersion()).dossierVersion(dossierDictionaryVersion).build());
    }


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

-import com.iqser.red.service.redaction.v1.model.FileAttribute;
 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;
@@ -34,7 +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);
@@ -42,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()) {

@@ -54,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);
        }
@@ -85,7 +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<>();

@@ -96,31 +95,31 @@ public class EntityRedactionService {
            List<Table> tables = paragraph.getTables();
            for (Table table : tables) {
                if (table.getColCount() == 2) {
-                    sectionSearchableTextPairs.addAll(processTableAsOneText(classifiedDoc, table, manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber, fileAttributes));
+                    sectionSearchableTextPairs.addAll(processTableAsOneText(classifiedDoc, table, manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber));
                } else {
-                    sectionSearchableTextPairs.addAll(processTablePerRow(classifiedDoc, table, manualRedactions, 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();
        }

@@ -165,7 +164,7 @@ public class EntityRedactionService {
                                                               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<>();

@@ -230,7 +229,6 @@ public class EntityRedactionService {
                    .tabularData(tabularData)
                    .searchableText(searchableRow)
                    .dictionary(dictionary)
-                    .fileAttributes(fileAttributes)
                    .build(), searchableRow));

            if (!local) {
@@ -254,8 +252,7 @@ public class EntityRedactionService {
                                                                  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();
@@ -299,7 +296,6 @@ public class EntityRedactionService {
                .sectionNumber(sectionNumber.intValue())
                .searchableText(entireTableText)
                .dictionary(dictionary)
-                .fileAttributes(fileAttributes)
                .build(), entireTableText));

        if (!local) {
@@ -319,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();
@@ -359,7 +355,6 @@ public class EntityRedactionService {
                .images(images.stream()
                        .map(image -> convert(image, sectionNumber.intValue(), headline))
                        .collect(Collectors.toSet()))
-                .fileAttributes(fileAttributes)
                .build(), searchableText);
    }

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

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

@@ -217,7 +217,6 @@ public class ReanalyzeService {
                    .searchableText(reanalysisSection.getSearchableText())
                    .dictionary(dictionary)
                    .images(reanalysisSection.getImages())
-                    .fileAttributes(analyzeRequest.getFileAttributes())
                    .build(), reanalysisSection.getSearchableText()));
        }

@@ -269,9 +268,8 @@ public class ReanalyzeService {

        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);
+
    }


@@ -9,17 +9,21 @@ import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSeque
 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.ReasonHolder;
 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.beans.BeanUtils;
 import org.springframework.stereotype.Service;

-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;

@Service
@@ -67,7 +71,7 @@ public class RedactionLogCreatorService {

            RedactionLogEntry redactionLogEntry = RedactionLogEntry.builder()
                    .id(id)
-                    .color(getColorForImage(image.getType(), dossierTemplateId, false, image.isRedaction()))
+                    .color(getColorForImage(image, dossierTemplateId, false))
                    .isImage(true)
                    .type(image.getType())
                    .redacted(image.isRedaction())
@@ -85,7 +89,117 @@ public class RedactionLogCreatorService {
                    .section(image.getSection())
                    .build();

-            processImageEntry(manualRedactions, dossierTemplateId, image, redactionLogEntry);
+            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);
        }
@@ -93,118 +207,6 @@ public class RedactionLogCreatorService {
        return redactionLogEntities;
    }

-    private void processImageEntry(ManualRedactions manualRedactions, String dossierTemplateId, ReasonHolder image, RedactionLogEntry redactionLogEntry) {
-        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)) {
-                        image.setRedaction(recategorization.isRedacted());
-                        redactionLogEntry.setType(recategorization.getType());
-                        redactionLogEntry.setHint(dictionaryService.isHint(recategorization.getType(), dossierTemplateId));
-                        redactionLogEntry.setRedacted(recategorization.isRedacted());
-                        redactionLogEntry.setStatus(Status.APPROVED);
-                        redactionLogEntry.setLegalBasis(recategorization.getLegalBasis());
-                        manualOverrideReason = mergeReasonIfNecessary(image.getRedactionReason(), ", recategorized by manual override");
-                        redactionLogEntry.setColor(getColorForImage(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry.isRedacted()));
-                    } else if (recategorization.getStatus().equals(Status.REQUESTED)) {
-                        manualOverrideReason = mergeReasonIfNecessary(image.getRedactionReason(), ", requested to recategorize");
-                        redactionLogEntry.setStatus(Status.REQUESTED);
-                        redactionLogEntry.setColor(getColorForImage(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry.isRedacted()));
-                        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(redactionLogEntry.getId())) {
-                    String manualOverrideReason = null;
-                    if (manualRemoval.getStatus().equals(Status.APPROVED)) {
-                        image.setRedaction(false);
-                        redactionLogEntry.setRedacted(false);
-                        redactionLogEntry.setStatus(Status.APPROVED);
-                        manualOverrideReason = mergeReasonIfNecessary(image.getRedactionReason(), ", removed by manual override");
-                        redactionLogEntry.setColor(getColorForImage(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry.isRedacted()));
-                    } else if (manualRemoval.getStatus().equals(Status.REQUESTED)) {
-                        manualOverrideReason = mergeReasonIfNecessary(image.getRedactionReason(), ", requested to remove");
-                        redactionLogEntry.setStatus(Status.REQUESTED);
-                        redactionLogEntry.setColor(getColorForImage(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry.isRedacted()));
-                    } 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(redactionLogEntry.getId())) {
-                    String manualOverrideReason = null;
-                    if (manualForceRedact.getStatus().equals(Status.APPROVED)) {
-                        image.setRedaction(true);
-                        redactionLogEntry.setRedacted(true);
-                        redactionLogEntry.setStatus(Status.APPROVED);
-                        redactionLogEntry.setColor(getColorForImage(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry.isRedacted()));
-                        manualOverrideReason = mergeReasonIfNecessary(image.getRedactionReason(), ", forced by manual override");
-                        redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
-                    } else if (manualForceRedact.getStatus().equals(Status.REQUESTED)) {
-                        manualOverrideReason = mergeReasonIfNecessary(image.getRedactionReason(), ", requested to force redact");
-                        redactionLogEntry.setStatus(Status.REQUESTED);
-                        redactionLogEntry.setColor(getColorForImage(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry.isRedacted()));
-                        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(redactionLogEntry.getId())) {
-                    String manualOverrideReason = null;
-                    if (manualLegalBasisChange.getStatus().equals(Status.APPROVED)) {
-                        redactionLogEntry.setStatus(Status.APPROVED);
-                        manualOverrideReason = mergeReasonIfNecessary(image.getRedactionReason(), ", legal basis was manually changed");
-                        redactionLogEntry.setLegalBasis(manualLegalBasisChange.getLegalBasis());
-                    } else if (manualLegalBasisChange.getStatus().equals(Status.REQUESTED)) {
-                        manualOverrideReason = mergeReasonIfNecessary(image.getRedactionReason(), ", legal basis change requested");
-                        redactionLogEntry.setStatus(Status.REQUESTED);
-                        redactionLogEntry.setColor(getColorForImage(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry.isRedacted()));
-                        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);
-                }
-            }
-        }
-    }
-

    private Set<Integer> getManualRedactionPages(ManualRedactions manualRedactions) {

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

+            List<Comment> comments = null;

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

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

-                redactionLogEntry.setId(entityPositionSequence.getId());
-                processRedactionLogEntry(manualRedactions, dossierTemplateId, redactionLogEntry, entity);
+                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()
@@ -255,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) {
@@ -271,109 +356,6 @@ public class RedactionLogCreatorService {
        return redactionLogEntities;
    }

-    private void processRedactionLogEntry(ManualRedactions manualRedactions, String dossierTemplateId, RedactionLogEntry redactionLogEntry, ReasonHolder reasonHolder) {
-
-        List<Comment> comments = null;
-
-        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)) {
-                        reasonHolder.setRedaction(false);
-                        redactionLogEntry.setRedacted(false);
-                        redactionLogEntry.setStatus(Status.APPROVED);
-                        manualOverrideReason = mergeReasonIfNecessary(reasonHolder.getRedactionReason(), ", removed by manual override");
-                        redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry.isRedacted()));
-                    } else if (manualRemoval.getStatus().equals(Status.REQUESTED)) {
-                        manualOverrideReason = mergeReasonIfNecessary(reasonHolder.getRedactionReason(), ", requested to remove");
-                        redactionLogEntry.setStatus(Status.REQUESTED);
-                        redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry.isRedacted()));
-                    } else {
-                        redactionLogEntry.setStatus(Status.DECLINED);
-                    }
-
-                    reasonHolder.setRedactionReason(manualOverrideReason != null ? manualOverrideReason : reasonHolder.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(redactionLogEntry.getId())) {
-                    String manualOverrideReason = null;
-                    if (manualForceRedact.getStatus().equals(Status.APPROVED)) {
-                        reasonHolder.setRedaction(true);
-                        redactionLogEntry.setRedacted(true);
-                        redactionLogEntry.setStatus(Status.APPROVED);
-                        redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry.isRedacted()));
-                        manualOverrideReason = mergeReasonIfNecessary(reasonHolder.getRedactionReason(), ", forced by manual override");
-                        redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
-                    } else if (manualForceRedact.getStatus().equals(Status.REQUESTED)) {
-                        manualOverrideReason = mergeReasonIfNecessary(reasonHolder.getRedactionReason(), ", requested to force redact");
-                        redactionLogEntry.setStatus(Status.REQUESTED);
-                        redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry.isRedacted()));
-                        redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
-                    } else {
-                        redactionLogEntry.setStatus(Status.DECLINED);
-                    }
-
-                    reasonHolder.setRedactionReason(manualOverrideReason != null ? manualOverrideReason : reasonHolder.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(redactionLogEntry.getId())) {
-                    String manualOverrideReason = null;
-                    if (manualLegalBasisChange.getStatus().equals(Status.APPROVED)) {
-                        redactionLogEntry.setStatus(Status.APPROVED);
-                        manualOverrideReason = mergeReasonIfNecessary(reasonHolder.getRedactionReason(), ", legal basis was manually changed");
-                        redactionLogEntry.setLegalBasis(manualLegalBasisChange.getLegalBasis());
-                    } else if (manualLegalBasisChange.getStatus().equals(Status.REQUESTED)) {
-                        manualOverrideReason = mergeReasonIfNecessary(reasonHolder.getRedactionReason(), ", legal basis change requested");
-                        redactionLogEntry.setStatus(Status.REQUESTED);
-                        redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry.isRedacted()));
-                        redactionLogEntry.setLegalBasisChangeValue(manualLegalBasisChange.getLegalBasis());
-                    } else {
-                        redactionLogEntry.setStatus(Status.DECLINED);
-                    }
-
-                    reasonHolder.setRedactionReason(manualOverrideReason != null ? manualOverrideReason : reasonHolder.getRedactionReason());
-                    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 "";
-        }
-    }
-

    private List<Rectangle> getRectanglesPerLine(List<RedTextPosition> textPositions, int page) {

@@ -468,14 +450,14 @@ public class RedactionLogCreatorService {
    private RedactionLogEntry createRedactionLogEntry(Entity entity, String dossierTemplateId) {

        return RedactionLogEntry.builder()
-                .color(getColor(entity.getType(), dossierTemplateId, false, 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())
@@ -489,15 +471,15 @@ public class RedactionLogCreatorService {
    }


-    private float[] getColor(String type, String dossierTemplateId, boolean requestedToRemove, boolean isRedaction) {
+    private float[] getColor(Entity entity, String dossierTemplateId, boolean requestedToRemove) {

        if (requestedToRemove) {
            return dictionaryService.getRequestRemoveColor(dossierTemplateId);
        }
-        if (!isRedaction && !isHint(type, dossierTemplateId)) {
+        if (!entity.isRedaction() && !isHint(entity, dossierTemplateId)) {
            return dictionaryService.getNotRedactedColor(dossierTemplateId);
        }
-        return dictionaryService.getColor(type, dossierTemplateId);
+        return dictionaryService.getColor(entity.getType(), dossierTemplateId);
    }


@@ -518,27 +500,27 @@ public class RedactionLogCreatorService {
    }


-    private float[] getColorForImage(String type, String dossierTemplateId, boolean requestedToRemove, boolean isRedaction) {
+    private float[] getColorForImage(Image image, String dossierTemplateId, boolean requestedToRemove) {

        if (requestedToRemove) {
            return dictionaryService.getRequestRemoveColor(dossierTemplateId);
        }
-        if (!isRedaction && !dictionaryService.isHint(type, dossierTemplateId)) {
+        if (!image.isRedaction() && !dictionaryService.isHint(image.getType(), dossierTemplateId)) {
            return dictionaryService.getNotRedactedColor(dossierTemplateId);
        }
-        return dictionaryService.getColor(type, dossierTemplateId);
+        return dictionaryService.getColor(image.getType(), dossierTemplateId);
    }


-    private boolean isHint(String type, String dossierTemplateId) {
+    private boolean isHint(Entity entity, String dossierTemplateId) {

-        return dictionaryService.isHint(type, dossierTemplateId);
+        return dictionaryService.isHint(entity.getType(), dossierTemplateId);
    }


-    private boolean isRecommendation(String type, String dossierTemplateId) {
+    private boolean isRecommendation(Entity entity, String dossierTemplateId) {

-        return dictionaryService.isRecommendation(type, dossierTemplateId);
+        return dictionaryService.isRecommendation(entity.getType(), dossierTemplateId);
    }


@@ -585,92 +567,4 @@ public class RedactionLogCreatorService {
        }
    }

-    public RedactionLog getRedactionLogPreview(RedactionLog redactionLog, String dossierTemplateId, ManualRedactions manualRedactions) {
-
-
-        var manualRedactionPages = getManualRedactionPages(manualRedactions);
-
-        // generate all manual entries
-        var manualRedactionLogEntries = new HashMap<String, RedactionLogEntry>();
-        for (var page : manualRedactionPages) {
-
-            var pageEntries = addManualAddEntries(manualRedactions.getEntriesToAdd(), manualRedactions.getComments(), page, dossierTemplateId);
-
-            for (var entry : pageEntries) {
-                manualRedactionLogEntries.put(entry.getId(), entry);
-            }
-        }
-
-        for (var manualEntry : manualRedactionLogEntries.values()) {
-            var existingEntry = redactionLog.getRedactionLogEntry().stream().filter(e -> e.getId().equals(manualEntry.getId())).findAny();
-            if (existingEntry.isPresent()) {
-                // if it has already been processed of sorts, update it
-                BeanUtils.copyProperties(manualEntry, existingEntry.get());
-            } else {
-                // not yet in the redaction-log - add it
-                redactionLog.getRedactionLogEntry().add(manualEntry);
-            }
-        }
-
-
-        for (RedactionLogEntry entry : redactionLog.getRedactionLogEntry()) {
-
-            var reasonHolder = new PreviewReasonHolder(entry);
-
-            if (entry.isImage()) {
-                processImageEntry(manualRedactions, dossierTemplateId, reasonHolder, entry);
-            }
-
-            processRedactionLogEntry(manualRedactions, dossierTemplateId, entry, reasonHolder);
-        }
-
-
-        handleAddToDictionary(redactionLog, manualRedactions, dossierTemplateId);
-
-        return redactionLog;
-    }
-
-
-    private void handleAddToDictionary(RedactionLog redactionLog, ManualRedactions manualRedactions, String dossierTemplateId) {
-
-        for (var manualRedaction : manualRedactions.getEntriesToAdd()) {
-
-            if (manualRedaction.isAddToDictionary() || manualRedaction.isAddToDossierDictionary()) {
-                var redactionLogEntry = createRedactionLogEntry(manualRedaction, manualRedaction.getId(), dossierTemplateId);
-                redactionLogEntry.setDictionaryEntry(manualRedaction.isAddToDossierDictionary());
-                redactionLogEntry.setDossierDictionaryEntry(manualRedaction.isAddToDossierDictionary());
-
-                redactionLog.getRedactionLogEntry().add(redactionLogEntry);
-            }
-        }
-    }
-
-    public static class PreviewReasonHolder implements ReasonHolder {
-
-        private final RedactionLogEntry entry;
-
-        public PreviewReasonHolder(RedactionLogEntry entry) {
-            this.entry = entry;
-        }
-
-        @Override
-        public String getRedactionReason() {
-            return entry.getReason();
-        }
-
-        @Override
-        public void setRedactionReason(String reason) {
-            entry.setReason(reason);
-        }
-
-        @Override
-        public boolean isRedaction() {
-            return entry.isRedacted();
-        }
-
-        @Override
-        public void setRedaction(boolean value) {
-            entry.setRedacted(value);
-        }
-    }
 }
@@ -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);
@@ -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