[fix/#94] Dto mapper로직 추가

Author: seokbeom00

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

@@ -1,5 +1,6 @@
 package com.moplus.moplus_server.client.submit.dto.response;
 
+import com.moplus.moplus_server.domain.problem.domain.problem.Problem;
 import lombok.Builder;
 
 @Builder
@@ -12,16 +13,14 @@ public record CommentaryGetResponse(
         String seniorTipImageUrl,
         PrescriptionResponse prescription
 ) {
-    public static CommentaryGetResponse of(int problemNumber, String answer, String mainAnalysisImageUrl,
-                                           String mainHandwritingExplanationImageUrl, String readingTipImageUrl,
-                                           String seniorTipImageUrl, PrescriptionResponse prescription) {
+    public static CommentaryGetResponse of(int problemNumber, Problem problem, PrescriptionResponse prescription) {
         return CommentaryGetResponse.builder()
                 .problemNumber(problemNumber)
-                .answer(answer)
-                .mainAnalysisImageUrl(mainAnalysisImageUrl)
-                .mainHandwritingExplanationImageUrl(mainHandwritingExplanationImageUrl)
-                .readingTipImageUrl(readingTipImageUrl)
-                .seniorTipImageUrl(seniorTipImageUrl)
+                .answer(problem.getAnswer())
+                .mainAnalysisImageUrl(problem.getMainAnalysisImageUrl())
+                .mainHandwritingExplanationImageUrl(problem.getMainHandwritingExplanationImageUrl())
+                .readingTipImageUrl(problem.getReadingTipImageUrl())
+                .seniorTipImageUrl(problem.getSeniorTipImageUrl())
                 .prescription(prescription)
                 .build();
     }

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

@@ -1,6 +1,7 @@
 package com.moplus.moplus_server.client.submit.dto.response;
 
 import com.moplus.moplus_server.client.submit.domain.ProblemSubmitStatus;
+import com.moplus.moplus_server.domain.problem.domain.problem.Problem;
 import java.util.List;
 import lombok.Builder;
 
@@ -10,10 +11,10 @@ public record ProblemDetailResponse(
         List<String> prescriptionImageUrls,
         ProblemSubmitStatus submitStatus
 ) {
-    public static ProblemDetailResponse of(String imageUrl, List<String> prescriptionImageUrls, ProblemSubmitStatus submitStatus) {
+    public static ProblemDetailResponse of(Problem problem, ProblemSubmitStatus submitStatus) {
         return ProblemDetailResponse.builder()
-                .imageUrl(imageUrl)
-                .prescriptionImageUrls(prescriptionImageUrls)
+                .imageUrl(problem.getMainProblemImageUrl())
+                .prescriptionImageUrls(problem.getPrescriptionImageUrls())
                 .submitStatus(submitStatus)
                 .build();
     }

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

@@ -47,8 +47,7 @@ public CommentaryGetResponse getCommentary(Long publishId, Long problemId) {
         // 문항 해설 생성
         Problem problem = problemRepository.findByIdElseThrow(problemId);
         ProblemDetailResponse mainProblem = ProblemDetailResponse.of(
-                problem.getMainProblemImageUrl(),
-                problem.getPrescriptionImageUrls(),
+                problem,
                 problemSubmit.getStatus()
         );
 
@@ -74,11 +73,7 @@ public CommentaryGetResponse getCommentary(Long publishId, Long problemId) {
 
         return CommentaryGetResponse.of(
                 number + 1,
-                problem.getAnswer(),
-                problem.getMainAnalysisImageUrl(),
-                problem.getMainHandwritingExplanationImageUrl(),
-                problem.getReadingTipImageUrl(),
-                problem.getSeniorTipImageUrl(),
+                problem,
                 prescription
         );
     }

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

@@ -137,15 +137,23 @@ public ChildProblemClientGetResponse getChildProblem(Long publishId, Long proble
         ChildProblemSubmit childProblemSubmit = childProblemSubmitRepository.findByMemberIdAndPublishIdAndChildProblemIdElseThrow(
                 memberId, publishId, childProblemId);
 
-        int sequence = 0;
+        int childProblemNumber = 0;
         for (int i = 0; i < problem.getChildProblems().size(); i++) {
             if (problem.getChildProblems().get(i).getId().equals(childProblemId)) {
-                sequence = i + 1;
+                childProblemNumber = i + 1;
                 break;
             }
         }
 
-        return ChildProblemClientGetResponse.of(problem.getNumber(), sequence, childProblem.getImageUrl(), childProblemSubmit.getStatus());
+        // 문항 번호 추출
+        ProblemSet problemSet = problemSetRepository.findByIdElseThrow(publish.getProblemSetId());
+        List<Long> problemIds = problemSet.getProblemIds();
+        int problemNumber = problemIds.indexOf(problemId);
+        if (problemNumber == -1) {
+            throw new NotFoundException(ErrorCode.PROBLEM_NOT_FOUND_IN_PROBLEM_SET);
+        }
+
+        return ChildProblemClientGetResponse.of(problemNumber + 1, childProblemNumber + 1, childProblem.getImageUrl(), childProblemSubmit.getStatus());
     }
 
     private void denyAccessToFuturePublish(Publish publish){