[fix/#94] 문항 번호 sequence 기준으로 조회

Author: seokbeom00

src/main/java/com/moplus/moplus_server/client/submit/dto/response/ProblemClientGetResponse.java

@@ -15,9 +15,9 @@ public record ProblemClientGetResponse(
         ProblemSubmitStatus status,
         List<ChildProblemSubmitStatus> childProblemStatuses
 ) {
-    public static ProblemClientGetResponse of(Problem problem, ProblemSubmitStatus status, List<ChildProblemSubmitStatus> childProblemStatuses) {
+    public static ProblemClientGetResponse of(Problem problem, ProblemSubmitStatus status, List<ChildProblemSubmitStatus> childProblemStatuses, int number) {
         return ProblemClientGetResponse.builder()
-                .number(problem.getNumber())
+                .number(number)
                 .imageUrl(problem.getMainProblemImageUrl())
                 .status(status)
                 .childProblemStatuses(childProblemStatuses)

src/main/java/com/moplus/moplus_server/client/submit/service/ClientGetService.java

@@ -20,13 +20,16 @@
 import com.moplus.moplus_server.domain.problem.domain.problem.Problem;
 import com.moplus.moplus_server.domain.problem.repository.ChildProblemRepository;
 import com.moplus.moplus_server.domain.problem.repository.ProblemRepository;
+import com.moplus.moplus_server.domain.problemset.domain.ProblemSet;
 import com.moplus.moplus_server.domain.problemset.repository.ProblemSetRepository;
 import com.moplus.moplus_server.domain.publish.repository.PublishRepository;
 import com.moplus.moplus_server.global.error.exception.ErrorCode;
 import com.moplus.moplus_server.global.error.exception.InvalidValueException;
+import com.moplus.moplus_server.global.error.exception.NotFoundException;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
+import javax.swing.undo.CannotUndoException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -74,8 +77,16 @@ public CommentaryGetResponse getCommentary(Long publishId, Long problemId) {
         // 처방 정보 생성
         PrescriptionResponse prescription = PrescriptionResponse.of(childProblem, mainProblem);
 
+        // 문항 번호 추출
+        ProblemSet problemSet = problemSetRepository.findByIdElseThrow(publish.getProblemSetId());
+        List<Long> problemIds = problemSet.getProblemIds();
+        int number = problemIds.indexOf(problemId);
+        if (number == -1) {
+            throw new NotFoundException(ErrorCode.PROBLEM_NOT_FOUND_IN_PROBLEM_SET);
+        }
+
         return CommentaryGetResponse.of(
-                problem.getNumber(),
+                number + 1,
                 problem.getAnswer(),
                 problem.getMainAnalysisImageUrl(),
                 problem.getMainHandwritingExplanationImageUrl(),
@@ -138,6 +149,14 @@ public ProblemClientGetResponse getProblem(Long publishId, Long problemId) {
         Publish publish = publishRepository.findByIdElseThrow(publishId);
         denyAccessToFuturePublish(publish);
 
+        // 문항 번호 추출
+        ProblemSet problemSet = problemSetRepository.findByIdElseThrow(publish.getProblemSetId());
+        List<Long> problemIds = problemSet.getProblemIds();
+        int number = problemIds.indexOf(problemId);
+        if (number == -1) {
+            throw new NotFoundException(ErrorCode.PROBLEM_NOT_FOUND_IN_PROBLEM_SET);
+        }
+
         // 문항조회
         Problem problem = problemRepository.findByIdElseThrow(problemId);
 
@@ -155,7 +174,7 @@ public ProblemClientGetResponse getProblem(Long publishId, Long problemId) {
                 .map(ChildProblemSubmit::getStatus)
                 .toList();
 
-        return ProblemClientGetResponse.of(problem, problemSubmit.getStatus(), childProblemStatuses);
+        return ProblemClientGetResponse.of(problem, problemSubmit.getStatus(), childProblemStatuses, number + 1);
     }
 
     @Transactional(readOnly = true)

src/main/java/com/moplus/moplus_server/global/error/exception/ErrorCode.java

@@ -34,6 +34,7 @@ public enum ErrorCode {
     INVALID_SHORT_NUMBER_ANSWER(HttpStatus.BAD_REQUEST, "주관식 문항의 정답은 0~999 사이의 숫자여야 합니다"),
     INVALID_CONFIRM_PROBLEM(HttpStatus.BAD_REQUEST, "유효하지 않은 문항들 : "),
     INVALID_DIFFICULTY(HttpStatus.BAD_REQUEST, "난이도는 1~10 사이의 숫자여야 합니다"),
+    PROBLEM_NOT_FOUND_IN_PROBLEM_SET(HttpStatus.NOT_FOUND, "해당 날짜에 발행된 문항세트에 존재하는 문항이 아닙니다."),
 
     //새끼 문항
     CHILD_PROBLEM_NOT_FOUND(HttpStatus.NOT_FOUND, "해당 새끼 문제를 찾을 수 없습니다"),