From c119f79410bcbb6105d9ec001689f9d260175a98 Mon Sep 17 00:00:00 2001
From: Haemin Kim <haemin1230@gmail.com>
Date: Sun, 28 Sep 2025 15:27:30 +0900
Subject: [PATCH] =?UTF-8?q?:recycle:=20(#328)=20=ED=80=B4=EC=A6=88=20?=
 =?UTF-8?q?=EB=AC=B8=EC=A0=9C=20=EC=A0=95=EB=A0=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/quiz/converter/QuizConverter.java  | 46 ++++++++++---------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/backend/src/main/java/org/example/backend/domain/quiz/converter/QuizConverter.java b/backend/src/main/java/org/example/backend/domain/quiz/converter/QuizConverter.java
index 7d89b7ca..c574a0af 100644
--- a/backend/src/main/java/org/example/backend/domain/quiz/converter/QuizConverter.java
+++ b/backend/src/main/java/org/example/backend/domain/quiz/converter/QuizConverter.java
@@ -20,27 +20,31 @@ public class QuizConverter {
     private final OptionRepository optionRepository;
 
     public QuizListResponseDTO toQuizListResponseDTO(UUID lectureId, List<Quiz> quizList) {
-        List<QuizListResponseDTO.QuizDTO> quizDTOs = quizList.stream().map(quiz -> {
-            List<OptionResponseDTO> options = new ArrayList<>();
-            if (quiz.getType() == QuizType.MULTIPLE_CHOICE) {
-                options = optionRepository.findByQuizId(quiz.getId())
-                        .stream()
-                        .map(option -> new OptionResponseDTO(
-                                option.getId(),
-                                option.getOptionOrder(),
-                                option.getText()
-                        ))
-                        .toList();
-            }
-            return new QuizListResponseDTO.QuizDTO(
-                    quiz.getId(),
-                    quiz.getQuizOrder(),
-                    quiz.getQuiz(),
-                    quiz.getSolution(),
-                    QuizResultStudentConverter.toCamelCase(quiz.getType()),
-                    options
-            );
-        }).toList();
+        List<QuizListResponseDTO.QuizDTO> quizDTOs = quizList.stream()
+                .sorted((q1, q2) -> Integer.compare(q1.getQuizOrder(), q2.getQuizOrder()))
+                .map(quiz -> {
+                    List<OptionResponseDTO> options = new ArrayList<>();
+                    if (quiz.getType() == QuizType.MULTIPLE_CHOICE) {
+                        options = optionRepository.findByQuizId(quiz.getId())
+                                .stream()
+                                .map(option -> new OptionResponseDTO(
+                                        option.getId(),
+                                        option.getOptionOrder(),
+                                        option.getText()
+                                ))
+                                .sorted((o1, o2) -> Integer.compare(o1.getOptionOrder(), o2.getOptionOrder()))
+                                .toList();
+                    }
+                    return new QuizListResponseDTO.QuizDTO(
+                            quiz.getId(),
+                            quiz.getQuizOrder(),
+                            quiz.getQuiz(),
+                            quiz.getSolution(),
+                            QuizResultStudentConverter.toCamelCase(quiz.getType()),
+                            options
+                    );
+                })
+                .toList();
 
         return new QuizListResponseDTO(lectureId, quizDTOs);
     }