🔧 chore : 충돌 해결

Author: silver-eunjoo

backend/src/main/java/io/f1/backend/domain/question/api/QuestionController.java

@@ -21,9 +21,15 @@ public class QuestionController {
     private final QuestionService questionService;
 
     @PutMapping("/{questionId}")
-    public ResponseEntity<Void> updateQuestion(
-            @PathVariable Long questionId, @RequestBody QuestionUpdateRequest request) {
-        questionService.updateQuestion(questionId, request);
+    public ResponseEntity<Void> updateQuestion(@PathVariable Long questionId, @RequestBody QuestionUpdateRequest request) {
+
+        if(request.content()!=null) {
+            questionService.updateQuestionContent(questionId, request.content());
+        }
+
+        if(request.content()!=null) {
+            questionService.updateQuestionAnswer(questionId, request.answer());
+        }
 
         return ResponseEntity.noContent().build();
     }

backend/src/main/java/io/f1/backend/domain/question/app/QuestionService.java

@@ -38,24 +38,29 @@ public void saveQuestion(Quiz quiz, QuestionRequest request) {
     }
 
     @Transactional
-    public void updateQuestion(Long questionId, QuestionUpdateRequest request) {
+    public void updateQuestionContent(Long questionId, String content) {
+
+        validateContent(content);
 
         Question question =
                 questionRepository
                         .findById(questionId)
                         .orElseThrow(() -> new NoSuchElementException("존재하지 않는 문제입니다."));
 
         TextQuestion textQuestion = question.getTextQuestion();
+        textQuestion.changeContent(content);
+    }
 
-        if (request.content() != null) {
-            validateContent(request.content());
-            textQuestion.changeContent(request.content());
-        }
+    @Transactional
+    public void updateQuestionAnswer(Long questionId, String answer) {
+
+        validateAnswer(answer);
+
+        Question question = questionRepository.findById(questionId)
+            .orElseThrow(() -> new NoSuchElementException("존재하지 않는 문제입니다."));
+
+        question.changeAnswer(answer);
 
-        if (request.answer() != null) {
-            validateAnswer(request.answer());
-            question.changeAnswer(request.answer());
-        }
     }
 
     @Transactional