Merge pull request #79 from Kid-Bean/dev/ngh/fix/enrollUseWord

fix: enrollUseWords 에러 수정
Kid-Bean · Jun 20, 2024 · ee2edfb · ee2edfb
2 parents 13586fe + 21da6e3
commit ee2edfb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/main/java/soongsil/kidbean/server/quiz/application/AnswerQuizSolvedService.java b/src/main/java/soongsil/kidbean/server/quiz/application/AnswerQuizSolvedService.java
@@ -3,6 +3,7 @@
 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.stereotype.Service;
@@ -12,6 +13,7 @@
 import soongsil.kidbean.server.global.domain.S3Info;
 import soongsil.kidbean.server.member.domain.Member;
 import soongsil.kidbean.server.quiz.application.vo.OpenApiResponse;
+import soongsil.kidbean.server.quiz.application.vo.UseWordVO;
 import soongsil.kidbean.server.quiz.domain.AnswerQuiz;
 import soongsil.kidbean.server.quiz.domain.AnswerQuizSolved;
 import soongsil.kidbean.server.quiz.domain.UseWord;
@@ -57,7 +59,9 @@ public void enrollNewAnswerQuizSolved(AnswerQuiz answerQuiz, String submitAnswer
     }
 
     private void enrollUseWords(OpenApiResponse openApiResponse, AnswerQuizSolved answerQuizSolved, Member member) {
-        Map<String, Long> wordCountMap = useWordRepository.findWordCountsForMember(member);
+        List<UseWordVO> wordCountList = useWordRepository.findWordCountsForMember(member);
+        Map<String, Long> wordCountMap = wordCountList.stream()
+                .collect(Collectors.toMap(UseWordVO::word, UseWordVO::count));
 
         List<UseWord> newUseWords = new ArrayList<>();
 

diff --git a/src/main/java/soongsil/kidbean/server/quiz/repository/UseWordRepository.java b/src/main/java/soongsil/kidbean/server/quiz/repository/UseWordRepository.java
@@ -8,6 +8,7 @@
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 import soongsil.kidbean.server.member.domain.Member;
+import soongsil.kidbean.server.quiz.application.vo.UseWordVO;
 import soongsil.kidbean.server.quiz.domain.AnswerQuizSolved;
 import soongsil.kidbean.server.quiz.domain.UseWord;
 
@@ -17,7 +18,7 @@ public interface UseWordRepository extends JpaRepository<UseWord, Long> {
     List<UseWord> findTop5ByMemberOrderByCountDesc(Member member);
 
     @Query("SELECT uw.wordName, uw.count FROM UseWord uw WHERE uw.member = :member")
-    Map<String,Long> findWordCountsForMember(@Param("member") Member member);
+    List<UseWordVO> findWordCountsForMember(@Param("member") Member member);
 
     Optional<UseWord> findByWordNameAndMember(String wordName, Member member);