refactor: 그루밍 테스트 관련 로직 리팩토링

src/docs/asciidoc/grooming-test-api.adoc

@@ -21,11 +21,24 @@ include::{snippetsDir}/submitGroomingTests/1/http-request.adoc[]
 include::{snippetsDir}/submitGroomingTests/1/request-fields.adoc[]
 
 ==== 성공 Response
+성공 1. 인증된 유저인 경우
 include::{snippetsDir}/submitGroomingTests/1/http-response.adoc[]
 
+성공 2. 인증되지 않은 유저인 경우
+include::{snippetsDir}/submitGroomingTests/2/http-response.adoc[]
+
 ==== Response Body Fields
 include::{snippetsDir}/submitGroomingTests/1/response-fields.adoc[]
 
+==== 실패 Response
+실패 3. 유효하지 않은 그루밍 테스트 질문 ID일 경우 (존재하지 않는 질문 ID, 중복된 질문 ID)
+
+include::{snippetsDir}/submitGroomingTests/3/http-response.adoc[]
+
+실패 4. 유효하지 않은 그루밍 테스트 답변 ID일 경우 (존재하지 않는 답변 ID, 질문과 잘못 매핑된 답변 ID, 중복된 답변 ID)
+
+include::{snippetsDir}/submitGroomingTests/4/http-response.adoc[]
+
 ---
 
 === **3. 그루밍 테스트 가능 여부 조회**
@@ -58,7 +71,7 @@ include::{snippetsDir}/checkGroomingTestAvailability/4/http-response.adoc[]
 
 === **4. 그루밍 테스트 결과 저장**
 
-그루밍 테스트 결과를 저장하는 api 입니다. (비로그인 그루밍 테스트 이후 회원가입 할 때)
+그루밍 테스트 결과를 저장하는 api 입니다.
 
 ==== Request
 include::{snippetsDir}/saveGroomingTestResult/1/http-request.adoc[]
@@ -78,4 +91,15 @@ include::{snippetsDir}/saveGroomingTestResult/1/response-fields.adoc[]
 include::{snippetsDir}/saveGroomingTestResult/2/http-response.adoc[]
 
 실패 2. 존재하지 않는 그루밍 레벨인 경우
+
 include::{snippetsDir}/saveGroomingTestResult/3/http-response.adoc[]
+
+실패 3. 유효하지 않은 그루밍 테스트 질문 ID일 경우 (존재하지 않는 질문 ID, 중복된 질문 ID)
+
+include::{snippetsDir}/saveGroomingTestResult/4/http-response.adoc[]
+
+실패 4. 유효하지 않은 그루밍 테스트 답변 ID일 경우 (존재하지 않는 답변 ID, 질문과 잘못 매핑된 답변 ID, 중복된 답변 ID)
+
+include::{snippetsDir}/saveGroomingTestResult/5/http-response.adoc[]
+
+---

src/main/java/com/ftm/server/adapter/in/web/grooming/dto/request/GroomingTestSubmissionRequest.java

@@ -16,13 +16,6 @@ public static class SubmittedQuestion {
 
         private Long questionId;
         private String groomingCategory;
-        private List<SelectedAnswer> answers;
-
-        @Getter
-        @AllArgsConstructor
-        public static class SelectedAnswer {
-            private Long answerId;
-            private Integer score;
-        }
+        private List<Long> answerIds;
     }
 }

src/main/java/com/ftm/server/adapter/in/web/grooming/dto/response/GroomingTestResultResponse.java

@@ -9,11 +9,13 @@
 @Getter
 public class GroomingTestResultResponse {
 
+    private final boolean isAuthenticated;
     private final GroomingTestResultScoresVo scores;
     private final GroomingTestResultGradesVo grades;
     private final GroomingLevelVo level;
 
     private GroomingTestResultResponse(GroomingTestResultVo result) {
+        this.isAuthenticated = result.isAuthenticated();
         this.scores = result.getScores();
         this.grades = result.getGrades();
         this.level = result.getLevel();

src/main/java/com/ftm/server/adapter/in/web/grooming/dto/response/GroomingTestsInfoResponse.java

@@ -1,22 +1,66 @@
 package com.ftm.server.adapter.in.web.grooming.dto.response;
 
+import com.ftm.server.application.vo.grooming.GroomingTestAnswerInfoVo;
 import com.ftm.server.application.vo.grooming.GroomingTestQuestionWithAnswersVo;
-import java.util.Set;
+import com.ftm.server.domain.enums.GroomingCategory;
+import java.util.List;
 import lombok.Getter;
 
 @Getter
 public class GroomingTestsInfoResponse {
 
     private final Integer totalCount;
-    private final Set<GroomingTestQuestionWithAnswersVo> groomingTests;
+    private final List<GroomingTestQuestionWithAnswersResponse> groomingTests;
 
-    GroomingTestsInfoResponse(Set<GroomingTestQuestionWithAnswersVo> groomingTests) {
+    GroomingTestsInfoResponse(List<GroomingTestQuestionWithAnswersVo> groomingTests) {
         this.totalCount = groomingTests.size();
-        this.groomingTests = groomingTests;
+        this.groomingTests =
+                groomingTests.stream().map(GroomingTestQuestionWithAnswersResponse::from).toList();
     }
 
     public static GroomingTestsInfoResponse from(
-            Set<GroomingTestQuestionWithAnswersVo> groomingTests) {
+            List<GroomingTestQuestionWithAnswersVo> groomingTests) {
         return new GroomingTestsInfoResponse(groomingTests);
     }
+
+    @Getter
+    public static class GroomingTestQuestionWithAnswersResponse {
+        private final Long groomingTestQuestionId;
+        private final String question;
+        private final GroomingCategory groomingCategory;
+        private final List<GroomingTestAnswerInfoResponse> answers;
+
+        GroomingTestQuestionWithAnswersResponse(
+                GroomingTestQuestionWithAnswersVo groomingTestQuestionWithAnswersVo) {
+            this.groomingTestQuestionId =
+                    groomingTestQuestionWithAnswersVo.getGroomingTestQuestionId();
+            this.question = groomingTestQuestionWithAnswersVo.getQuestion();
+            this.groomingCategory = groomingTestQuestionWithAnswersVo.getGroomingCategory();
+            this.answers =
+                    groomingTestQuestionWithAnswersVo.getAnswers().stream()
+                            .map(GroomingTestAnswerInfoResponse::from)
+                            .toList();
+        }
+
+        public static GroomingTestQuestionWithAnswersResponse from(
+                GroomingTestQuestionWithAnswersVo groomingTestQuestionWithAnswersVo) {
+            return new GroomingTestQuestionWithAnswersResponse(groomingTestQuestionWithAnswersVo);
+        }
+
+        @Getter
+        public static class GroomingTestAnswerInfoResponse {
+            private final Long groomingTestAnswerId;
+            private final String answer;
+
+            GroomingTestAnswerInfoResponse(GroomingTestAnswerInfoVo groomingTestAnswerInfoVo) {
+                this.groomingTestAnswerId = groomingTestAnswerInfoVo.getGroomingTestAnswerId();
+                this.answer = groomingTestAnswerInfoVo.getAnswer();
+            }
+
+            public static GroomingTestAnswerInfoResponse from(
+                    GroomingTestAnswerInfoVo groomingTestAnswerInfoVo) {
+                return new GroomingTestAnswerInfoResponse(groomingTestAnswerInfoVo);
+            }
+        }
+    }
 }

src/main/java/com/ftm/server/adapter/in/web/grooming/mapper/GroomingTestCommandMapper.java

@@ -17,16 +17,7 @@ public static SubmitGroomingTestCommand toSubmitGroomingTestCommand(
                                         SubmitGroomingTestCommand.SubmittedQuestion.of(
                                                 item.getQuestionId(),
                                                 item.getGroomingCategory(),
-                                                item.getAnswers().stream()
-                                                        .map(
-                                                                answer ->
-                                                                        SubmitGroomingTestCommand
-                                                                                .SubmittedQuestion
-                                                                                .SelectedAnswer.of(
-                                                                                answer
-                                                                                        .getAnswerId(),
-                                                                                answer.getScore()))
-                                                        .toList()))
+                                                item.getAnswerIds()))
                         .toList();
 
         return SubmitGroomingTestCommand.from(userId, submissions);

src/main/java/com/ftm/server/adapter/out/cache/CaffeineCacheAdapter.java

@@ -0,0 +1,71 @@
+package com.ftm.server.adapter.out.cache;
+
+import static com.ftm.server.common.consts.StaticConsts.GROOMING_TESTS_INFO_CACHE_KEY_ALL;
+import static com.ftm.server.common.consts.StaticConsts.GROOMING_TESTS_INFO_CACHE_NAME;
+
+import com.ftm.server.adapter.out.persistence.mapper.GroomingTestAnswerMapper;
+import com.ftm.server.adapter.out.persistence.mapper.GroomingTestQuestionMapper;
+import com.ftm.server.adapter.out.persistence.repository.GroomingTestAnswerRepository;
+import com.ftm.server.adapter.out.persistence.repository.GroomingTestQuestionRepository;
+import com.ftm.server.application.port.out.cache.LoadGroomingTestsWithCachePort;
+import com.ftm.server.application.vo.grooming.GroomingTestAnswerInfoVo;
+import com.ftm.server.application.vo.grooming.GroomingTestQuestionWithAnswersVo;
+import com.ftm.server.common.annotation.Adapter;
+import com.ftm.server.domain.entity.GroomingTestAnswer;
+import com.ftm.server.domain.entity.GroomingTestQuestion;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cache.annotation.Cacheable;
+
+@Slf4j
+@Adapter
+@RequiredArgsConstructor
+public class CaffeineCacheAdapter implements LoadGroomingTestsWithCachePort {
+
+    private final GroomingTestQuestionRepository groomingTestQuestionRepository;
+    private final GroomingTestAnswerRepository groomingTestAnswerRepository;
+
+    private final GroomingTestQuestionMapper groomingTestQuestionMapper;
+    private final GroomingTestAnswerMapper groomingTestAnswerMapper;
+
+    @Cacheable(value = GROOMING_TESTS_INFO_CACHE_NAME, key = GROOMING_TESTS_INFO_CACHE_KEY_ALL)
+    @Override
+    public List<GroomingTestQuestionWithAnswersVo> loadGroomingTestsCache() {
+        // 모든 그루밍 테스트 질문 목록 조회
+        List<GroomingTestQuestion> questions =
+                groomingTestQuestionRepository.findAll().stream()
+                        .map(groomingTestQuestionMapper::toDomain)
+                        .toList();
+
+        // 모든 그루밍 테스트 답변 목록 조회
+        List<GroomingTestAnswer> answers =
+                groomingTestAnswerRepository.findAll().stream()
+                        .map(groomingTestAnswerMapper::toDomain)
+                        .toList();
+
+        // 같은 질문의 답변 목록끼리 그룹화
+        Map<Long, List<GroomingTestAnswerInfoVo>> answersByQuestionId =
+                answers.stream()
+                        .collect(
+                                Collectors.groupingBy(
+                                        GroomingTestAnswer
+                                                ::getGroomingTestQuestionId, // 질문 ID를 기준으로 답변 그룹화
+                                        Collectors.mapping(
+                                                GroomingTestAnswerInfoVo::from,
+                                                Collectors.toList())));
+
+        // 각 그루밍 테스트 질문에 속한 답변목록을 함께 담아 응답
+        return questions.stream()
+                .map(
+                        question ->
+                                GroomingTestQuestionWithAnswersVo.from(
+                                        question,
+                                        answersByQuestionId.getOrDefault(
+                                                question.getId(), List.of())))
+                .collect(Collectors.toCollection(ArrayList::new));
+    }
+}

src/main/java/com/ftm/server/application/command/grooming/SubmitGroomingTestCommand.java

@@ -23,34 +23,17 @@ public static class SubmittedQuestion {
 
         private final Long questionId;
         private final String groomingCategory;
-        private final List<SelectedAnswer> answers;
+        private final List<Long> answerIds;
 
-        private SubmittedQuestion(
-                Long questionId, String groomingCategory, List<SelectedAnswer> answers) {
+        private SubmittedQuestion(Long questionId, String groomingCategory, List<Long> answerIds) {
             this.questionId = questionId;
             this.groomingCategory = groomingCategory;
-            this.answers = answers;
+            this.answerIds = answerIds;
         }
 
         public static SubmittedQuestion of(
-                Long questionId, String groomingCategory, List<SelectedAnswer> answers) {
-            return new SubmittedQuestion(questionId, groomingCategory, answers);
-        }
-
-        @Getter
-        public static class SelectedAnswer {
-
-            private final Long answerId;
-            private final int score;
-
-            private SelectedAnswer(Long answerId, int score) {
-                this.answerId = answerId;
-                this.score = score;
-            }
-
-            public static SelectedAnswer of(Long answerId, int score) {
-                return new SelectedAnswer(answerId, score);
-            }
+                Long questionId, String groomingCategory, List<Long> answerIds) {
+            return new SubmittedQuestion(questionId, groomingCategory, answerIds);
         }
     }
 }

src/main/java/com/ftm/server/application/port/in/grooming/LoadGroomingTestsUseCase.java

@@ -2,10 +2,10 @@
 
 import com.ftm.server.application.vo.grooming.GroomingTestQuestionWithAnswersVo;
 import com.ftm.server.common.annotation.UseCase;
-import java.util.Set;
+import java.util.List;
 
 @UseCase
 public interface LoadGroomingTestsUseCase {
 
-    Set<GroomingTestQuestionWithAnswersVo> execute();
+    List<GroomingTestQuestionWithAnswersVo> execute();
 }

src/main/java/com/ftm/server/application/port/out/cache/LoadGroomingTestsWithCachePort.java

@@ -0,0 +1,11 @@
+package com.ftm.server.application.port.out.cache;
+
+import com.ftm.server.application.vo.grooming.GroomingTestQuestionWithAnswersVo;
+import com.ftm.server.common.annotation.Port;
+import java.util.List;
+
+@Port
+public interface LoadGroomingTestsWithCachePort {
+
+    List<GroomingTestQuestionWithAnswersVo> loadGroomingTestsCache();
+}

src/main/java/com/ftm/server/application/service/grooming/CheckGroomingTestAvailabilityService.java

@@ -12,6 +12,7 @@
 import java.time.temporal.ChronoUnit;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
 @RequiredArgsConstructor
@@ -20,6 +21,7 @@ public class CheckGroomingTestAvailabilityService implements CheckGroomingTestAv
     private final LoadGroomingTestResultPort loadGroomingTestResultPort;
 
     @Override
+    @Transactional(readOnly = true)
     public GroomingTestAvailabilityVo execute(FindByUserIdQuery query) {
         // 가장 최근 테스트 날짜 조회
         LocalDateTime lastTestDateTime =