fix choices issue

Author: MmagdyHafezZ

apps/api/src/api/assignment/attempt/attempt.service.ts

@@ -2511,8 +2511,8 @@ export class AttemptServiceV1 {
     return { responseDto, learnerResponse };
   }
 
-  private normalizeText(text: string): string {
-    return text
+  private normalizeText(text: string | number): string {
+    return String(text)
       .trim()
       .toLowerCase()
 
@@ -2953,6 +2953,26 @@ export class AttemptServiceV1 {
         }),
       );
 
+      // Parse learner response for multiple choice questions
+      let learnerChoices: string[] | undefined;
+      if (
+        (question.type === "SINGLE_CORRECT" ||
+          question.type === "MULTIPLE_CORRECT") &&
+        correspondingResponses.length > 0
+      ) {
+        const learnerResponse = correspondingResponses[0]?.learnerResponse;
+        if (learnerResponse && typeof learnerResponse === "string") {
+          try {
+            const parsed: unknown = JSON.parse(learnerResponse);
+            if (Array.isArray(parsed)) {
+              learnerChoices = parsed as string[];
+            }
+          } catch {
+            // If parsing fails, learnerChoices remains undefined
+          }
+        }
+      }
+
       return {
         id: question.id,
         variantId: extendedQuestion.variantId,
@@ -2972,6 +2992,7 @@ export class AttemptServiceV1 {
             ?.showRubricsToLearner
             ? question.scoring
             : undefined,
+        learnerChoices,
       };
     });
   }

apps/api/src/api/assignment/attempt/dto/assignment-attempt/get.assignment.attempt.response.dto.ts

@@ -211,6 +211,16 @@ export class AssignmentAttemptQuestions {
   })
   @Optional()
   variantId?: number;
+
+  @ApiPropertyOptional({
+    description:
+      "The learner's selected choices for multiple choice questions (array of choice indices as strings).",
+    type: [String],
+    required: false,
+  })
+  @Optional()
+  learnerChoices?: string[];
+
   @Optional()
   _permutation?: boolean;
 }

apps/api/src/api/assignment/dto/update.questions.request.dto.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
 import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
 import {
   AssignmentQuestionDisplayOrder,
@@ -6,7 +7,7 @@ import {
   QuestionType,
   ResponseType,
 } from "@prisma/client";
-import { Type } from "class-transformer";
+import { Transform, Type } from "class-transformer";
 import {
   ArrayNotEmpty,
   IsArray,
@@ -31,6 +32,9 @@ export enum VariantType {
 export class Choice {
   @IsNotEmpty()
   @IsString()
+  @Transform(({ value }) =>
+    typeof value === "number" ? String(value) : (value as string),
+  )
   choice: string;
 
   @IsNotEmpty()

apps/api/src/api/assignment/question/dto/create.update.question.request.dto.ts

@@ -1,6 +1,6 @@
 import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
 import { QuestionType } from "@prisma/client";
-import { Type } from "class-transformer";
+import { Transform, Type } from "class-transformer";
 import {
   ArrayNotEmpty,
   IsArray,
@@ -45,6 +45,9 @@ export interface LLMResponseQuestion {
 export class Choice {
   @IsNotEmpty()
   @IsString()
+  @Transform(({ value }) =>
+    typeof value === "number" ? String(value) : (value as string),
+  )
   choice: string;
   @IsNotEmpty()
   @IsBoolean()

apps/api/src/api/attempt/common/utils/attempt-questions-mapper.util.ts

@@ -391,10 +391,13 @@ export class AttemptQuestionsMapper {
     if (!choices || typeof choices === "string") return [];
 
     return choices
-      .filter((c): c is Choice => !!c && typeof c.choice === "string")
+      .filter(
+        (c): c is Choice =>
+          !!c && (typeof c.choice === "string" || typeof c.choice === "number"),
+      )
       .map((c) => ({
         id: c.id === undefined ? null : c.id,
-        choice: c.choice,
+        choice: typeof c.choice === "number" ? String(c.choice) : c.choice,
       }));
   }
 

apps/api/src/api/llm/llm-facade.service.ts

@@ -227,7 +227,7 @@ export class LlmFacadeService {
         rubrics?: RubricDto[];
       };
       choices?: {
-        choice: string;
+        choice: string | number;
         isCorrect: boolean;
         points: number;
         feedback: string;

apps/web/app/learner/(components)/Question/MultipleChoiceQuestion.tsx

@@ -40,6 +40,12 @@ function MultipleChoiceQuestion({
     <div className="flex flex-col gap-y-2 w-full">
       {choices.map((choice, index) => {
         const isSelected = learnerChoices?.includes(String(index));
+        const choiceText =
+          typeof choice === "string"
+            ? choice
+            : typeof choice === "number"
+              ? String(choice)
+              : choice?.choice;
 
         return (
           <button
@@ -76,7 +82,7 @@ function MultipleChoiceQuestion({
                 ) : null}
               </span>
               <div className="whitespace-pre-wrap break-words hyphens-auto text-left overflow-hidden w-full">
-                {choice.choice}
+                {choiceText}
               </div>
             </div>
           </button>

apps/web/app/learner/[assignmentId]/successPage/Question.tsx

@@ -576,7 +576,7 @@ const Question: FC<Props> = ({
         <ul className="list-none text-gray-800 w-full flex flex-col justify-start gap-y-2">
           {choices.map((choiceObj, idx) => {
             const isSelected = Array.isArray(learnerResponse)
-              ? (learnerResponse as string[]).includes(choiceObj.choice)
+              ? (learnerResponse as string[]).includes(String(idx))
               : false;
 
             const isCorrect = choiceObj.isCorrect;

apps/web/stores/learner.ts

@@ -840,7 +840,19 @@ export const useLearnerStore = createWithEqualityFn<
               const prevDataForQuestion = state.questions.find(
                 (q2) => q2.id === q.id,
               );
-              return prevDataForQuestion ? { ...prevDataForQuestion, ...q } : q;
+              const questionData = prevDataForQuestion
+                ? { ...prevDataForQuestion, ...q }
+                : q;
+
+              if (
+                (!questionData.choices || questionData.choices.length === 0) &&
+                (questionData as any).randomizedChoices &&
+                Array.isArray((questionData as any).randomizedChoices)
+              ) {
+                questionData.choices = (questionData as any).randomizedChoices;
+              }
+
+              return questionData;
             });
             return { questions: updatedQuestions as QuestionStore[] };
           }),