Merge pull request #65 from team-MoPlus/hotfix/#54

Hotfix/#54 문항 변경사항 반영

Author: sejoon00

src/main/generated/com/moplus/moplus_server/domain/problem/service/mapper/ChildProblemMapperImpl.java

@@ -10,7 +10,7 @@
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2025-02-18T17:01:34+0900",
+    date = "2025-02-20T02:36:18+0900",
     comments = "version: 1.6.3, compiler: javac, environment: Java 17.0.10 (JetBrains s.r.o.)"
 )
 @Component

src/main/generated/com/moplus/moplus_server/domain/problem/service/mapper/ProblemMapperImpl.java

@@ -15,7 +15,7 @@
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2025-02-18T21:41:47+0900",
+    date = "2025-02-20T02:36:19+0900",
     comments = "version: 1.6.3, compiler: javac, environment: Java 17.0.10 (JetBrains s.r.o.)"
 )
 @Component

src/main/generated/com/moplus/moplus_server/domain/v0/TestResult/entity/QIncorrectProblem.java

@@ -37,7 +37,7 @@ public class QIncorrectProblem extends EntityPathBase<IncorrectProblem> {
 
     public final NumberPath<Long> practiceTestId = createNumber("practiceTestId", Long.class);
 
-    public final NumberPath<Long> problemId = createNumber("problemCustomId", Long.class);
+    public final NumberPath<Long> problemId = createNumber("problemId", Long.class);
 
     public final StringPath problemNumber = createString("problemNumber");
 

src/main/generated/com/moplus/moplus_server/domain/v0/practiceTest/domain/QProblemImageForTest.java

@@ -25,7 +25,7 @@ public class QProblemImageForTest extends EntityPathBase<ProblemImageForTest> {
 
     public final StringPath imageUrl = createString("imageUrl");
 
-    public final NumberPath<Long> problemId = createNumber("problemCustomId", Long.class);
+    public final NumberPath<Long> problemId = createNumber("problemId", Long.class);
 
     public QProblemImageForTest(String variable) {
         super(ProblemImageForTest.class, forVariable(variable));

src/main/java/com/moplus/moplus_server/domain/problem/controller/ImageUploadController.java

@@ -24,7 +24,7 @@ public class ImageUploadController {
     @Operation(summary = "이미지 업로드를 위한 presigned URL 발급")
     @GetMapping("/problem/{problemId}/presigned-url")
     public ResponseEntity<PresignedUrlResponse> getProblemImagePresignedUrl(
-            @PathVariable("problemId") String problemId,
+            @PathVariable("problemId") Long problemId,
             @RequestParam(value = "image-type") ProblemImageType imageType) {
         String presignedUrl = imageUploadService.generateProblemImagePresignedUrl(problemId, imageType);
         return ResponseEntity.ok(PresignedUrlResponse.of(presignedUrl));

src/main/java/com/moplus/moplus_server/domain/problem/domain/Answer.java

@@ -31,7 +31,7 @@ private void validateByType(String answer, AnswerType answerType) {
                 throw new InvalidValueException(ErrorCode.INVALID_MULTIPLE_CHOICE_ANSWER);
             }
         }
-        if (answerType == AnswerType.SHORT_NUMBER_ANSWER) {
+        if (answerType == AnswerType.SHORT_ANSWER) {
             try {
                 int numericAnswer = Integer.parseInt(answer);
                 if (numericAnswer < 0 || numericAnswer > 999) {

src/main/java/com/moplus/moplus_server/domain/problem/domain/childProblem/ChildProblem.java

@@ -54,7 +54,7 @@ public ChildProblem(Long id, String imageUrl, AnswerType answerType, String answ
     public static ChildProblem createEmptyChildProblem() {
         return ChildProblem.builder()
                 .imageUrl("")
-                .answerType(AnswerType.SHORT_STRING_ANSWER)
+                .answerType(AnswerType.SHORT_ANSWER)
                 .answer("")
                 .conceptTagIds(Set.of())
                 .build();

src/main/java/com/moplus/moplus_server/domain/problem/domain/problem/AnswerType.java

@@ -5,33 +5,8 @@
 @RequiredArgsConstructor
 public enum AnswerType {
     MULTIPLE_CHOICE("객관식"),
-    SHORT_NUMBER_ANSWER("주관식_숫자"),
-    SHORT_STRING_ANSWER("주관식_문자");
+    SHORT_ANSWER("주관식");
 
 
     private final String name;
-
-    public static AnswerType getTypeForProblem(String subject, int number) {
-
-        // 미적분, 기하, 확률과 통계
-        if (subject.equals("미적분") || subject.equals("기하") || subject.equals("확률과통계")) {
-            if ((number >= 1 && number <= 15) || (number >= 23 && number <= 28)) {
-                return MULTIPLE_CHOICE;
-            } else if ((number >= 16 && number <= 22) || number == 29 || number == 30) {
-                return SHORT_NUMBER_ANSWER;
-            }
-        }
-
-        // 고1, 고2
-        if (subject.equals("고1") || subject.equals("고2")) {
-            if (number >= 1 && number <= 21) {
-                return MULTIPLE_CHOICE;
-            } else if (number >= 22 && number <= 30) {
-                return SHORT_NUMBER_ANSWER;
-            }
-        }
-
-        // 기본값: 객관식
-        return MULTIPLE_CHOICE;
-    }
 }

src/main/java/com/moplus/moplus_server/domain/problem/dto/request/ChildProblemPostRequest.java

@@ -1,12 +1,14 @@
 package com.moplus.moplus_server.domain.problem.dto.request;
 
 import com.moplus.moplus_server.domain.problem.domain.problem.AnswerType;
+import jakarta.validation.constraints.NotNull;
 import java.util.Set;
 
 public record ChildProblemPostRequest(
         String imageUrl,
         AnswerType answerType,
         String answer,
+        @NotNull(message = "컬렉션 값은 필수입니다.")
         Set<Long> conceptTagIds,
         int sequence
 ) {

src/main/java/com/moplus/moplus_server/domain/problem/dto/request/ChildProblemUpdateRequest.java

@@ -1,13 +1,15 @@
 package com.moplus.moplus_server.domain.problem.dto.request;
 
 import com.moplus.moplus_server.domain.problem.domain.problem.AnswerType;
+import jakarta.validation.constraints.NotNull;
 import java.util.Set;
 
 public record ChildProblemUpdateRequest(
         Long id,
         String imageUrl,
         AnswerType answerType,
         String answer,
+        @NotNull(message = "컬렉션 값은 필수입니다.")
         Set<Long> conceptTagIds
 ) {
 }