Fix: 기존에 등록된 프로젝트에 이미지 추가 시 예외가 발생하지 않던 에러 해결 (#157)

* refactor: 이미지 순서 0부터 시작하게 변경 * fix: 로고와 썸네일 이미지 존재할 경우 예외처리 발생하게 수정 * feat: Project, ProjectImage, ProjectMember 엔티티에 BaseTimeEntity 추가 * refactor: 이미지 존재 여부 검증 메서드 변경 * refactor: 이미지 존재 여부 검증 메서드 분리
IT-Cotato · Sep 19, 2024 · 5795753 · 5795753
1 parent fe93868
commit 5795753
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 10 deletions.
diff --git a/src/main/java/org/cotato/csquiz/common/error/ErrorCode.java b/src/main/java/org/cotato/csquiz/common/error/ErrorCode.java
@@ -84,6 +84,10 @@ public enum ErrorCode {
     ALREADY_ATTEND(HttpStatus.CONFLICT, "AT-301", "이미 해당 타입으로 출석한 기록이 있습니다."),
     ATTENDANCE_NOT_OPEN(HttpStatus.BAD_REQUEST, "AT-401", "출석 시간이 아닙니다."),
 
+    //프로젝트 관련
+    LOGO_IMAGE_EXIST(HttpStatus.CONFLICT, "PJ-301", "이미 로고 이미지가 존재합니다."),
+    THUMBNAIL_IMAGE_EXIST(HttpStatus.CONFLICT, "PJ-302", "이미 썸네일 이미지가 존재합니다."),
+
     // 500 오류 -> 서버측에서 처리가 실패한 부분들
     WEBSOCKET_SEND_EXCEPTION(HttpStatus.INTERNAL_SERVER_ERROR, "S-001", "소캣 메세지 전송 실패"),
     IMAGE_PROCESSING_FAIL(HttpStatus.INTERNAL_SERVER_ERROR, "S-002", "이미지 처리에 실패했습니다."),

diff --git a/src/main/java/org/cotato/csquiz/domain/generation/entity/Project.java b/src/main/java/org/cotato/csquiz/domain/generation/entity/Project.java
@@ -9,11 +9,12 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.cotato.csquiz.common.entity.BaseTimeEntity;
 
 @Entity
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-public class Project {
+public class Project extends BaseTimeEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

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
@@ -11,13 +11,14 @@
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.cotato.csquiz.common.entity.BaseTimeEntity;
 import org.cotato.csquiz.common.entity.S3Info;
 import org.cotato.csquiz.domain.generation.enums.ProjectImageType;
 
 @Entity
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-public class ProjectImage {
+public class ProjectImage extends BaseTimeEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -49,15 +50,15 @@ public static ProjectImage logoImage(S3Info s3Info, Long projectId) {
                 ProjectImageType.LOGO,
                 s3Info,
                 projectId,
-                1);
+                0);
     }
 
     public static ProjectImage thumbnailImage(S3Info s3Info, Long projectId) {
         return new ProjectImage(
                 ProjectImageType.THUMBNAIL,
                 s3Info,
                 projectId,
-                1);
+                0);
     }
 
     public static ProjectImage detailImage(S3Info imageInfo, Long projectId, int imageOrder) {

diff --git a/src/main/java/org/cotato/csquiz/domain/generation/entity/ProjectMember.java b/src/main/java/org/cotato/csquiz/domain/generation/entity/ProjectMember.java
@@ -11,12 +11,13 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.cotato.csquiz.common.entity.BaseTimeEntity;
 import org.cotato.csquiz.domain.auth.enums.MemberPosition;
 
 @Entity
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-public class ProjectMember {
+public class ProjectMember extends BaseTimeEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

diff --git a/src/main/java/org/cotato/csquiz/domain/generation/repository/ProjectImageRepository.java b/src/main/java/org/cotato/csquiz/domain/generation/repository/ProjectImageRepository.java
@@ -8,4 +8,6 @@
 public interface ProjectImageRepository extends JpaRepository<ProjectImage, Long> {
     List<ProjectImage> findAllByProjectId(Long projectId);
     List<ProjectImage> findAllByProjectIdInAndProjectImageType(List<Long> projectIds, ProjectImageType projectImageType);
-}
+
+    boolean existsByProjectIdAndProjectImageType(Long projectId, ProjectImageType projectImageType);
+}
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
@@ -8,9 +8,12 @@
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.cotato.csquiz.common.entity.S3Info;
+import org.cotato.csquiz.common.error.ErrorCode;
+import org.cotato.csquiz.common.error.exception.AppException;
 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,8 +29,11 @@ public class ProjectImageService {
 
     @Transactional
     public void createProjectImage(Long projectId, MultipartFile logoImage, MultipartFile thumbNailImage,
-                                   List<MultipartFile> detailImages)
-            throws ImageException {
+                                   List<MultipartFile> detailImages) throws ImageException {
+
+        validateLogoImageExistence(projectId);
+        validateThumbNailImageExistence(projectId);
+
         List<ProjectImage> newImages = new ArrayList<>();
 
         File webpLogoImage = convertToWebp(convert(logoImage));
@@ -39,8 +45,8 @@ public void createProjectImage(Long projectId, MultipartFile logoImage, Multipar
         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);
+            for (int orderIndex = 0; orderIndex < detailImages.size(); orderIndex++) {
+                MultipartFile detailImage = detailImages.get(orderIndex);
                 File webpDetailImage = convertToWebp(convert(detailImage));
                 S3Info detailImageInfo = s3Uploader.uploadFiles(webpDetailImage, PROJECT_IMAGE);
                 newImages.add(ProjectImage.detailImage(detailImageInfo, projectId, orderIndex));
@@ -49,4 +55,16 @@ public void createProjectImage(Long projectId, MultipartFile logoImage, Multipar
 
         projectImageRepository.saveAll(newImages);
     }
+
+    private void validateThumbNailImageExistence(Long projectId) {
+        if (projectImageRepository.existsByProjectIdAndProjectImageType(projectId, ProjectImageType.THUMBNAIL)) {
+            throw new AppException(ErrorCode.THUMBNAIL_IMAGE_EXIST);
+        }
+    }
+
+    private void validateLogoImageExistence(Long projectId) {
+        if (projectImageRepository.existsByProjectIdAndProjectImageType(projectId, ProjectImageType.LOGO)) {
+            throw new AppException(ErrorCode.LOGO_IMAGE_EXIST);
+        }
+    }
 }