@quesmed/types-rn 2.4.17 → 2.4.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quesmed/types-rn",
-  "version": "2.4.17",
+  "version": "2.4.19",
   "description": "Typescript types for Quesmed",
   "keywords": [
     "quesmed",

package/resolvers/query/restricted/topics.js

@@ -42,6 +42,12 @@ exports.TOPICS = (0, client_1.gql) `
           topicId
           totalQuestions
           totalCards
+          correctQuestions
+          incorrectQuestions
+          greenCards
+          yellowCards
+          redCards
+          dailyFeedCards
         }
       }
     }

package/utils/commonFunctions.js

@@ -35,27 +35,26 @@ function mapPrescribeMarkToAnswer(obj) {
 }
 exports.mapPrescribeMarkToAnswer = mapPrescribeMarkToAnswer;
 function formatPrescribeAnswer(baseAnswer) {
-    const obj = {
-        ...baseAnswer,
-        drug: {
-            ...baseAnswer.drug,
-        },
-        dose: {
-            ...baseAnswer.dose,
-        },
-        units: {
-            ...baseAnswer.units,
-        },
-        route: {
-            ...baseAnswer.route,
-        },
-        frequency: {
-            ...baseAnswer.frequency,
-        },
-        duration: {
-            ...baseAnswer.duration,
-        },
-    };
+    const obj = Object.assign({}, baseAnswer, {
+        drug: Object.assign({}, baseAnswer.drug, {
+            value: baseAnswer.drug?.value ?? '',
+        }),
+        dose: Object.assign({}, baseAnswer.dose, {
+            value: baseAnswer.dose?.value ?? 0,
+        }),
+        units: Object.assign({}, baseAnswer.units, {
+            value: baseAnswer.units?.value ?? '',
+        }),
+        route: Object.assign({}, baseAnswer.route, {
+            value: baseAnswer.route?.value ?? '',
+        }),
+        frequency: Object.assign({}, baseAnswer.frequency, {
+            value: baseAnswer.frequency?.value ?? '',
+        }),
+        duration: Object.assign({}, baseAnswer.duration, {
+            value: baseAnswer.duration?.value ?? '',
+        }),
+    });
     obj.drug.value = obj.drug.value.toLowerCase().replace(/\s/g, '');
     obj.route.value = obj.route.value
         .toLowerCase()
@@ -141,7 +140,6 @@ function formatPrescribeAnswer(baseAnswer) {
     return obj;
 }
 exports.formatPrescribeAnswer = formatPrescribeAnswer;
-const answerRegex = /answer/gi;
 function correctMark(mark) {
     const data = {
         correct: false,
@@ -153,10 +151,11 @@ function correctMark(mark) {
     }
     try {
         const qKeys = Object.keys(mark.question);
-        const answerKey = qKeys.find((k) => answerRegex.exec(k)) || 'answer';
+        const answerKey = qKeys.find((k) => k.toLowerCase().indexOf('answer') !== -1) || 'answer';
         const answer = mark.question[answerKey];
         const flatAnswer = answer[0];
-        const flatAttempt = mark.mark[0];
+        const jsonAnswer = typeof mark.mark === 'string' ? JSON.parse(mark.mark) : mark.mark;
+        const flatAttempt = jsonAnswer[0];
         if (models_1.EQuestionType.SINGLE_BEST_ANSWER === mark.question.typeId) {
             const answer = flatAnswer;
             const attempt = flatAttempt;
@@ -185,11 +184,11 @@ function correctMark(mark) {
         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 (Array.isArray(jsonAnswer) &&
+                jsonAnswer.length === 2 &&
+                Array.isArray(jsonAnswer[0]) &&
+                Array.isArray(jsonAnswer[1])) {
+                [attemptA, attemptB] = jsonAnswer.map((x) => x.sort());
             }
             if (answerA.length !== attemptA.length ||
                 answerB.length !== attemptB.length) {