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:
parent
aaf59bd437
commit
c024b8bc59
@ -302,6 +302,7 @@ public class DossierTemplateController implements DossierTemplateResource {
|
|||||||
.downloadFileTypes(dossierTemplate.getDownloadFileTypes())
|
.downloadFileTypes(dossierTemplate.getDownloadFileTypes())
|
||||||
.dossierTemplateStatus(DossierTemplateStatus.valueOf(dossierTemplate.getDossierTemplateStatus().name()))
|
.dossierTemplateStatus(DossierTemplateStatus.valueOf(dossierTemplate.getDossierTemplateStatus().name()))
|
||||||
.keepImageMetadata(dossierTemplate.isKeepImageMetadata())
|
.keepImageMetadata(dossierTemplate.isKeepImageMetadata())
|
||||||
|
.keepHiddenText(dossierTemplate.isKeepHiddenText())
|
||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -69,6 +69,9 @@ public class DossierTemplateEntity {
|
|||||||
@Column(name = "keep_image_metadata")
|
@Column(name = "keep_image_metadata")
|
||||||
private boolean keepImageMetadata;
|
private boolean keepImageMetadata;
|
||||||
|
|
||||||
|
@Column(name = "keep_hidden_text")
|
||||||
|
private boolean keepHiddenText;
|
||||||
|
|
||||||
@Builder.Default
|
@Builder.Default
|
||||||
@Column(columnDefinition = "text", name = "download_file_types")
|
@Column(columnDefinition = "text", name = "download_file_types")
|
||||||
@Convert(converter = JSONDownloadFileTypeConverter.class)
|
@Convert(converter = JSONDownloadFileTypeConverter.class)
|
||||||
|
|||||||
@ -98,6 +98,7 @@ public class DownloadPreparationService {
|
|||||||
.collect(Collectors.toSet()))
|
.collect(Collectors.toSet()))
|
||||||
.redactionPreviewColor(previewColor)
|
.redactionPreviewColor(previewColor)
|
||||||
.keepImageMetaData(dossierTemplate.isKeepImageMetadata())
|
.keepImageMetaData(dossierTemplate.isKeepImageMetadata())
|
||||||
|
.keepHiddenText(dossierTemplate.isKeepHiddenText())
|
||||||
.appliedRedactionColor(appliedRedactionColor)
|
.appliedRedactionColor(appliedRedactionColor)
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
|
|||||||
@ -123,3 +123,5 @@ databaseChangeLog:
|
|||||||
file: db/changelog/tenant/sql/202-acl-duplicate-cleanup.sql
|
file: db/changelog/tenant/sql/202-acl-duplicate-cleanup.sql
|
||||||
- include:
|
- include:
|
||||||
file: db/changelog/tenant/sql/46-add-keep_image_metadata.sql
|
file: db/changelog/tenant/sql/46-add-keep_image_metadata.sql
|
||||||
|
- include:
|
||||||
|
file: 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;
|
||||||
@ -55,6 +55,8 @@ public class DossierTemplateModel {
|
|||||||
|
|
||||||
@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;
|
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(){
|
public String getId(){
|
||||||
return dossierTemplateId;
|
return dossierTemplateId;
|
||||||
|
|||||||
@ -30,4 +30,6 @@ public class CreateOrUpdateDossierTemplateRequest {
|
|||||||
private Set<DownloadFileType> downloadFileTypes = new HashSet<>();
|
private Set<DownloadFileType> downloadFileTypes = new HashSet<>();
|
||||||
|
|
||||||
private boolean keepImageMetadata;
|
private boolean keepImageMetadata;
|
||||||
|
|
||||||
|
private boolean keepHiddenText;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -31,5 +31,5 @@ public class DossierTemplate {
|
|||||||
private Set<DownloadFileType> downloadFileTypes = new HashSet<>();
|
private Set<DownloadFileType> downloadFileTypes = new HashSet<>();
|
||||||
private DossierTemplateStatus dossierTemplateStatus;
|
private DossierTemplateStatus dossierTemplateStatus;
|
||||||
private boolean keepImageMetadata;
|
private boolean keepImageMetadata;
|
||||||
|
private boolean keepHiddenText;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -32,7 +32,7 @@
|
|||||||
<properties>
|
<properties>
|
||||||
<redaction-service.version>4.0.0</redaction-service.version>
|
<redaction-service.version>4.0.0</redaction-service.version>
|
||||||
<search-service.version>4.0.0</search-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>
|
<redaction-report-service.version>4.0.0</redaction-report-service.version>
|
||||||
<keycloak.version>20.0.1</keycloak.version>
|
<keycloak.version>20.0.1</keycloak.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user