Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

Pull request #625: RED-4874 2

Browse Source 
Merge in RED/persistence-service from RED-4874_2 to master

* commit 'dc1f1c3562f5c4546dd5810f7be398bfe6311d4b':
  RED-4874 - only slighty change of a comment for bamboo-test
  RED-4874 - add column keepImageMetadata to CreateOrUpdateDossierTemplateRequest
  RED-4874 - activated keepImageMetaData and set pdftron-version to newest
This commit is contained in:
Thomas Beyer 2023-03-14 10:19:15 +01:00
commit 751cc93453
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,7 +75,7 @@ public class DownloadPreparationService {
var downloadStatus = downloadStatusPersistenceService.getStatus(reportResultMessage.getDownloadId()); var downloadStatus = downloadStatusPersistenceService.getStatus(reportResultMessage.getDownloadId());
var dossier = downloadStatus.getDossier(); var dossier = downloadStatus.getDossier();
var storedPreviewColor = downloadStatus.getRedactionPreviewColor(); var storedPreviewColor = downloadStatus.getRedactionPreviewColor();
// var dossierTemplate = dossierTemplatePersistenceService.getDossierTemplate(dossier.getDossierTemplateId()); var dossierTemplate = dossierTemplatePersistenceService.getDossierTemplate(dossier.getDossierTemplateId());
final String previewColor; final String previewColor;
if (storedPreviewColor == null || storedPreviewColor.isBlank()) { if (storedPreviewColor == null || storedPreviewColor.isBlank()) {
@ -97,7 +97,7 @@ public class DownloadPreparationService {
.map(FileEntity::getId) .map(FileEntity::getId)
.collect(Collectors.toSet())) .collect(Collectors.toSet()))
.redactionPreviewColor(previewColor) .redactionPreviewColor(previewColor)
// .keepImageMetaData(dossierTemplate.isKeepImageMetadata()) .keepImageMetaData(dossierTemplate.isKeepImageMetadata())
.appliedRedactionColor(appliedRedactionColor) .appliedRedactionColor(appliedRedactionColor)
.build(); .build();

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

@ -53,7 +53,7 @@ public class DossierTemplateModel {
@Schema(description = "Status of dossier template.") @Schema(description = "Status of dossier template.")
private DossierTemplateStatus dossierTemplateStatus; private DossierTemplateStatus dossierTemplateStatus;
@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;
public String getId(){ public String getId(){

1
persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/dossiertemplate/CreateOrUpdateDossierTemplateRequest.java
View File

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

2
persistence-service-v1/pom.xml
View File

@ -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.0.0</pdftron-redaction-service.version> <pdftron-redaction-service.version>4.2.0</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>