@quesmed/types 2.6.233 → 2.6.235

package/dist/cjs/models/Blog.d.ts

@@ -15,7 +15,8 @@ export declare enum EBlogTags {
     MLA_CSPA = "MLA_CPSA",
     MRCP_VIDEO = "MRCP_Video",
     PLAB1 = "PLAB1",
-    PLAB2 = "PLAB2"
+    PLAB2 = "PLAB2",
+    UCAT = "UCAT"
 }
 export interface IBlogTag {
     id: Id;

package/dist/cjs/models/Blog.js

@@ -18,4 +18,5 @@ var EBlogTags;
     EBlogTags["MRCP_VIDEO"] = "MRCP_Video";
     EBlogTags["PLAB1"] = "PLAB1";
     EBlogTags["PLAB2"] = "PLAB2";
+    EBlogTags["UCAT"] = "UCAT";
 })(EBlogTags = exports.EBlogTags || (exports.EBlogTags = {}));

package/dist/cjs/models/Question.d.ts

@@ -204,7 +204,7 @@ export interface IQuestionRanking extends IQuestion {
 }
 export interface IQuestionSjtTwoAnswer extends IQuestion {
     answer: [string, string];
-    sjtTwoAnswer: [string, string];
+    sbaAnswer: [string, string];
 }
 export interface IQuestionPrescribe extends IQuestion {
     answer: IPrescribeAnswer[];

package/dist/cjs/resolvers/mutation/restricted/marksheet.js

@@ -81,10 +81,39 @@ exports.SAVE_MARKSHEET = (0, client_1.gql) `
           flagged
           mark
         }
+        sections {
+          entitlementId
+          marks {
+            isAnswered
+            isInDailyStack
+            result
+            score
+            id
+            marksheetId
+            questionChoiceId
+            timeTaken
+            flagged
+            mark
+          }
+        }
       }
     }
   }
 `;
+function getMarksFromMarksheet(marksheets, marksheetId) {
+    const marksheet = marksheets.find((m) => Number(m.id) === Number(marksheetId));
+    if (!marksheet)
+        return [];
+    // Case 1: direct marks
+    if (Array.isArray(marksheet.marks) && marksheet.marks.length > 0) {
+        return marksheet.marks;
+    }
+    // Case 2: nested sections → flatten marks
+    if (Array.isArray(marksheet.sections)) {
+        return marksheet.sections.flatMap((section) => section.marks || []);
+    }
+    return [];
+}
 const updateMarksheets = (cache, result, options) => {
     const { saveMarksheets } = result?.data?.restricted || {};
     const { variables } = options || {};
@@ -95,7 +124,7 @@ const updateMarksheets = (cache, result, options) => {
         const { input } = variables;
         for (let i = 0; i < input.length; i++) {
             const inputData = input[i];
-            const savedMarks = saveMarksheets.find((m) => Number(m.id) === Number(inputData.marksheetId))?.marks;
+            const savedMarks = getMarksFromMarksheet(saveMarksheets, inputData.marksheetId);
             const savedData = savedMarks?.find((m) => m.id === inputData.markId);
             cache.writeFragment({
                 id: cache.identify({
@@ -121,43 +150,68 @@ const updateMarksheets = (cache, result, options) => {
 exports.updateMarksheets = updateMarksheets;
 const optimisticSaveMarksheets = (marksheet, marksheetInput, questionIndex) => {
     const { timeTaken, choiceId, mark, marksheetId, markId } = marksheetInput;
-    const { marks = [], ...rest } = marksheet || {};
-    const currentMark = marks.find((m) => Number(m.id) === Number(markId));
-    if (!currentMark) {
+    const { marks = [], sections = [], ...rest } = marksheet || {};
+    const updateMarksArray = (marksArr) => {
+        const currentMark = marksArr.find((m) => Number(m.id) === Number(markId));
+        if (!currentMark)
+            return marksArr;
+        const { psaSectionId, choices, typeId } = currentMark.question;
+        const { answerField } = (0, utils_1.getQuestionInfo)(typeId, psaSectionId);
+        const answer = currentMark.question[answerField];
+        const { result, score } = (0, utils_1.evaluateMark)({
+            mark: mark || '',
+            answer,
+            psaSectionId,
+            questionTypeId: typeId,
+            choices,
+        });
+        const updatedMark = {
+            ...marksArr[questionIndex],
+            marksheetId,
+            timeTaken,
+            questionChoiceId: choiceId ?? null,
+            isAnswered: true,
+            mark: mark || null,
+            result,
+            score,
+        };
+        return [
+            ...marksArr.slice(0, questionIndex),
+            updatedMark,
+            ...marksArr.slice(questionIndex + 1),
+        ];
+    };
+    // Case 1: marks
+    if (marks.length > 0) {
         return {
             restricted: {
-                saveMarksheets: [{ ...rest, marks }],
+                saveMarksheets: [{ ...rest, marks: updateMarksArray(marks), sections }],
             },
         };
     }
-    const { psaSectionId, choices, typeId } = currentMark.question;
-    const { answerField } = (0, utils_1.getQuestionInfo)(typeId, psaSectionId);
-    const answer = currentMark.question[answerField];
-    const { result, score } = (0, utils_1.evaluateMark)({
-        mark: mark || '',
-        answer,
-        psaSectionId,
-        questionTypeId: typeId,
-        choices,
-    });
-    const updatedMark = {
-        ...marks[questionIndex],
-        marksheetId,
-        timeTaken,
-        questionChoiceId: choiceId ?? null,
-        isAnswered: true,
-        mark: mark || null,
-        result,
-        score,
-    };
-    const updatedMarks = [
-        ...marks.slice(0, questionIndex),
-        updatedMark,
-        ...marks.slice(questionIndex + 1),
-    ];
+    // Case 2: sections
+    if (sections.length > 0) {
+        const updatedSections = sections.map((section) => {
+            if (!Array.isArray(section.marks))
+                return section;
+            const hasMark = section.marks.some((m) => Number(m.id) === Number(markId));
+            if (!hasMark)
+                return section;
+            return {
+                ...section,
+                marks: updateMarksArray(section.marks),
+            };
+        });
+        return {
+            restricted: {
+                saveMarksheets: [{ ...rest, sections: updatedSections, marks }],
+            },
+        };
+    }
+    // fallback
     return {
         restricted: {
-            saveMarksheets: [{ ...rest, marks: updatedMarks }],
+            saveMarksheets: [{ ...rest, marks, sections }],
         },
     };
 };

package/dist/cjs/resolvers/mutation/restricted/questionDiscussion.js

@@ -46,7 +46,7 @@ const getQuestionTypeName = (typeId) => {
         [models_1.EQuestionType.DECISION_MAKING_SBA]: 'QuestionSBA',
         [models_1.EQuestionType.DECISION_MAKING_YES_NO]: 'QuestionMultiA',
         [models_1.EQuestionType.SJT_SINGLE_CHOICE]: 'QuestionSBA',
-        [models_1.EQuestionType.SJT_TWO_ANSWERS]: 'QuestionSelect3',
+        [models_1.EQuestionType.SJT_TWO_ANSWERS]: 'QuestionSBA',
     };
     return mappedObj[typeId] ?? 'QuestionSBA';
 };

package/dist/cjs/resolvers/mutation/restricted/users.js

@@ -209,34 +209,38 @@ const updateCacheOnConceptLearningStatusUpdate = (topicId, prevStatus, entitleme
         return;
     }
     const { conceptIds, status } = variables;
-    const entitlementIdentity = {
-        __ref: cache.identify({
-            id: entitlement,
-            __typename: 'Entitlement',
-        }),
-    };
     conceptIds.forEach((id) => {
-        if (entitlement) {
-            cache.writeFragment({
-                id: cache.identify({
-                    id: id.toString,
-                    entitlement: entitlementIdentity,
-                    __typename: 'Concept',
-                }),
-                data: { status },
-                fragment: STATUS_CONCEPT_FRAGMENT,
-            });
-        }
         cache.writeFragment({
             id: cache.identify({ id, __typename: 'Concept' }),
             data: { status },
             fragment: STATUS_CONCEPT_FRAGMENT,
         });
+        cache.writeFragment({
+            id: cache.identify({
+                id: id.toString(),
+                ...(entitlement && {
+                    entitlement: {
+                        __ref: cache.identify({
+                            id: entitlement,
+                            __typename: 'Entitlement',
+                        }),
+                    },
+                }),
+                __typename: 'Concept',
+            }),
+            data: { status },
+            fragment: STATUS_CONCEPT_FRAGMENT,
+        });
     });
     const topicFragmentId = cache.identify({
         id: topicId.toString(),
         ...(entitlement && {
-            entitlement: entitlementIdentity,
+            entitlement: {
+                __ref: cache.identify({
+                    id: entitlement,
+                    __typename: 'Entitlement',
+                }),
+            },
         }),
         __typename: 'Topic',
     });

package/dist/cjs/utils/evaluateMark.js

@@ -81,7 +81,7 @@ function getQuestionInfo(questionType, psaSectionId) {
         case models_1.EQuestionType.SJT_SINGLE_CHOICE:
             return { maxScore: 1, answerField: 'sbaAnswer' };
         case models_1.EQuestionType.SJT_TWO_ANSWERS:
-            return { maxScore: 1, answerField: 'rankingAnswer' };
+            return { maxScore: 1, answerField: 'sbaAnswer' };
         default:
             return { maxScore: 1, answerField: 'answer' };
     }

package/dist/mjs/models/Blog.d.ts

@@ -15,7 +15,8 @@ export declare enum EBlogTags {
     MLA_CSPA = "MLA_CPSA",
     MRCP_VIDEO = "MRCP_Video",
     PLAB1 = "PLAB1",
-    PLAB2 = "PLAB2"
+    PLAB2 = "PLAB2",
+    UCAT = "UCAT"
 }
 export interface IBlogTag {
     id: Id;

package/dist/mjs/models/Blog.js

@@ -15,4 +15,5 @@ export var EBlogTags;
     EBlogTags["MRCP_VIDEO"] = "MRCP_Video";
     EBlogTags["PLAB1"] = "PLAB1";
     EBlogTags["PLAB2"] = "PLAB2";
+    EBlogTags["UCAT"] = "UCAT";
 })(EBlogTags || (EBlogTags = {}));

package/dist/mjs/models/Question.d.ts

@@ -204,7 +204,7 @@ export interface IQuestionRanking extends IQuestion {
 }
 export interface IQuestionSjtTwoAnswer extends IQuestion {
     answer: [string, string];
-    sjtTwoAnswer: [string, string];
+    sbaAnswer: [string, string];
 }
 export interface IQuestionPrescribe extends IQuestion {
     answer: IPrescribeAnswer[];

package/dist/mjs/resolvers/mutation/restricted/marksheet.js

@@ -78,10 +78,39 @@ export const SAVE_MARKSHEET = gql `
           flagged
           mark
         }
+        sections {
+          entitlementId
+          marks {
+            isAnswered
+            isInDailyStack
+            result
+            score
+            id
+            marksheetId
+            questionChoiceId
+            timeTaken
+            flagged
+            mark
+          }
+        }
       }
     }
   }
 `;
+function getMarksFromMarksheet(marksheets, marksheetId) {
+    const marksheet = marksheets.find((m) => Number(m.id) === Number(marksheetId));
+    if (!marksheet)
+        return [];
+    // Case 1: direct marks
+    if (Array.isArray(marksheet.marks) && marksheet.marks.length > 0) {
+        return marksheet.marks;
+    }
+    // Case 2: nested sections → flatten marks
+    if (Array.isArray(marksheet.sections)) {
+        return marksheet.sections.flatMap((section) => section.marks || []);
+    }
+    return [];
+}
 export const updateMarksheets = (cache, result, options) => {
     const { saveMarksheets } = result?.data?.restricted || {};
     const { variables } = options || {};
@@ -92,7 +121,7 @@ export const updateMarksheets = (cache, result, options) => {
         const { input } = variables;
         for (let i = 0; i < input.length; i++) {
             const inputData = input[i];
-            const savedMarks = saveMarksheets.find((m) => Number(m.id) === Number(inputData.marksheetId))?.marks;
+            const savedMarks = getMarksFromMarksheet(saveMarksheets, inputData.marksheetId);
             const savedData = savedMarks?.find((m) => m.id === inputData.markId);
             cache.writeFragment({
                 id: cache.identify({
@@ -117,43 +146,68 @@ export const updateMarksheets = (cache, result, options) => {
 };
 export const optimisticSaveMarksheets = (marksheet, marksheetInput, questionIndex) => {
     const { timeTaken, choiceId, mark, marksheetId, markId } = marksheetInput;
-    const { marks = [], ...rest } = marksheet || {};
-    const currentMark = marks.find((m) => Number(m.id) === Number(markId));
-    if (!currentMark) {
+    const { marks = [], sections = [], ...rest } = marksheet || {};
+    const updateMarksArray = (marksArr) => {
+        const currentMark = marksArr.find((m) => Number(m.id) === Number(markId));
+        if (!currentMark)
+            return marksArr;
+        const { psaSectionId, choices, typeId } = currentMark.question;
+        const { answerField } = getQuestionInfo(typeId, psaSectionId);
+        const answer = currentMark.question[answerField];
+        const { result, score } = evaluateMark({
+            mark: mark || '',
+            answer,
+            psaSectionId,
+            questionTypeId: typeId,
+            choices,
+        });
+        const updatedMark = {
+            ...marksArr[questionIndex],
+            marksheetId,
+            timeTaken,
+            questionChoiceId: choiceId ?? null,
+            isAnswered: true,
+            mark: mark || null,
+            result,
+            score,
+        };
+        return [
+            ...marksArr.slice(0, questionIndex),
+            updatedMark,
+            ...marksArr.slice(questionIndex + 1),
+        ];
+    };
+    // Case 1: marks
+    if (marks.length > 0) {
         return {
             restricted: {
-                saveMarksheets: [{ ...rest, marks }],
+                saveMarksheets: [{ ...rest, marks: updateMarksArray(marks), sections }],
             },
         };
     }
-    const { psaSectionId, choices, typeId } = currentMark.question;
-    const { answerField } = getQuestionInfo(typeId, psaSectionId);
-    const answer = currentMark.question[answerField];
-    const { result, score } = evaluateMark({
-        mark: mark || '',
-        answer,
-        psaSectionId,
-        questionTypeId: typeId,
-        choices,
-    });
-    const updatedMark = {
-        ...marks[questionIndex],
-        marksheetId,
-        timeTaken,
-        questionChoiceId: choiceId ?? null,
-        isAnswered: true,
-        mark: mark || null,
-        result,
-        score,
-    };
-    const updatedMarks = [
-        ...marks.slice(0, questionIndex),
-        updatedMark,
-        ...marks.slice(questionIndex + 1),
-    ];
+    // Case 2: sections
+    if (sections.length > 0) {
+        const updatedSections = sections.map((section) => {
+            if (!Array.isArray(section.marks))
+                return section;
+            const hasMark = section.marks.some((m) => Number(m.id) === Number(markId));
+            if (!hasMark)
+                return section;
+            return {
+                ...section,
+                marks: updateMarksArray(section.marks),
+            };
+        });
+        return {
+            restricted: {
+                saveMarksheets: [{ ...rest, sections: updatedSections, marks }],
+            },
+        };
+    }
+    // fallback
     return {
         restricted: {
-            saveMarksheets: [{ ...rest, marks: updatedMarks }],
+            saveMarksheets: [{ ...rest, marks, sections }],
         },
     };
 };

package/dist/mjs/resolvers/mutation/restricted/questionDiscussion.js

@@ -42,7 +42,7 @@ export const getQuestionTypeName = (typeId) => {
         [EQuestionType.DECISION_MAKING_SBA]: 'QuestionSBA',
         [EQuestionType.DECISION_MAKING_YES_NO]: 'QuestionMultiA',
         [EQuestionType.SJT_SINGLE_CHOICE]: 'QuestionSBA',
-        [EQuestionType.SJT_TWO_ANSWERS]: 'QuestionSelect3',
+        [EQuestionType.SJT_TWO_ANSWERS]: 'QuestionSBA',
     };
     return mappedObj[typeId] ?? 'QuestionSBA';
 };

package/dist/mjs/resolvers/mutation/restricted/users.js

@@ -203,34 +203,38 @@ export const updateCacheOnConceptLearningStatusUpdate = (topicId, prevStatus, en
         return;
     }
     const { conceptIds, status } = variables;
-    const entitlementIdentity = {
-        __ref: cache.identify({
-            id: entitlement,
-            __typename: 'Entitlement',
-        }),
-    };
     conceptIds.forEach((id) => {
-        if (entitlement) {
-            cache.writeFragment({
-                id: cache.identify({
-                    id: id.toString,
-                    entitlement: entitlementIdentity,
-                    __typename: 'Concept',
-                }),
-                data: { status },
-                fragment: STATUS_CONCEPT_FRAGMENT,
-            });
-        }
         cache.writeFragment({
             id: cache.identify({ id, __typename: 'Concept' }),
             data: { status },
             fragment: STATUS_CONCEPT_FRAGMENT,
         });
+        cache.writeFragment({
+            id: cache.identify({
+                id: id.toString(),
+                ...(entitlement && {
+                    entitlement: {
+                        __ref: cache.identify({
+                            id: entitlement,
+                            __typename: 'Entitlement',
+                        }),
+                    },
+                }),
+                __typename: 'Concept',
+            }),
+            data: { status },
+            fragment: STATUS_CONCEPT_FRAGMENT,
+        });
     });
     const topicFragmentId = cache.identify({
         id: topicId.toString(),
         ...(entitlement && {
-            entitlement: entitlementIdentity,
+            entitlement: {
+                __ref: cache.identify({
+                    id: entitlement,
+                    __typename: 'Entitlement',
+                }),
+            },
         }),
         __typename: 'Topic',
     });

package/dist/mjs/utils/evaluateMark.js

@@ -78,7 +78,7 @@ export function getQuestionInfo(questionType, psaSectionId) {
         case EQuestionType.SJT_SINGLE_CHOICE:
             return { maxScore: 1, answerField: 'sbaAnswer' };
         case EQuestionType.SJT_TWO_ANSWERS:
-            return { maxScore: 1, answerField: 'rankingAnswer' };
+            return { maxScore: 1, answerField: 'sbaAnswer' };
         default:
             return { maxScore: 1, answerField: 'answer' };
     }

package/package.json

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