Merge pull request #96 from Project-BookLog/fix/web/1

s3 업로드 오류 수정

Author: millkk04

booklog/src/main/java/com/example/booklog/aws/s3/AmazonS3Manager.java

@@ -5,6 +5,8 @@
 import com.amazonaws.services.s3.model.ObjectMetadata;
 import com.amazonaws.services.s3.model.PutObjectRequest;
 import com.example.booklog.global.common.Uuid;
+import com.example.booklog.global.common.apiPayload.code.status.ErrorStatus;
+import com.example.booklog.global.common.apiPayload.exception.GeneralException;
 import com.example.booklog.global.common.repository.UuidRepository;
 import com.example.booklog.global.config.AmazonConfig;
 import lombok.RequiredArgsConstructor;
@@ -28,15 +30,23 @@ public class AmazonS3Manager {
     private final UuidRepository uuidRepository;
 
     public String uploadFile(String keyName, MultipartFile file){
+        String bucket = amazonConfig.getBucket();
+        log.info("[S3] upload start bucket='{}' key='{}' size={} contentType={}",
+                bucket, keyName, file.getSize(), file.getContentType());
+
         ObjectMetadata metadata = new ObjectMetadata();
         metadata.setContentLength(file.getSize());
+
         try {
-            amazonS3.putObject(new PutObjectRequest(amazonConfig.getBucket(), keyName, file.getInputStream(), metadata));
-        } catch (IOException e){
-            log.error("error at AmazonS3Manager uploadFile : {}", (Object) e.getStackTrace());
+            amazonS3.putObject(new PutObjectRequest(bucket, keyName, file.getInputStream(), metadata));
+        } catch (Exception e) {
+            log.error("[S3] putObject failed bucket='{}' key='{}'", bucket, keyName, e);
+            throw new GeneralException(ErrorStatus.FILE_UPLOAD_FAILED);
         }
 
-        return amazonS3.getUrl(amazonConfig.getBucket(), keyName).toString();
+        String url = amazonS3.getUrl(bucket, keyName).toString();
+        log.info("[S3] upload success url='{}'", url);
+        return url;
     }
 
     public String generateReviewKeyName(Uuid uuid) {

booklog/src/main/java/com/example/booklog/domain/users/service/MeAvatarService.java

@@ -9,7 +9,6 @@
 import com.example.booklog.global.common.apiPayload.exception.GeneralException;
 import com.example.booklog.global.common.repository.UuidRepository;
 import lombok.RequiredArgsConstructor;
-import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -20,7 +19,6 @@
 @Service
 @RequiredArgsConstructor
 @Transactional
-@Profile("!local")
 public class MeAvatarService {
 
     private final UsersRepository usersRepository;

booklog/src/main/java/com/example/booklog/global/common/apiPayload/code/status/ErrorStatus.java

@@ -22,6 +22,7 @@ public enum ErrorStatus implements BaseErrorCode {
     FILE_REQUIRED(HttpStatus.BAD_REQUEST, "F001", "파일이 필요합니다."),
     FILE_TOO_LARGE(HttpStatus.PAYLOAD_TOO_LARGE, "F002", "파일 용량이 너무 큽니다."),
     UNSUPPORTED_IMAGE_TYPE(HttpStatus.UNSUPPORTED_MEDIA_TYPE, "F003", "지원하는 파일 양식이 아닙니다."),
+    FILE_UPLOAD_FAILED(HttpStatus.EXPECTATION_FAILED, "F004", "파일업로드에 실패했습니다."),
 
     // =========================
     // [Author / Enrichment / Search]

booklog/src/main/java/com/example/booklog/global/config/AmazonConfig.java

@@ -30,7 +30,7 @@ public class AmazonConfig {
     @Value("${cloud.aws.region.static}")
     private String region;
 
-    @Value(("${cloud.aws.s3.bucket"))
+    @Value("${cloud.aws.s3.bucket}")
     private String bucket;
 
     @Value("${cloud.aws.s3.path.review}")