From e6f7b5824612c8a7682b6d8631b26c130ea86b3e Mon Sep 17 00:00:00 2001 From: Thomas Beyer Date: Mon, 15 May 2023 09:51:59 +0200 Subject: [PATCH] RED-4876 - add new column keep_overlapping_objects in dossier-template --- .../api/impl/controller/DossierTemplateController.java | 1 + .../v1/processor/entity/dossier/DossierTemplateEntity.java | 3 +++ .../processor/service/download/DownloadPreparationService.java | 1 + .../src/main/resources/db/changelog/db.changelog-tenant.yaml | 2 ++ .../changelog/tenant/sql/49-add-keep_overlapping_objects.sql | 2 ++ .../service/v1/api/shared/model/DossierTemplateModel.java | 3 +++ .../v1/api/shared/model/dossiertemplate/DossierTemplate.java | 1 + .../dossiertemplate/dossier/CreateOrUpdateDossierRequest.java | 1 + persistence-service-v1/pom.xml | 2 +- 9 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/sql/49-add-keep_overlapping_objects.sql diff --git a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DossierTemplateController.java b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DossierTemplateController.java index 1c50a32e1..512b39092 100644 --- a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DossierTemplateController.java +++ b/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(); } diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/DossierTemplateEntity.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/DossierTemplateEntity.java index ca53a7e33..97ee671c6 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/DossierTemplateEntity.java +++ b/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) 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 aa9444050..221ea404c 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 @@ -99,6 +99,7 @@ public class DownloadPreparationService { .redactionPreviewColor(previewColor) .keepImageMetaData(dossierTemplate.isKeepImageMetadata()) .keepHiddenText(dossierTemplate.isKeepHiddenText()) + .keepOverlappingObjects(dossierTemplate.isKeepOverlappingObjects()) .appliedRedactionColor(appliedRedactionColor) .build(); diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/db.changelog-tenant.yaml b/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/db.changelog-tenant.yaml index 5d0e4d390..e807ab9d6 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/db.changelog-tenant.yaml +++ b/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 \ No newline at end of file diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/sql/49-add-keep_overlapping_objects.sql b/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/sql/49-add-keep_overlapping_objects.sql new file mode 100644 index 000000000..4da21e282 --- /dev/null +++ b/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; \ No newline at end of file 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 605454f51..2997c00a8 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 @@ -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() { 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/DossierTemplate.java b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/dossiertemplate/DossierTemplate.java index 79976fd10..cd413982a 100644 --- a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/dossiertemplate/DossierTemplate.java +++ b/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; } 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/dossier/CreateOrUpdateDossierRequest.java b/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 index fba3257cb..dd8bf9856 100644 --- a/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 +++ b/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; } diff --git a/persistence-service-v1/pom.xml b/persistence-service-v1/pom.xml index 2f13a4b82..2f36fe125 100755 --- a/persistence-service-v1/pom.xml +++ b/persistence-service-v1/pom.xml @@ -32,7 +32,7 @@ 4.0.0 4.0.0 - 4.4.0 + 4.11.0 4.0.0 20.0.1