Merge pull request #97 from Modagbul/feat/alarm_minsu

hotfix: 마이페이지 오류 수정
Modagbul · Nov 29, 2023 · bf030f0 · bf030f0
2 parents 89acd6c + 2b4cc24
commit bf030f0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/main/java/com/moing/backend/domain/mypage/application/service/ProfileUseCase.java b/src/main/java/com/moing/backend/domain/mypage/application/service/ProfileUseCase.java
@@ -9,6 +9,7 @@
 import org.springframework.stereotype.Service;
 
 import javax.transaction.Transactional;
+import java.util.concurrent.CompletableFuture;
 
 @Service
 @RequiredArgsConstructor
@@ -41,8 +42,10 @@ private String getUpdatedValue(String newValue, String currentValue) {
     }
 
     private void deletePreviousImage(UpdateProfileRequest updateProfileRequest, Member member) {
-        if (updateProfileRequest.getProfileImage() != null) {
-            s3Service.deleteImage(member.getProfileImage());
+        if (updateProfileRequest.getProfileImage() != null && member.getProfileImage() != null) {
+            CompletableFuture.runAsync(() -> {
+                s3Service.deleteImage(member.getProfileImage());
+            });
         }
     }
 

diff --git a/src/main/java/com/moing/backend/global/config/s3/S3Service.java b/src/main/java/com/moing/backend/global/config/s3/S3Service.java
@@ -42,10 +42,12 @@ public void deleteImage(String fileUrl) {
         String splitStr = ".com/";
         String fileName = fileUrl.substring(fileUrl.lastIndexOf(splitStr) + splitStr.length());
 
-        amazonS3.deleteObject(new DeleteObjectRequest(bucket, fileName));
+        if (amazonS3.doesObjectExist(bucket, fileName)) {
+            amazonS3.deleteObject(new DeleteObjectRequest(bucket, fileName));
+        }
     }
 
-    private String createFileName(String fileExtension) {
+        private String createFileName(String fileExtension) {
         return UUID.randomUUID() + "." + fileExtension;
     }