RED-4876 - add new column keep_overlapping_objects in dossier-template

persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DossierTemplateController.java

@@ -303,6 +303,7 @@ public class DossierTemplateController implements DossierTemplateResource {
                 .dossierTemplateStatus(DossierTemplateStatus.valueOf(dossierTemplate.getDossierTemplateStatus().name()))
                 .keepImageMetadata(dossierTemplate.isKeepImageMetadata())
                 .keepHiddenText(dossierTemplate.isKeepHiddenText())
+                .keepOverlappingObjects(dossierTemplate.isKeepOverlappingObjects())
                 .build();
     }
 

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/DossierTemplateEntity.java

@@ -72,6 +72,9 @@ public class DossierTemplateEntity {
     @Column(name = "keep_hidden_text")
     private boolean keepHiddenText;
 
+    @Column(name = "keep_overlapping_objects")
+    private boolean keepOverlappingObjects;
+
     @Builder.Default
     @Column(columnDefinition = "text", name = "download_file_types")
     @Convert(converter = JSONDownloadFileTypeConverter.class)

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/download/DownloadPreparationService.java

@@ -99,6 +99,7 @@ public class DownloadPreparationService {
                 .redactionPreviewColor(previewColor)
                 .keepImageMetaData(dossierTemplate.isKeepImageMetadata())
                 .keepHiddenText(dossierTemplate.isKeepHiddenText())
+                .keepOverlappingObjects(dossierTemplate.isKeepOverlappingObjects())
                 .appliedRedactionColor(appliedRedactionColor)
                 .build();
 

persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/db.changelog-tenant.yaml

@@ -131,3 +131,5 @@ databaseChangeLog:
       file: db/changelog/tenant/sql/203-spring-acl-constraints.changelog.sql
   - include:
       file: db/changelog/tenant/48-add-watermark-text-alignment.yaml
+  - include:
+      file: db/changelog/tenant/sql/49-add-keep_overlapping_objects.sql

persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/sql/49-add-keep_overlapping_objects.sql

@@ -0,0 +1,2 @@
+-- add new column
+alter table dossier_template add column keep_overlapping_objects BOOLEAN NOT NULL DEFAULT FALSE;

persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/DossierTemplateModel.java

@@ -59,6 +59,9 @@ public class DossierTemplateModel {
     @Schema(description = "Representing the setting if the hidden text in pdfs should get kept, or removed")
     private boolean keepHiddenText;
 
+    @Schema(description = "Representing the setting if the overlapping objects in pdfs should get kept or removed by flattening the pages")
+    private boolean keepOverlappingObjects;
+
 
     public String getId() {
 

persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/dossiertemplate/DossierTemplate.java

@@ -32,4 +32,5 @@ public class DossierTemplate {
     private DossierTemplateStatus dossierTemplateStatus;
     private boolean keepImageMetadata;
     private boolean keepHiddenText;
+    private boolean keepOverlappingObjects;
 }

persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/dossiertemplate/dossier/CreateOrUpdateDossierRequest.java

@@ -47,5 +47,6 @@ public class CreateOrUpdateDossierRequest {
 
     private Long watermarkId;
     private Long previewWatermarkId;
+    private boolean keepOverlappingObjects;
 
 }

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.4.0</pdftron-redaction-service.version>
+        <pdftron-redaction-service.version>4.11.0</pdftron-redaction-service.version>
         <redaction-report-service.version>4.0.0</redaction-report-service.version>
         <keycloak.version>20.0.1</keycloak.version>
     </properties>