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

RED-7500 Fix report storage id generation

Browse Source
This commit is contained in:
Andrei Isvoran 2023-08-29 14:08:10 +02:00
parent 0fb7ccf7a2
commit 515edb1c1c
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
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

@ -72,6 +72,8 @@ public class DownloadController implements DownloadResource {
private final AccessControlService accessControlService; private final AccessControlService accessControlService;
private final FileManagementStorageService fileManagementStorageService; private final FileManagementStorageService fileManagementStorageService;
private final String REPORT_INFO = "/REPORT_INFO.json.gz";
@Value("${storage.backend:s3}") @Value("${storage.backend:s3}")
private String storageBackend; private String storageBackend;
@ -177,17 +179,10 @@ public class DownloadController implements DownloadResource {
removeDownloadRequest.getStorageIds().forEach(storageId -> { removeDownloadRequest.getStorageIds().forEach(storageId -> {
downloadService.deleteDownloadStatus(JSONPrimitive.of(storageId)); downloadService.deleteDownloadStatus(JSONPrimitive.of(storageId));
fileManagementStorageService.deleteObject(storageId); fileManagementStorageService.deleteObject(storageId);
fileManagementStorageService.deleteObject(generateReportJsonStorageIdForS3(storageId));
String s3ReportJson = generateReportJsonStorageIdForS3(storageId); fileManagementStorageService.deleteObject(generateReportJsonStorageIdForAzure(storageId));
if (fileManagementStorageService.objectExists(s3ReportJson)) {
fileManagementStorageService.deleteObject(s3ReportJson);
}
String azureReportJson = generateReportJsonStorageIdForAzure(storageId);
if (fileManagementStorageService.objectExists(azureReportJson)) {
fileManagementStorageService.deleteObject(azureReportJson);
}
auditPersistenceService.audit(AuditRequest.builder() auditPersistenceService.audit(AuditRequest.builder()
.userId(KeycloakSecurity.getUserId()) .userId(KeycloakSecurity.getUserId())
@ -304,12 +299,12 @@ public class DownloadController implements DownloadResource {
private String generateReportJsonStorageIdForS3(String storageId) { 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) { private String generateReportJsonStorageIdForAzure(String storageId) {
return storageId.replace(".zip", "/REPORT_INFO.json.gz"); return storageId.substring(0, storageId.length() - 3) + REPORT_INFO;
} }
} }