[feat]문제 이미지 업로드 기능 추가

Author: sejoon00

build.gradle

@@ -41,6 +41,9 @@ dependencies {
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
     implementation 'io.swagger.core.v3:swagger-core-jakarta:2.2.15'
 
+    //s3
+    implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
+
 }
 
 tasks.named('test') {

docker-compose-dev.yml

@@ -13,6 +13,13 @@ services:
       - SPRING_DATASOURCE_USERNAME=${MYSQL_USERNAME}
       - SPRING_DATASOURCE_PASSWORD=${MYSQL_PASSWORD}
       - SENTRY_DSN=${SENTRY_DSN}
+      - CLOUD_AWS_S3_BUCKET=${S3_BUCKET}
+      - CLOUD_AWS_S3_SIGNATURE_VERSION=AWS4-HMAC-SHA256
+      - CLOUD_AWS_CREDENTIALS_ACCESS_KEY=${AWS_ACCESS_KEY}
+      - CLOUD_AWS_CREDENTIALS_SECRET_KEY=${AWS_SECRET_KEY}
+      - CLOUD_AWS_REGION_STATIC=${AWS_REGION}
+      - CLOUD_AWS_REGION_AUTO=false
+      - CLOUD_AWS_STACK_AUTO=false
     depends_on:
       - mysql
     networks:

src/main/java/com/moplus/moplus_server/domain/practiceTest/api/admin/PracticeTestAdminController.java

@@ -31,23 +31,6 @@ public String listPracticeTests(Model model) {
         return "practiceTestList";
     }
 
-    @PostMapping("/submitAnswers")
-    @Operation(summary = "모의고사 문제 답안 생성 요청")
-    public String submitAnswers(@RequestParam("practiceTestId") Long practiceTestId, HttpServletRequest request) {
-        PracticeTest practiceTest = practiceTestService.getPracticeTestById(practiceTestId);
 
-        problemService.saveProblems(practiceTest, request);
-
-        return "redirect:/practiceTests";
-    }
-
-    @PostMapping("/submitAnswers/{id}")
-    @Operation(summary = "모의고사 문제 답안 수정 요청")
-    public String updateAnswers(@PathVariable("id") Long id, HttpServletRequest request) {
-        PracticeTest practiceTest = practiceTestService.getPracticeTestById(id);
-        problemService.updateProblems(practiceTest, request);
-
-        return "redirect:/practiceTests";
-    }
 
 }

src/main/java/com/moplus/moplus_server/domain/practiceTest/api/admin/PracticeTestCreateController.java

@@ -1,13 +1,10 @@
 package com.moplus.moplus_server.domain.practiceTest.api.admin;
 
 import com.moplus.moplus_server.domain.practiceTest.dto.admin.request.PracticeTestRequest;
-import com.moplus.moplus_server.domain.practiceTest.dto.client.response.ProblemGetResponse;
-import com.moplus.moplus_server.domain.practiceTest.domain.PracticeTest;
 import com.moplus.moplus_server.domain.practiceTest.service.admin.PracticeTestAdminService;
 import com.moplus.moplus_server.domain.practiceTest.service.client.PracticeTestService;
 import com.moplus.moplus_server.domain.practiceTest.service.client.ProblemService;
 import io.swagger.v3.oas.annotations.Operation;
-import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;

src/main/java/com/moplus/moplus_server/domain/practiceTest/api/admin/ProblemAdminController.java

@@ -0,0 +1,41 @@
+package com.moplus.moplus_server.domain.practiceTest.api.admin;
+
+import com.moplus.moplus_server.domain.practiceTest.domain.PracticeTest;
+import com.moplus.moplus_server.domain.practiceTest.service.client.PracticeTestService;
+import com.moplus.moplus_server.domain.practiceTest.service.client.ProblemService;
+import io.swagger.v3.oas.annotations.Operation;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@Controller
+@RequestMapping("/admin/practiceTests")
+@RequiredArgsConstructor
+public class ProblemAdminController {
+
+    private final ProblemService problemService;
+    private final PracticeTestService practiceTestService;
+
+    @PostMapping("/submitAnswers")
+    @Operation(summary = "모의고사 문제 답안 생성 요청")
+    public String submitAnswers(@RequestParam("practiceTestId") Long practiceTestId, HttpServletRequest request) {
+        PracticeTest practiceTest = practiceTestService.getPracticeTestById(practiceTestId);
+
+        problemService.saveProblems(practiceTest, request);
+
+        return String.format("redirect:/admin/practiceTests/imageUploadPage/%d", practiceTestId);
+    }
+
+    @PostMapping("/submitAnswers/{id}")
+    @Operation(summary = "모의고사 문제 답안 수정 요청")
+    public String updateAnswers(@PathVariable("id") Long practiceTestId, HttpServletRequest request) {
+        PracticeTest practiceTest = practiceTestService.getPracticeTestById(practiceTestId);
+        problemService.updateProblems(practiceTest, request);
+
+        return String.format("redirect:/admin/practiceTests/imageUploadPage/%d", practiceTestId);
+    }
+}

src/main/java/com/moplus/moplus_server/domain/practiceTest/api/admin/ProblemImageUploadController.java

@@ -0,0 +1,40 @@
+package com.moplus.moplus_server.domain.practiceTest.api.admin;
+
+import com.moplus.moplus_server.domain.practiceTest.service.admin.ProblemImageUploadService;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+@Controller
+@RequestMapping("/admin/practiceTests")
+@RequiredArgsConstructor
+public class ProblemImageUploadController {
+
+    private final ProblemImageUploadService problemImageUploadService;
+
+    @GetMapping("/imageUploadPage/{practiceTestId}")
+    @Operation(summary = "문제 이미지 업로드 페이지 HTML 요청")
+    public String showImageUploadPage(@PathVariable("practiceTestId") Long practiceTestId, Model model) {
+        problemImageUploadService.setProblemImagesByPracticeTestId(practiceTestId, model);
+        model.addAttribute("practiceTestId", practiceTestId);
+
+        return "imageUploadPage";
+    }
+
+    @PostMapping("/uploadImage/{problemId}")
+    @Operation(summary = "문제 이미지 업로드 요청")
+    public String uploadImage(@RequestParam("practiceTestId") Long practiceTestId, @PathVariable("problemId") Long problemId, @RequestParam("image") MultipartFile image) {
+        // 이미지 업로드 처리
+        problemImageUploadService.uploadImage(practiceTestId ,problemId, image);
+
+        return "redirect:/admin/practiceTests/imageUploadPage/" + practiceTestId;
+    }
+}

src/main/java/com/moplus/moplus_server/domain/practiceTest/api/client/PracticeTestController.java

@@ -19,7 +19,6 @@
 public class PracticeTestController {
 
     private final PracticeTestService practiceTestService;
-    private final OptimisticLockPracticeTestFacade optimisticLockPracticeTestFacade;
 
     @GetMapping("/all")
     @Operation(summary = "모든 모의고사 목록 조회 (검색용)")
@@ -30,7 +29,7 @@ public ResponseEntity<List<PracticeTestGetResponse>> getAllPracticeTests() {
     @PutMapping("/{practiceTestid}/viewCount")
     @Operation(summary = "조회수 업데이트하기")
     public ResponseEntity<Void> updateViewCount(@PathVariable("practiceTestid") Long id) throws InterruptedException {
-        optimisticLockPracticeTestFacade.updateViewCount(id);
+        practiceTestService.updateViewCount(id);
         return ResponseEntity.ok().body(null);
     }
 

src/main/java/com/moplus/moplus_server/domain/practiceTest/domain/FileExtension.java

@@ -0,0 +1,28 @@
+package com.moplus.moplus_server.domain.practiceTest.domain;
+
+import com.moplus.moplus_server.global.error.exception.ErrorCode;
+import com.moplus.moplus_server.global.error.exception.NotFoundException;
+import java.util.Arrays;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum FileExtension {
+    JPEG("jpeg"),
+    JPG("jpg"),
+    PNG("png"),
+    PDF("pdf"),
+    ;
+
+    private final String uploadExtension;
+
+    public static FileExtension from(String uploadExtension) {
+        return Arrays.stream(values())
+                .filter(
+                        imageFileExtension ->
+                                imageFileExtension.uploadExtension.equals(uploadExtension))
+                .findFirst()
+                .orElseThrow(() -> new NotFoundException(ErrorCode.IMAGE_FILE_EXTENSION_NOT_FOUND));
+    }
+}

src/main/java/com/moplus/moplus_server/domain/practiceTest/domain/Problem.java

@@ -1,6 +1,7 @@
 package com.moplus.moplus_server.domain.practiceTest.domain;
 
 import com.moplus.moplus_server.global.common.BaseEntity;
+import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
@@ -11,6 +12,7 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToOne;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -35,13 +37,21 @@ public class Problem extends BaseEntity {
     private String subunit;
     double correctRate;
 
-    @ManyToOne(fetch = FetchType.LAZY)
+    @Enumerated(EnumType.STRING)
+    ProblemRating problemRating;
+
+    @ManyToOne()
     @JoinColumn(name = "practice_test_id")
     private PracticeTest practiceTest;
 
+    @OneToOne(cascade = CascadeType.REMOVE, fetch = FetchType.LAZY, orphanRemoval = true)
+    @JoinColumn(name = "problem_image_id")
+    private ProblemImage image;
+
     @Builder
     public Problem(String problemNumber, AnswerFormat answerFormat, String answer, int point, Long incorrectNum,
-        String conceptType, String unit, String subunit, PracticeTest practiceTest, double correctRate) {
+                   String conceptType, String unit, String subunit, double correctRate, ProblemRating problemRating,
+                   PracticeTest practiceTest) {
         this.problemNumber = problemNumber;
         this.answerFormat = answerFormat;
         this.answer = answer;
@@ -50,8 +60,18 @@ public Problem(String problemNumber, AnswerFormat answerFormat, String answer, i
         this.conceptType = conceptType;
         this.unit = unit;
         this.subunit = subunit;
-        this.practiceTest = practiceTest;
         this.correctRate = correctRate;
+        this.problemRating = problemRating;
+        this.practiceTest = practiceTest;
+    }
+
+
+    public void addImage(ProblemImage image) {
+        this.image = image;
+    }
+
+    public void calculateProblemRating(){
+        this.problemRating = ProblemRating.findProblemRating(this);
     }
 
     public void updateAnswer(String answer) {

src/main/java/com/moplus/moplus_server/domain/practiceTest/domain/ProblemImage.java

@@ -0,0 +1,36 @@
+package com.moplus.moplus_server.domain.practiceTest.domain;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Entity
+@Getter
+@NoArgsConstructor
+public class ProblemImage {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "problem_image_id")
+    private Long id;
+
+    private String fileName;
+
+    private String imageUrl;
+
+    private Long problemId;
+
+    @Builder
+    public ProblemImage(String fileName, String imageUrl, Long problemId) {
+        this.fileName = fileName;
+        this.imageUrl = imageUrl;
+        this.problemId = problemId;
+    }
+}

src/main/java/com/moplus/moplus_server/domain/practiceTest/domain/ProblemRating.java

@@ -0,0 +1,32 @@
+package com.moplus.moplus_server.domain.practiceTest.domain;
+
+import java.util.Arrays;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum ProblemRating {
+
+    EXTREME("극상위권", 0, 30, "최상"),
+    TIER_1("1등급", 30, 50, "상"),
+    TIER_2("2등급", 50, 60, "중상"),
+    TIER_3("3등급", 60, 80, "중"),
+    TIER_4("4등급", 80, 90, "중하"),
+    OTHER("5등급 이하", 90, 100, "하"),
+    ;
+
+    private String rating;
+    private double startCorrectRateRange;
+    private double endCorrectRateRange;
+    private String difficultyLevel;
+
+    public static ProblemRating findProblemRating(Problem problem) {
+        return Arrays.stream(values())
+                .filter(problemRating -> problemRating.startCorrectRateRange <= problem.getCorrectRate()
+                        && problemRating.endCorrectRateRange > problem.getCorrectRate())
+                .findFirst()
+                .orElse(OTHER);
+    }
+}

src/main/java/com/moplus/moplus_server/domain/practiceTest/dto/admin/request/ProblemImageRequest.java

@@ -0,0 +1,20 @@
+package com.moplus.moplus_server.domain.practiceTest.dto.admin.request;
+
+import com.moplus.moplus_server.domain.practiceTest.domain.Problem;
+import lombok.Builder;
+
+@Builder
+public record ProblemImageRequest(
+        Long problemId,
+        String problemNumber,
+        String imageUrl
+) {
+
+    public static ProblemImageRequest of(Problem problem) {
+        return ProblemImageRequest.builder()
+                .problemId(problem.getId())
+                .problemNumber(problem.getProblemNumber())
+                .imageUrl(problem.getImage() != null ? problem.getImage().getImageUrl() : null)
+                .build();
+    }
+}

src/main/java/com/moplus/moplus_server/domain/practiceTest/repository/ProblemImageRepository.java

@@ -0,0 +1,11 @@
+package com.moplus.moplus_server.domain.practiceTest.repository;
+
+import com.moplus.moplus_server.domain.practiceTest.domain.ProblemImage;
+import java.util.Optional;
+import javax.swing.JPanel;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface ProblemImageRepository extends JpaRepository<ProblemImage, Long> {
+
+    Optional<ProblemImage> findByProblemId(Long problemId);
+}

src/main/java/com/moplus/moplus_server/domain/practiceTest/repository/ProblemRepository.java

@@ -1,9 +1,15 @@
 package com.moplus.moplus_server.domain.practiceTest.repository;
 
+import com.moplus.moplus_server.domain.practiceTest.domain.PracticeTest;
 import com.moplus.moplus_server.domain.practiceTest.domain.Problem;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.persistence.LockModeType;
 import java.util.List;
 import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Lock;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 public interface ProblemRepository extends JpaRepository<Problem, Long> {
 
@@ -12,4 +18,8 @@ public interface ProblemRepository extends JpaRepository<Problem, Long> {
     void deleteAllByPracticeTestId(Long id);
 
     Optional<Problem> findByProblemNumberAndPracticeTestId(String problemNumber, Long practiceTest_id);
+
+    @Lock(LockModeType.PESSIMISTIC_WRITE)
+    @Query("SELECT p FROM Problem p WHERE p.problemNumber = :problem_number AND p.practiceTest.id = :practice_test_id")
+    Optional<Problem> findByProblemNumberAndPracticeTestIdWithPessimisticLock(@Param("problem_number") String problemNumber,@Param("practice_test_id")  Long practiceTest_id);
 }