[Fix] 챕터 단 건 조회 해결 상태 조건 불일치 문제 해결

9oormthon-univ · Nov 29, 2024 · 4aa776a · 4aa776a
1 parent e828a95
commit 4aa776a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/domain/src/main/java/com/codingland/domain/chapter/dto/ResponseChapterDto.java b/domain/src/main/java/com/codingland/domain/chapter/dto/ResponseChapterDto.java
@@ -10,7 +10,7 @@ public record ResponseChapterDto(
         Long id,
         String name,
         boolean isCleared,
-        List<ResponseFindByChapter> quizzes,
-        boolean isRewardButtonActive
+        boolean isRewardButtonActive,
+        List<ResponseFindByChapter> quizzes
 ) {
 }
diff --git a/domain/src/main/java/com/codingland/domain/chapter/service/ChapterService.java b/domain/src/main/java/com/codingland/domain/chapter/service/ChapterService.java
@@ -93,10 +93,14 @@ public ResponseChapterDto getChapter(Long chapter_id, Long user_id) {
                 buttonActiveState = false;
         }
 
+        if(foundChapter.getQuizzes().isEmpty()) {
+            buttonActiveState = false;
+        }
+
         Map<Long, IsQuizCleared> quizClearedMap = new HashMap<>();
 
         for (IsQuizCleared clearedQuiz : clearedQuizzes) {
-            quizClearedMap.put(clearedQuiz.getId(), clearedQuiz);
+            quizClearedMap.put(clearedQuiz.getQuiz().getId(), clearedQuiz);
         }
 
         List<ResponseFindByChapter> responseQuizDtoList = new ArrayList<>();