[refactor/#83] problem, childproblem 코드 리팩토링

Author: sejoon00

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-03-14T20:25:51+0900",
+    date = "2025-03-15T21:23:23+0900",
     comments = "version: 1.6.3, compiler: javac, environment: Java 17.0.10 (JetBrains s.r.o.)"
 )
 @Component

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

@@ -13,4 +13,12 @@ public enum ProblemType {
 
     private final String name;
     private final int code;
+
+    public boolean isCreationProblem() {
+        return this == CREATION_PROBLEM;
+    }
+
+    public boolean requiresPracticeTest() {
+        return !isCreationProblem();
+    }
 }

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

@@ -19,12 +19,6 @@ default void existsByIdElseThrow(Long id) {
         }
     }
 
-    default void existsByProblemAdminIdElseThrow(ProblemCustomId problemCustomId) {
-        if (!existsByProblemCustomId(problemCustomId)) {
-            throw new NotFoundException(ErrorCode.PROBLEM_NOT_FOUND);
-        }
-    }
-
     @Query("SELECT DISTINCT p FROM Problem p " +
             "LEFT JOIN FETCH p.childProblems c " +
             "WHERE p.id = :id")

src/main/java/com/moplus/moplus_server/domain/problem/service/ChildProblemService.java

@@ -17,23 +17,30 @@ public class ChildProblemService {
 
     @Transactional
     public Long createChildProblem(Long problemId) {
-        Problem problem = problemRepository.findByIdElseThrow(problemId);
-        if (problem.isConfirmed()) {
-            throw new InvalidValueException(ErrorCode.CHILD_PROBLEM_UPDATE_AFTER_CONFIRMED);
-        }
-
-        problem.addChildProblem(ChildProblem.createEmptyChildProblem());
-
-        return problemRepository.save(problem).getChildProblems().get(problem.getChildProblems().size() - 1).getId();
+        Problem problem = findAndValidateProblem(problemId);
+        ChildProblem newChildProblem = ChildProblem.createEmptyChildProblem();
+        problem.addChildProblem(newChildProblem);
+        
+        return getCreatedChildProblemId(problem);
     }
 
     @Transactional
     public void deleteChildProblem(Long problemId, Long childProblemId) {
+        Problem problem = findAndValidateProblem(problemId);
+        problem.deleteChildProblem(childProblemId);
+    }
+
+    private Problem findAndValidateProblem(Long problemId) {
         Problem problem = problemRepository.findByIdElseThrow(problemId);
         if (problem.isConfirmed()) {
             throw new InvalidValueException(ErrorCode.CHILD_PROBLEM_UPDATE_AFTER_CONFIRMED);
         }
-        problem.deleteChildProblem(childProblemId);
-        problemRepository.save(problem);
+        return problem;
+    }
+
+    private Long getCreatedChildProblemId(Problem problem) {
+        return problem.getChildProblems()
+            .get(problem.getChildProblems().size() - 1)
+            .getId();
     }
 }

src/main/java/com/moplus/moplus_server/domain/problem/service/ProblemSaveService.java

@@ -25,19 +25,32 @@ public class ProblemSaveService {
 
     @Transactional
     public ProblemPostResponse createProblem(ProblemPostRequest request) {
-        Problem problem;
-        if (request.problemType() != ProblemType.CREATION_PROBLEM) {
-            PracticeTestTag practiceTestTag = practiceTestRepository.findByIdElseThrow(request.practiceTestId());
-            ProblemCustomId problemCustomId = problemAdminIdService.nextId(request.number(), practiceTestTag,
-                    request.problemType());
+        PracticeTestTag practiceTestTag = getPracticeTestTag(request);
+        ProblemCustomId problemCustomId = createProblemCustomId(request);
+        Problem problem = createProblem(request, problemCustomId, practiceTestTag);
+        
+        return ProblemPostResponse.of(problemRepository.save(problem));
+    }
 
-            problem = problemMapper.from(request, problemCustomId, practiceTestTag);
-        } else {
-            ProblemCustomId problemCustomId = problemAdminIdService.nextId(request.problemType());
-            problem = problemMapper.from(request.problemType(), problemCustomId);
+    private Problem createProblem(ProblemPostRequest request, ProblemCustomId problemCustomId, PracticeTestTag practiceTestTag) {
+        if (request.problemType().isCreationProblem()) {
+            return problemMapper.from(request, problemCustomId, practiceTestTag);
         }
+        return problemMapper.from(request.problemType(), problemCustomId);
+    }
 
-        return ProblemPostResponse.of(problemRepository.save(problem));
+    private ProblemCustomId createProblemCustomId(ProblemPostRequest request) {
+        if (request.problemType().requiresPracticeTest()) {
+            PracticeTestTag practiceTestTag = practiceTestRepository.findByIdElseThrow(request.practiceTestId());
+            return problemAdminIdService.nextId(request.number(), practiceTestTag, request.problemType());
+        }
+        return problemAdminIdService.nextId(request.problemType());
     }
 
+    private PracticeTestTag getPracticeTestTag(ProblemPostRequest request) {
+        if (request.problemType().requiresPracticeTest()) {
+            return practiceTestRepository.findByIdElseThrow(request.practiceTestId());
+        }
+        return null;
+    }
 }

src/main/java/com/moplus/moplus_server/domain/problem/service/ProblemUpdateService.java

@@ -1,14 +1,13 @@
 package com.moplus.moplus_server.domain.problem.service;
 
+import com.moplus.moplus_server.admin.problem.dto.request.ProblemUpdateRequest;
+import com.moplus.moplus_server.admin.problem.dto.response.ProblemGetResponse;
 import com.moplus.moplus_server.domain.concept.repository.ConceptTagRepository;
 import com.moplus.moplus_server.domain.problem.domain.childProblem.ChildProblem;
 import com.moplus.moplus_server.domain.problem.domain.practiceTest.PracticeTestTag;
 import com.moplus.moplus_server.domain.problem.domain.problem.Problem;
 import com.moplus.moplus_server.domain.problem.domain.problem.ProblemAdminIdService;
 import com.moplus.moplus_server.domain.problem.domain.problem.ProblemCustomId;
-import com.moplus.moplus_server.admin.problem.dto.request.ProblemUpdateRequest;
-import com.moplus.moplus_server.admin.problem.dto.response.ProblemGetResponse;
-import com.moplus.moplus_server.domain.problem.domain.problem.ProblemType;
 import com.moplus.moplus_server.domain.problem.repository.PracticeTestTagRepository;
 import com.moplus.moplus_server.domain.problem.repository.ProblemRepository;
 import com.moplus.moplus_server.domain.problem.service.mapper.ChildProblemMapper;
@@ -33,15 +32,8 @@ public class ProblemUpdateService {
     public ProblemGetResponse updateProblem(Long problemId, ProblemUpdateRequest request) {
         conceptTagRepository.existsByIdElseThrow(request.conceptTagIds());
         Problem problem = problemRepository.findByIdElseThrow(problemId);
-        PracticeTestTag practiceTestTag = null;
-        ProblemCustomId problemCustomId = null;
-        if (request.problemType() != ProblemType.CREATION_PROBLEM) {
-            practiceTestTag = practiceTestRepository.findByIdElseThrow(request.practiceTestId());
-            problemCustomId = problemAdminIdService.nextId(request.number(), practiceTestTag,
-                    request.problemType());
-        } else {
-            problemCustomId = problemAdminIdService.nextId(request.problemType());
-        }
+        PracticeTestTag practiceTestTag = getPracticeTestTag(request);
+        ProblemCustomId problemCustomId = createProblemCustomId(request);
 
         Problem inputProblem = problemMapper.from(request, problemCustomId, practiceTestTag);
         problem.update(inputProblem);
@@ -57,4 +49,19 @@ private List<ChildProblem> changeToChildProblems(ProblemUpdateRequest request) {
                 .map(childProblemMapper::from)
                 .toList();
     }
+
+    private ProblemCustomId createProblemCustomId(ProblemUpdateRequest request) {
+        if (request.problemType().requiresPracticeTest()) {
+            PracticeTestTag practiceTestTag = practiceTestRepository.findByIdElseThrow(request.practiceTestId());
+            return problemAdminIdService.nextId(request.number(), practiceTestTag, request.problemType());
+        }
+        return problemAdminIdService.nextId(request.problemType());
+    }
+
+    private PracticeTestTag getPracticeTestTag(ProblemUpdateRequest request) {
+        if (request.problemType().requiresPracticeTest()) {
+            return practiceTestRepository.findByIdElseThrow(request.practiceTestId());
+        }
+        return null;
+    }
 }