@quesmed/types 1.0.13 → 1.0.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quesmed/types",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "description": "Typescript types for Quesmed",
   "main": "index.js",
   "types": "dist/index.d.ts",

package/utils/commonFunctions.js

@@ -61,6 +61,7 @@ function formatPrescribeAnswer(obj) {
     }
     return obj;
 }
+const answerRegex = /answer/gi;
 function correctMark(mark) {
     const data = {
         correct: false,
@@ -70,7 +71,10 @@ function correctMark(mark) {
     if (!mark || !mark.mark) {
         return data;
     }
-    const flatAnswer = mark.question.answer[0];
+    const qKeys = Object.keys(mark.question);
+    const answerKey = qKeys.find((k) => answerRegex.exec(k)) || 'answer';
+    const answer = mark.question[answerKey];
+    const flatAnswer = answer[0];
     const flatAttempt = mark.mark[0];
     if (models_1.EQuestionType.SINGLE_BEST_ANSWER === mark.question.typeId) {
         const answer = flatAnswer;
@@ -93,7 +97,7 @@ function correctMark(mark) {
         }
     }
     else if (models_1.EQuestionType.MULTIPLE_ANSWERS === mark.question.typeId) {
-        const [answerA, answerB] = mark.question.answer.map((x) => x.sort());
+        const [answerA, answerB] = answer.map((x) => x.sort());
         const [attemptA, attemptB] = mark.mark.map((x) => x.sort());
         if (answerA.length !== attemptA.length || answerB.length !== attemptB.length) {
             data.incorrect = true;
@@ -106,7 +110,7 @@ function correctMark(mark) {
         }
     }
     else if (models_1.EQuestionType.PRESCRIPTION_ANSWER === mark.question.typeId) {
-        const answers = mark.question.answer.map(formatPrescribeAnswer);
+        const answers = answer.map(formatPrescribeAnswer);
         const attempt = formatPrescribeAnswer(flatAttempt);
         let foundCorrect = false;
         let index = 0;