Merge pull request #76 from Team-UMC/feature/#75/large-data-upload

[S3] 대용량 파일 처리 설정
Team-UMC · Feb 15, 2024 · 1312252 · 1312252
2 parents d728a0e + eb64052
commit 1312252
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 12 deletions.
diff --git a/src/main/java/com/umc/networkingService/global/common/exception/code/S3ErrorCode.java b/src/main/java/com/umc/networkingService/global/common/exception/code/S3ErrorCode.java
@@ -11,10 +11,13 @@
 @AllArgsConstructor
 public enum S3ErrorCode implements ErrorCodeInterface {
     // Image
-    FAILED_UPLOAD_S3_IMAGE(HttpStatus.INTERNAL_SERVER_ERROR, "IMAGE001", "이미지 저장에 실패하였습니다."),
+    FAILED_UPLOAD_S3_IMAGE(HttpStatus.INTERNAL_SERVER_ERROR, "IMAGE001", "S3에 이미지 저장에 실패하였습니다."),
+    FALIED_READ_IMAGE(HttpStatus.BAD_REQUEST, "IMAGE002","이미지 파일을 읽는 중 문제가 발생하였습니다."),
 
     // File
-    FAILED_UPLOAD_S3_FILE(HttpStatus.INTERNAL_SERVER_ERROR, "FILE001", "파일 저장에 실패하였습니다."),
+    FAILED_UPLOAD_S3_FILE(HttpStatus.INTERNAL_SERVER_ERROR, "FILE001", "S3에 파일 저장에 실패하였습니다."),
+    FALIED_READ_FILE(HttpStatus.BAD_REQUEST, "FILE002","파일을 읽는 중 문제가 발생하였습니다."),
+
     ;
 
     private final HttpStatus httpStatus;

diff --git a/src/main/java/com/umc/networkingService/global/utils/S3FileComponent.java b/src/main/java/com/umc/networkingService/global/utils/S3FileComponent.java
@@ -1,17 +1,15 @@
 package com.umc.networkingService.global.utils;
 
 import com.amazonaws.services.s3.AmazonS3Client;
-import com.amazonaws.services.s3.model.CannedAccessControlList;
-import com.amazonaws.services.s3.model.DeleteObjectRequest;
-import com.amazonaws.services.s3.model.ObjectMetadata;
-import com.amazonaws.services.s3.model.PutObjectRequest;
+import com.amazonaws.services.s3.model.*;
 import com.umc.networkingService.global.common.exception.RestApiException;
 import com.umc.networkingService.global.common.exception.code.S3ErrorCode;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.util.Objects;
 import java.util.UUID;
@@ -30,17 +28,39 @@ public String uploadFile(String category, MultipartFile multipartFile) {
         ObjectMetadata objectMetadata = new ObjectMetadata();
         objectMetadata.setContentType(multipartFile.getContentType());
 
-        // S3에 업로드
+        // 파일 타입 확인
+        boolean isImage = multipartFile.getContentType() != null && multipartFile.getContentType().startsWith("image");
+
+        // 바이트 배열로 파일 내용 읽기
+        byte[] bytes;
         try {
-            amazonS3Client.putObject(new PutObjectRequest(bucket, fileName, multipartFile.getInputStream(), objectMetadata)
-                    .withCannedAcl(CannedAccessControlList.PublicRead));
+            bytes = multipartFile.getBytes();
         } catch (IOException e) {
+            // 파일 업로드 실패 시 에러 코드 분기
+            if (isImage) {
+                throw new RestApiException(S3ErrorCode.FALIED_READ_IMAGE);
+            } else {
+                throw new RestApiException(S3ErrorCode.FALIED_READ_FILE);
+            }
+        }
+
+        // Content-Length 설정
+        objectMetadata.setContentLength(bytes.length);
 
-            if (multipartFile.getContentType().startsWith("image"))
+        // ByteArrayInputStream 생성
+        ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(bytes);
+
+        // S3에 업로드
+        try {
+            amazonS3Client.putObject(new PutObjectRequest(bucket, fileName, byteArrayInputStream, objectMetadata)
+                    .withCannedAcl(CannedAccessControlList.PublicRead));
+        } catch (AmazonS3Exception e) {
+            // S3 업로드 실패 시 에러 코드 분기
+            if (isImage) {
                 throw new RestApiException(S3ErrorCode.FAILED_UPLOAD_S3_IMAGE);
-            else
+            } else {
                 throw new RestApiException(S3ErrorCode.FAILED_UPLOAD_S3_FILE);
-
+            }
         }
 
         return amazonS3Client.getUrl(bucket, fileName).toString();