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

RED-7500 - Only delete the metadata for the specific storage

Browse Source
This commit is contained in:
Andrei Isvoran 2023-08-29 15:30:19 +02:00
parent 633ddec803
commit af4dff23dc
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DownloadController.java vendored
View File

@ -74,7 +74,7 @@ public class DownloadController implements DownloadResource {
private final String REPORT_INFO = "/REPORT_INFO.json.gz"; private final String REPORT_INFO = "/REPORT_INFO.json.gz";
@Value("${storage.backend:s3}") @Value("${storage.backend}")
private String storageBackend; private String storageBackend;
@ -181,8 +181,16 @@ public class DownloadController implements DownloadResource {
downloadService.deleteDownloadStatus(JSONPrimitive.of(storageId)); downloadService.deleteDownloadStatus(JSONPrimitive.of(storageId));
fileManagementStorageService.deleteObject(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() auditPersistenceService.audit(AuditRequest.builder()
.userId(KeycloakSecurity.getUserId()) .userId(KeycloakSecurity.getUserId())
@ -299,12 +307,12 @@ public class DownloadController implements DownloadResource {
private String generateReportJsonStorageIdForS3(String storageId) { 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) { private String generateReportJsonStorageIdForAzure(String storageId) {
return storageId.substring(0, storageId.length() - 3) + REPORT_INFO; return storageId.substring(0, storageId.length() - 4) + REPORT_INFO;
} }
} }