Pull request #191 : fixed undo after reanalysis

Merge in RED/redaction-service from RED-1830 to master * commit '93844d8e76e0806cf00292b591a9f97ee8e61230': fixed undo after reanalysis
fixed undo after reanalysis
2021-07-19 10:46:38 +02:00 · 2021-07-19 11:39:19 +03:00 · 2021-07-14 20:36:47 +02:00 · 2021-07-14 17:03:32 +02:00 · 2021-07-14 12:59:04 +02:00 · 2021-07-14 12:27:31 +02:00
32 changed files with 943 additions and 384 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.7_all.deb -o /tmp/ttf-mscorefonts-installer_3.7_all.deb \
- && dpkg -i /tmp/ttf-mscorefonts-installer_3.7_all.deb \
- && rm /tmp/ttf-mscorefonts-installer_3.7_all.deb \
+RUN curl http://ftp.br.debian.org/debian/pool/contrib/m/msttcorefonts/ttf-mscorefonts-installer_3.8_all.deb -o /tmp/ttf-mscorefonts-installer_3.8_all.deb \
+ && dpkg -i /tmp/ttf-mscorefonts-installer_3.8_all.deb \
+ && rm /tmp/ttf-mscorefonts-installer_3.8_all.deb \
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>platform-dependency</artifactId>
        <groupId>com.iqser.red</groupId>
-        <version>1.1.2</version>
+        <version>1.1.3</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@@ -32,7 +32,7 @@
            <dependency>
                <groupId>com.iqser.red</groupId>
                <artifactId>platform-commons-dependency</artifactId>
-                <version>1.3.1</version>
+                <version>1.3.6</version>
                <scope>import</scope>
                <type>pom</type>
            </dependency>
@@ -6,6 +6,11 @@ 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
@Builder
@@ -19,6 +24,10 @@ public class AnalyzeRequest {
    private boolean reanalyseOnlyIfPossible;
    private ManualRedactions manualRedactions;
    private OffsetDateTime lastProcessed;
+    private Set<Integer> excludedPages;
+
+    @Builder.Default
+    private List<FileAttribute> fileAttributes = new ArrayList<>();

 }

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

+    private boolean wasReanalyzed;
+

 }

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

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

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

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

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

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

@@ -29,4 +30,8 @@ public class ManualRedactionEntry {

    private boolean addToDossierDictionary;

+    private OffsetDateTime requestDate;
+    private OffsetDateTime processedDate;
+    private OffsetDateTime softDeletedTime;
+
 }
@@ -1,5 +1,5 @@
 package com.iqser.red.service.redaction.v1.model;

 public enum ManualRedactionType {
-    ADD, REMOVE, FORCE_REDACT
+    ADD, REMOVE, FORCE_REDACT, RECATEGORIZE, LEGAL_BASIS_CHANGE
 }
@@ -26,6 +26,12 @@ public class ManualRedactions {
    @Builder.Default
    private Set<ManualRedactionEntry> entriesToAdd = new HashSet<>();

+    @Builder.Default
+    private Set<ManualImageRecategorization> imageRecategorizations = new HashSet<>();
+
+    @Builder.Default
+    private Set<ManualLegalBasisChange> manualLegalBasisChanges = new HashSet<>();
+
    @Builder.Default
    private Map<String, List<Comment>> comments = new HashMap<>();

@@ -44,4 +44,6 @@ public class RedactionChangeLogEntry {

    private boolean isDossierDictionaryEntry;

+    private boolean excluded;
+
 }
@@ -49,4 +49,9 @@ public class RedactionLogEntry {

    private boolean isDossierDictionaryEntry;

+    private boolean excluded;
+
+    private String recategorizationType;
+    private String legalBasisChangeValue;
+
 }
@@ -8,8 +8,6 @@ import org.springframework.web.bind.annotation.RequestBody;

 public interface RedactionResource {

-    String SERVICE_NAME = "redaction-service-v1";
-
    String RULE_SET_PARAMETER_NAME = "dossierTemplateId";
    String RULE_SET_PATH_VARIABLE = "/{" + RULE_SET_PARAMETER_NAME + "}";

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

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

+    @Override
+    public RedactionLog getRedactionLogPreview(RedactionRequest redactionRequest) {
+
+        log.info("Requested preview for: {}", redactionRequest);
+        dictionaryService.updateDictionary(redactionRequest.getDossierTemplateId(), redactionRequest.getDossierId());
+
+        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 {

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

-                Rectangle2D imageBounds = calculateImagePosition(pdfImage);
+                Matrix ctmNew = getGraphicsState().getCurrentTransformationMatrix();

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

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

                if (rect.getHeight() > 2 && rect.getWidth() > 2) {
-                    this.images.add(new PdfImage(pdfImage.getImage(), rect, pageNumber));
+                    this.images.add(new PdfImage(image.getImage(), rect, pageNumber));
                }
            }
        } catch (Exception e) {
@@ -209,21 +208,6 @@ public class PDFLinesTextStripper extends PDFTextStripper {
    }


-    private Rectangle2D calculateImagePosition(PDImageXObject pdfImage) throws IOException {
-
-        Matrix ctm = getGraphicsState().getCurrentTransformationMatrix();
-
-        Rectangle2D imageBounds = pdfImage.getImage().getRaster().getBounds();
-
-        AffineTransform imageTransform = new AffineTransform(ctm.createAffineTransform());
-        imageTransform.scale(1.0 / pdfImage.getWidth(), -1.0 / pdfImage.getHeight());
-        imageTransform.translate(0, -pdfImage.getHeight());
-
-        AffineTransform pageTransform = new AffineTransform();
-        pageTransform.concatenate(imageTransform);
-
-        return pageTransform.createTransformedShape(imageBounds).getBounds2D();
-    }


    private float floatValue(COSBase value) {
@@ -9,7 +9,7 @@ import java.util.List;

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


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

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

+import com.iqser.red.service.redaction.v1.model.FileAttribute;
 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.Patterns;
@@ -8,9 +9,11 @@ import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;

+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.regex.Matcher;
@@ -52,6 +55,22 @@ 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,31 +4,42 @@ 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().anyMatch(RedactionLogEntry::isHint);
+    public AnalyzeResult createAnalyzeResponse(String dossierId, String fileId, long duration, int pageCount,
+                                               RedactionLog redactionLog, RedactionChangeLog redactionChangeLog) {
+
+        boolean hasHints = redactionLog.getRedactionLogEntry()
+                .stream()
+                .filter(entry -> !entry.isExcluded())
+                .anyMatch(entry -> entry.isHint() && !entry.getType().equals("false_positive"));

        boolean hasRequests = redactionLog.getRedactionLogEntry()
                .stream()
+                .filter(entry -> !entry.isExcluded())
                .anyMatch(entry -> entry.isManual() && entry.getStatus()
                        .equals(com.iqser.red.service.redaction.v1.model.Status.REQUESTED));

        boolean hasRedactions = redactionLog.getRedactionLogEntry()
                .stream()
+                .filter(entry -> !entry.isExcluded())
                .anyMatch(entry -> entry.isRedacted() && !entry.isManual() || entry.isManual() && entry.getStatus()
                        .equals(com.iqser.red.service.redaction.v1.model.Status.APPROVED));

        boolean hasImages = redactionLog.getRedactionLogEntry()
                .stream()
-                .anyMatch(entry -> entry.isHint() && entry.getType().equals("image"));
+                .filter(entry -> !entry.isExcluded())
+                .anyMatch(entry -> entry.isHint() && entry.getType().equals("image") || entry.isImage());

        boolean hasUpdates = redactionChangeLog != null && redactionChangeLog.getRedactionLogEntry() != null && !redactionChangeLog
                .getRedactionLogEntry()
-                .isEmpty() && redactionChangeLog.getRedactionLogEntry().stream().anyMatch(entry -> !entry.getType().equals("false_positive"));
+                .isEmpty() && redactionChangeLog.getRedactionLogEntry()
+                .stream()
+                .anyMatch(entry -> !entry.getType().equals("false_positive"));

        return AnalyzeResult.builder()
                .dossierId(dossierId)
@@ -46,4 +57,5 @@ public class AnalyzeResponseService {
                .dossierDictionaryVersion(redactionLog.getDossierDictionaryVersion())
                .build();
    }
+
 }
@@ -33,6 +33,7 @@ public class DictionaryService {

    public DictionaryVersion updateDictionary(String dossierTemplateId, String dossierId) {

+        log.info("Updating dictionary data for: {} / {}", dossierTemplateId, dossierId);
        long dossierTemplateDictionaryVersion = dictionaryClient.getVersion(dossierTemplateId, GLOBAL_DOSSIER);
        var dossierTemplateDictionary = dictionariesByDossierTemplate.get(dossierTemplateId);
        if (dossierTemplateDictionary == null || dossierTemplateDictionaryVersion > dossierTemplateDictionary.getDictionaryVersion()) {
@@ -163,6 +164,7 @@ public class DictionaryService {

    public float[] getColor(String type, String dossierTemplateId) {

+        log.info("requested : {} / {}",type,dossierTemplateId);
        DictionaryModel model = dictionariesByDossierTemplate.get(dossierTemplateId).getLocalAccessMap().get(type);
        if (model != null) {
            return model.getColor();
@@ -1,18 +1,24 @@
 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.ManualImageRecategorization;
 import com.iqser.red.service.redaction.v1.model.ManualRedactionEntry;
 import com.iqser.red.service.redaction.v1.model.ManualRedactions;
 import com.iqser.red.service.redaction.v1.model.Point;
 import com.iqser.red.service.redaction.v1.model.Rectangle;
 import com.iqser.red.service.redaction.v1.model.SectionArea;
+import com.iqser.red.service.redaction.v1.model.Status;
 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;
 import lombok.extern.slf4j.Slf4j;
+
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.kie.api.runtime.KieContainer;
@@ -33,7 +39,8 @@ public class EntityRedactionService {
    private final SurroundingWordsService surroundingWordsService;


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

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

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

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

        if (dictionary.hasLocalEntries()) {

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

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

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

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

@@ -95,31 +103,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));
+                    sectionSearchableTextPairs.addAll(processTableAsOneText(classifiedDoc, table, manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber, fileAttributes));
                } else {
-                    sectionSearchableTextPairs.addAll(processTablePerRow(classifiedDoc, table, manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber));
+                    sectionSearchableTextPairs.addAll(processTablePerRow(classifiedDoc, table, manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber, fileAttributes));
                }
                sectionNumber.incrementAndGet();
            }
            sectionSearchableTextPairs.add(processText(classifiedDoc, paragraph.getSearchableText(), paragraph.getTextBlocks(), paragraph
                    .getHeadline(), manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber, paragraph
-                    .getImages()));
+                    .getImages(), fileAttributes));
            sectionNumber.incrementAndGet();
        }

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

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

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

@@ -164,7 +172,8 @@ public class EntityRedactionService {
                                                               ManualRedactions manualRedactions,
                                                               AtomicInteger sectionNumber, Dictionary dictionary,
                                                               boolean local,
-                                                               Map<Integer, Set<Entity>> hintsPerSectionNumber) {
+                                                               Map<Integer, Set<Entity>> hintsPerSectionNumber,
+                                                               List<FileAttribute> fileAttributes) {

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

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

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

        List<SectionSearchableTextPair> sectionSearchableTextPairs = new ArrayList<>();
        SearchableText entireTableText = new SearchableText();
@@ -296,6 +307,7 @@ public class EntityRedactionService {
                .sectionNumber(sectionNumber.intValue())
                .searchableText(entireTableText)
                .dictionary(dictionary)
+                .fileAttributes(fileAttributes)
                .build(), entireTableText));

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

        if (!local) {
            SectionText sectionText = new SectionText();
@@ -330,7 +342,7 @@ public class EntityRedactionService {
            sectionText.setSectionNumber(sectionNumber.intValue());
            sectionText.setTable(false);
            sectionText.setImages(images.stream()
-                    .map(image -> convert(image, sectionNumber.intValue(), headline))
+                    .map(image -> convertAndRecategorize(image, sectionNumber.intValue(), headline, manualRedactions))
                    .collect(Collectors.toSet()));
            sectionText.setTextBlocks(paragraphTextBlocks);
            classifiedDoc.getSectionText().add(sectionText);
@@ -353,8 +365,9 @@ public class EntityRedactionService {
                .searchableText(searchableText)
                .dictionary(dictionary)
                .images(images.stream()
-                        .map(image -> convert(image, sectionNumber.intValue(), headline))
+                        .map(image -> convertAndRecategorize(image, sectionNumber.intValue(), headline, manualRedactions))
                        .collect(Collectors.toSet()))
+                .fileAttributes(fileAttributes)
                .build(), searchableText);
    }

@@ -371,9 +384,11 @@ public class EntityRedactionService {
        String lowercaseInputString = searchableString.toLowerCase();
        for (DictionaryModel model : dictionary.getDictionaryModels()) {
            if (model.isCaseInsensitive()) {
-                found.addAll(EntitySearchUtils.find(lowercaseInputString, model.getValues(local), model.getType(), headline, sectionNumber, local, model.isDossierDictionary()));
+                found.addAll(EntitySearchUtils.find(lowercaseInputString, model.getValues(local), model.getType(), headline, sectionNumber, local, model
+                        .isDossierDictionary()));
            } else {
-                found.addAll(EntitySearchUtils.find(searchableString, model.getValues(local), model.getType(), headline, sectionNumber, local, model.isDossierDictionary()));
+                found.addAll(EntitySearchUtils.find(searchableString, model.getValues(local), model.getType(), headline, sectionNumber, local, model
+                        .isDossierDictionary()));
            }
        }

@@ -401,9 +416,9 @@ public class EntityRedactionService {
    }


-    private Image convert(PdfImage pdfImage, int sectionNumber, String headline) {
+    private Image convertAndRecategorize(PdfImage pdfImage, int sectionNumber, String headline, ManualRedactions manualRedactions) {

-        return Image.builder()
+        Image image = Image.builder()
                .type(pdfImage.getImageType().equals(ImageType.OTHER) ? "image" : pdfImage.getImageType()
                        .name()
                        .toLowerCase(Locale.ROOT))
@@ -412,6 +427,18 @@ public class EntityRedactionService {
                .section(headline)
                .page(pdfImage.getPage())
                .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,15 +1,49 @@
 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.model.Status;
 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;

@@ -17,14 +51,6 @@ 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
@RequiredArgsConstructor
@@ -41,6 +67,7 @@ public class ReanalyzeService {
    private final AnalyzeResponseService analyzeResponseService;
    private final LegalBasisClient legalBasisClient;

+
    public AnalyzeResult analyze(AnalyzeRequest analyzeRequest) {

        long startTime = System.currentTimeMillis();
@@ -59,18 +86,18 @@ public class ReanalyzeService {
        log.info("Document structure analysis successful, starting redaction analysis...");

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

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

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

        log.info("Analyzed with rules {} and dictionary {} for dossierTemplate: {}", classifiedDoc.getRulesVersion(), classifiedDoc
                .getDictionaryVersion(), analyzeRequest.getDossierTemplateId());
@@ -165,20 +192,35 @@ public class ReanalyzeService {

        KieContainer kieContainer = droolsExecutionService.updateRules(analyzeRequest.getDossierTemplateId());

-        Dictionary dictionary = dictionaryService.getDeepCopyDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId());
+        Dictionary dictionary = dictionaryService.getDeepCopyDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest
+                .getDossierId());

        List<SectionSearchableTextPair> sectionSearchableTextPairs = new ArrayList<>();
        for (SectionText reanalysisSection : reanalysisSections) {

            Set<Entity> entities = entityRedactionService.findEntities(reanalysisSection.getSearchableText(), reanalysisSection
                    .getHeadline(), reanalysisSection.getSectionNumber(), dictionary, false);
-            if (reanalysisSection.getCellStarts() != null) {
+            if (reanalysisSection.getCellStarts() != null && !reanalysisSection.getCellStarts().isEmpty()) {
                surroundingWordsService.addSurroundingText(entities, reanalysisSection.getSearchableText(), dictionary, reanalysisSection
                        .getCellStarts());
            } else {
                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())
@@ -191,6 +233,7 @@ public class ReanalyzeService {
                    .searchableText(reanalysisSection.getSearchableText())
                    .dictionary(dictionary)
                    .images(reanalysisSection.getImages())
+                    .fileAttributes(analyzeRequest.getFileAttributes())
                    .build(), reanalysisSection.getSearchableText()));
        }

@@ -240,11 +283,11 @@ public class ReanalyzeService {
                    .getDossierTemplateId()));
        }

-        redactionLog.getRedactionLogEntry()
-                .removeIf(entry -> sectionsToReanalyse.contains(entry.getSectionNumber()));
+        redactionLog.getRedactionLogEntry().removeIf(entry -> sectionsToReanalyse.contains(entry.getSectionNumber()));
        redactionLog.getRedactionLogEntry().addAll(newRedactionLogEntries);
-        return finalizeAnalysis(analyzeRequest, startTime, redactionLog, text, dictionaryIncrement);
-
+        AnalyzeResult analyzeResult = finalizeAnalysis(analyzeRequest, startTime, redactionLog, text, dictionaryIncrement);
+        analyzeResult.setWasReanalyzed(true);
+        return analyzeResult;
    }


@@ -255,6 +298,8 @@ public class ReanalyzeService {
        redactionLog.setDictionaryVersion(dictionaryIncrement.getDictionaryVersion().getDossierTemplateVersion());
        redactionLog.setDossierDictionaryVersion(dictionaryIncrement.getDictionaryVersion().getDossierVersion());

+        excludeExcludedPages(redactionLog, analyzeRequest.getExcludedPages());
+
        var changeLog = redactionChangeLogService.createAndStoreChangeLog(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), redactionLog);
        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.REDACTION_LOG, redactionLog);

@@ -271,9 +316,13 @@ public class ReanalyzeService {
            return new HashSet<>();
        }

-        return Stream.concat(manualRedactions.getIdsToRemove()
+        return Stream.concat(manualRedactions.getManualLegalBasisChanges()
                .stream()
-                .map(IdRemoval::getId), manualRedactions.getForceRedacts().stream().map(ManualForceRedact::getId))
+                .map(ManualLegalBasisChange::getId), Stream.concat(manualRedactions.getImageRecategorizations()
+                .stream()
+                .map(ManualImageRecategorization::getId), Stream.concat(manualRedactions.getIdsToRemove()
+                .stream()
+                .map(IdRemoval::getId), manualRedactions.getForceRedacts().stream().map(ManualForceRedact::getId))))
                .collect(Collectors.toSet());
    }

@@ -292,4 +341,18 @@ public class ReanalyzeService {
                .build();
    }

+
+    private void excludeExcludedPages(RedactionLog redactionLog, Set<Integer> excludedPages) {
+
+        redactionLog.getRedactionLogEntry().forEach(entry -> {
+            entry.getPositions().forEach(pos -> {
+                if (excludedPages != null && excludedPages.contains(pos.getPage())) {
+                    entry.setExcluded(true);
+                } else {
+                    entry.setExcluded(false);
+                }
+            });
+        });
+    }
+
 }
@@ -90,6 +90,7 @@ public class RedactionChangeLogService {
                .comments(entry.getComments())
                .changeType(changeType)
                .isDossierDictionaryEntry(entry.isDossierDictionaryEntry())
+                .excluded(entry.isExcluded())
                .build();
    }

@@ -9,19 +9,17 @@ 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.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;

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

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

-            if (manualRedactions != null && !manualRedactions.getIdsToRemove().isEmpty()) {
-                for (IdRemoval manualRemoval : manualRedactions.getIdsToRemove()) {
-                    if (manualRemoval.getId().equals(id)) {
-                        String manualOverrideReason = null;
-                        if (manualRemoval.getStatus().equals(Status.APPROVED)) {
-                            image.setRedaction(false);
-                            redactionLogEntry.setRedacted(false);
-                            redactionLogEntry.setStatus(Status.APPROVED);
-                            manualOverrideReason = image.getRedactionReason() + ", removed by manual override";
-                            redactionLogEntry.setColor(getColorForImage(image, dossierTemplateId, false));
-                        } else if (manualRemoval.getStatus().equals(Status.REQUESTED)) {
-                            manualOverrideReason = image.getRedactionReason() + ", requested to remove";
-                            redactionLogEntry.setStatus(Status.REQUESTED);
-                            redactionLogEntry.setColor(getColorForImage(image, dossierTemplateId, true));
-                        } else {
-                            redactionLogEntry.setStatus(Status.DECLINED);
-                        }
-
-                        image.setRedactionReason(manualOverrideReason != null ? manualOverrideReason : image.getRedactionReason());
-                        redactionLogEntry.setReason(manualOverrideReason);
-                        redactionLogEntry.setManual(true);
-                        redactionLogEntry.setManualRedactionType(ManualRedactionType.REMOVE);
-                    }
-                }
-            }
-
-            if (manualRedactions != null && !manualRedactions.getForceRedacts().isEmpty()) {
-                for (ManualForceRedact manualForceRedact : manualRedactions.getForceRedacts()) {
-                    if (manualForceRedact.getId().equals(id)) {
-                        String manualOverrideReason = null;
-                        if (manualForceRedact.getStatus().equals(Status.APPROVED)) {
-                            image.setRedaction(true);
-                            redactionLogEntry.setRedacted(true);
-                            redactionLogEntry.setStatus(Status.APPROVED);
-                            redactionLogEntry.setColor(getColorForImage(image, dossierTemplateId, false));
-                            manualOverrideReason = image.getRedactionReason() + ", forced by manual override";
-                            redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
-                        } else if (manualForceRedact.getStatus().equals(Status.REQUESTED)) {
-                            manualOverrideReason = image.getRedactionReason() + ", requested to force redact";
-                            redactionLogEntry.setStatus(Status.REQUESTED);
-                            redactionLogEntry.setColor(getColorForImage(image, dossierTemplateId, true));
-                            redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
-                        } else {
-                            redactionLogEntry.setStatus(Status.DECLINED);
-                        }
-
-                        image.setRedactionReason(manualOverrideReason != null ? manualOverrideReason : image.getRedactionReason());
-                        redactionLogEntry.setReason(manualOverrideReason);
-                        redactionLogEntry.setManual(true);
-                        redactionLogEntry.setManualRedactionType(ManualRedactionType.FORCE_REDACT);
-                    }
-                }
-            }
+            processImageEntry(manualRedactions, dossierTemplateId, image, redactionLogEntry);

            redactionLogEntities.add(redactionLogEntry);
        }
@@ -147,6 +93,115 @@ 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)) {
+                        redactionLogEntry.setStatus(Status.APPROVED);
+                        redactionLogEntry.setType(recategorization.getType());
+                        manualOverrideReason = mergeReasonIfNecessary(image.getRedactionReason(), ", recategorized by manual override");
+                    } 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);
+                    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)) {
+                        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) {

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

-            List<Comment> comments = null;

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

@@ -189,60 +243,8 @@ public class RedactionLogCreatorService {
                    processedIds.add(entityPositionSequence.getId());
                }

-                if (manualRedactions != null && !manualRedactions.getIdsToRemove().isEmpty()) {
-                    for (IdRemoval manualRemoval : manualRedactions.getIdsToRemove()) {
-                        if (manualRemoval.getId().equals(entityPositionSequence.getId())) {
-                            comments = manualRedactions.getComments().get(manualRemoval.getId());
-                            String manualOverrideReason = null;
-                            if (manualRemoval.getStatus().equals(Status.APPROVED)) {
-                                entity.setRedaction(false);
-                                redactionLogEntry.setRedacted(false);
-                                redactionLogEntry.setStatus(Status.APPROVED);
-                                manualOverrideReason = entity.getRedactionReason() + ", removed by manual override";
-                                redactionLogEntry.setColor(getColor(entity, dossierTemplateId, false));
-                            } else if (manualRemoval.getStatus().equals(Status.REQUESTED)) {
-                                manualOverrideReason = entity.getRedactionReason() + ", requested to remove";
-                                redactionLogEntry.setStatus(Status.REQUESTED);
-                                redactionLogEntry.setColor(getColor(entity, dossierTemplateId, true));
-                            } else {
-                                redactionLogEntry.setStatus(Status.DECLINED);
-                            }
-
-                            entity.setRedactionReason(manualOverrideReason != null ? manualOverrideReason : entity.getRedactionReason());
-                            redactionLogEntry.setReason(manualOverrideReason);
-                            redactionLogEntry.setManual(true);
-                            redactionLogEntry.setManualRedactionType(ManualRedactionType.REMOVE);
-                        }
-                    }
-                }
-
-                if (manualRedactions != null && !manualRedactions.getForceRedacts().isEmpty()) {
-                    for (ManualForceRedact manualForceRedact : manualRedactions.getForceRedacts()) {
-                        if (manualForceRedact.getId().equals(entityPositionSequence.getId())) {
-                            String manualOverrideReason = null;
-                            if (manualForceRedact.getStatus().equals(Status.APPROVED)) {
-                                entity.setRedaction(true);
-                                redactionLogEntry.setRedacted(true);
-                                redactionLogEntry.setStatus(Status.APPROVED);
-                                redactionLogEntry.setColor(getColor(entity, dossierTemplateId, false));
-                                manualOverrideReason = entity.getRedactionReason() + ", forced by manual override";
-                                redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
-                            } else if (manualForceRedact.getStatus().equals(Status.REQUESTED)) {
-                                manualOverrideReason = entity.getRedactionReason() + ", requested to force redact";
-                                redactionLogEntry.setStatus(Status.REQUESTED);
-                                redactionLogEntry.setColor(getColor(entity, dossierTemplateId, true));
-                                redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
-                            } else {
-                                redactionLogEntry.setStatus(Status.DECLINED);
-                            }
-
-                            entity.setRedactionReason(manualOverrideReason != null ? manualOverrideReason : entity.getRedactionReason());
-                            redactionLogEntry.setReason(manualOverrideReason);
-                            redactionLogEntry.setManual(true);
-                            redactionLogEntry.setManualRedactionType(ManualRedactionType.FORCE_REDACT);
-                        }
-                    }
-                }
+                redactionLogEntry.setId(entityPositionSequence.getId());
+                processRedactionLogEntry(manualRedactions, dossierTemplateId, redactionLogEntry, entity);

                if (CollectionUtils.isNotEmpty(entityPositionSequence.getSequences())) {
                    List<Rectangle> rectanglesPerLine = getRectanglesPerLine(entityPositionSequence.getSequences()
@@ -250,16 +252,11 @@ public class RedactionLogCreatorService {
                            .flatMap(seq -> seq.getTextPositions().stream())
                            .collect(Collectors.toList()), page);

-                    if (manualRedactions != null) {
-                        comments = manualRedactions.getComments().get(entityPositionSequence.getId());
-                    }

-                    redactionLogEntry.setComments(comments);
                    redactionLogEntry.getPositions().addAll(rectanglesPerLine);

                }

-                redactionLogEntry.setId(entityPositionSequence.getId());

                // FIXME ids should never be null. Figure out why this happens.
                if (redactionLogEntry.getId() != null) {
@@ -271,25 +268,133 @@ 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);
+                    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)) {
+                        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) {

        List<Rectangle> rectangles = new ArrayList<>();
        if (textPositions.size() == 1) {
-            rectangles.add( TextPositionSequence.fromData(textPositions, page).getRectangle());
+            rectangles.add(TextPositionSequence.fromData(textPositions, page).getRectangle());
        } else {
            float y = textPositions.get(0).getYDirAdj();
            int startIndex = 0;
            for (int i = 1; i < textPositions.size(); i++) {
                float yDirAdj = textPositions.get(i).getYDirAdj();
                if (yDirAdj != y) {
-                    rectangles.add( TextPositionSequence.fromData(textPositions.subList(startIndex, i), page).getRectangle());
+                    rectangles.add(TextPositionSequence.fromData(textPositions.subList(startIndex, i), page)
+                            .getRectangle());
                    y = yDirAdj;
                    startIndex = i;
                }
            }
            if (startIndex != textPositions.size()) {
-                rectangles.add( TextPositionSequence.fromData(textPositions.subList(startIndex, textPositions.size()), page).getRectangle());
+                rectangles.add(TextPositionSequence.fromData(textPositions.subList(startIndex, textPositions.size()), page)
+                        .getRectangle());
            }
        }

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

        return RedactionLogEntry.builder()
-                .color(getColor(entity, dossierTemplateId, false))
+                .color(getColor(entity.getType(), dossierTemplateId, false, entity.isRedaction()))
                .reason(entity.getRedactionReason())
                .legalBasis(entity.getLegalBasis())
                .value(entity.getWord())
                .type(entity.getType())
                .redacted(entity.isRedaction())
-                .isHint(isHint(entity, dossierTemplateId))
-                .isRecommendation(isRecommendation(entity, dossierTemplateId))
+                .isHint(isHint(entity.getType(), dossierTemplateId))
+                .isRecommendation(isRecommendation(entity.getType(), dossierTemplateId))
                .section(entity.getHeadline())
                .sectionNumber(entity.getSectionNumber())
                .matchedRule(entity.getMatchedRule())
@@ -384,15 +489,15 @@ public class RedactionLogCreatorService {
    }


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

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


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


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

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


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

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


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

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


@@ -480,4 +585,157 @@ 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);
+            }
+        }
+
+
+        Set<String> entriesToRemoveBecauseOfUndoActions = new HashSet<>();
+        for (RedactionLogEntry entry : redactionLog.getRedactionLogEntry()) {
+
+            var reasonHolder = new PreviewReasonHolder(entry);
+
+            if (entry.isImage()) {
+                processImageEntry(manualRedactions, dossierTemplateId, reasonHolder, entry);
+            }
+
+            processRedactionLogEntry(manualRedactions, dossierTemplateId, entry, reasonHolder);
+            var shouldRemove = postProcessRedactionLogEntryForDeletedManualRedactions(manualRedactions, entry);
+            if (shouldRemove) {
+                entriesToRemoveBecauseOfUndoActions.add(entry.getId());
+            }
+        }
+
+        redactionLog.setRedactionLogEntry(redactionLog.getRedactionLogEntry()
+                .stream().filter(entry -> !entriesToRemoveBecauseOfUndoActions.contains(entry.getId())).collect(Collectors.toList()));
+
+
+        handleAddToDictionary(redactionLog, manualRedactions, dossierTemplateId);
+
+        return redactionLog;
+    }
+
+    private boolean postProcessRedactionLogEntryForDeletedManualRedactions(ManualRedactions manualRedactions, RedactionLogEntry entry) {
+        if (entry.isManual()) {
+
+            if (entry.getManualRedactionType() == ManualRedactionType.ADD) {
+                var manualRedactionExists = manualRedactions.getEntriesToAdd().stream().anyMatch(entryToAdd -> entryToAdd.getId().equalsIgnoreCase(entry.getId()));
+                return !manualRedactionExists;
+            }
+
+            if (entry.getManualRedactionType() == ManualRedactionType.FORCE_REDACT) {
+                var forceRedactExists = manualRedactions.getForceRedacts().stream().anyMatch(entryToAdd -> entryToAdd.getId().equalsIgnoreCase(entry.getId()));
+                if (!forceRedactExists) {
+                    entry.setRedacted(false);
+                    entry.setManual(false);
+                    entry.setStatus(null);
+                }
+            }
+
+            if (entry.getManualRedactionType() == ManualRedactionType.REMOVE) {
+                var removeIdExists = manualRedactions.getIdsToRemove().stream().anyMatch(entryToAdd -> entryToAdd.getId().equalsIgnoreCase(entry.getId()));
+                if (!removeIdExists) {
+                    entry.setRedacted(true);
+                    entry.setManual(false);
+                    entry.setStatus(null);
+                }
+            }
+
+            // Cannot undo Already Approved change because UI won't allow it for now
+            if (Status.REQUESTED.equals(entry.getStatus())) {
+                if (entry.getManualRedactionType() == ManualRedactionType.RECATEGORIZE) {
+                    entry.setManual(false);
+                    entry.setStatus(null);
+                    entry.setRecategorizationType(null);
+                }
+                if (entry.getManualRedactionType() == ManualRedactionType.LEGAL_BASIS_CHANGE) {
+                    entry.setManual(false);
+                    entry.setStatus(null);
+                    entry.setLegalBasisChangeValue(null);
+                }
+
+            }
+        }
+
+        return false;
+    }
+
+
+    private void handleAddToDictionary(RedactionLog redactionLog, ManualRedactions manualRedactions, String dossierTemplateId) {
+
+        for (var manualRedaction : manualRedactions.getEntriesToAdd()) {
+
+            // not yet processed, and dictionary modifying, show in redaction-log preview
+            if (manualRedaction.getProcessedDate() == null && manualRedaction.isAddToDictionary() || manualRedaction.isAddToDossierDictionary()) {
+                var redactionLogEntry = createRedactionLogEntry(manualRedaction, manualRedaction.getId(), dossierTemplateId);
+                redactionLogEntry.setDictionaryEntry(manualRedaction.isAddToDictionary());
+                redactionLogEntry.setDossierDictionaryEntry(manualRedaction.isAddToDossierDictionary());
+                redactionLogEntry.setPositions(manualRedaction.getPositions());
+
+
+                var found = redactionLog.getRedactionLogEntry().stream().filter(r -> r.getId().equalsIgnoreCase(redactionLogEntry.getId())).findAny();
+                if (found.isPresent()) {
+                    found.get().setDictionaryEntry(manualRedaction.isAddToDictionary());
+                    found.get().setDossierDictionaryEntry(manualRedaction.isAddToDossierDictionary());
+                    found.get().setPositions(manualRedaction.getPositions());
+                } else {
+                    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);
+        }
+    }
 }
@@ -0,0 +1,165 @@
+package com.iqser.red.service.redaction.v1.server.segmentation;
+
+import java.awt.Graphics;
+import java.awt.geom.Rectangle2D;
+import java.awt.image.BufferedImage;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class ImageMergeService {
+
+
+    public List<PdfImage> mergeImages(List<PdfImage> images, int rotation){
+
+        List<PdfImage> mergedList = processImages(images, rotation);
+
+        List<PdfImage> imagesInImage = new ArrayList<>();
+        for(PdfImage image: mergedList){
+            for (PdfImage inner: mergedList){
+                if(image != inner && image.getPosition().contains(inner.getPosition().getX(), inner.getPosition().getY(), inner.getPosition().getWidth(), inner.getPosition().getHeight())){
+                    imagesInImage.add(inner);
+                }
+            }
+        }
+        mergedList.removeAll(imagesInImage);
+
+        return mergedList;
+    }
+
+
+    //merge images, if they are separated during pdf import, return new list of Pdfimages
+    private List<PdfImage> processImages(List<PdfImage> imageList, int rotation) {
+        if (imageList.size() > 1) {
+            List<PdfImage> mergedList = new ArrayList<>();
+            int countElementsInList = 0;
+            boolean beginImage = true;
+
+            // a List of Boolean, true = candidate for merging, false = no merging
+            List<Boolean> candidatesList = getCandidatesList(imageList, rotation);
+
+            // loop through list, if there are candidates for merging (true), merge images and add it to mergedList
+            for (int i = 0; i < candidatesList.size(); i++) {
+                if (candidatesList.get(i)) {
+                    if (beginImage) {
+                        //begin of image, merge two parts of imageList
+                        PdfImage mergedImage = mergeTwoImages(imageList.get(i), imageList.get(i + 1), rotation);
+                        // image merge successful
+                        if (mergedImage != null) {
+                            mergedList.add(mergedImage);
+                            countElementsInList++;
+                        }
+                    } else {
+                        //middle of an image, merge current piece auf mergedList with image of imageList
+                        PdfImage mergedImage = mergeTwoImages(mergedList.get(countElementsInList - 1), imageList.get(i + 1), rotation);
+                        // image merge successful
+                        if (mergedImage != null) {
+                            mergedList.set(countElementsInList - 1, mergedImage);
+                        }
+                    }
+                    beginImage = false;
+                } else {
+                    // if the last candidate is false, then both images i and i+1 must be added
+                    if (i == candidatesList.size() - 1) {
+                        if (countElementsInList > 0 && mergedList.get(countElementsInList - 1) == imageList.get(i)) {
+                            mergedList.add(imageList.get(i + 1));
+                        } else {
+                            mergedList.add(imageList.get(i));
+                            mergedList.add(imageList.get(i + 1));
+                        }
+                    } else {
+                        //first image is not splitted, add i to resultlist
+                        if (beginImage) {
+                            mergedList.add(imageList.get(i));
+                            countElementsInList++;
+                        } else {
+                            // i is the end of an image, add begin of new image
+                            mergedList.add(imageList.get(i + 1));
+                            countElementsInList++;
+                            beginImage = false;
+                        }
+                    }
+                }
+            }
+            return mergedList;
+        } else {
+            return imageList;
+        }
+    }
+
+    private PdfImage mergeTwoImages(PdfImage image1, PdfImage image2, int rotation) {
+
+        // diese Angaben von getPosition scheinen nicht richtig zu sein, damit werden teile des Bildes abgeschnitten
+        double width = image1.getPosition().getWidth();
+        double width2 = image2.getPosition().getWidth();
+        double height1 = image1.getPosition().getHeight();
+        double height2 = image2.getPosition().getHeight();
+        // mit  den Werten, die unter Image gespeichert sind, funktioniert es
+        double img1height = image1.getImage().getHeight();
+        double img1width = image1.getImage().getWidth();
+        double img2height = image2.getImage().getHeight();
+
+        BufferedImage mergedImage = new BufferedImage((int) img1width, (int) (img1height + img2height), BufferedImage.TYPE_INT_RGB);
+        Graphics mergedImageGraphics = mergedImage.getGraphics();
+        try {
+            mergedImageGraphics.drawImage(image1.getImage(), 0, 0, null);
+            mergedImageGraphics.drawImage(image2.getImage(), 0, (int) (img1height), null);
+
+            // set Image, Position and type for merged Image
+            //set position for merged image with values of image1 and the height of both
+            Rectangle2D pos = new Rectangle2D.Float();
+            pos.setRect(image1.getPosition().getX(), image2.getPosition().getY(), rotation == 90 ? width + width2: width, rotation == 90 ? height1 : height1 + height2);
+            PdfImage newPdfImage = new PdfImage(mergedImage, pos, image1.getPage());
+            // Graphics need to be disposed
+
+            image1.getImage().flush();
+            image2.getImage().flush();
+
+            mergedImage.flush();
+            mergedImageGraphics.dispose();
+
+            return newPdfImage;
+        } catch (Exception e) {
+            // failed to merge image
+            log.error("Failed to merge image", e);
+            return null;
+        }
+
+
+    }
+
+    //make a list of true and false, if the image is a candidate for merging
+    private List<Boolean> getCandidatesList(List<PdfImage> imageList, int rotation) {
+        List<Boolean> candidatesList = new ArrayList<>();
+        for (int i = 0; i < imageList.size(); i++) {
+            if (i >= 1) {
+                candidatesList.add(isCandidateForMerging(imageList.get(i - 1), imageList.get(i), rotation));
+            }
+        }
+        return candidatesList;
+    }
+
+    // evaluate if two images are candidates for merging, depending on their coordinates, width and height
+    private boolean isCandidateForMerging(PdfImage image1, PdfImage image2, int rotation) {
+        double x1 = rotation == 90 ? image1.getPosition().getY() : image1.getPosition().getX();
+        double y1 = rotation == 90 ? image1.getPosition().getX() : image1.getPosition().getY();
+        double width1 = rotation == 90 ? image1.getPosition().getHeight() : image1.getPosition().getWidth();
+        double x2 = rotation == 90 ? image2.getPosition().getY() : image2.getPosition().getX();
+        double y2 = rotation == 90 ? image2.getPosition().getX() : image2.getPosition().getY();
+        double width2 = rotation == 90 ? image2.getPosition().getHeight() : image2.getPosition().getWidth();
+        double height2 = rotation == 90 ? image2.getPosition().getWidth() : image2.getPosition().getHeight();
+        //if the x-coordinates and widths of images are equal and the height is equal to difference between y-coordinates,
+        // then it is the same picture and has to be merged -> return true
+        return x1 == x2 && width1 == width2 && Math.ceil(height2) == Math.ceil(rotation == 90 ? y2 - y1 : y1 - y2) && width2 > (height2 / 6);
+    }
+
+}
@@ -1,6 +1,19 @@
 package com.iqser.red.service.redaction.v1.server.segmentation;

-import com.iqser.red.service.redaction.v1.model.Rectangle;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.pdfbox.io.MemoryUsageSetting;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.springframework.stereotype.Service;
+
 import com.iqser.red.service.redaction.v1.server.classification.model.Document;
 import com.iqser.red.service.redaction.v1.server.classification.model.Page;
 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
@@ -15,24 +28,9 @@ import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractT
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.CleanRulings;
 import com.iqser.red.service.redaction.v1.server.tableextraction.service.RulingCleaningService;
 import com.iqser.red.service.redaction.v1.server.tableextraction.service.TableExtractionService;
+
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.IOUtils;
-import org.apache.pdfbox.io.MemoryUsageSetting;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.common.PDRectangle;
-import org.springframework.stereotype.Service;
-
-import java.awt.Graphics;
-import java.awt.geom.Rectangle2D;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;

@Slf4j
@Service
@@ -47,13 +45,17 @@ public class PdfSegmentationService {
    private final ClassificationService classificationService;
    private final SectionsBuilderService sectionsBuilderService;
    private final ImageClassificationService imageClassificationService;
+    private final ImageMergeService imageMergeService;


    public Document parseDocument(InputStream documentInputStream) throws IOException {
+
        return parseDocument(documentInputStream, false);
    }

+
    public Document parseDocument(InputStream documentInputStream, boolean ignoreImages) throws IOException {
+
        PDDocument pdDocument = null;
        try {
            //create tempFile
@@ -64,7 +66,6 @@ public class PdfSegmentationService {
            Document document = new Document();
            List<Page> pages = new ArrayList<>();

-
            pdDocument = reinitializePDDocument(tempFile, null);
            long pageCount = pdDocument.getNumberOfPages();

@@ -101,32 +102,19 @@ public class PdfSegmentationService {
                page.setRotation(rotation);
                page.setLandscape(isLandscape || isRotated);
                page.setPageNumber(pageNumber);
-                List<PdfImage> mergedList = processImages(stripper.getImages());
-
-                List<PdfImage> imagesInImage = new ArrayList<>();
-                for(PdfImage image: mergedList){
-                    for (PdfImage inner: mergedList){
-                        if(image != inner && image.getPosition().contains(inner.getPosition().getX(), inner.getPosition().getY(), inner.getPosition().getWidth(), inner.getPosition().getHeight())){
-                            imagesInImage.add(inner);
-                        }
-                    }
-                }
-                mergedList.removeAll(imagesInImage);

+                List<PdfImage> mergedList = imageMergeService.mergeImages(stripper.getImages(), rotation);
                page.setImages(mergedList);

                tableExtractionService.extractTables(cleanRulings, page);
                buildPageStatistics(page);
                increaseDocumentStatistics(page, document);

-
                if (!ignoreImages) {
                    imageClassificationService.classifyImages(page);
                }

                pages.add(page);
-
-
            }

            document.setPages(pages);
@@ -149,7 +137,9 @@ public class PdfSegmentationService {
        }
    }

+
    private PDDocument reinitializePDDocument(File tempFile, PDDocument pdDocument) throws IOException {
+
        if (pdDocument != null) {
            pdDocument.close();
        }
@@ -164,130 +154,6 @@ public class PdfSegmentationService {
        return newPDDocument;
    }

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

    private void increaseDocumentStatistics(Page page, Document document) {

@@ -319,5 +185,4 @@ public class PdfSegmentationService {

    }

-
 }
@@ -633,6 +633,9 @@ public class RedactionIntegrationTest {
        long start = System.currentTimeMillis();
        ClassPathResource pdfFileResource = new ClassPathResource("files/new/Single Study - Oral (Gavage) Mouse.pdf");
        AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());
+        request.setExcludedPages(Set.of(1));
+
+        request.setFileAttributes(List.of(FileAttribute.builder().id("fileAttributeId").label("Vertebrate Study").placeholder("{fileattributes.vertebrateStudy}").value("true").build()));

        AnalyzeResult result = reanalyzeService.analyze(request);

@@ -688,8 +691,23 @@ public class RedactionIntegrationTest {
        when(dictionaryClient.getDictionaryForType(VERTEBRATE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(VERTEBRATE, false));

        start = System.currentTimeMillis();
+
+        ManualRedactions manualRedactions = new ManualRedactions();
+
+        manualRedactions.setImageRecategorizations(Set.of(ManualImageRecategorization.builder()
+                .id("37eee3e9d589a5cc529bfec38c3ba479")
+                .status(Status.APPROVED)
+                .type("signature")
+                .build()));
+
+        request.setManualRedactions(manualRedactions);
+
+
        AnalyzeResult reanalyzeResult = reanalyzeService.reanalyze(request);

+
+        redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID);
+
        end = System.currentTimeMillis();
        System.out.println("reanalysis analysis duration: " + (end - start));

@@ -757,6 +775,7 @@ public class RedactionIntegrationTest {
                .status(Status.APPROVED)
                .build()));

+
        manualRedactions.getComments().put("e5be0f1d941bbb92a068e198648d06c4", List.of(comment));
        manualRedactions.getComments().put("0836727c3508a0b2ea271da69c04cc2f", List.of(comment));
        manualRedactions.getComments().put(manualAddId, List.of(comment));
@@ -776,14 +795,21 @@ public class RedactionIntegrationTest {
        request.setManualRedactions(manualRedactions);
        AnalyzeResult result = reanalyzeService.analyze(request);

+
        manualRedactions.getEntriesToAdd().add(manualRedactionEntry);
        manualRedactions.setIdsToRemove(Set.of(IdRemoval.builder()
                .id("5b940b2cb401ed9f5be6fc24f6e77bcf")
                .status(Status.APPROVED)
                .build()));
+        manualRedactions.setManualLegalBasisChanges(Set.of(ManualLegalBasisChange.builder()
+                .id("675eba69b0c2917de55462c817adaa05")
+                .legalBasis("Manual Legal Basis Change")
+                .status(Status.APPROVED)
+                .build()));

        reanalyzeService.reanalyze(request);

+        var redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID);

        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
                .dossierId(TEST_DOSSIER_ID)
@@ -151,7 +151,7 @@ public class EntityRedactionServiceTest {
        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(sponsorResponse);

        Document classifiedDoc = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
-        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId");
+        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId", null);
        assertThat(classifiedDoc.getEntities()).hasSize(1); // one page
        assertThat(classifiedDoc.getEntities().get(1)).hasSize(7);// 3 author cells, 1 address, 1 Y and 2 N entities
    }
@@ -177,7 +177,7 @@ public class EntityRedactionServiceTest {
        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(sponsorResponse);

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

        classifiedDoc = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
-        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId");
+        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId", null);
        assertThat(classifiedDoc.getEntities()).hasSize(1); // one page
        assertThat(classifiedDoc.getEntities().get(1).stream().filter(entity -> entity.getMatchedRule() == 9).count()).isEqualTo(3);
        assertThat(classifiedDoc.getEntities().get(1).stream().filter(entity -> entity.getMatchedRule() == 8).count()).isEqualTo(9);
@@ -419,7 +419,7 @@ public class EntityRedactionServiceTest {
                .build();
        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(sponsorResponse);
        Document classifiedDoc = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
-        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId");
+        entityRedactionService.processDocument(classifiedDoc, TEST_DOSSIER_TEMPLATE_ID, null, "dossierId", null);
        assertThat(classifiedDoc.getEntities()).hasSize(1); // one page
        assertThat(classifiedDoc.getEntities().get(1).stream().filter(entity -> entity.getMatchedRule() == 8).count()).isEqualTo(6);
    }
@@ -268,7 +268,7 @@ rule "18: Redact contact information if Producer is found"

 rule "19: Redact AUTHOR(S)"
    when
-        Section(searchText.contains("AUTHOR(S):"))
+        Section(searchText.contains("AUTHOR(S):") && fileAttributeByPlaceholderEquals("{fileattributes.vertebrateStudy}", "true"))
    then
        section.redactLinesBetween("AUTHOR(S):", "COMPLETION DATE:", "PII", 19, true, "AUTHOR(S) was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
    end
Author	SHA1	Message	Date
Timo Bejan	6c0b567299	Pull request #191 : fixed undo after reanalysis Merge in RED/redaction-service from RED-1830 to master * commit '93844d8e76e0806cf00292b591a9f97ee8e61230': fixed undo after reanalysis	2021-07-19 10:46:38 +02:00
Timo	93844d8e76	fixed undo after reanalysis	2021-07-19 11:39:19 +03:00
Timo Bejan	a6da970902	Pull request #190 : RED-1813: Fixed to large images Merge in RED/redaction-service from RED-1813 to master * commit '84db91d74dabc82306911972a0ffface1bcdff3a': RED-1813: Fixed to large images	2021-07-14 20:36:47 +02:00
Dominique Eifländer	84db91d74d	RED-1813: Fixed to large images	2021-07-14 17:03:32 +02:00
Dominique Eiflaender	a1926a4055	Pull request #189 : RED-1814: Apply manual image recategorization before rules execution Merge in RED/redaction-service from RED-1814 to master * commit 'cb41187be660b5f4180c11e890bae57ebc79308a': RED-1814: Apply manual image recategorization before rules execution	2021-07-14 12:59:04 +02:00
Dominique Eifländer	cb41187be6	RED-1814: Apply manual image recategorization before rules execution	2021-07-14 12:27:31 +02:00
Timo Bejan	c8eb6489fa	Pull request #188 : Redaction log backend preview remove code duplication from ui Merge in RED/redaction-service from redaction-log-backend-preview-remove-code-duplication-from-ui to master * commit '71ba89306715d88ddadaa7780f4935a99bd107d6': id removal modifying dict flag added logs for dict	2021-07-14 10:40:17 +02:00
Timo	71ba893067	id removal modifying dict flag	2021-07-14 11:20:37 +03:00
Timo	5e50c0bfde	added logs for dict	2021-07-13 16:34:44 +03:00
Timo Bejan	0851712a10	Pull request #187 : Redaction log backend preview remove code duplication from ui Merge in RED/redaction-service from redaction-log-backend-preview-remove-code-duplication-from-ui to master * commit '58dd6841d60ad8562ae0aedf3e0aea2889fb8a4c': fixed typo update dictionary before preview	2021-07-13 14:57:09 +02:00
Timo	58dd6841d6	fixed typo	2021-07-13 15:35:39 +03:00
Timo	b42dd58824	update dictionary before preview	2021-07-13 15:18:06 +03:00
Timo Bejan	a3b5c8bb4e	Pull request #186 : Redaction log backend preview remove code duplication from ui Merge in RED/redaction-service from redaction-log-backend-preview-remove-code-duplication-from-ui to master * commit '9da43429393a875b82e0ea73dfcd8093bede91c5': changed to fonts 3.8 to fix build fixed pmd handling add to dict requests added dates to model classes for manual redactions	2021-07-13 11:48:29 +02:00
Timo	9da4342939	changed to fonts 3.8 to fix build	2021-07-13 12:43:07 +03:00
Timo	2d0a6d4d29	fixed pmd	2021-07-13 11:39:44 +03:00
Timo	af46bdca90	handling add to dict requests	2021-07-13 11:35:18 +03:00
Timo	279fdc6985	added dates to model classes for manual redactions	2021-07-13 11:34:08 +03:00
Timo Bejan	88704717d0	Pull request #185 : Redaction log backend preview remove code duplication from ui Merge in RED/redaction-service from redaction-log-backend-preview-remove-code-duplication-from-ui to master * commit '3517841d24bc69028391043157d9fcf142600ddf': positions for dict entries added some logging added some logging	2021-07-12 11:17:01 +02:00
Timo	3517841d24	positions for dict entries	2021-07-12 11:43:24 +03:00
Timo	79660f1623	added some logging	2021-07-12 11:18:13 +03:00
Timo	f713ea2655	added some logging	2021-07-12 11:16:48 +03:00
Timo Bejan	80c68d6278	Pull request #184 : fixed dictionary add corner case Merge in RED/redaction-service from redaction-log-backend-preview-remove-code-duplication-from-ui to master * commit 'cc1c3122bb3a4704a8ca1ff858a35f335d7d058b': fixed dictionary add corner case	2021-07-12 10:06:27 +02:00
Timo	cc1c3122bb	fixed dictionary add corner case	2021-07-12 10:44:42 +03:00
Timo Bejan	6eb6455247	Pull request #183 : added dictionary entries Merge in RED/redaction-service from redaction-log-backend-preview-remove-code-duplication-from-ui to master * commit '6741b8a596fcb7a014fdbca371329f1cf46d1fd7': added dictionary entries	2021-07-12 09:40:36 +02:00
Timo	6741b8a596	added dictionary entries	2021-07-12 10:33:30 +03:00
Dominique Eiflaender	e3b8022b54	Pull request #182 : RED-1755: Fixed hasHints flag at excluded pages Merge in RED/redaction-service from RED-1755 to master * commit 'abb48d46f95ab218c790dece094a44b8e9ccf86c': RED-1755: Fixed hasHints flag at excluded pages	2021-07-08 11:35:48 +02:00
Dominique Eifländer	abb48d46f9	RED-1755: Fixed hasHints flag at excluded pages	2021-07-08 11:31:27 +02:00
Timo Bejan	6a193d8fa2	Pull request #181 : added a preview method that allows us to see how the redaction-log will look like after analysis, this is useful for the UI since we do no longer need to duplicate this code in the UI Merge in RED/redaction-service from redaction-log-backend-preview-remove-code-duplication-from-ui to master * commit '9225b9959ded9768c32ed5e23b50e2428117952f': updated platform dep version and fixed pmd issue added a preview method that allows us to see how the redaction-log will look like after analysis, this is useful for the UI since we do no longer need to duplicate this code in the UI	2021-07-07 22:21:13 +02:00
Timo	9225b9959d	updated platform dep version and fixed pmd issue	2021-07-07 23:17:03 +03:00
Timo	c36a3813c4	added a preview method that allows us to see how the redaction-log will look like after analysis, this is useful for the UI since we do no longer need to duplicate this code in the UI	2021-07-07 23:05:49 +03:00
Dominique Eiflaender	4efe70f2a9	Pull request #180 : RED-809: Added flag to AnalysisResult to see if a reanalysis or normal analysis was performed Merge in RED/redaction-service from RED-809 to master * commit '041a3c87ae908fb8e127d4719aa421cbf6c3621e': RED-809: Added flag to AnalysisResult to see if a reanalysis or normal analysis was performed	2021-07-05 14:40:00 +02:00
Dominique Eifländer	041a3c87ae	RED-809: Added flag to AnalysisResult to see if a reanalysis or normal analysis was performed	2021-07-05 14:29:04 +02:00
Kresnadi Budisantoso	fa47da1aed	Pull request #179 : RED-1728: Do not show isHint flag if only false_positive entries are included in redactionlog Merge in RED/redaction-service from RED-1728 to master * commit '24ed2498ea1be2fc4a4daeda81c9a5371e8ad7ce': RED-1728: Do not show isHint flag if only false_positive entries are included in redactionlog	2021-07-01 15:49:20 +02:00
Dominique Eifländer	24ed2498ea	RED-1728: Do not show isHint flag if only false_positive entries are included in redactionlog	2021-07-01 09:16:32 +02:00
Dominique Eiflaender	4c2eda02cc	Pull request #178 : RED-1445: Enabled to use file attributes in rules Merge in RED/redaction-service from RED-1445 to master * commit '6ae6d467fc5fec4b385cde1c70bae7a21143342f': RED-1445: Enabled to use file attributes in rules	2021-06-29 10:29:17 +02:00
Dominique Eifländer	6ae6d467fc	RED-1445: Enabled to use file attributes in rules	2021-06-29 10:24:51 +02:00
Dominique Eiflaender	19680668ed	Pull request #177 : RED-1637: Fixed hasImages flag Merge in RED/redaction-service from RED-1637 to master * commit '5d5b3529cd8e45493cc91df3cb8b1f2a3ba14b4e': RED-1637: Fixed hasImages flag	2021-06-25 11:18:06 +02:00
Dominique Eifländer	5d5b3529cd	RED-1637: Fixed hasImages flag	2021-06-25 10:57:20 +02:00
Dominique Eiflaender	6fd4115e93	Pull request #176 : RED-1446: Enabled to change legal basis manually Merge in RED/redaction-service from RED-1446 to master * commit '7c99581f32fa4ac963cf0bd32bbc0dfe05903d0b': RED-1446: Enabled to change legal basis manually	2021-06-22 12:13:57 +02:00
Dominique Eifländer	7c99581f32	RED-1446: Enabled to change legal basis manually	2021-06-22 12:09:35 +02:00
Dominique Eiflaender	106c25f7d1	Pull request #175 : RED-1326: Fixed image recatigorization in reanalysis Merge in RED/redaction-service from RED-1326-2 to master * commit 'c5f5b9f7b928c31e25a000a6d9c055aab3e9fc00': RED-1326: Fixed image recatigorization in reanalysis	2021-06-21 15:15:03 +02:00
Dominique Eifländer	c5f5b9f7b9	RED-1326: Fixed image recatigorization in reanalysis	2021-06-21 15:10:33 +02:00
Dominique Eiflaender	03b8a95c33	Pull request #174 : RED-1326: Enabled to recategorize images Merge in RED/redaction-service from RED-1326 to master * commit '8ff3e463eae960a35e11fce7589e24131ccb51f2': RED-1326: Enabled to recategorize images	2021-06-18 11:53:21 +02:00
Dominique Eifländer	8ff3e463ea	RED-1326: Enabled to recategorize images	2021-06-18 11:29:43 +02:00
Dominique Eiflaender	e8b7e1fe7c	Pull request #173 : RED-1212: Enabled to exclude pages Merge in RED/redaction-service from RED-1212 to master * commit 'b166ab29ee16ab1bec7a8c310c6bd1cda238ae3f': RED-1212: Enabled to exclude pages	2021-06-17 12:21:01 +02:00
Dominique Eifländer	b166ab29ee	RED-1212: Enabled to exclude pages	2021-06-17 12:16:07 +02:00
Dominique Eiflaender	3a4b8833c8	Pull request #172 : RED-1539: Fixed missing textBefore & textAfter on reanalyis that leads to wrong changelog Merge in RED/redaction-service from RED-1539 to master * commit '143877ff2d6003597cd2a8fc0fe8f835f9d96de5': RED-1539: Fixed missing textBefore & textAfter on reanalyis that leads to wrong changelog	2021-06-16 11:20:40 +02:00
Dominique Eifländer	143877ff2d	RED-1539: Fixed missing textBefore & textAfter on reanalyis that leads to wrong changelog	2021-06-16 10:54:51 +02:00
Dominique Eiflaender	925b2a274c	Pull request #171 : RED-1472: Fixed image merging in rotated pages Merge in RED/redaction-service from RED-1472 to master * commit 'b8dc0e448d9101db8099aaf638ac929a16c87c3a': RED-1472: Fixed image merging in rotated pages	2021-06-15 13:11:25 +02:00
Dominique Eifländer	b8dc0e448d	RED-1472: Fixed image merging in rotated pages	2021-06-15 12:29:46 +02:00
Dominique Eiflaender	00af39bb6d	Pull request #169 : Fixed endless processing Merge in RED/redaction-service from FixEndlessProcessingOnError to master * commit '6bd8c2cf0f61eba94717d5478cdefd87f1cb4dbb': Fixed endless processing	2021-06-02 13:52:05 +02:00
Dominique Eiflaender	1f288d04ac	Pull request #167 : Ignore failing Ruling expansion Merge in RED/redaction-service from IgnoreFailedRulingExpansion to master * commit '418faac923e79c17f2d2b88a02920ab459fc36bf': Ignore failing Ruling expansion	2021-06-02 12:58:28 +02:00