From ba11d3fcc1c1fab821506f6af5b5747663bf075e Mon Sep 17 00:00:00 2001
From: deiflaender <dominique.eiflaender@iqser.com>
Date: Thu, 7 Jul 2022 14:34:13 +0200
Subject: [PATCH] RED-4497: Do not apply resize for ResizeRedactions with
 addtoDictionary  in mergeredactionlog

---
 redaction-service-v1/redaction-service-api-v1/pom.xml           | 2 +-
 .../v1/server/redaction/service/RedactionLogMergeService.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/redaction-service-v1/redaction-service-api-v1/pom.xml b/redaction-service-v1/redaction-service-api-v1/pom.xml
index eec6528c..cd34b49d 100644
--- a/redaction-service-v1/redaction-service-api-v1/pom.xml
+++ b/redaction-service-v1/redaction-service-api-v1/pom.xml
@@ -12,7 +12,7 @@
     <artifactId>redaction-service-api-v1</artifactId>
 
     <properties>
-        <persistence-service.version>1.166.0</persistence-service.version>
+        <persistence-service.version>1.235.0</persistence-service.version>
     </properties>
 
     <dependencies>
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogMergeService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogMergeService.java
index 2d393712..98473f14 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogMergeService.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogMergeService.java
@@ -321,7 +321,7 @@ public class RedactionLogMergeService {
             if (mrw.getItem() instanceof ManualResizeRedaction) {
                 var manualResizeRedact = (ManualResizeRedaction) mrw.getItem();
                 String manualOverrideReason = null;
-                if (manualResizeRedact.getStatus().equals(AnnotationStatus.APPROVED)) {
+                if (manualResizeRedact.getStatus().equals(AnnotationStatus.APPROVED) && manualResizeRedact.getUpdateDictionary() != null && !manualResizeRedact.getUpdateDictionary()) {
                     redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), colors, false, redactionLogEntry.isRedacted(), false, types));
                     redactionLogEntry.setPositions(convertPositions(manualResizeRedact.getPositions()));
                     redactionLogEntry.setValue(manualResizeRedact.getValue());