refactor: AnswerPersistenceService 네이밍 및 구조 정리

Author: Woomin-Wang

src/main/java/io/wisoft/prepair/prepair_api/service/answer/AnswerPersistenceService.java

@@ -30,25 +30,55 @@
 @Slf4j
 @Service
 @RequiredArgsConstructor
+@Transactional
 public class AnswerPersistenceService {
 
     private final QuestionRepository questionRepository;
     private final AnswerRepository answerRepository;
     private final FeedbackRepository feedbackRepository;
     private final ObjectMapper objectMapper;
 
-    @Transactional
-    public AnswerSubmitResult saveAnswerAndFeedback(final UUID questionId, final UUID memberId, final String answer, final FeedbackResult result, final FeedbackDetail detail) {
+    public AnswerSubmitResult saveAnswerAndFeedback(final UUID questionId, final UUID memberId, final String answerText, final FeedbackResult result, final FeedbackDetail detail) {
         InterviewQuestion question = getQuestion(questionId, memberId);
         question.updateStatus(QuestionStatus.ANSWERED);
 
-        InterviewAnswer interviewAnswer = saveAnswer(answer, question);
-        InterviewFeedback feedback = saveFeedback(result, detail, interviewAnswer);
+        // 답변 + 피드백 저장
+        InterviewAnswer answer = saveAnswer(answerText, question);
+        InterviewFeedback feedback = saveTextFeedback(result, detail, answer);
+
+        // 조건부 UPDATE로 최초 답변 여부 원자적 판단 (race condition 방지)
         boolean firstAnswer = isFirstTodayAnswer(questionId, feedback.getScore());
 
+        // sendScore는 트랜잭션 외부에서 호출하므로 firstAnswer를 함께 반환
         return new AnswerSubmitResult(feedback, firstAnswer);
     }
 
+    public InterviewAnswer saveVideoAnswer(final UUID questionId, final UUID memberId) {
+        InterviewQuestion question = getQuestion(questionId, memberId);
+        question.updateStatus(QuestionStatus.ANSWERED);
+        return answerRepository.save(new InterviewAnswer(question, "", AnswerType.VIDEO, null));
+    }
+
+    public void updateMediaUrl(final UUID answerId, final String mediaUrl) {
+        InterviewAnswer interviewAnswer = getAnswer(answerId);
+        interviewAnswer.updateMediaUrl(mediaUrl);
+    }
+
+    public void updateAnswer(final UUID answerId, final String answer) {
+        InterviewAnswer interviewAnswer = getAnswer(answerId);
+        interviewAnswer.updateAnswer(answer);
+    }
+
+    public void saveVideoFeedback(final UUID answerId, final FeedbackResult result, final FeedbackDetail detail, final FeedbackType feedbackType) {
+        InterviewAnswer interviewAnswer = getAnswer(answerId);
+        feedbackRepository.save(new InterviewFeedback(interviewAnswer, serializeFeedback(detail), feedbackType, result.score()));
+    }
+
+    public void saveCombinedFeedback(final UUID answerId, final CombinedFeedbackResult result) {
+        InterviewAnswer interviewAnswer = getAnswer(answerId);
+        feedbackRepository.save(new InterviewFeedback(interviewAnswer, result.combineFeedback(), FeedbackType.COMBINED, result.score()));
+    }
+
     private InterviewQuestion getQuestion(UUID questionId, UUID memberId) {
         return questionRepository.findByIdAndMemberId(questionId, memberId)
                 .orElseThrow(() -> new BusinessException(ErrorCode.QUESTION_NOT_FOUND));
@@ -60,7 +90,7 @@ private InterviewAnswer saveAnswer(String answer, InterviewQuestion question) {
         );
     }
 
-    private InterviewFeedback saveFeedback(FeedbackResult result, FeedbackDetail detail, InterviewAnswer interviewAnswer) {
+    private InterviewFeedback saveTextFeedback(FeedbackResult result, FeedbackDetail detail, InterviewAnswer interviewAnswer) {
         return feedbackRepository.save(
                 new InterviewFeedback(interviewAnswer, serializeFeedback(detail), FeedbackType.TEXT, result.score())
         );
@@ -72,46 +102,9 @@ private boolean isFirstTodayAnswer(final UUID questionId, final Integer score) {
         return questionRepository.updateLatestScoreIfFirstTime(questionId, score, startOfDay, endOfDay) > 0;
     }
 
-    @Transactional
-    public InterviewAnswer createVideoAnswer(final UUID questionId, final UUID memberId) {
-        InterviewQuestion question = getQuestion(questionId, memberId);
-        question.updateStatus(QuestionStatus.ANSWERED);
-
-        return answerRepository.save(
-                new InterviewAnswer(question, "", AnswerType.VIDEO, null));
-    }
-
-    @Transactional
-    public void updateMediaUrl(final UUID answerId, final String mediaUrl) {
-        InterviewAnswer interviewAnswer = answerRepository.findById(answerId)
-                .orElseThrow(() -> new BusinessException(ErrorCode.ANSWER_NOT_FOUND));
-        interviewAnswer.updateMediaUrl(mediaUrl);
-    }
-
-    @Transactional
-    public void updateAnswer(final UUID answerId, final String answer) {
-        InterviewAnswer interviewAnswer = answerRepository.findById(answerId)
-                .orElseThrow(() -> new BusinessException(ErrorCode.ANSWER_NOT_FOUND));
-        interviewAnswer.updateAnswer(answer);
-    }
-
-    @Transactional
-    public void saveFeedback(final UUID answerId, final FeedbackResult result,
-                             final FeedbackDetail detail, final FeedbackType feedbackType) {
-        InterviewAnswer interviewAnswer = answerRepository.findById(answerId)
-                .orElseThrow(() -> new BusinessException(ErrorCode.ANSWER_NOT_FOUND));
-
-        feedbackRepository.save(
-                new InterviewFeedback(interviewAnswer, serializeFeedback(detail), feedbackType, result.score()));
-    }
-
-    @Transactional
-    public void saveCombinedFeedback(final UUID answerId, final CombinedFeedbackResult result) {
-        InterviewAnswer interviewAnswer = answerRepository.findById(answerId)
+    private InterviewAnswer getAnswer(UUID answerId) {
+        return answerRepository.findById(answerId)
                 .orElseThrow(() -> new BusinessException(ErrorCode.ANSWER_NOT_FOUND));
-
-        feedbackRepository.save(
-                new InterviewFeedback(interviewAnswer, result.combineFeedback(), FeedbackType.COMBINED, result.score()));
     }
 
     private String serializeFeedback(final FeedbackDetail detail) {

src/main/java/io/wisoft/prepair/prepair_api/service/answer/AnswerService.java

@@ -58,7 +58,7 @@ public void submitVideoAnswer(final UUID questionId, final UUID memberId, final
 
         // 임시 파일 먼저 생성 후 DB 저장 (실패 시 고아 레코드 방지)
         Path videoPath = createTempFile(video);
-        InterviewAnswer answer = answerPersistenceService.createVideoAnswer(questionId, memberId);
+        InterviewAnswer answer = answerPersistenceService.saveVideoAnswer(questionId, memberId);
 
         // 3개 비동기 작업 모두 완료 시 이벤트 발행을 위한 트래커 초기화
         completionTracker.init(answer.getId(), videoPath);

src/main/java/io/wisoft/prepair/prepair_api/service/answer/VideoAnswerAnalyzer.java

@@ -57,7 +57,7 @@ public void analyzeSTT(final UUID answerId, final UUID questionId, final UUID me
             FeedbackResult result = feedbackGenerator.generate(question, answer);
             FeedbackDetail detail = new FeedbackDetail(result.good(), result.improvement(), result.recommendation());
 
-            answerPersistenceService.saveFeedback(answerId, result, detail, FeedbackType.STT);
+            answerPersistenceService.saveVideoFeedback(answerId, result, detail, FeedbackType.STT);
             log.info("[VIDEO-STT] 분석 완료 - answerId: {}", answerId);
             completionTracker.complete(answerId);
         } catch (Exception e) {
@@ -72,7 +72,7 @@ public void analyzeVideo(final UUID answerId, final Path videoPath) {
             FeedbackResult result = videoAnalysisService.analyze(videoPath);
             FeedbackDetail detail = new FeedbackDetail(result.good(), result.improvement(), result.recommendation());
 
-            answerPersistenceService.saveFeedback(answerId, result, detail, FeedbackType.VIDEO);
+            answerPersistenceService.saveVideoFeedback(answerId, result, detail, FeedbackType.VIDEO);
             log.info("[VIDEO-ANALYSIS] 분석 완료 - answerId: {}", answerId);
             completionTracker.complete(answerId);
         } catch (Exception e) {