From a7fc2619e94b9268ef47b1c3a231abc9801cc611 Mon Sep 17 00:00:00 2001
From: Thomas Beyer <thomas.beyer@iqser.com>
Date: Mon, 13 Mar 2023 15:00:31 +0100
Subject: [PATCH 1/3] RED-4874 - activated keepImageMetaData and set
 pdftron-version to newest

---
 .../service/download/DownloadPreparationService.java          | 4 ++--
 persistence-service-v1/pom.xml                                | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/download/DownloadPreparationService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/download/DownloadPreparationService.java
index 09da92088..72b8806ab 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/download/DownloadPreparationService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/download/DownloadPreparationService.java
@@ -75,7 +75,7 @@ public class DownloadPreparationService {
         var downloadStatus = downloadStatusPersistenceService.getStatus(reportResultMessage.getDownloadId());
         var dossier = downloadStatus.getDossier();
         var storedPreviewColor = downloadStatus.getRedactionPreviewColor();
-//        var dossierTemplate = dossierTemplatePersistenceService.getDossierTemplate(dossier.getDossierTemplateId());
+        var dossierTemplate = dossierTemplatePersistenceService.getDossierTemplate(dossier.getDossierTemplateId());
 
         final String previewColor;
         if (storedPreviewColor == null || storedPreviewColor.isBlank()) {
@@ -97,7 +97,7 @@ public class DownloadPreparationService {
                         .map(FileEntity::getId)
                         .collect(Collectors.toSet()))
                 .redactionPreviewColor(previewColor)
-//              .keepImageMetaData(dossierTemplate.isKeepImageMetadata())
+                .keepImageMetaData(dossierTemplate.isKeepImageMetadata())
                 .appliedRedactionColor(appliedRedactionColor)
                 .build();
 
diff --git a/persistence-service-v1/pom.xml b/persistence-service-v1/pom.xml
index 385147625..13ab3f3ef 100755
--- a/persistence-service-v1/pom.xml
+++ b/persistence-service-v1/pom.xml
@@ -32,7 +32,7 @@
     <properties>
         <redaction-service.version>4.0.0</redaction-service.version>
         <search-service.version>4.0.0</search-service.version>
-        <pdftron-redaction-service.version>4.0.0</pdftron-redaction-service.version>
+        <pdftron-redaction-service.version>4.2.0</pdftron-redaction-service.version>
         <redaction-report-service.version>4.0.0</redaction-report-service.version>
         <keycloak.version>20.0.1</keycloak.version>
     </properties>

From 06d1290b5e45756534f1c76692b77340881d5193 Mon Sep 17 00:00:00 2001
From: Thomas Beyer <thomas.beyer@iqser.com>
Date: Mon, 13 Mar 2023 16:11:40 +0100
Subject: [PATCH 2/3] RED-4874 - add column keepImageMetadata to
 CreateOrUpdateDossierTemplateRequest

---
 .../dossiertemplate/CreateOrUpdateDossierTemplateRequest.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/dossiertemplate/CreateOrUpdateDossierTemplateRequest.java b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/dossiertemplate/CreateOrUpdateDossierTemplateRequest.java
index b581351bb..c23234c6f 100644
--- a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/dossiertemplate/CreateOrUpdateDossierTemplateRequest.java
+++ b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/dossiertemplate/CreateOrUpdateDossierTemplateRequest.java
@@ -29,4 +29,5 @@ public class CreateOrUpdateDossierTemplateRequest {
 
     private Set<DownloadFileType> downloadFileTypes = new HashSet<>();
 
+    private boolean keepImageMetadata;
 }

From dc1f1c3562f5c4546dd5810f7be398bfe6311d4b Mon Sep 17 00:00:00 2001
From: Thomas Beyer <thomas.beyer@iqser.com>
Date: Mon, 13 Mar 2023 16:56:40 +0100
Subject: [PATCH 3/3] RED-4874 - only slighty change of a comment for
 bamboo-test

---
 .../service/v1/api/shared/model/DossierTemplateModel.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/DossierTemplateModel.java b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/DossierTemplateModel.java
index f3748bc57..570de2a9a 100644
--- a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/DossierTemplateModel.java
+++ b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/DossierTemplateModel.java
@@ -53,7 +53,7 @@ public class DossierTemplateModel {
     @Schema(description = "Status of dossier template.")
     private DossierTemplateStatus dossierTemplateStatus;
 
-    @Schema(description = "Representing the setting if the metadata of images in pdfs should get kept or removed")
+    @Schema(description = "Representing the setting if the metadata of images in pdfs should get kept, or removed")
     private boolean keepImageMetadata;
 
     public String getId(){