API - v0.1.5-2

ALL-CHIVE · Aug 25, 2023 · 7f43ba4 · 7f43ba4
2 parents 75c829d + 037165e
commit 7f43ba4
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 18 deletions.
diff --git a/Api/src/main/java/allchive/server/api/recycle/service/ClearDeletedObjectUseCase.java b/Api/src/main/java/allchive/server/api/recycle/service/ClearDeletedObjectUseCase.java
@@ -60,17 +60,19 @@ public void execute(ClearDeletedObjectRequest request) {
 
     private void deleteS3Object(List<Content> contents, List<Archiving> archivings) {
         List<String> imageKeys =
-                archivings.stream()
-                        .map(Archiving::getImageUrl)
+                new ArrayList<>(
+                        archivings.stream()
+                                .map(Archiving::getImageUrl)
+                                .filter(url -> !url.isEmpty())
+                                .filter(url -> !url.startsWith("http"))
+                                .toList());
+        imageKeys.addAll(
+                contents.stream()
+                        .filter(content -> content.getContentType().equals(ContentType.IMAGE))
+                        .map(Content::getImageUrl)
                         .filter(url -> !url.isEmpty())
                         .filter(url -> !url.startsWith("http"))
-                        .toList();
-        contents.stream()
-                .filter(content -> content.getContentType().equals(ContentType.IMAGE))
-                .map(Content::getImageUrl)
-                .filter(url -> !url.startsWith("http"))
-                .filter(url -> !url.isEmpty())
-                .forEach(imageKeys::add);
+                        .toList());
         s3DeleteObjectService.deleteS3Object(imageKeys);
     }
 

diff --git a/Api/src/main/java/allchive/server/api/recycle/service/ClearOldDeletedObjectUseCase.java b/Api/src/main/java/allchive/server/api/recycle/service/ClearOldDeletedObjectUseCase.java
@@ -63,17 +63,19 @@ public void executeSchedule() {
 
     private void deleteS3Object(List<Content> contents, List<Archiving> archivings) {
         List<String> imageKeys =
-                archivings.stream()
-                        .map(Archiving::getImageUrl)
+                new ArrayList<>(
+                        archivings.stream()
+                                .map(Archiving::getImageUrl)
+                                .filter(url -> !url.isEmpty())
+                                .filter(url -> !url.startsWith("http"))
+                                .toList());
+        imageKeys.addAll(
+                contents.stream()
+                        .filter(content -> content.getContentType().equals(ContentType.IMAGE))
+                        .map(Content::getImageUrl)
                         .filter(url -> !url.isEmpty())
                         .filter(url -> !url.startsWith("http"))
-                        .toList();
-        contents.stream()
-                .filter(content -> content.getContentType().equals(ContentType.IMAGE))
-                .map(Content::getImageUrl)
-                .filter(url -> !url.isEmpty())
-                .filter(url -> !url.startsWith("http"))
-                .forEach(imageKeys::add);
+                        .toList());
         s3DeleteObjectService.deleteS3Object(imageKeys);
     }