From c024b8bc5943295abb49017b0916c06bae3b2cbd Mon Sep 17 00:00:00 2001 From: Thomas Beyer Date: Mon, 20 Mar 2023 09:53:15 +0100 Subject: [PATCH] RED-4875 - add new column keepHiddenText in dossiertemplate and corresponding classes/methods, and set version of pdftron-service to newest --- .../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 ++ .../db/changelog/tenant/sql/47-add-keep_hidden_text.sql | 2 ++ .../service/v1/api/shared/model/DossierTemplateModel.java | 2 ++ .../dossiertemplate/CreateOrUpdateDossierTemplateRequest.java | 2 ++ .../v1/api/shared/model/dossiertemplate/DossierTemplate.java | 2 +- persistence-service-v1/pom.xml | 2 +- 9 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/sql/47-add-keep_hidden_text.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 e81841d36..1c50a32e1 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 @@ -302,6 +302,7 @@ public class DossierTemplateController implements DossierTemplateResource { .downloadFileTypes(dossierTemplate.getDownloadFileTypes()) .dossierTemplateStatus(DossierTemplateStatus.valueOf(dossierTemplate.getDossierTemplateStatus().name())) .keepImageMetadata(dossierTemplate.isKeepImageMetadata()) + .keepHiddenText(dossierTemplate.isKeepHiddenText()) .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 d853ae99b..ca53a7e33 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 @@ -69,6 +69,9 @@ public class DossierTemplateEntity { @Column(name = "keep_image_metadata") private boolean keepImageMetadata; + @Column(name = "keep_hidden_text") + private boolean keepHiddenText; + @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 d550931eb..d5b62aa22 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 @@ -98,6 +98,7 @@ public class DownloadPreparationService { .collect(Collectors.toSet())) .redactionPreviewColor(previewColor) .keepImageMetaData(dossierTemplate.isKeepImageMetadata()) + .keepHiddenText(dossierTemplate.isKeepHiddenText()) .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 8ab3ada09..e720d72a6 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 @@ -123,3 +123,5 @@ databaseChangeLog: file: db/changelog/tenant/sql/202-acl-duplicate-cleanup.sql - include: file: db/changelog/tenant/sql/46-add-keep_image_metadata.sql + - include: + file: db/changelog/tenant/sql/47-add-keep_hidden_text.sql diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/sql/47-add-keep_hidden_text.sql b/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/sql/47-add-keep_hidden_text.sql new file mode 100644 index 000000000..e20fc740a --- /dev/null +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/sql/47-add-keep_hidden_text.sql @@ -0,0 +1,2 @@ +-- add new column +alter table dossier_template add column keep_hidden_text BOOLEAN NOT NULL DEFAULT FALSE; 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 570de2a9a..e0c4f7d29 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 @@ -55,6 +55,8 @@ public class DossierTemplateModel { @Schema(description = "Representing the setting if the metadata of images in pdfs should get kept, or removed") private boolean keepImageMetadata; + @Schema(description = "Representing the setting if the hidden text in pdfs should get kept, or removed") + private boolean keepHiddenText; public String getId(){ return dossierTemplateId; 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 c23234c6f..362d55980 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 @@ -30,4 +30,6 @@ public class CreateOrUpdateDossierTemplateRequest { private Set downloadFileTypes = new HashSet<>(); private boolean keepImageMetadata; + + private boolean keepHiddenText; } 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 265325417..79976fd10 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 @@ -31,5 +31,5 @@ public class DossierTemplate { private Set downloadFileTypes = new HashSet<>(); private DossierTemplateStatus dossierTemplateStatus; private boolean keepImageMetadata; - + private boolean keepHiddenText; } diff --git a/persistence-service-v1/pom.xml b/persistence-service-v1/pom.xml index 13ab3f3ef..174e63f74 100755 --- a/persistence-service-v1/pom.xml +++ b/persistence-service-v1/pom.xml @@ -32,7 +32,7 @@ 4.0.0 4.0.0 - 4.2.0 + dev_red4875_40800 4.0.0 20.0.1