From 515edb1c1ce010ccf26ab676e2cdddd76e228e1d Mon Sep 17 00:00:00 2001 From: Andrei Isvoran Date: Tue, 29 Aug 2023 14:08:10 +0200 Subject: [PATCH] RED-7500 Fix report storage id generation --- .../impl/controller/DownloadController.java | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DownloadController.java b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DownloadController.java index 590a0468e..ed9f70084 100644 --- a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DownloadController.java +++ b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DownloadController.java @@ -72,6 +72,8 @@ public class DownloadController implements DownloadResource { private final AccessControlService accessControlService; private final FileManagementStorageService fileManagementStorageService; + private final String REPORT_INFO = "/REPORT_INFO.json.gz"; + @Value("${storage.backend:s3}") private String storageBackend; @@ -177,17 +179,10 @@ public class DownloadController implements DownloadResource { removeDownloadRequest.getStorageIds().forEach(storageId -> { downloadService.deleteDownloadStatus(JSONPrimitive.of(storageId)); + fileManagementStorageService.deleteObject(storageId); - - String s3ReportJson = generateReportJsonStorageIdForS3(storageId); - if (fileManagementStorageService.objectExists(s3ReportJson)) { - fileManagementStorageService.deleteObject(s3ReportJson); - } - - String azureReportJson = generateReportJsonStorageIdForAzure(storageId); - if (fileManagementStorageService.objectExists(azureReportJson)) { - fileManagementStorageService.deleteObject(azureReportJson); - } + fileManagementStorageService.deleteObject(generateReportJsonStorageIdForS3(storageId)); + fileManagementStorageService.deleteObject(generateReportJsonStorageIdForAzure(storageId)); auditPersistenceService.audit(AuditRequest.builder() .userId(KeycloakSecurity.getUserId()) @@ -304,12 +299,12 @@ public class DownloadController implements DownloadResource { private String generateReportJsonStorageIdForS3(String storageId) { - return storageId.replace("zip", "/REPORT_INFO.json.gz"); + return storageId.substring(0, storageId.length() - 4) + REPORT_INFO; } private String generateReportJsonStorageIdForAzure(String storageId) { - return storageId.replace(".zip", "/REPORT_INFO.json.gz"); + return storageId.substring(0, storageId.length() - 3) + REPORT_INFO; } }