From ceeaf801e0e0dd2297e499bffef462560cf4e1a8 Mon Sep 17 00:00:00 2001 From: yunhacandy Date: Mon, 16 Sep 2024 22:02:24 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20addImage=20=EB=A9=94=EC=84=9C?= =?UTF-8?q?=EB=93=9C=20=EC=A0=9C=EA=B1=B0=20=EB=B0=8F=20=EC=A7=81=EC=A0=91?= =?UTF-8?q?=EC=A0=81=EC=9D=B8=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC=20=EB=B0=A9=EC=8B=9D=EC=9C=BC=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../generation/entity/ProjectImage.java | 1 - .../service/ProjectImageService.java | 23 ++++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/cotato/csquiz/domain/generation/entity/ProjectImage.java b/src/main/java/org/cotato/csquiz/domain/generation/entity/ProjectImage.java index fe7dd1ca..6622d05c 100644 --- a/src/main/java/org/cotato/csquiz/domain/generation/entity/ProjectImage.java +++ b/src/main/java/org/cotato/csquiz/domain/generation/entity/ProjectImage.java @@ -9,7 +9,6 @@ import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import lombok.AccessLevel; -import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; import org.cotato.csquiz.common.entity.S3Info; diff --git a/src/main/java/org/cotato/csquiz/domain/generation/service/ProjectImageService.java b/src/main/java/org/cotato/csquiz/domain/generation/service/ProjectImageService.java index eabf44f3..ba1205cf 100644 --- a/src/main/java/org/cotato/csquiz/domain/generation/service/ProjectImageService.java +++ b/src/main/java/org/cotato/csquiz/domain/generation/service/ProjectImageService.java @@ -11,7 +11,6 @@ import org.cotato.csquiz.common.error.exception.ImageException; import org.cotato.csquiz.common.s3.S3Uploader; import org.cotato.csquiz.domain.generation.entity.ProjectImage; -import org.cotato.csquiz.domain.generation.enums.ProjectImageType; import org.cotato.csquiz.domain.generation.repository.ProjectImageRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -26,26 +25,28 @@ public class ProjectImageService { private final ProjectImageRepository projectImageRepository; @Transactional - public void createProjectImage(Long projectId, MultipartFile logoImage, MultipartFile thumbNailImage, List detailImages) + public void createProjectImage(Long projectId, MultipartFile logoImage, MultipartFile thumbNailImage, + List detailImages) throws ImageException { List newImages = new ArrayList<>(); - addImage(newImages, logoImage, ProjectImageType.LOGO, projectId, 1); - addImage(newImages, thumbNailImage, ProjectImageType.THUMBNAIL, projectId, 1); + File webpLogoImage = convertToWebp(convert(logoImage)); + S3Info logoImageInfo = s3Uploader.uploadFiles(webpLogoImage, PROJECT_IMAGE); + newImages.add(ProjectImage.logoImage(logoImageInfo, projectId)); + + File webpThumbNailImage = convertToWebp(convert(thumbNailImage)); + S3Info thumbNailInfo = s3Uploader.uploadFiles(webpThumbNailImage, PROJECT_IMAGE); + newImages.add(ProjectImage.thumbnailImage(thumbNailInfo, projectId)); if (detailImages != null && !detailImages.isEmpty()) { for (int orderIndex = 1; orderIndex <= detailImages.size(); orderIndex++) { MultipartFile detailImage = detailImages.get(orderIndex - 1); - addImage(newImages, detailImage, ProjectImageType.DETAIL, projectId, orderIndex); + File webpDetailImage = convertToWebp(convert(detailImage)); + S3Info detailImageInfo = s3Uploader.uploadFiles(webpDetailImage, PROJECT_IMAGE); + newImages.add(ProjectImage.detailImage(detailImageInfo, projectId, orderIndex)); } } projectImageRepository.saveAll(newImages); } - - private void addImage( List newImages, MultipartFile image, ProjectImageType imageType, Long projectId, int imageOrder) throws ImageException { - File webpImage = convertToWebp(convert(image)); - S3Info ImageInfo = s3Uploader.uploadFiles(webpImage, PROJECT_IMAGE); - newImages.add(ProjectImage.createProjectImage(imageType, ImageInfo, projectId, imageOrder)); - } }