refactor: 이미지 업로드/삭제 작업을 병렬로 수행하도록 수정

#848
woowacourse-teams · Dec 6, 2023 · 17ed8f6 · 17ed8f6
1 parent e9fe5b9
commit 17ed8f6
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 10 deletions.
diff --git a/backend/emm-sale/src/main/java/com/emmsale/image/application/S3Client.java b/backend/emm-sale/src/main/java/com/emmsale/image/application/S3Client.java
@@ -12,6 +12,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -40,21 +41,32 @@ public S3Client(
   }
 
   public List<String> uploadImages(final List<MultipartFile> multipartFiles) {
-    return multipartFiles.stream().map(this::uploadImage)
+    final AtomicBoolean catchException = new AtomicBoolean(false);
+
+    final List<String> uploadedImageNames = multipartFiles.stream()
+        .parallel()
+        .map(file -> uploadImage(file, catchException))
+        .filter(Objects::nonNull)
         .collect(Collectors.toList());
+    if (catchException.get()) {
+      deleteImages(uploadedImageNames);
+      throw new ImageException(ImageExceptionType.FAIL_S3_UPLOAD_IMAGE);
+    }
+    return uploadedImageNames;
   }
 
-  public String uploadImage(final MultipartFile file) {
+  public String uploadImage(final MultipartFile file, final AtomicBoolean catchException) {
     final String fileExtension = extractFileExtension(file);
     final String newFileName = UUID.randomUUID().toString().concat(fileExtension);
     final ObjectMetadata objectMetadata = configureObjectMetadata(file);
 
     try (final InputStream inputStream = file.getInputStream()) {
       amazonS3.putObject(new PutObjectRequest(bucket, newFileName, inputStream, objectMetadata));
+      return newFileName;
     } catch (final IOException | SdkClientException exception) {
-      throw new ImageException(ImageExceptionType.FAIL_S3_UPLOAD_IMAGE);
+      catchException.set(true);
+      return null;
     }
-    return newFileName;
   }
 
   private String extractFileExtension(final MultipartFile file) {
@@ -82,8 +94,10 @@ private ObjectMetadata configureObjectMetadata(final MultipartFile file) {
 
   public void deleteImages(final List<String> fileNames) {
     try {
-      fileNames.forEach(fileName ->
-          amazonS3.deleteObject(new DeleteObjectRequest(bucket, fileName)));
+      fileNames.stream()
+          .parallel()
+          .forEach(fileName ->
+              amazonS3.deleteObject(new DeleteObjectRequest(bucket, fileName)));
     } catch (SdkClientException exception) {
       throw new ImageException(ImageExceptionType.FAIL_S3_DELETE_IMAGE);
     }

diff --git a/backend/emm-sale/src/main/java/com/emmsale/member/application/MemberCommandService.java b/backend/emm-sale/src/main/java/com/emmsale/member/application/MemberCommandService.java
@@ -8,6 +8,7 @@
 import com.emmsale.member.exception.MemberException;
 import com.emmsale.member.exception.MemberExceptionType;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
 import javax.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -51,7 +52,7 @@ public MemberImageResponse updateMemberProfile(
       s3Client.deleteImages(List.of(imageName));
     }
 
-    final String imageName = s3Client.uploadImage(image);
+    final String imageName = s3Client.uploadImage(image, new AtomicBoolean(false));
     final String imageUrl = s3Client.convertImageUrl(imageName);
     member.updateProfile(imageUrl);
 

diff --git a/backend/emm-sale/src/test/java/com/emmsale/member/application/MemberCommandServiceTest.java b/backend/emm-sale/src/test/java/com/emmsale/member/application/MemberCommandServiceTest.java
@@ -5,8 +5,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyList;
 import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -146,7 +148,7 @@ class UpdateProfile {
     @BeforeEach
     void setUp() {
       ReflectionTestUtils.setField(s3Client, "bucket", bucket);
-      when(s3Client.uploadImage(image)).thenReturn(imageName);
+      when(s3Client.uploadImage(eq(image), any())).thenReturn(imageName);
       when(s3Client.convertImageUrl(anyString())).thenCallRealMethod();
       when(s3Client.convertImageName(anyString())).thenCallRealMethod();
     }
@@ -166,7 +168,7 @@ void pastGithubUrl() {
           () -> assertThat(member.getImageUrl())
               .isEqualTo(s3Client.convertImageUrl(imageName)),
           () -> verify(s3Client, times(1))
-              .uploadImage(image)
+              .uploadImage(eq(image), any())
       );
     }
 
@@ -186,7 +188,7 @@ void pastCustomImage() {
           () -> assertThat(member.getImageUrl())
               .isEqualTo(s3Client.convertImageUrl(imageName)),
           () -> verify(s3Client, times(1))
-              .uploadImage(image),
+              .uploadImage(eq(image), any()),
           () -> verify(s3Client, times(1))
               .deleteImages(anyList())
       );