From 0469d5756b5fc40f45ca3340d9a734e5e85a1acc Mon Sep 17 00:00:00 2001
From: nuyh <hjaehyun25@gmail.com>
Date: Wed, 1 Nov 2023 16:20:49 +0900
Subject: [PATCH] =?UTF-8?q?refactor:=20Dto=20->=20Map=20=EB=B3=80=ED=99=98?=
 =?UTF-8?q?=20=EB=A1=9C=EC=A7=81=20Stream=20API=20=EC=82=AC=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#1609
---
 .../roadmap/application/RoadMapService.java   | 30 +++++++------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/backend/src/main/java/wooteco/prolog/roadmap/application/RoadMapService.java b/backend/src/main/java/wooteco/prolog/roadmap/application/RoadMapService.java
index 236259aef..450d6be28 100644
--- a/backend/src/main/java/wooteco/prolog/roadmap/application/RoadMapService.java
+++ b/backend/src/main/java/wooteco/prolog/roadmap/application/RoadMapService.java
@@ -9,11 +9,10 @@
 import wooteco.prolog.roadmap.domain.repository.dto.KeywordIdAndDoneQuizCount;
 import wooteco.prolog.roadmap.domain.repository.dto.KeywordIdAndTotalQuizCount;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static java.util.Objects.isNull;
+import static java.util.stream.Collectors.toMap;
 
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
@@ -34,25 +33,18 @@ public KeywordsResponse findAllKeywordsWithProgress(final Long curriculumId, fin
     }
 
     private Map<Long, Integer> getTotalQuizCounts() {
-        final Map<Long, Integer> totalQuizCounts = new HashMap<>();
-
-        for (KeywordIdAndTotalQuizCount totalQuizCount : keywordRepository.findTotalQuizCount()) {
-            totalQuizCounts.put(totalQuizCount.getKeywordId(), totalQuizCount.getTotalQuizCount());
-        }
-
-        return totalQuizCounts;
+        return keywordRepository.findTotalQuizCount().stream()
+            .collect(
+                toMap(
+                    KeywordIdAndTotalQuizCount::getKeywordId,
+                    KeywordIdAndTotalQuizCount::getTotalQuizCount));
     }
 
     private Map<Long, Integer> getDoneQuizCounts(final Long memberId) {
-        final Map<Long, Integer> doneQuizCounts = new HashMap<>();
-        if (isNull(memberId)) {
-            return doneQuizCounts;
-        }
-
-        for (KeywordIdAndDoneQuizCount doneQuizCount : keywordRepository.findDoneQuizCountByMemberId(memberId)) {
-            doneQuizCounts.put(doneQuizCount.getKeywordId(), doneQuizCount.getDoneQuizCount());
-        }
-
-        return doneQuizCounts;
+        return keywordRepository.findDoneQuizCountByMemberId(memberId).stream()
+            .collect(
+                toMap(
+                    KeywordIdAndDoneQuizCount::getKeywordId,
+                    KeywordIdAndDoneQuizCount::getDoneQuizCount));
     }
 }