From afc837163677aaa33fe1c8c25f7b52c39dd41a66 Mon Sep 17 00:00:00 2001 From: Viktor Seifert Date: Fri, 1 Jul 2022 15:31:06 +0200 Subject: [PATCH] RED-1098: Added files generated by pdftron to the list of files that are deleted when the download archive has been created --- .../service/download/DownloadPreparationService.java | 9 ++++++++- .../service/download/DownloadReportCleanupService.java | 9 ++++----- 2 files changed, 12 insertions(+), 6 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 0abf73232..b8c29fe47 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 @@ -130,7 +130,14 @@ public class DownloadPreparationService { .build()); } - downloadReportCleanupService.deleteTmpReportFiles(downloadStatus.getGeneratedReportsInformation()); + downloadReportCleanupService.deleteTmpReportFiles(downloadStatus.getGeneratedReportsInformation() + .stream() + .map(StoredFileInformation::getStorageId) + .collect(Collectors.toSet())); + downloadReportCleanupService.deleteTmpReportFiles(reportResultMessage.getRedactionResultDetails() + .stream() + .map(RedactionResultDetail::getStorageId) + .collect(Collectors.toSet())); } diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadReportCleanupService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadReportCleanupService.java index 93ceac143..415e4baf5 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadReportCleanupService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadReportCleanupService.java @@ -6,7 +6,6 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import com.iqser.red.service.peristence.v1.server.service.FileManagementStorageService; -import com.iqser.red.service.redaction.report.v1.api.model.StoredFileInformation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -19,11 +18,11 @@ public class DownloadReportCleanupService { private final FileManagementStorageService fileManagementStorageService; @Async - public void deleteTmpReportFiles(Collection fileInformationList) { + public void deleteTmpReportFiles(Collection storageIds) { - for (StoredFileInformation storedFileInformation : fileInformationList) { - fileManagementStorageService.deleteObject(storedFileInformation.getStorageId()); - log.info("Deleted tmp report file {}", storedFileInformation.getStorageId()); + for (String storageId : storageIds) { + fileManagementStorageService.deleteObject(storageId); + log.info("Deleted tmp report file {}", storageId); } } }