diff --git a/backend/src/main/java/org/example/backend/domain/quizAnswer/converter/QuizResultStudentConverter.java b/backend/src/main/java/org/example/backend/domain/quizAnswer/converter/QuizResultStudentConverter.java index ad422c90..5f8a14b9 100644 --- a/backend/src/main/java/org/example/backend/domain/quizAnswer/converter/QuizResultStudentConverter.java +++ b/backend/src/main/java/org/example/backend/domain/quizAnswer/converter/QuizResultStudentConverter.java @@ -13,7 +13,6 @@ import java.util.UUID; import java.util.stream.Collectors; - @NoArgsConstructor(access = AccessLevel.PRIVATE) @Component public class QuizResultStudentConverter { @@ -21,9 +20,13 @@ public static QuizResultStudentResponseDTO toResultStudentResponse( UUID lectureId, List quizzes ) { + List sortedQuizzes = quizzes.stream() + .sorted((q1, q2) -> Integer.compare(q1.getQuizOrder(), q2.getQuizOrder())) + .collect(Collectors.toList()); + return QuizResultStudentResponseDTO.builder() .lectureId(lectureId) - .quizzes(quizzes) + .quizzes(sortedQuizzes) .build(); } @@ -36,6 +39,7 @@ public static QuizResultStudentResponseDTO.QuizDTO toQuizDTO( boolean isCollect = (myAnswer != null) && Boolean.TRUE.equals(myAnswer.getIsCollect()); List optionDTOs = options.stream() + .sorted((o1, o2) -> Integer.compare(o1.getOptionOrder(), o2.getOptionOrder())) .map(o -> QuizResultStudentResponseDTO.OptionDTO.builder() .id(o.getId()) .optionOrder(o.getOptionOrder())