@quesmed/types 2.5.57 → 2.5.59

package/dist/cjs/index.d.ts

@@ -8,6 +8,13 @@ export declare const ERRORS: {
     SUBSCRIPTION_EXPIRED: string;
     PERMISSION_INVALID: string;
 };
+export declare enum AlgoliaIndex {
+    Questions = "questions",
+    Flashcards = "cards",
+    Quesbook = "quesbook",
+    OsceBook = "oscebook",
+    Videos = "videos"
+}
 export declare enum EGrammarType {
     QUESTION = 0,
     CARD = 1,

package/dist/cjs/index.js

@@ -26,7 +26,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateDisplayName = exports.medicalWords = exports.termsAndConditions = exports.EPlatformId = exports.FCM_TOPICS = exports.EGrammarType = exports.ERRORS = exports.utils = exports.Models = void 0;
+exports.generateDisplayName = exports.medicalWords = exports.termsAndConditions = exports.EPlatformId = exports.FCM_TOPICS = exports.EGrammarType = exports.AlgoliaIndex = exports.ERRORS = exports.utils = exports.Models = void 0;
 const random_1 = require("./utils/random");
 exports.Models = __importStar(require("./models"));
 __exportStar(require("./resolvers"), exports);
@@ -38,6 +38,14 @@ exports.ERRORS = {
     SUBSCRIPTION_EXPIRED: 'Expired subscription.',
     PERMISSION_INVALID: 'Invalid permission.',
 };
+var AlgoliaIndex;
+(function (AlgoliaIndex) {
+    AlgoliaIndex["Questions"] = "questions";
+    AlgoliaIndex["Flashcards"] = "cards";
+    AlgoliaIndex["Quesbook"] = "quesbook";
+    AlgoliaIndex["OsceBook"] = "oscebook";
+    AlgoliaIndex["Videos"] = "videos";
+})(AlgoliaIndex = exports.AlgoliaIndex || (exports.AlgoliaIndex = {}));
 var EGrammarType;
 (function (EGrammarType) {
     EGrammarType[EGrammarType["QUESTION"] = 0] = "QUESTION";

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

@@ -1,4 +1,5 @@
 import { IBuildConfigData, IPreBuildMarksheet } from '../resolvers/mutation/restricted/marksheet';
+import { EProductType } from './Product';
 import { IPrescribeAnswer, IPrescribeMark, IQuestion, IQuestionChoice, IQuestionQAAnswer } from './Question';
 import { ETopicType } from './Topic';
 import { Id } from './Type';
@@ -78,6 +79,7 @@ export interface IMarksheet {
     topicConceptData?: string;
     preBuildData?: IPreBuildMarksheet;
     builderConfig?: IBuildConfigData;
+    productId: EProductType;
 }
 export type IMarksheetMarkJSONB = string | [string] | [IQuestionQAAnswer] | [string[], string[]] | [IPrescribeMark] | IPrescribeAnswer | null;
 export interface IMarksheetMark {

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

@@ -1,3 +1,4 @@
+import { EProductType } from './Product';
 import { IQuestion } from './Question';
 import { Id } from './Type';
 export declare enum EMockTestType {
@@ -21,6 +22,7 @@ export interface IMockTest {
     passingMark: number;
     public: boolean;
     questions: IQuestion[];
+    productId: EProductType[];
 }
 export interface IUserMockTest {
     id: Id;

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

@@ -1,4 +1,5 @@
 import { IOsceStation, IOsceStationMark, IOsceType } from './OsceStation';
+import { EProductType } from './Product';
 import { Id } from './Type';
 import { IUser } from './User';
 export interface IOsceMarksheetMember {
@@ -81,6 +82,7 @@ export interface IOsceMarksheet {
     members: IOsceMarksheetMember[];
     state: EOsceMarksheetState;
     completed: boolean;
+    productId: EProductType;
 }
 export interface IDashboardOsce {
     lastSessionId: string;
@@ -113,6 +115,7 @@ export declare enum EOsceStage {
 }
 export interface IOsceMarksheetTimer {
     osceMarksheetId: number;
+    sessionId: string;
     timeRemaining: string;
     totalStationTime: string;
     stageTime: string;

package/dist/cjs/models/OsceMarksheet.js

@@ -48,6 +48,7 @@ var EOsceStage;
 function createTimerPayload(osceMarksheet) {
     const payload = {
         osceMarksheetId: osceMarksheet.id,
+        sessionId: osceMarksheet.sessionId,
         timeRemaining: '00:00',
         totalStationTime: '00:00',
         stageTime: '/00 secs',

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

@@ -1,22 +1,18 @@
-import { ETopicType } from "./Topic";
-import { Id } from "./Type";
-import { IUniversity } from "./University";
+import { ETopicType } from './Topic';
+import { Id } from './Type';
+import { IUniversity } from './University';
 export interface IPresetTopic {
     id: Id;
     name: string;
-    concepts: number[];
+    concepts: Id[];
 }
-/**
- * topicType is not needed in the presets query
- * but used in the db model
- */
 export interface IPreset {
     id: Id;
     createdAt: number | Date;
     updatedAt: number | Date;
     userId: Id;
     name: string;
-    topicType?: ETopicType;
+    topicType: ETopicType;
     likes: number;
     university: IUniversity;
     total: number;

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

@@ -13,7 +13,8 @@ export declare enum EProductType {
     MSRA = 10,
     INTERVIEW_ANAESTHETICS = 11,
     INTERVIEW_CST = 12,
-    INTERVIEW_IMT = 13
+    INTERVIEW_IMT = 13,
+    INTERVIEW_RADIOLOGY = 14
 }
 export interface IProduct {
     id: Id;

package/dist/cjs/models/Product.js

@@ -17,6 +17,7 @@ var EProductType;
     EProductType[EProductType["INTERVIEW_ANAESTHETICS"] = 11] = "INTERVIEW_ANAESTHETICS";
     EProductType[EProductType["INTERVIEW_CST"] = 12] = "INTERVIEW_CST";
     EProductType[EProductType["INTERVIEW_IMT"] = 13] = "INTERVIEW_IMT";
+    EProductType[EProductType["INTERVIEW_RADIOLOGY"] = 14] = "INTERVIEW_RADIOLOGY";
 })(EProductType = exports.EProductType || (exports.EProductType = {}));
 var EAppType;
 (function (EAppType) {

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

@@ -177,11 +177,11 @@ export interface IQuestionEMQ extends IQuestion {
 }
 export interface IQuestionSelect3 extends IQuestion {
     answer: [string, string, string];
-    answerSelect3: [string, string, string];
+    select3Answer: [string, string, string];
 }
 export interface IQuestionRanking extends IQuestion {
     answer: string[];
-    answerRanking: string[];
+    rankingAnswer: string[];
 }
 export declare function isQuestionPrescribe(data: IQuestionAll): data is IQuestionPrescribe;
 export interface IQuestionPrescribe extends IQuestion {

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

@@ -8,7 +8,8 @@ export declare enum ETopicType {
     DATA_INTERPRETATION = 4,
     PSA = 5,
     OSCE = 6,
-    MOCK_TEST = 7
+    MOCK_TEST = 7,
+    SJT = 8
 }
 export interface ITopicType {
     id: ETopicType;

package/dist/cjs/models/Topic.js

@@ -11,4 +11,5 @@ var ETopicType;
     ETopicType[ETopicType["PSA"] = 5] = "PSA";
     ETopicType[ETopicType["OSCE"] = 6] = "OSCE";
     ETopicType[ETopicType["MOCK_TEST"] = 7] = "MOCK_TEST";
+    ETopicType[ETopicType["SJT"] = 8] = "SJT";
 })(ETopicType = exports.ETopicType || (exports.ETopicType = {}));

package/dist/cjs/resolvers/mutation/restricted/marksheet.d.ts

@@ -171,6 +171,7 @@ export declare const optimisticModifyMarksheetBuilderConfig: (marksheetId: numbe
             currentMarkId?: number | undefined;
             topicConceptData?: string | undefined;
             preBuildData?: IPreBuildMarksheet | undefined;
+            productId: import("../../../models").EProductType;
         };
     };
 };
@@ -267,6 +268,7 @@ export declare const optimisticEndMarksheet: (marksheet: IMarksheet) => {
             topicConceptData?: string | undefined;
             preBuildData?: IPreBuildMarksheet | undefined;
             builderConfig?: IBuildConfigData | undefined;
+            productId: import("../../../models").EProductType;
             __typename: string;
         };
     };

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

@@ -609,6 +609,13 @@ exports.BUILD_QUESTION_MARKSHEET = (0, client_1.gql) `
                 tag
                 color
               }
+              cases {
+                id
+                questionId
+                case
+                explanation
+                label
+              }
               choices {
                 id
                 explanation
@@ -1590,6 +1597,13 @@ exports.BUILD_MARKSHEET = (0, client_1.gql) `
                 tag
                 color
               }
+              cases {
+                id
+                questionId
+                case
+                explanation
+                label
+              }
               choices {
                 id
                 explanation
@@ -2576,6 +2590,13 @@ exports.RE_BUILD_MARKSHEET = (0, client_1.gql) `
                 tag
                 color
               }
+              cases {
+                id
+                questionId
+                case
+                explanation
+                label
+              }
               choices {
                 id
                 explanation

package/dist/cjs/resolvers/mutation/restricted/mockTest.d.ts

@@ -76,6 +76,7 @@ export declare const optimisticEndMockTest: (marksheet: IMarksheet) => {
             topicConceptData?: string | undefined;
             preBuildData?: import("./marksheet").IPreBuildMarksheet | undefined;
             builderConfig?: import("./marksheet").IBuildConfigData | undefined;
+            productId: import("../../../models").EProductType;
             __typename: string;
         };
     };

package/dist/cjs/resolvers/mutation/restricted/osce.d.ts

@@ -33,7 +33,7 @@ export interface IBuildOsceMarksheetVar {
 export type IBuildOsceMarksheetData = RestrictedData<graphqlNormalize & IOsceMarksheet, 'buildOsceMarksheet'>;
 export declare const CHANGE_OSCE_ROLE: import("@apollo/client").DocumentNode;
 export interface IChangeOsceRoleVar {
-    osceMarksheetId: Id;
+    sessionId: string;
     role: EOsceRoles;
 }
 export type IChangeOsceRoleData = RestrictedData<graphqlNormalize & IOsceMarksheet, 'changeOsceRole'>;

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

@@ -68,9 +68,9 @@ exports.BUILD_OSCE_MARKSHEET = (0, client_1.gql) `
 `;
 exports.CHANGE_OSCE_ROLE = (0, client_1.gql) `
   ${osce_1.OSCE_MARKSHEET_FIELDS}
-  mutation ChangeOsceRole($osceMarksheetId: Int!, $role: Int!) {
+  mutation ChangeOsceRole($sessionId: String!, $role: Int!) {
     restricted {
-      changeOsceRole(osceMarksheetId: $osceMarksheetId, role: $role) {
+      changeOsceRole(sessionId: $sessionId, role: $role) {
         ...OsceMarksheetFields
       }
     }

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

@@ -611,6 +611,13 @@ exports.MARKSHEET = (0, client_1.gql) `
                 tag
                 color
               }
+              cases {
+                id
+                questionId
+                case
+                explanation
+                label
+              }
               choices {
                 id
                 explanation
@@ -1736,6 +1743,13 @@ exports.FLAGGED_QUESTIONS = (0, client_1.gql) `
                   tag
                   color
                 }
+                cases {
+                  id
+                  questionId
+                  case
+                  explanation
+                  label
+                }
                 choices {
                   id
                   explanation
@@ -2710,6 +2724,13 @@ exports.FLAGGED_QUESTIONS_MARKSHEET = (0, client_1.gql) `
                 tag
                 color
               }
+              cases {
+                id
+                questionId
+                case
+                explanation
+                label
+              }
               choices {
                 id
                 explanation

package/dist/cjs/resolvers/query/restricted/question.js

@@ -545,6 +545,13 @@ exports.QUESTION = (0, client_1.gql) `
             tag
             color
           }
+          cases {
+            id
+            questionId
+            case
+            explanation
+            label
+          }
           choices {
             id
             explanation

package/dist/cjs/resolvers/query/restricted/topics.js

@@ -3,25 +3,37 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FLASHCARDS_TOPICS = exports.QUESTION_TOPICS = exports.TOPICS = exports.TOPIC = exports.TOPIC_STATS = void 0;
 const client_1 = require("@apollo/client");
 exports.TOPIC_STATS = (0, client_1.gql) `
-query TopicStats($typeId: [Int!]) {
-  restricted {
-    topicStats(typeId: $typeId) {
-      totalQuestions
-      completedQuestions
-      correctQuestions
-      incorrectQuestions
-      types {
-        id
-        name
+  query TopicStats($typeId: [Int!]) {
+    restricted {
+      topicStats(typeId: $typeId) {
         totalQuestions
         completedQuestions
         correctQuestions
         incorrectQuestions
+
+        redCards
+        totalCards
+        greenCards
+        yellowCards
+        dailyFeedCards
+
+        types {
+          id
+          name
+          totalQuestions
+          completedQuestions
+          correctQuestions
+          incorrectQuestions
+
+          redCards
+          totalCards
+          greenCards
+          yellowCards
+          dailyFeedCards
+        }
       }
     }
   }
-}
-
 `;
 exports.TOPIC = (0, client_1.gql) `
   query Topic($topicId: Int!) {

package/dist/cjs/resolvers/query/university.d.ts

@@ -1,7 +1,8 @@
 import { Id, IUniversity } from '../../models';
 import { graphqlNormalize, RootData } from '../types';
 export interface IUniversitiesVar {
-    id: Id;
+    id?: Id;
+    order?: string;
 }
 export type IUniversitiesData = RootData<graphqlNormalize & IUniversity[], 'universities'>;
 export declare const UNIVERSITIES: import("@apollo/client").DocumentNode;

package/dist/cjs/resolvers/query/university.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UNIVERSITIES = void 0;
 const client_1 = require("@apollo/client");
 exports.UNIVERSITIES = (0, client_1.gql) `
-  query universities($id: Int) {
-    universities(id: $id) {
+  query universities($id: Int, $order: String) {
+    universities(id: $id, order: $order) {
       name
       id
     }

package/dist/cjs/resolvers/subscription/marksheet.d.ts

@@ -8,7 +8,7 @@ export interface IMarksheetGroupMember {
  * onMarksheetChange
  */
 export interface IOnMarksheetChangeVar {
-    marksheetId: Id;
+    sessionId: string;
 }
 export interface IMarksheetInfo {
     state: EMarksheetState;
@@ -30,7 +30,7 @@ export declare const ON_MARKSHEET_CHANGE: import("@apollo/client").DocumentNode;
  * onPreStartMarksheetChange
  */
 export interface IOnPreStartMarksheetChangeVar {
-    marksheetId: Id;
+    sessionId: string;
 }
 export interface IPreStartMarksheetData {
     topicConceptData?: string;
@@ -38,6 +38,7 @@ export interface IPreStartMarksheetData {
     action: EMarksheetAction;
     builderConfig?: IBuildConfigData;
     marksheetId: Id;
+    sessionId: string;
     user: IUser;
 }
 export type IOnPreStartMarksheetChangeData = RootData<IPreStartMarksheetData, 'onPreStartMarksheetChange'>;
@@ -47,11 +48,12 @@ export declare const ON_PRESTART_MARKSHEET_CHANGE: import("@apollo/client").Docu
  * onMarksheetMarkChange
  */
 export interface IOnMarksheetMarkChangeVar {
-    marksheetId: Id;
+    sessionId: string;
 }
 export interface IMarksheetMarkData {
     action: EMarksheetAction;
     marksheetId: Id;
+    sessionId: string;
     markId?: Id;
     newMarkId?: Id;
     markIndex?: number;

package/dist/cjs/resolvers/subscription/marksheet.js

@@ -4,8 +4,8 @@ exports.ON_MARKSHEET_MARK_CHANGE = exports.ON_MARKSHEET_MARK_CHANGE_KEY = export
 const client_1 = require("@apollo/client");
 exports.ON_MARKSHEET_CHANGE_KEY = 'ON_MARKSHEET_CHANGE_KEY';
 exports.ON_MARKSHEET_CHANGE = (0, client_1.gql) `
-  subscription OnMarksheetChange($marksheetId: Int!) {
-    onMarksheetChange(marksheetId: $marksheetId) {
+  subscription OnMarksheetChange($sessionId: String!) {
+    onMarksheetChange(sessionId: $sessionId) {
       marksheetId
       agoraId
       sessionId
@@ -31,9 +31,10 @@ exports.ON_MARKSHEET_CHANGE = (0, client_1.gql) `
 `;
 exports.ON_PRESTART_MARKSHEET_CHANGE_KEY = 'ON_PRESTART_MARKSHEET_CHANGE_KEY';
 exports.ON_PRESTART_MARKSHEET_CHANGE = (0, client_1.gql) `
-  subscription OnPreStartMarksheetChange($marksheetId: Int!) {
-    onPreStartMarksheetChange(marksheetId: $marksheetId) {
+  subscription OnPreStartMarksheetChange($sessionId: String!) {
+    onPreStartMarksheetChange(sessionId: $sessionId) {
       marksheetId
+      sessionId
       topicConceptData
       action
       user {
@@ -60,10 +61,11 @@ exports.ON_PRESTART_MARKSHEET_CHANGE = (0, client_1.gql) `
 `;
 exports.ON_MARKSHEET_MARK_CHANGE_KEY = 'ON_MARKSHEET_CHANGE_KEY';
 exports.ON_MARKSHEET_MARK_CHANGE = (0, client_1.gql) `
-  subscription OnMarksheetMarkChange($marksheetId: Int!) {
-    onMarksheetMarkChange(marksheetId: $marksheetId) {
+  subscription OnMarksheetMarkChange($sessionId: String!) {
+    onMarksheetMarkChange(sessionId: $sessionId) {
       action
       marksheetId
+      sessionId
       markId
       newMarkId
       markIndex

package/dist/cjs/resolvers/subscription/osce.d.ts

@@ -18,16 +18,17 @@ export interface IOsceGroup {
 export declare const OsceGroupInit: (osceMarksheetId: number) => IOsceMarksheetMember[];
 export declare const OSCE_ROLE_CHANGE: import("@apollo/client").DocumentNode;
 export interface IOsceRoleChangedVar {
-    osceMarksheetId: Id;
+    sessionId: string;
 }
 export type IOsceRoleChangedData = RootData<IOsceGroup, 'osceRoleChange'>;
 export declare const OSCE_MARKSHEET_ACTION: import("@apollo/client").DocumentNode;
 export interface IOsceMarksheetActionVar {
-    osceMarksheetId: Id;
+    sessionId: string;
 }
 export interface IOsceMarksheetAction {
     osceMarksheetId: Id;
     osceStationId: Id;
+    completed: boolean;
     agoraId: string;
     sessionId: string;
     userId: Id;
@@ -40,6 +41,8 @@ export interface IOsceMarksheetAction {
     state: EOsceMarksheetState;
     action: EOsceMarksheetAction;
     marks?: IOsceMarksheetMark[];
+    timeTaken?: number;
+    score?: number;
     globalScore?: number;
     feedback?: string;
 }
@@ -70,6 +73,6 @@ export type IOsceMatchmakingUsersData = RootData<[
 ], 'osceMatchmakingUsers'>;
 export declare const OSCE_MARKSHEET_TIMER: import("@apollo/client").DocumentNode;
 export interface IOsceMarksheetTimerVar {
-    osceMarksheetId: number;
+    sessionId: string;
 }
 export type IOsceMarksheetTimerData = RootData<IOsceMarksheetTimer, 'osceMarksheetTimer'>;

package/dist/cjs/resolvers/subscription/osce.js

@@ -49,8 +49,8 @@ const OsceGroupInit = (osceMarksheetId) => [
 ];
 exports.OsceGroupInit = OsceGroupInit;
 exports.OSCE_ROLE_CHANGE = (0, client_1.gql) `
-  subscription osceRoleChangeSubscription($osceMarksheetId: Int!) {
-    osceRoleChange(osceMarksheetId: $osceMarksheetId) {
+  subscription osceRoleChangeSubscription($sessionId: String!) {
+    osceRoleChange(sessionId: $sessionId) {
       osceMarksheetId
       sessionId
       members {
@@ -71,11 +71,12 @@ exports.OSCE_ROLE_CHANGE = (0, client_1.gql) `
 `;
 exports.OSCE_MARKSHEET_ACTION = (0, client_1.gql) `
   ${fragments_1.OSCE_MARKSHEET_MARK_FIELDS}
-  subscription OsceMarksheetAction($osceMarksheetId: Int!) {
-    osceMarksheetAction(osceMarksheetId: $osceMarksheetId) {
+  subscription OsceMarksheetAction($sessionId: String!) {
+    osceMarksheetAction(sessionId: $sessionId) {
       osceMarksheetId
       osceStationId
       state
+      completed
       sessionId
       agoraId
       userId
@@ -98,7 +99,9 @@ exports.OSCE_MARKSHEET_ACTION = (0, client_1.gql) `
         role
       }
       feedback
+      timeTaken
       globalScore
+      score
       marks {
         ...OsceMarksheetMarkFields
       }
@@ -122,9 +125,10 @@ exports.OSCE_MATCHMAKING_USERS = (0, client_1.gql) `
   }
 `;
 exports.OSCE_MARKSHEET_TIMER = (0, client_1.gql) `
-  subscription OsceMarksheetTimer($osceMarksheetId: Int!) {
-    osceMarksheetTimer(osceMarksheetId: $osceMarksheetId) {
+  subscription OsceMarksheetTimer($sessionId: String!) {
+    osceMarksheetTimer(sessionId: $sessionId) {
       osceMarksheetId
+      sessionId
       timeRemaining
       totalStationTime
       stage

package/dist/mjs/index.d.ts

@@ -8,6 +8,13 @@ export declare const ERRORS: {
     SUBSCRIPTION_EXPIRED: string;
     PERMISSION_INVALID: string;
 };
+export declare enum AlgoliaIndex {
+    Questions = "questions",
+    Flashcards = "cards",
+    Quesbook = "quesbook",
+    OsceBook = "oscebook",
+    Videos = "videos"
+}
 export declare enum EGrammarType {
     QUESTION = 0,
     CARD = 1,

package/dist/mjs/index.js

@@ -9,6 +9,14 @@ export const ERRORS = {
     SUBSCRIPTION_EXPIRED: 'Expired subscription.',
     PERMISSION_INVALID: 'Invalid permission.',
 };
+export var AlgoliaIndex;
+(function (AlgoliaIndex) {
+    AlgoliaIndex["Questions"] = "questions";
+    AlgoliaIndex["Flashcards"] = "cards";
+    AlgoliaIndex["Quesbook"] = "quesbook";
+    AlgoliaIndex["OsceBook"] = "oscebook";
+    AlgoliaIndex["Videos"] = "videos";
+})(AlgoliaIndex || (AlgoliaIndex = {}));
 export var EGrammarType;
 (function (EGrammarType) {
     EGrammarType[EGrammarType["QUESTION"] = 0] = "QUESTION";

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

@@ -1,4 +1,5 @@
 import { IBuildConfigData, IPreBuildMarksheet } from '../resolvers/mutation/restricted/marksheet';
+import { EProductType } from './Product';
 import { IPrescribeAnswer, IPrescribeMark, IQuestion, IQuestionChoice, IQuestionQAAnswer } from './Question';
 import { ETopicType } from './Topic';
 import { Id } from './Type';
@@ -78,6 +79,7 @@ export interface IMarksheet {
     topicConceptData?: string;
     preBuildData?: IPreBuildMarksheet;
     builderConfig?: IBuildConfigData;
+    productId: EProductType;
 }
 export type IMarksheetMarkJSONB = string | [string] | [IQuestionQAAnswer] | [string[], string[]] | [IPrescribeMark] | IPrescribeAnswer | null;
 export interface IMarksheetMark {

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

@@ -1,3 +1,4 @@
+import { EProductType } from './Product';
 import { IQuestion } from './Question';
 import { Id } from './Type';
 export declare enum EMockTestType {
@@ -21,6 +22,7 @@ export interface IMockTest {
     passingMark: number;
     public: boolean;
     questions: IQuestion[];
+    productId: EProductType[];
 }
 export interface IUserMockTest {
     id: Id;

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

@@ -1,4 +1,5 @@
 import { IOsceStation, IOsceStationMark, IOsceType } from './OsceStation';
+import { EProductType } from './Product';
 import { Id } from './Type';
 import { IUser } from './User';
 export interface IOsceMarksheetMember {
@@ -81,6 +82,7 @@ export interface IOsceMarksheet {
     members: IOsceMarksheetMember[];
     state: EOsceMarksheetState;
     completed: boolean;
+    productId: EProductType;
 }
 export interface IDashboardOsce {
     lastSessionId: string;
@@ -113,6 +115,7 @@ export declare enum EOsceStage {
 }
 export interface IOsceMarksheetTimer {
     osceMarksheetId: number;
+    sessionId: string;
     timeRemaining: string;
     totalStationTime: string;
     stageTime: string;

package/dist/mjs/models/OsceMarksheet.js

@@ -45,6 +45,7 @@ export var EOsceStage;
 export function createTimerPayload(osceMarksheet) {
     const payload = {
         osceMarksheetId: osceMarksheet.id,
+        sessionId: osceMarksheet.sessionId,
         timeRemaining: '00:00',
         totalStationTime: '00:00',
         stageTime: '/00 secs',

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

@@ -1,22 +1,18 @@
-import { ETopicType } from "./Topic";
-import { Id } from "./Type";
-import { IUniversity } from "./University";
+import { ETopicType } from './Topic';
+import { Id } from './Type';
+import { IUniversity } from './University';
 export interface IPresetTopic {
     id: Id;
     name: string;
-    concepts: number[];
+    concepts: Id[];
 }
-/**
- * topicType is not needed in the presets query
- * but used in the db model
- */
 export interface IPreset {
     id: Id;
     createdAt: number | Date;
     updatedAt: number | Date;
     userId: Id;
     name: string;
-    topicType?: ETopicType;
+    topicType: ETopicType;
     likes: number;
     university: IUniversity;
     total: number;

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

@@ -13,7 +13,8 @@ export declare enum EProductType {
     MSRA = 10,
     INTERVIEW_ANAESTHETICS = 11,
     INTERVIEW_CST = 12,
-    INTERVIEW_IMT = 13
+    INTERVIEW_IMT = 13,
+    INTERVIEW_RADIOLOGY = 14
 }
 export interface IProduct {
     id: Id;

package/dist/mjs/models/Product.js

@@ -14,6 +14,7 @@ export var EProductType;
     EProductType[EProductType["INTERVIEW_ANAESTHETICS"] = 11] = "INTERVIEW_ANAESTHETICS";
     EProductType[EProductType["INTERVIEW_CST"] = 12] = "INTERVIEW_CST";
     EProductType[EProductType["INTERVIEW_IMT"] = 13] = "INTERVIEW_IMT";
+    EProductType[EProductType["INTERVIEW_RADIOLOGY"] = 14] = "INTERVIEW_RADIOLOGY";
 })(EProductType || (EProductType = {}));
 export var EAppType;
 (function (EAppType) {

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

@@ -177,11 +177,11 @@ export interface IQuestionEMQ extends IQuestion {
 }
 export interface IQuestionSelect3 extends IQuestion {
     answer: [string, string, string];
-    answerSelect3: [string, string, string];
+    select3Answer: [string, string, string];
 }
 export interface IQuestionRanking extends IQuestion {
     answer: string[];
-    answerRanking: string[];
+    rankingAnswer: string[];
 }
 export declare function isQuestionPrescribe(data: IQuestionAll): data is IQuestionPrescribe;
 export interface IQuestionPrescribe extends IQuestion {

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

@@ -8,7 +8,8 @@ export declare enum ETopicType {
     DATA_INTERPRETATION = 4,
     PSA = 5,
     OSCE = 6,
-    MOCK_TEST = 7
+    MOCK_TEST = 7,
+    SJT = 8
 }
 export interface ITopicType {
     id: ETopicType;

package/dist/mjs/models/Topic.js

@@ -8,4 +8,5 @@ export var ETopicType;
     ETopicType[ETopicType["PSA"] = 5] = "PSA";
     ETopicType[ETopicType["OSCE"] = 6] = "OSCE";
     ETopicType[ETopicType["MOCK_TEST"] = 7] = "MOCK_TEST";
+    ETopicType[ETopicType["SJT"] = 8] = "SJT";
 })(ETopicType || (ETopicType = {}));

package/dist/mjs/resolvers/mutation/restricted/marksheet.d.ts

@@ -171,6 +171,7 @@ export declare const optimisticModifyMarksheetBuilderConfig: (marksheetId: numbe
             currentMarkId?: number | undefined;
             topicConceptData?: string | undefined;
             preBuildData?: IPreBuildMarksheet | undefined;
+            productId: import("../../../models").EProductType;
         };
     };
 };
@@ -267,6 +268,7 @@ export declare const optimisticEndMarksheet: (marksheet: IMarksheet) => {
             topicConceptData?: string | undefined;
             preBuildData?: IPreBuildMarksheet | undefined;
             builderConfig?: IBuildConfigData | undefined;
+            productId: import("../../../models").EProductType;
             __typename: string;
         };
     };

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

@@ -606,6 +606,13 @@ export const BUILD_QUESTION_MARKSHEET = gql `
                 tag
                 color
               }
+              cases {
+                id
+                questionId
+                case
+                explanation
+                label
+              }
               choices {
                 id
                 explanation
@@ -1587,6 +1594,13 @@ export const BUILD_MARKSHEET = gql `
                 tag
                 color
               }
+              cases {
+                id
+                questionId
+                case
+                explanation
+                label
+              }
               choices {
                 id
                 explanation
@@ -2573,6 +2587,13 @@ export const RE_BUILD_MARKSHEET = gql `
                 tag
                 color
               }
+              cases {
+                id
+                questionId
+                case
+                explanation
+                label
+              }
               choices {
                 id
                 explanation

package/dist/mjs/resolvers/mutation/restricted/mockTest.d.ts

@@ -76,6 +76,7 @@ export declare const optimisticEndMockTest: (marksheet: IMarksheet) => {
             topicConceptData?: string | undefined;
             preBuildData?: import("./marksheet").IPreBuildMarksheet | undefined;
             builderConfig?: import("./marksheet").IBuildConfigData | undefined;
+            productId: import("../../../models").EProductType;
             __typename: string;
         };
     };

package/dist/mjs/resolvers/mutation/restricted/osce.d.ts

@@ -33,7 +33,7 @@ export interface IBuildOsceMarksheetVar {
 export type IBuildOsceMarksheetData = RestrictedData<graphqlNormalize & IOsceMarksheet, 'buildOsceMarksheet'>;
 export declare const CHANGE_OSCE_ROLE: import("@apollo/client").DocumentNode;
 export interface IChangeOsceRoleVar {
-    osceMarksheetId: Id;
+    sessionId: string;
     role: EOsceRoles;
 }
 export type IChangeOsceRoleData = RestrictedData<graphqlNormalize & IOsceMarksheet, 'changeOsceRole'>;

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

@@ -65,9 +65,9 @@ export const BUILD_OSCE_MARKSHEET = gql `
 `;
 export const CHANGE_OSCE_ROLE = gql `
   ${OSCE_MARKSHEET_FIELDS}
-  mutation ChangeOsceRole($osceMarksheetId: Int!, $role: Int!) {
+  mutation ChangeOsceRole($sessionId: String!, $role: Int!) {
     restricted {
-      changeOsceRole(osceMarksheetId: $osceMarksheetId, role: $role) {
+      changeOsceRole(sessionId: $sessionId, role: $role) {
         ...OsceMarksheetFields
       }
     }

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

@@ -608,6 +608,13 @@ export const MARKSHEET = gql `
                 tag
                 color
               }
+              cases {
+                id
+                questionId
+                case
+                explanation
+                label
+              }
               choices {
                 id
                 explanation
@@ -1733,6 +1740,13 @@ export const FLAGGED_QUESTIONS = gql `
                   tag
                   color
                 }
+                cases {
+                  id
+                  questionId
+                  case
+                  explanation
+                  label
+                }
                 choices {
                   id
                   explanation
@@ -2707,6 +2721,13 @@ export const FLAGGED_QUESTIONS_MARKSHEET = gql `
                 tag
                 color
               }
+              cases {
+                id
+                questionId
+                case
+                explanation
+                label
+              }
               choices {
                 id
                 explanation

package/dist/mjs/resolvers/query/restricted/question.js

@@ -542,6 +542,13 @@ export const QUESTION = gql `
             tag
             color
           }
+          cases {
+            id
+            questionId
+            case
+            explanation
+            label
+          }
           choices {
             id
             explanation

package/dist/mjs/resolvers/query/restricted/topics.js

@@ -1,24 +1,36 @@
 import { gql } from '@apollo/client';
 export const TOPIC_STATS = gql `
-query TopicStats($typeId: [Int!]) {
-  restricted {
-    topicStats(typeId: $typeId) {
-      totalQuestions
-      completedQuestions
-      correctQuestions
-      incorrectQuestions
-      types {
-        id
-        name
+  query TopicStats($typeId: [Int!]) {
+    restricted {
+      topicStats(typeId: $typeId) {
         totalQuestions
         completedQuestions
         correctQuestions
         incorrectQuestions
+
+        redCards
+        totalCards
+        greenCards
+        yellowCards
+        dailyFeedCards
+
+        types {
+          id
+          name
+          totalQuestions
+          completedQuestions
+          correctQuestions
+          incorrectQuestions
+
+          redCards
+          totalCards
+          greenCards
+          yellowCards
+          dailyFeedCards
+        }
       }
     }
   }
-}
-
 `;
 export const TOPIC = gql `
   query Topic($topicId: Int!) {

package/dist/mjs/resolvers/query/university.d.ts

@@ -1,7 +1,8 @@
 import { Id, IUniversity } from '../../models';
 import { graphqlNormalize, RootData } from '../types';
 export interface IUniversitiesVar {
-    id: Id;
+    id?: Id;
+    order?: string;
 }
 export type IUniversitiesData = RootData<graphqlNormalize & IUniversity[], 'universities'>;
 export declare const UNIVERSITIES: import("@apollo/client").DocumentNode;

package/dist/mjs/resolvers/query/university.js

@@ -1,7 +1,7 @@
 import { gql } from '@apollo/client';
 export const UNIVERSITIES = gql `
-  query universities($id: Int) {
-    universities(id: $id) {
+  query universities($id: Int, $order: String) {
+    universities(id: $id, order: $order) {
       name
       id
     }

package/dist/mjs/resolvers/subscription/marksheet.d.ts

@@ -8,7 +8,7 @@ export interface IMarksheetGroupMember {
  * onMarksheetChange
  */
 export interface IOnMarksheetChangeVar {
-    marksheetId: Id;
+    sessionId: string;
 }
 export interface IMarksheetInfo {
     state: EMarksheetState;
@@ -30,7 +30,7 @@ export declare const ON_MARKSHEET_CHANGE: import("@apollo/client").DocumentNode;
  * onPreStartMarksheetChange
  */
 export interface IOnPreStartMarksheetChangeVar {
-    marksheetId: Id;
+    sessionId: string;
 }
 export interface IPreStartMarksheetData {
     topicConceptData?: string;
@@ -38,6 +38,7 @@ export interface IPreStartMarksheetData {
     action: EMarksheetAction;
     builderConfig?: IBuildConfigData;
     marksheetId: Id;
+    sessionId: string;
     user: IUser;
 }
 export type IOnPreStartMarksheetChangeData = RootData<IPreStartMarksheetData, 'onPreStartMarksheetChange'>;
@@ -47,11 +48,12 @@ export declare const ON_PRESTART_MARKSHEET_CHANGE: import("@apollo/client").Docu
  * onMarksheetMarkChange
  */
 export interface IOnMarksheetMarkChangeVar {
-    marksheetId: Id;
+    sessionId: string;
 }
 export interface IMarksheetMarkData {
     action: EMarksheetAction;
     marksheetId: Id;
+    sessionId: string;
     markId?: Id;
     newMarkId?: Id;
     markIndex?: number;

package/dist/mjs/resolvers/subscription/marksheet.js

@@ -1,8 +1,8 @@
 import { gql } from '@apollo/client';
 export const ON_MARKSHEET_CHANGE_KEY = 'ON_MARKSHEET_CHANGE_KEY';
 export const ON_MARKSHEET_CHANGE = gql `
-  subscription OnMarksheetChange($marksheetId: Int!) {
-    onMarksheetChange(marksheetId: $marksheetId) {
+  subscription OnMarksheetChange($sessionId: String!) {
+    onMarksheetChange(sessionId: $sessionId) {
       marksheetId
       agoraId
       sessionId
@@ -28,9 +28,10 @@ export const ON_MARKSHEET_CHANGE = gql `
 `;
 export const ON_PRESTART_MARKSHEET_CHANGE_KEY = 'ON_PRESTART_MARKSHEET_CHANGE_KEY';
 export const ON_PRESTART_MARKSHEET_CHANGE = gql `
-  subscription OnPreStartMarksheetChange($marksheetId: Int!) {
-    onPreStartMarksheetChange(marksheetId: $marksheetId) {
+  subscription OnPreStartMarksheetChange($sessionId: String!) {
+    onPreStartMarksheetChange(sessionId: $sessionId) {
       marksheetId
+      sessionId
       topicConceptData
       action
       user {
@@ -57,10 +58,11 @@ export const ON_PRESTART_MARKSHEET_CHANGE = gql `
 `;
 export const ON_MARKSHEET_MARK_CHANGE_KEY = 'ON_MARKSHEET_CHANGE_KEY';
 export const ON_MARKSHEET_MARK_CHANGE = gql `
-  subscription OnMarksheetMarkChange($marksheetId: Int!) {
-    onMarksheetMarkChange(marksheetId: $marksheetId) {
+  subscription OnMarksheetMarkChange($sessionId: String!) {
+    onMarksheetMarkChange(sessionId: $sessionId) {
       action
       marksheetId
+      sessionId
       markId
       newMarkId
       markIndex

package/dist/mjs/resolvers/subscription/osce.d.ts

@@ -18,16 +18,17 @@ export interface IOsceGroup {
 export declare const OsceGroupInit: (osceMarksheetId: number) => IOsceMarksheetMember[];
 export declare const OSCE_ROLE_CHANGE: import("@apollo/client").DocumentNode;
 export interface IOsceRoleChangedVar {
-    osceMarksheetId: Id;
+    sessionId: string;
 }
 export type IOsceRoleChangedData = RootData<IOsceGroup, 'osceRoleChange'>;
 export declare const OSCE_MARKSHEET_ACTION: import("@apollo/client").DocumentNode;
 export interface IOsceMarksheetActionVar {
-    osceMarksheetId: Id;
+    sessionId: string;
 }
 export interface IOsceMarksheetAction {
     osceMarksheetId: Id;
     osceStationId: Id;
+    completed: boolean;
     agoraId: string;
     sessionId: string;
     userId: Id;
@@ -40,6 +41,8 @@ export interface IOsceMarksheetAction {
     state: EOsceMarksheetState;
     action: EOsceMarksheetAction;
     marks?: IOsceMarksheetMark[];
+    timeTaken?: number;
+    score?: number;
     globalScore?: number;
     feedback?: string;
 }
@@ -70,6 +73,6 @@ export type IOsceMatchmakingUsersData = RootData<[
 ], 'osceMatchmakingUsers'>;
 export declare const OSCE_MARKSHEET_TIMER: import("@apollo/client").DocumentNode;
 export interface IOsceMarksheetTimerVar {
-    osceMarksheetId: number;
+    sessionId: string;
 }
 export type IOsceMarksheetTimerData = RootData<IOsceMarksheetTimer, 'osceMarksheetTimer'>;

package/dist/mjs/resolvers/subscription/osce.js

@@ -45,8 +45,8 @@ export const OsceGroupInit = (osceMarksheetId) => [
     },
 ];
 export const OSCE_ROLE_CHANGE = gql `
-  subscription osceRoleChangeSubscription($osceMarksheetId: Int!) {
-    osceRoleChange(osceMarksheetId: $osceMarksheetId) {
+  subscription osceRoleChangeSubscription($sessionId: String!) {
+    osceRoleChange(sessionId: $sessionId) {
       osceMarksheetId
       sessionId
       members {
@@ -67,11 +67,12 @@ export const OSCE_ROLE_CHANGE = gql `
 `;
 export const OSCE_MARKSHEET_ACTION = gql `
   ${OSCE_MARKSHEET_MARK_FIELDS}
-  subscription OsceMarksheetAction($osceMarksheetId: Int!) {
-    osceMarksheetAction(osceMarksheetId: $osceMarksheetId) {
+  subscription OsceMarksheetAction($sessionId: String!) {
+    osceMarksheetAction(sessionId: $sessionId) {
       osceMarksheetId
       osceStationId
       state
+      completed
       sessionId
       agoraId
       userId
@@ -94,7 +95,9 @@ export const OSCE_MARKSHEET_ACTION = gql `
         role
       }
       feedback
+      timeTaken
       globalScore
+      score
       marks {
         ...OsceMarksheetMarkFields
       }
@@ -118,9 +121,10 @@ export const OSCE_MATCHMAKING_USERS = gql `
   }
 `;
 export const OSCE_MARKSHEET_TIMER = gql `
-  subscription OsceMarksheetTimer($osceMarksheetId: Int!) {
-    osceMarksheetTimer(osceMarksheetId: $osceMarksheetId) {
+  subscription OsceMarksheetTimer($sessionId: String!) {
+    osceMarksheetTimer(sessionId: $sessionId) {
       osceMarksheetId
+      sessionId
       timeRemaining
       totalStationTime
       stage

package/package.json

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