@quesmed/types 1.0.27 → 1.0.29

package/models/Chapter.d.ts

@@ -5,7 +5,7 @@ export interface IChapter {
     id: Id;
     createdAt: string | Date;
     updatedAt: string | Date;
-    explanation: string;
+    explanation: string | null;
     clinical: boolean;
     pictures: IChapterPicture[];
     files: IFile[];

package/models/Marksheet.d.ts

@@ -9,9 +9,9 @@ export interface IMarksheet {
     mockTestId: number | null;
 }
 export declare enum EQuestionLike {
-    LIKE = 0,
-    DISLIKE = 1,
-    REMOVE = 2
+    NONE = 0,
+    LIKE = 1,
+    DISLIKE = 2
 }
 export declare type IMarksheetMarkJSONB = string | [string] | [IQuestionQAAnswer] | [string[], string[]] | [IPrescribeMark] | null;
 export interface IMarksheetMark {
@@ -26,7 +26,7 @@ export interface IMarksheetMark {
     mark: IMarksheetMarkJSONB;
     like: number;
     dislike: number;
-    isLikeByMe: string;
+    isLikeByMe: EQuestionLike;
     discussion: IDiscussion[];
 }
 export interface IDiscussion {
@@ -36,7 +36,7 @@ export interface IDiscussion {
     comment: string;
     like: number;
     dislike: number;
-    isLikeByMe: string;
+    isLikeByMe: EQuestionLike;
     commentId: number;
     questionId: number;
     reply: IDiscussion[];

package/models/Marksheet.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EQuestionLike = void 0;
 var EQuestionLike;
 (function (EQuestionLike) {
-    EQuestionLike[EQuestionLike["LIKE"] = 0] = "LIKE";
-    EQuestionLike[EQuestionLike["DISLIKE"] = 1] = "DISLIKE";
-    EQuestionLike[EQuestionLike["REMOVE"] = 2] = "REMOVE";
+    EQuestionLike[EQuestionLike["NONE"] = 0] = "NONE";
+    EQuestionLike[EQuestionLike["LIKE"] = 1] = "LIKE";
+    EQuestionLike[EQuestionLike["DISLIKE"] = 2] = "DISLIKE";
 })(EQuestionLike = exports.EQuestionLike || (exports.EQuestionLike = {}));

package/models/Question.d.ts

@@ -38,7 +38,7 @@ export interface IQuestion {
 export interface IQuestionChoice {
     id: Id;
     name: string;
-    explanation: string;
+    explanation: string | null;
     label: string;
     answer: boolean;
     votes: number;

package/package.json

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

package/utils/commonFunctions.js

@@ -105,69 +105,94 @@ function correctMark(mark) {
     if (!mark || !mark.mark) {
         return data;
     }
-    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;
-        const attempt = flatAttempt;
-        if (answer === attempt) {
-            data.correct = true;
-        }
-        else {
-            data.incorrect = true;
-        }
-    }
-    else if (models_1.EQuestionType.QUESTION_ANSWER === mark.question.typeId) {
-        const answer = flatAnswer.dose.toLowerCase().replace(/\s/g, '');
-        const attempt = flatAttempt.toLowerCase().replace(/\s/g, '');
-        if (answer === attempt) {
-            data.correct = true;
-        }
-        else {
-            data.incorrect = true;
-        }
-    }
-    else if (models_1.EQuestionType.MULTIPLE_ANSWERS === mark.question.typeId) {
-        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;
-        }
-        else if (attemptA.every((x, i) => x === answerA[i]) && attemptB.every((x, i) => answerB[i])) {
-            data.correct = true;
-        }
-        else {
-            data.incorrect = true;
+    try {
+        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;
+            const attempt = flatAttempt;
+            if (answer === attempt) {
+                data.correct = true;
+            }
+            else {
+                data.incorrect = true;
+            }
         }
-    }
-    else if (models_1.EQuestionType.PRESCRIPTION_ANSWER === mark.question.typeId) {
-        const answers = answer.map(formatPrescribeAnswer);
-        const attempt = formatPrescribeAnswer(mapPrescribeMarkToAnswer(flatAttempt));
-        let foundCorrect = false;
-        let index = 0;
-        for (const answer of answers) {
-            if (answer.dose.value === attempt.dose.value &&
-                answer.drug.value === attempt.drug.value &&
-                answer.duration.value.split(',').includes(attempt.duration.value) &&
-                answer.frequency.value === attempt.frequency.value &&
-                answer.route.value === attempt.route.value &&
-                answer.units.value === attempt.units.value) {
-                foundCorrect = true;
-                break;
+        else if (models_1.EQuestionType.QUESTION_ANSWER === mark.question.typeId) {
+            const answer = flatAnswer.dose.toLowerCase().replace(/\s/g, '');
+            let attempt = '';
+            if (flatAttempt) {
+                attempt = flatAttempt.toLowerCase().replace(/\s/g, '');
+            }
+            if (answer === attempt) {
+                data.correct = true;
+            }
+            else {
+                data.incorrect = true;
             }
-            index++;
         }
-        if (foundCorrect) {
-            data.correct = true;
-            data.correctIndex = index;
+        else if (models_1.EQuestionType.MULTIPLE_ANSWERS === mark.question.typeId) {
+            const [answerA, answerB] = answer.map((x) => x.sort());
+            let [attemptA, attemptB] = [[], []];
+            if (Array.isArray(mark.mark) &&
+                mark.mark.length === 2 &&
+                Array.isArray(mark.mark[0]) &&
+                Array.isArray(mark.mark[1])) {
+                [attemptA, attemptB] = mark.mark.map((x) => x.sort());
+            }
+            if (answerA.length !== attemptA.length || answerB.length !== attemptB.length) {
+                data.incorrect = true;
+            }
+            else if (attemptA.every((x, i) => x === answerA[i]) &&
+                attemptB.every((_, i) => answerB[i])) {
+                data.correct = true;
+            }
+            else {
+                data.incorrect = true;
+            }
         }
-        else {
-            data.incorrect = true;
+        else if (models_1.EQuestionType.PRESCRIPTION_ANSWER === mark.question.typeId) {
+            const answers = answer.map(formatPrescribeAnswer);
+            let attempt = formatPrescribeAnswer(mapPrescribeMarkToAnswer({
+                drug: '',
+                dose: -1,
+                units: '',
+                route: '',
+                frequency: '',
+                duration: '',
+            }));
+            if (typeof flatAttempt === 'object' && Object.keys(flatAttempt).length === 6) {
+                attempt = formatPrescribeAnswer(mapPrescribeMarkToAnswer(flatAttempt));
+            }
+            let foundCorrect = false;
+            let index = 0;
+            for (const answer of answers) {
+                if (answer.dose.value === attempt.dose.value &&
+                    answer.drug.value === attempt.drug.value &&
+                    answer.duration.value.split(',').includes(attempt.duration.value) &&
+                    answer.frequency.value === attempt.frequency.value &&
+                    answer.route.value === attempt.route.value &&
+                    answer.units.value === attempt.units.value) {
+                    foundCorrect = true;
+                    break;
+                }
+                index++;
+            }
+            if (foundCorrect) {
+                data.correct = true;
+                data.correctIndex = index;
+            }
+            else {
+                data.incorrect = true;
+            }
         }
     }
+    catch (e) {
+        console.error(e);
+    }
     return data;
 }
 exports.correctMark = correctMark;