feat: refactor quiz evaluation request structure

Selleo · Jan 13, 2025 · 8f01bb7 · 8f01bb7
1 parent 3cf1abd
commit 8f01bb7
Show file tree

Hide file tree

Showing 9 changed files with 273 additions and 277 deletions.
diff --git a/apps/api/src/lesson/lesson.schema.ts b/apps/api/src/lesson/lesson.schema.ts
@@ -139,18 +139,31 @@ export const lessonForChapterSchema = Type.Array(
   }),
 );
 
-export const answerQuestionsForLessonBody = Type.Object({
-  lessonId: UUIDSchema,
+export const onlyAnswerIdSAnswerSchema = Type.Object({
+  answerId: UUIDSchema,
+});
+
+export const onlyValueAnswerSchema = Type.Object({
+  value: Type.String(),
+});
+
+export const fullAnswerSchema = Type.Object({
+  answerId: UUIDSchema,
+  value: Type.String(),
+});
+
+export const studentQuestionAnswersSchema = Type.Object({
+  questionId: UUIDSchema,
   answers: Type.Array(
-    Type.Object({
-      questionId: UUIDSchema,
-      answer: Type.Array(
-        Type.Object({ answerId: Type.Optional(UUIDSchema), value: Type.Optional(Type.String()) }),
-      ),
-    }),
+    Type.Union([onlyAnswerIdSAnswerSchema, onlyValueAnswerSchema, fullAnswerSchema]),
   ),
 });
 
+export const answerQuestionsForLessonBody = Type.Object({
+  lessonId: UUIDSchema,
+  questionsAnswers: Type.Array(studentQuestionAnswersSchema),
+});
+
 export const nextLessonSchema = Type.Union([
   Type.Object({
     courseId: UUIDSchema,
@@ -182,3 +195,7 @@ export type LessonSchema = Static<typeof lessonSchema>;
 export type AnswerQuestionBody = Static<typeof answerQuestionsForLessonBody>;
 export type QuestionDetails = Static<typeof questionDetails>;
 export type NextLesson = Static<typeof nextLessonSchema>;
+export type StudentQuestionAnswer = Static<typeof studentQuestionAnswersSchema>;
+export type OnlyAnswerIdAsnwer = Static<typeof onlyAnswerIdSAnswerSchema>;
+export type OnlyValueAnswer = Static<typeof onlyValueAnswerSchema>;
+export type FullAnswer = Static<typeof fullAnswerSchema>;
diff --git a/apps/api/src/lesson/services/lesson.service.ts b/apps/api/src/lesson/services/lesson.service.ts
@@ -135,7 +135,7 @@ export class LessonService {
     const correctAnswersForQuizQuestions =
       await this.questionRepository.getQuizQuestionsToEvaluation(studentQuizAnswers.lessonId);
 
-    if (correctAnswersForQuizQuestions.length !== studentQuizAnswers.answers.length) {
+    if (correctAnswersForQuizQuestions.length !== studentQuizAnswers.questionsAnswers.length) {
       throw new ConflictException("Quiz is not completed");
     }