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

Merge branch 'master' into RED-5479

Browse Source 
# Conflicts:
#	persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadPreparationService.java
This commit is contained in:
Viktor Seifert 2022-12-02 16:22:58 +01:00
commit 6caeb3a11d
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,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;
@ -63,6 +64,7 @@ public class DownloadPreparationService {
StorageService storageService;
DownloadReportCleanupService downloadReportCleanupService;
ColorsService colorsService;
FileManagementServiceSettings settings;
@Transactional
@ -235,7 +237,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));

2
persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/settings/FileManagementServiceSettings.java
View File

@ -34,4 +34,6 @@ public class FileManagementServiceSettings {
private boolean figureDetectionEnabled;
private boolean scmEnabled;
}