FU-334 chore: develop 브랜치와 conflict 해결

SWM-15th-ForU · Nov 5, 2024 · 364f612 · 364f612
2 parents 2e52686 + 1a58e0a
commit 364f612
Show file tree

Hide file tree

Showing 6 changed files with 100 additions and 42 deletions.
diff --git a/src/main/java/com/foru/freebe/errors/errorcode/CommonErrorCode.java b/src/main/java/com/foru/freebe/errors/errorcode/CommonErrorCode.java
@@ -11,7 +11,8 @@ public enum CommonErrorCode implements ErrorCode {
     ACCESS_DENIED(403, "You don't have permission to access this resource."),
     RESOURCE_NOT_FOUND(500, "Resource not exists"),
     INTERNAL_SERVER_ERROR(500, "Internal server error"),
-    IO_EXCEPTION(500, "IoException occurred");
+    IO_EXCEPTION(500, "IoException occurred"),
+    MAXIMUM_UPLOAD_SIZE_EXCEEDED(500, "Maximum upload size exceeded");
 
     private final int httpStatus;
     private final String message;

diff --git a/src/main/java/com/foru/freebe/errors/handler/GlobalExceptionHandler.java b/src/main/java/com/foru/freebe/errors/handler/GlobalExceptionHandler.java
@@ -16,7 +16,6 @@
 import org.springframework.web.multipart.MaxUploadSizeExceededException;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
 
-import com.foru.freebe.errors.errorcode.AwsErrorCode;
 import com.foru.freebe.errors.errorcode.CommonErrorCode;
 import com.foru.freebe.errors.errorcode.ErrorCode;
 import com.foru.freebe.errors.exception.JwtTokenException;
@@ -61,7 +60,7 @@ public ResponseEntity<Object> handleMethodArgumentNotValid(MethodArgumentNotVali
     @Override
     public ResponseEntity<Object> handleMaxUploadSizeExceededException(MaxUploadSizeExceededException e,
         HttpHeaders headers, HttpStatusCode status, WebRequest request) {
-        ErrorCode errorCode = AwsErrorCode.MAXIMUM_UPLOAD_SIZE_EXCEEDED;
+        ErrorCode errorCode = CommonErrorCode.MAXIMUM_UPLOAD_SIZE_EXCEEDED;
         return handleExceptionInternal(e, errorCode);
     }
 

diff --git a/src/main/java/com/foru/freebe/product/service/CustomerProductService.java b/src/main/java/com/foru/freebe/product/service/CustomerProductService.java
@@ -6,6 +6,7 @@
 import org.springframework.stereotype.Service;
 
 import com.foru.freebe.errors.errorcode.CommonErrorCode;
+import com.foru.freebe.errors.errorcode.ProductImageErrorCode;
 import com.foru.freebe.errors.exception.RestApiException;
 import com.foru.freebe.member.entity.Member;
 import com.foru.freebe.product.dto.customer.ProductDetailResponse;
@@ -55,18 +56,26 @@ public List<ProductListResponse> getProductList(String profileName) {
 
         List<ProductListResponse> productListResponseList = new ArrayList<>();
         for (Product product : products) {
-            List<ProductImage> productImage = productImageRepository.findByProduct(product);
-
             ProductListResponse productListResponse = ProductListResponse.builder()
                 .productId(product.getId())
                 .productTitle(product.getTitle())
                 .basicPrice(product.getBasicPrice())
-                .productRepresentativeImageUrl(productImage.get(0).getThumbnailUrl())
+                .productRepresentativeImageUrl(getRepresentativeProductImage(product))
                 .build();
 
             productListResponseList.add(productListResponse);
         }
 
         return productListResponseList;
     }
+
+    private String getRepresentativeProductImage(Product product) {
+        List<ProductImage> productImage = productImageRepository.findByProduct(product);
+
+        return productImage.stream()
+            .filter(image -> image.getImageOrder() == 0)
+            .map(ProductImage::getThumbnailUrl)
+            .findFirst()
+            .orElseThrow(() -> new RestApiException(ProductImageErrorCode.PRODUCT_IMAGE_NOT_FOUND));
+    }
 }
diff --git a/src/main/java/com/foru/freebe/s3/S3ImageService.java b/src/main/java/com/foru/freebe/s3/S3ImageService.java
@@ -1,5 +1,6 @@
 package com.foru.freebe.s3;
 
+import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -12,6 +13,8 @@
 import java.util.List;
 import java.util.UUID;
 
+import javax.imageio.ImageIO;
+
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
@@ -28,11 +31,14 @@
 import com.foru.freebe.errors.errorcode.AwsErrorCode;
 import com.foru.freebe.errors.errorcode.CommonErrorCode;
 import com.foru.freebe.errors.exception.RestApiException;
+import com.foru.freebe.s3.model.ImageSize;
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 
 @Service
 @RequiredArgsConstructor
+@Slf4j
 public class S3ImageService {
     private final AmazonS3 amazonS3;
 
@@ -98,6 +104,19 @@ public SingleImageLink imageUploadToS3(MultipartFile image, S3ImageType s3ImageT
         return new SingleImageLink(originUrl, thumbnailUrl);
     }
 
+    public void deleteImageFromS3(String imageAddress) {
+        String key = getKeyFromImageAddress(imageAddress);
+        try {
+            amazonS3.deleteObject(new DeleteObjectRequest(bucketName, key));
+        } catch (AmazonS3Exception e) {
+            throw new RestApiException(AwsErrorCode.AMAZON_S3_EXCEPTION);
+        } catch (AmazonServiceException e) {
+            throw new RestApiException(AwsErrorCode.AMAZON_SERVICE_EXCEPTION);
+        } catch (Exception e) {
+            throw new RestApiException(AwsErrorCode.DELETE_OBJECT_EXCEPTION);
+        }
+    }
+
     private int determineThumbnailSize(S3ImageType s3ImageType) {
         int size;
 
@@ -111,62 +130,86 @@ private int determineThumbnailSize(S3ImageType s3ImageType) {
     }
 
     private String uploadOriginalImage(MultipartFile image, S3ImageType s3ImageType, Long memberId) throws IOException {
+        String originUrl = null;
         String originKey = generateImagePath(image, s3ImageType, memberId, true);
+        try {
+            ObjectMetadata metadata = setImageMetadata(image);
+
+            uploadToS3(originKey, image.getInputStream(), metadata);
+
+            originUrl = amazonS3.getUrl(bucketName, originKey).toString();
+        } catch (Exception e) {
+            log.error("Failed to upload original image: {}", e.getMessage());
+            throw e;
+        }
+        return originUrl;
+    }
 
+    private ObjectMetadata setImageMetadata(MultipartFile image) {
         ObjectMetadata metadata = new ObjectMetadata();
         metadata.setContentLength(image.getSize());
         metadata.setContentType(image.getContentType());
-
-        uploadToS3(originKey, image.getInputStream(), metadata);
-
-        return amazonS3.getUrl(bucketName, originKey).toString();
+        return metadata;
     }
 
     private String uploadThumbnailImage(MultipartFile image, S3ImageType s3ImageType, Long memberId,
         int thumbnailSize) throws IOException {
+
         String thumbnailKey = generateImagePath(image, s3ImageType, memberId, false);
+
         try (InputStream originalImageStream = image.getInputStream();
              ByteArrayOutputStream thumbnailOutputStream = new ByteArrayOutputStream()) {
 
-            resizeForThumbnail(thumbnailSize, originalImageStream, thumbnailOutputStream);
+            ImageSize thumbnail = calculateThumbnailSize(image, thumbnailSize);
 
-            InputStream thumbnailInputStream = new ByteArrayInputStream(thumbnailOutputStream.toByteArray());
+            resizeForThumbnail(thumbnail.getWidth(), thumbnail.getHeight(), originalImageStream, thumbnailOutputStream);
 
-            ObjectMetadata thumbnailMetadata = createMetadataForThumbnail(image,
-                thumbnailOutputStream);
+            try (InputStream thumbnailInputStream = new ByteArrayInputStream(thumbnailOutputStream.toByteArray())) {
+                ObjectMetadata thumbnailMetadata = createMetadataForThumbnail(image, thumbnailOutputStream);
 
-            uploadToS3(thumbnailKey, thumbnailInputStream, thumbnailMetadata);
+                uploadToS3(thumbnailKey, thumbnailInputStream, thumbnailMetadata);
 
-            return amazonS3.getUrl(bucketName, thumbnailKey).toString();
+                return amazonS3.getUrl(bucketName, thumbnailKey).toString();
+            }
+        }
+    }
+
+    private ImageSize calculateThumbnailSize(MultipartFile image, int thumbnailSize) throws IOException {
+        ImageSize originalSize = getOriginalSize(image);
+
+        int thumbnailWidth;
+        int thumbnailHeight;
+
+        if (originalSize.getWidth() < originalSize.getHeight()) {
+            thumbnailWidth = thumbnailSize;
+            thumbnailHeight = (int)((thumbnailSize / (double)originalSize.getWidth()) * originalSize.getHeight());
+        } else {
+            thumbnailHeight = thumbnailSize;
+            thumbnailWidth = (int)((thumbnailSize / (double)originalSize.getHeight()) * originalSize.getWidth());
         }
+
+        return new ImageSize(thumbnailWidth, thumbnailHeight);
+    }
+
+    private ImageSize getOriginalSize(MultipartFile image) throws IOException {
+        BufferedImage bufferedImage = ImageIO.read(image.getInputStream());
+        int originalWidth = bufferedImage.getWidth();
+        int originalHeight = bufferedImage.getHeight();
+        return new ImageSize(originalWidth, originalHeight);
     }
 
-    private ObjectMetadata createMetadataForThumbnail(MultipartFile image,
-        ByteArrayOutputStream thumbnailOutputStream) {
+    private ObjectMetadata createMetadataForThumbnail(MultipartFile image, ByteArrayOutputStream outputStream) {
         ObjectMetadata thumbnailMetadata = new ObjectMetadata();
         thumbnailMetadata.setContentType(image.getContentType());
-        thumbnailMetadata.setContentLength(thumbnailOutputStream.size());
+        thumbnailMetadata.setContentLength(outputStream.size());
         return thumbnailMetadata;
     }
 
-    private void resizeForThumbnail(int thumbnailSize, InputStream originalImageStream,
-        ByteArrayOutputStream thumbnailOutputStream) throws IOException {
+    private void resizeForThumbnail(int width, int thumbnailSize, InputStream originalImageStream,
+        ByteArrayOutputStream outputStream) throws IOException {
         Thumbnails.of(originalImageStream)
-            .size(thumbnailSize, thumbnailSize)
-            .toOutputStream(thumbnailOutputStream);
-    }
-
-    public void deleteImageFromS3(String imageAddress) {
-        String key = getKeyFromImageAddress(imageAddress);
-        try {
-            amazonS3.deleteObject(new DeleteObjectRequest(bucketName, key));
-        } catch (AmazonS3Exception e) {
-            throw new RestApiException(AwsErrorCode.AMAZON_S3_EXCEPTION);
-        } catch (AmazonServiceException e) {
-            throw new RestApiException(AwsErrorCode.AMAZON_SERVICE_EXCEPTION);
-        } catch (Exception e) {
-            throw new RestApiException(AwsErrorCode.DELETE_OBJECT_EXCEPTION);
-        }
+            .size(width, thumbnailSize)
+            .toOutputStream(outputStream);
     }
 
     private String generateImagePath(MultipartFile image, S3ImageType s3ImageType, Long memberId, Boolean isOrigin) {
@@ -197,11 +240,6 @@ private void uploadToS3(String key, InputStream imageInputStream, ObjectMetadata
         }
     }
 
-    private void addImageUrlFromS3(String key, List<String> originalImageUrls) {
-        String imageUrl = amazonS3.getUrl(bucketName, key).toString();
-        originalImageUrls.add(imageUrl);
-    }
-
     private String getKeyFromImageAddress(String imageAddress) {
         try {
             URL url = new URL(imageAddress);

diff --git a/src/main/java/com/foru/freebe/s3/model/ImageSize.java b/src/main/java/com/foru/freebe/s3/model/ImageSize.java
@@ -0,0 +1,11 @@
+package com.foru.freebe.s3.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class ImageSize {
+    private int width;
+    private int height;
+}
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
@@ -42,7 +42,7 @@ spring:
     multipart:
       enabled: true
       max-file-size: 10MB
-
+      max-request-size: 100MB
 cloud:
   aws:
     credentials: