Merge pull request #50 from SAIG-KMITL/feat/pretest-with-exam-answer

Feat/pretest with exam answer
SAIG-KMITL · Nov 28, 2024 · f95050f · f95050f
2 parents a7c0074 + 959234b
commit f95050f
Show file tree

Hide file tree

Showing 5 changed files with 77 additions and 0 deletions.
diff --git a/src/exam-answer/dtos/exam-answer-pretest-response.dto.ts b/src/exam-answer/dtos/exam-answer-pretest-response.dto.ts
@@ -63,10 +63,24 @@ export class ExamAnswerPretestResponseDto {
       questionId: '1e251a62-6339-4a59-bb56-e338f1dae55b',
       isCorrect: false,
       explanation: 'Rock is not biology.',
+      optionText: 'ROM',
     },
   })
   selectedOption: QuestionOption;
 
+  @ApiProperty({
+    description: 'Select Question Data',
+    type: QuestionOption,
+    example: {
+      id: '9d77c1d9-b0d1-4025-880c-48073e9dc7d5',
+      questionId: '1e251a62-6339-4a59-bb56-e338f1dae55b',
+      isCorrect: true,
+      explanation: 'Rock is not biology.',
+      optionText: 'ROM',
+    },
+  })
+  correctAnswer: QuestionOption;
+
   @ApiProperty({
     description: 'Answer text',
     type: String,
@@ -107,6 +121,7 @@ export class ExamAnswerPretestResponseDto {
     this.examAttempt = examAnswer.examAttempt;
     this.question = examAnswer.question;
     this.selectedOption = examAnswer.selectedOption;
+    this.correctAnswer = examAnswer.correctAnswer;
     this.isCorrect = examAnswer.isCorrect;
     this.points = examAnswer.points;
     this.createdAt = examAnswer.createdAt;

diff --git a/src/exam-answer/dtos/exam-answer-response.dto.ts b/src/exam-answer/dtos/exam-answer-response.dto.ts
@@ -55,6 +55,19 @@ export class ExamAnswerResponseDto {
   })
   selectedOption: QuestionOption;
 
+  @ApiProperty({
+    description: 'Select Question Data',
+    type: QuestionOption,
+    example: {
+      id: '9d77c1d9-b0d1-4025-880c-48073e9dc7d5',
+      questionId: '1e251a62-6339-4a59-bb56-e338f1dae55b',
+      isCorrect: true,
+      explanation: 'Rock is not biology.',
+      optionText: 'ROM',
+    },
+  })
+  correctAnswer: QuestionOption;
+
   @ApiProperty({
     description: 'Answer text',
     type: String,
@@ -95,6 +108,7 @@ export class ExamAnswerResponseDto {
     this.examAttempt = examAnswer.examAttempt;
     this.question = examAnswer.question;
     this.selectedOption = examAnswer.selectedOption;
+    this.correctAnswer = examAnswer.correctAnswer;
     this.isCorrect = examAnswer.isCorrect;
     this.points = examAnswer.points;
     this.createdAt = examAnswer.createdAt;

diff --git a/src/exam-answer/exam-answer.entity.ts b/src/exam-answer/exam-answer.entity.ts
@@ -52,6 +52,20 @@ export class ExamAnswer {
   @Column({ name: 'question_option_id' })
   selectedOptionId: string;
 
+  @ManyToOne(
+    () => QuestionOption,
+    (questionOption) => questionOption.examAnswerCorrect,
+    {
+      onDelete: 'CASCADE',
+      nullable: false,
+    },
+  )
+  @JoinColumn({ name: 'correct_answer_id' })
+  correctAnswer: QuestionOption;
+
+  @Column({ name: 'correct_answer_id' })
+  correctAnswerId: string;
+
   @Column({
     nullable: false,
   })

diff --git a/src/exam-answer/exam-answer.service.ts b/src/exam-answer/exam-answer.service.ts
@@ -72,11 +72,13 @@ export class ExamAnswerService {
         'question',
         'selectedOption',
         'examAttempt.user',
+        'correctAnswer',
       ],
       select: {
         examAttempt: this.selectPopulateExamAttempt(),
         question: this.selectPopulateQuestion(),
         selectedOption: this.selectPopulateSelectedOption(),
+        correctAnswer: this.selectPopulateSelectedOption(),
       },
     }).run();
 
@@ -186,11 +188,13 @@ export class ExamAnswerService {
         'question',
         'selectedOption',
         'examAttempt.user',
+        'correctAnswer',
       ],
       select: {
         examAttempt: this.selectPopulateExamAttempt(),
         question: this.selectPopulateQuestion(),
         selectedOption: this.selectPopulateSelectedOption(),
+        correctAnswer: this.selectPopulateSelectedOption(),
       },
     });
 
@@ -242,11 +246,13 @@ export class ExamAnswerService {
         'question',
         'selectedOption',
         'examAttempt.user',
+        'correctAnswer',
       ],
       select: {
         examAttempt: this.selectPopulateExamAttempt(),
         question: this.selectPopulateQuestion(),
         selectedOption: this.selectPopulateSelectedOption(),
+        correctAnswer: this.selectPopulateSelectedOption(),
       },
     }).run();
   }
@@ -292,11 +298,13 @@ export class ExamAnswerService {
         'question',
         'selectedOption',
         'examAttempt.user',
+        'correctAnswer',
       ],
       select: {
         examAttempt: this.selectPopulateExamAttempt(),
         question: this.selectPopulateQuestion(),
         selectedOption: this.selectPopulateSelectedOption(),
+        correctAnswer: this.selectPopulateSelectedOption(),
       },
     }).run();
   }
@@ -341,11 +349,13 @@ export class ExamAnswerService {
         'question',
         'selectedOption',
         'examAttempt.user',
+        'correctAnswer',
       ],
       select: {
         examAttempt: this.selectPopulateExamAttempt(),
         question: this.selectPopulateQuestionPretest(),
         selectedOption: this.selectPopulateSelectedOption(),
+        correctAnswer: this.selectPopulateSelectedOption(),
       },
     }).run();
   }
@@ -368,6 +378,14 @@ export class ExamAnswerService {
 
     if (!question) throw new NotFoundException('Not Found Question');
 
+    const correctAnswer = await this.questionOptionRepository.findOne({
+      where: { questionId: selectedOption.questionId, isCorrect: true },
+      select: this.selectPopulateSelectedOption(),
+    });
+
+    if (!correctAnswer)
+      throw new NotFoundException('Not found correct answer in this question');
+
     const examAttempt = createExamAnswerDto.examAttemptId
       ? await this.examAttemptRepository.findOne({
           where: { id: createExamAnswerDto.examAttemptId },
@@ -380,6 +398,8 @@ export class ExamAnswerService {
       selectedOption,
       question,
       examAttempt,
+      correctAnswer,
+      correctAnswerId: correctAnswer.id,
     });
 
     if (!examAnswer) throw new NotFoundException("Can't create exam");
@@ -435,11 +455,13 @@ export class ExamAnswerService {
         'question',
         'selectedOption',
         'examAttempt.user',
+        'correctAnswer',
       ],
       select: {
         examAttempt: this.selectPopulateExamAttempt(),
         question: this.selectPopulateQuestion(),
         selectedOption: this.selectPopulateSelectedOption(),
+        correctAnswer: this.selectPopulateSelectedOption(),
       },
     });
   }
@@ -487,6 +509,7 @@ export class ExamAnswerService {
       isCorrect: true,
       explanation: true,
       questionId: true,
+      optionText: true,
     };
   }
 
@@ -521,11 +544,13 @@ export class ExamAnswerService {
         'selectedOption',
         'question.pretest',
         'question.pretest.user',
+        'correctAnswer',
       ],
       select: {
         examAttempt: this.selectPopulateExamAttempt(),
         question: this.selectPopulateQuestionPretest(),
         selectedOption: this.selectPopulateSelectedOption(),
+        correctAnswer: this.selectPopulateSelectedOption(),
       },
     }).run();
 
@@ -614,11 +639,13 @@ export class ExamAnswerService {
         'selectedOption',
         'question.pretest',
         'question.pretest.user',
+        'correctAnswer',
       ],
       select: {
         examAttempt: this.selectPopulateExamAttempt(),
         question: this.selectPopulateQuestionPretest(),
         selectedOption: this.selectPopulateSelectedOption(),
+        correctAnswer: this.selectPopulateSelectedOption(),
       },
     }).run();
   }
@@ -664,11 +691,13 @@ export class ExamAnswerService {
         'selectedOption',
         'question.pretest',
         'question.pretest.user',
+        'correctAnswer',
       ],
       select: {
         examAttempt: this.selectPopulateExamAttempt(),
         question: this.selectPopulateQuestionPretest(),
         selectedOption: this.selectPopulateSelectedOption(),
+        correctAnswer: this.selectPopulateSelectedOption(),
       },
     }).run();
   }

diff --git a/src/question-option/question-option.entity.ts b/src/question-option/question-option.entity.ts
@@ -31,6 +31,11 @@ export class QuestionOption {
   })
   examAnswer: ExamAnswer[];
 
+  @OneToMany(() => ExamAnswer, (examAnswer) => examAnswer.correctAnswer, {
+    cascade: true,
+  })
+  examAnswerCorrect: ExamAnswer[];
+
   @Column({
     nullable: false,
   })