From af4dff23dc89c45d2af89ec8f025f9f479d8a68d Mon Sep 17 00:00:00 2001 From: Andrei Isvoran Date: Tue, 29 Aug 2023 15:30:19 +0200 Subject: [PATCH] RED-7500 - Only delete the metadata for the specific storage --- .../impl/controller/DownloadController.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 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 ed9f70084..5bbb4a604 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 @@ -74,7 +74,7 @@ public class DownloadController implements DownloadResource { private final String REPORT_INFO = "/REPORT_INFO.json.gz"; - @Value("${storage.backend:s3}") + @Value("${storage.backend}") private String storageBackend; @@ -181,8 +181,16 @@ public class DownloadController implements DownloadResource { downloadService.deleteDownloadStatus(JSONPrimitive.of(storageId)); fileManagementStorageService.deleteObject(storageId); - fileManagementStorageService.deleteObject(generateReportJsonStorageIdForS3(storageId)); - fileManagementStorageService.deleteObject(generateReportJsonStorageIdForAzure(storageId)); + + if (storageBackend.equals("s3")) { + var storageIdForS3 = generateReportJsonStorageIdForS3(storageId); + log.info("Deleting Report Json from S3 Storage {}", storageIdForS3); + fileManagementStorageService.deleteObject(storageIdForS3); + } else { + var storageIdForAzure = generateReportJsonStorageIdForAzure(storageId); + log.info("Deleting Report Json from Azure Storage {}", storageIdForAzure); + fileManagementStorageService.deleteObject(storageIdForAzure); + } auditPersistenceService.audit(AuditRequest.builder() .userId(KeycloakSecurity.getUserId()) @@ -299,12 +307,12 @@ public class DownloadController implements DownloadResource { private String generateReportJsonStorageIdForS3(String storageId) { - return storageId.substring(0, storageId.length() - 4) + REPORT_INFO; + return storageId.substring(0, storageId.length() - 3) + REPORT_INFO; } private String generateReportJsonStorageIdForAzure(String storageId) { - return storageId.substring(0, storageId.length() - 3) + REPORT_INFO; + return storageId.substring(0, storageId.length() - 4) + REPORT_INFO; } }