From 48c100c25a899a39fa384b06986c28e947c7ef5e Mon Sep 17 00:00:00 2001
From: Timo Bejan <timo.bejan.ext@iqser.com>
Date: Sun, 28 Nov 2021 22:29:58 +0200
Subject: [PATCH] legal basis can change value for rectangles

---
 .../service/redaction/v1/model/ManualLegalBasisChange.java | 1 +
 .../server/redaction/service/RedactionLogMergeService.java | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/ManualLegalBasisChange.java b/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/ManualLegalBasisChange.java
index 8b352e9a..8831d276 100644
--- a/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/ManualLegalBasisChange.java
+++ b/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/ManualLegalBasisChange.java
@@ -18,6 +18,7 @@ public class ManualLegalBasisChange {
     private Status status;
     private String legalBasis;
     private String section;
+    private String value;
 
     private OffsetDateTime requestDate;
     private OffsetDateTime processedDate;
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 2226af64..5a4ec912 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
@@ -182,6 +182,9 @@ public class RedactionLogMergeService {
                     if (manualLegalBasisChange.getSection() != null) {
                         redactionLogEntry.setSection(manualLegalBasisChange.getSection());
                     }
+                    if (redactionLogEntry.isRectangle() && manualLegalBasisChange.getValue() != null) {
+                        redactionLogEntry.setValue(manualLegalBasisChange.getValue());
+                    }
                 } else if (manualLegalBasisChange.getStatus().equals(Status.REQUESTED)) {
                     manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", legal basis change requested");
                     redactionLogEntry.setStatus(Status.REQUESTED);
@@ -218,8 +221,8 @@ public class RedactionLogMergeService {
 
 
     private List<RedactionLogEntry> addManualAddEntries(SectionGrid sectionGrid,
-                                                       Set<ManualRedactionEntry> manualAdds,
-                                                       Map<String, List<Comment>> comments, String dossierTemplateId) {
+                                                        Set<ManualRedactionEntry> manualAdds,
+                                                        Map<String, List<Comment>> comments, String dossierTemplateId) {
 
         List<RedactionLogEntry> redactionLogEntries = new ArrayList<>();