Issue #3029: Optionally exclude archived files from GUI S3 storage li…

…sting - cleanups
epam · Feb 15, 2023 · 9cb9298 · 9cb9298
1 parent 245e8cf
commit 9cb9298
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 22 deletions.
diff --git a/api/src/main/java/com/epam/pipeline/manager/datastorage/DataStorageManager.java b/api/src/main/java/com/epam/pipeline/manager/datastorage/DataStorageManager.java
@@ -1406,7 +1406,8 @@ private String createStorageNameIfRequired(final DataStorageVO dataStorageVO) {
     private DataStorageLifecycleRestoredListingContainer loadRestoredPaths(final AbstractDataStorage storage,
                                                                            final String path) {
         final String normalizedPath = ProviderUtils.delimiterIfEmpty(ProviderUtils.withLeadingDelimiter(path));
-        final List<StorageRestoreAction> restoredItems = loadSucceededRestoreActions(storage, path);
+        final List<StorageRestoreAction> restoredItems = storageLifecycleRestoreManager
+                .loadSucceededRestoreActions(storage, path);
 
         if (CollectionUtils.isEmpty(restoredItems)) {
             return DataStorageLifecycleRestoredListingContainer.builder()
@@ -1438,23 +1439,4 @@ private List<String> getRestoredFilePaths(final List<StorageRestoreAction> resto
                 .map(StorageRestoreAction::getPath)
                 .collect(Collectors.toList());
     }
-
-    private List<StorageRestoreAction> loadSucceededRestoreActions(final AbstractDataStorage storage,
-                                                                   final String path) {
-        final List<StorageRestoreAction> restoredItems = ListUtils.emptyIfNull(storageLifecycleRestoreManager
-                        .loadEffectiveRestoreStorageActionHierarchy(storage, StorageRestorePath.builder()
-                                .path(path)
-                                .type(StorageRestorePathType.FOLDER)
-                                .build(), false)).stream()
-                .filter(action -> StorageRestoreStatus.SUCCEEDED.equals(action.getStatus()))
-                .collect(Collectors.toList());
-        ListUtils.emptyIfNull(storageLifecycleRestoreManager
-                        .loadEffectiveRestoreStorageActionHierarchy(storage, StorageRestorePath.builder()
-                                .path(path)
-                                .type(StorageRestorePathType.FILE)
-                                .build(), false)).stream()
-                .filter(action -> StorageRestoreStatus.SUCCEEDED.equals(action.getStatus()))
-                .forEach(restoredItems::add);
-        return restoredItems;
-    }
 }
diff --git a/...a/com/epam/pipeline/manager/datastorage/lifecycle/DataStorageLifecycleRestoreManager.java b/...a/com/epam/pipeline/manager/datastorage/lifecycle/DataStorageLifecycleRestoreManager.java
@@ -198,6 +198,24 @@ public void deleteRestoreActions(final Long datastorageId) {
         dataStoragePathRestoreActionRepository.flush();
     }
 
+    public List<StorageRestoreAction> loadSucceededRestoreActions(final AbstractDataStorage storage,
+                                                                  final String path) {
+        final List<StorageRestoreAction> restoredItems = ListUtils.emptyIfNull(
+                loadEffectiveRestoreStorageActionHierarchy(storage, StorageRestorePath.builder()
+                        .path(path)
+                        .type(StorageRestorePathType.FOLDER)
+                        .build(), false)).stream()
+                .filter(action -> StorageRestoreStatus.SUCCEEDED.equals(action.getStatus()))
+                .collect(Collectors.toList());
+        ListUtils.emptyIfNull(loadEffectiveRestoreStorageActionHierarchy(storage, StorageRestorePath.builder()
+                        .path(path)
+                        .type(StorageRestorePathType.FILE)
+                        .build(), false)).stream()
+                .filter(action -> StorageRestoreStatus.SUCCEEDED.equals(action.getStatus()))
+                .forEach(restoredItems::add);
+        return restoredItems;
+    }
+
     protected StorageRestoreActionEntity buildStoragePathRestoreAction(
             final AbstractDataStorage storage, final StorageRestorePath path,
             final String restoreMode, final Long days, final boolean restoreVersions, final boolean force,

diff --git a/api/src/main/java/com/epam/pipeline/manager/preprocessing/NgsPreprocessingManager.java b/api/src/main/java/com/epam/pipeline/manager/preprocessing/NgsPreprocessingManager.java
@@ -372,7 +372,6 @@ private List<MetadataEntityVO> mapSampleSheetToMetadataEntities(final Long folde
     private boolean checkPathExistence(final Long dataStorageId, final String path) {
         try {
             // if we can list it, it should exist
-            // TODO: do we need to check archived?
             storageManager.getDataStorageItems(dataStorageId, path, false, 1, null, false);
             return true;
         } catch (RuntimeException e) {

diff --git a/api/src/main/java/com/epam/pipeline/manager/resource/StaticResourcesService.java b/api/src/main/java/com/epam/pipeline/manager/resource/StaticResourcesService.java
@@ -69,7 +69,6 @@ public DataStorageStreamingContent getContent(final String requestPath) {
                 throw new InvalidPathException(
                         messageHelper.getMessage(MessageConstants.ERROR_STATIC_RESOURCES_FOLDER_PATH));
             }
-            // TODO: Special error on archived content?
             final List<AbstractDataStorageItem> items = dataStorageManager.getDataStorageItems(storage.getId(),
                     ProviderUtils.withTrailingDelimiter(filePath), false, null, null, false).getResults();
             final String templatePath = preferenceManager.getPreference(