Merge pull request #81 from capstone-five-ai/dev

fix: AI 생성 문제 기반의 CategorizedProblem 수정 버그 해결
capstone-five-ai · Jul 10, 2024 · c6af5b7 · c6af5b7
2 parents 5d713fb + 1b9afb4
commit c6af5b7
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/src/main/java/com/app/domain/categorizedproblem/service/CategorizedProblemService.java b/src/main/java/com/app/domain/categorizedproblem/service/CategorizedProblemService.java
@@ -45,8 +45,6 @@ public class CategorizedProblemService {
 
     private final MemberSavedProblemMapper memberSavedProblemMapper;
 
-    private final AiGeneratedProblemService aiGeneratedProblemService;
-
     private final CategorizedProblemRepository categorizedProblemRepository;
 
     private final ProblemService problemService;
@@ -237,7 +235,7 @@ public MemberSavedSummaryDto.pdfResponse createCategorizedProblemsPdf(Long categ
 
     public CategorizedProblem updateCategorizedProblem(Long categorizedProblemId, MemberSavedProblemDto.Patch problemPatchDto) {
         CategorizedProblem categorizedProblem = findVerifiedCategorizedProblemByCategorizedProblemId(categorizedProblemId);
-        memberSavedProblemService.updateProblem(
+        problemService.updateProblem(
                 memberSavedProblemMapper.problemPatchDtoToProblem(problemPatchDto),
                 categorizedProblem.getProblem().getProblemId()
         );

diff --git a/src/main/java/com/app/domain/problem/service/ProblemService.java b/src/main/java/com/app/domain/problem/service/ProblemService.java
@@ -4,6 +4,7 @@
 import com.app.domain.problem.repository.ProblemRepository;
 import com.app.global.error.ErrorCode;
 import com.app.global.error.exception.EntityNotFoundException;
+import java.util.Optional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -15,6 +16,22 @@ public class ProblemService {
 
     private final ProblemRepository problemRepository;
 
+    public Problem updateProblem(Problem problem, Long problemId){
+        Problem preProblem = findVerifiedProblemByProblemId(problemId);
+        Optional.ofNullable(problem.getProblemName())
+                .ifPresent(problemName -> preProblem.updateProblemName(problemName));
+        Optional.ofNullable(problem.getProblemAnswer())
+                .ifPresent(problemAnswer -> preProblem.updateProblemAnswer(problemAnswer));
+        Optional.ofNullable(problem.getProblemCommentary())
+                .ifPresent(problemCommentary -> preProblem.updateProblemCommentary(problemCommentary));
+        Optional.ofNullable(problem.getProblemChoices())
+                .ifPresent(problemChoices ->{
+                    preProblem.getProblemChoices().clear();
+                    preProblem.getProblemChoices().addAll(problemChoices);
+                });
+        return problemRepository.save(preProblem);
+    }
+
     @Transactional(readOnly = true)
     public Problem findVerifiedProblemByProblemId(Long problemId) {
         return problemRepository.findById(problemId)