RED-4875 - add new column keepHiddenText in dossiertemplate and corresponding classes/methods, and set version of pdftron-service to newest

This commit is contained in:
Thomas Beyer 2023-03-20 09:53:15 +01:00
parent aaf59bd437
commit c024b8bc59
9 changed files with 15 additions and 2 deletions

View File

@ -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();
}

View File

@ -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)

View File

@ -98,6 +98,7 @@ public class DownloadPreparationService {
.collect(Collectors.toSet()))
.redactionPreviewColor(previewColor)
.keepImageMetaData(dossierTemplate.isKeepImageMetadata())
.keepHiddenText(dossierTemplate.isKeepHiddenText())
.appliedRedactionColor(appliedRedactionColor)
.build();

View File

@ -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

View File

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

View File

@ -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;

View File

@ -30,4 +30,6 @@ public class CreateOrUpdateDossierTemplateRequest {
private Set<DownloadFileType> downloadFileTypes = new HashSet<>();
private boolean keepImageMetadata;
private boolean keepHiddenText;
}

View File

@ -31,5 +31,5 @@ public class DossierTemplate {
private Set<DownloadFileType> downloadFileTypes = new HashSet<>();
private DossierTemplateStatus dossierTemplateStatus;
private boolean keepImageMetadata;
private boolean keepHiddenText;
}

View File

@ -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.2.0</pdftron-redaction-service.version>
<pdftron-redaction-service.version>dev_red4875_40800</pdftron-redaction-service.version>
<redaction-report-service.version>4.0.0</redaction-report-service.version>
<keycloak.version>20.0.1</keycloak.version>
</properties>