From b462ddba24e582b9bb5b030c5a831ea586d79f58 Mon Sep 17 00:00:00 2001 From: deiflaender Date: Wed, 30 Nov 2022 11:34:31 +0100 Subject: [PATCH] RSS-283: Do not add justification suffix to reports if scmEnabled --- .../service/download/DownloadPreparationService.java | 12 +++++++++--- .../settings/FileManagementServiceSettings.java | 2 ++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadPreparationService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadPreparationService.java index a5bc915e6..878e0620f 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadPreparationService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadPreparationService.java @@ -10,7 +10,6 @@ import java.util.stream.Collectors; import javax.transaction.Transactional; -import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.WorkflowStatus; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.stereotype.Service; @@ -23,6 +22,7 @@ import com.iqser.red.service.pdftron.redaction.v1.api.model.RedactionResultMessa import com.iqser.red.service.pdftron.redaction.v1.api.model.RedactionType; import com.iqser.red.service.peristence.v1.server.configuration.MessagingConfiguration; import com.iqser.red.service.peristence.v1.server.service.FileManagementStorageService; +import com.iqser.red.service.peristence.v1.server.settings.FileManagementServiceSettings; import com.iqser.red.service.peristence.v1.server.utils.FileSystemBackedArchiver; import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierEntity; import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileEntity; @@ -35,6 +35,7 @@ import com.iqser.red.service.persistence.management.v1.processor.service.persist import com.iqser.red.service.persistence.service.v1.api.model.audit.AddNotificationRequest; import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DownloadFileType; import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType; +import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.WorkflowStatus; import com.iqser.red.service.persistence.service.v1.api.model.download.DownloadStatusValue; import com.iqser.red.service.redaction.report.v1.api.model.ReportResultMessage; import com.iqser.red.service.redaction.report.v1.api.model.StoredFileInformation; @@ -62,6 +63,7 @@ public class DownloadPreparationService { StorageService storageService; DownloadReportCleanupService downloadReportCleanupService; + FileManagementServiceSettings settings; @Transactional @@ -76,7 +78,11 @@ public class DownloadPreparationService { .downloadId(reportResultMessage.getDownloadId()) .redactionTypes(toPdfTronRedactionTypes(downloadStatus.getDownloadFileTypes())) .fileIds(downloadStatus.getFiles().stream().map(FileEntity::getId).collect(Collectors.toList())) - .unapprovedFileIds(downloadStatus.getFiles().stream().filter(f -> !WorkflowStatus.APPROVED.equals(f.getWorkflowStatus())).map(FileEntity::getId).collect(Collectors.toSet())) + .unapprovedFileIds(downloadStatus.getFiles() + .stream() + .filter(f -> !WorkflowStatus.APPROVED.equals(f.getWorkflowStatus())) + .map(FileEntity::getId) + .collect(Collectors.toSet())) .build(); log.info("Sending redaction request for downloadId:{} to pdftron-redaction-queue", message.getDownloadId()); @@ -227,7 +233,7 @@ public class DownloadPreparationService { ReportTemplateEntity reportTemplate = reportTemplatePersistenceService.find(storedFileInformation.getTemplateId()); byte[] report = fileManagementStorageService.getStoredObjectBytes(storedFileInformation.getStorageId()); fileSystemBackedArchiver.addEntry(new FileSystemBackedArchiver.ArchiveModel(removeExtension(reportTemplate.getFileName()) + (reportTemplate.isMultiFileReport() ? " (multifile)" : ""), - addSuffix(createFileName(fileStatus, reportTemplate), + settings.isScmEnabled() ? createFileName(fileStatus, reportTemplate) : addSuffix(createFileName(fileStatus, reportTemplate), "justification" + (storedFileInformation.getDocumentPartNr() != 0 ? "_" + storedFileInformation.getDocumentPartNr() : "")), report)); diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/settings/FileManagementServiceSettings.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/settings/FileManagementServiceSettings.java index 9c2e12259..8d2f1b8f5 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/settings/FileManagementServiceSettings.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/settings/FileManagementServiceSettings.java @@ -34,4 +34,6 @@ public class FileManagementServiceSettings { private boolean figureDetectionEnabled; + private boolean scmEnabled; + }