@quesmed/types-rn 2.6.128 → 2.6.130

package/index.d.ts

@@ -30,7 +30,15 @@ export declare enum EGrammarType {
     SJT_QUESTION = 10,
     RA_QUESTION = 11,
     PACES = 12,
-    PACE_TEMPLATE = 13
+    PACE_TEMPLATE = 13,
+    QUESTION_STEM = 14,
+    VERBAL_VERACITY = 15,
+    VERBAL_READING_COMPREHENSION = 16,
+    QUANTITATIVE_REASONING_SBA = 17,
+    DECISION_MAKING_SBA = 18,
+    DECISION_MAKING_YES_NO = 19,
+    SJT_SINGLE_CHOICE = 20,
+    SJT_TWO_ANSWERS = 21
 }
 export declare const FCM_TOPICS: {
     GLOBAL: string;

package/index.js

@@ -63,6 +63,14 @@ var EGrammarType;
     EGrammarType[EGrammarType["RA_QUESTION"] = 11] = "RA_QUESTION";
     EGrammarType[EGrammarType["PACES"] = 12] = "PACES";
     EGrammarType[EGrammarType["PACE_TEMPLATE"] = 13] = "PACE_TEMPLATE";
+    EGrammarType[EGrammarType["QUESTION_STEM"] = 14] = "QUESTION_STEM";
+    EGrammarType[EGrammarType["VERBAL_VERACITY"] = 15] = "VERBAL_VERACITY";
+    EGrammarType[EGrammarType["VERBAL_READING_COMPREHENSION"] = 16] = "VERBAL_READING_COMPREHENSION";
+    EGrammarType[EGrammarType["QUANTITATIVE_REASONING_SBA"] = 17] = "QUANTITATIVE_REASONING_SBA";
+    EGrammarType[EGrammarType["DECISION_MAKING_SBA"] = 18] = "DECISION_MAKING_SBA";
+    EGrammarType[EGrammarType["DECISION_MAKING_YES_NO"] = 19] = "DECISION_MAKING_YES_NO";
+    EGrammarType[EGrammarType["SJT_SINGLE_CHOICE"] = 20] = "SJT_SINGLE_CHOICE";
+    EGrammarType[EGrammarType["SJT_TWO_ANSWERS"] = 21] = "SJT_TWO_ANSWERS";
 })(EGrammarType = exports.EGrammarType || (exports.EGrammarType = {}));
 exports.FCM_TOPICS = {
     GLOBAL: 'global',

package/models/Content.d.ts

@@ -1,5 +1,6 @@
 import { EGrammarType } from '..';
 import { EDifficultyType } from './Difficulty';
+import { IEntitlementType } from './Product';
 import { IQuestion } from './Question';
 import { Id } from './Type';
 export declare enum EBatchType {
@@ -28,6 +29,8 @@ export interface IBatch {
     id: string;
     editorId: Id;
     type: EBatchType;
+    entitlementId: Id;
+    entitlement?: IEntitlementType;
     comment: string | null;
     createdAt: Date | number;
     updatedAt: Date | number;
@@ -86,6 +89,7 @@ export interface FileData {
 export interface IForcedChecks {
     question: boolean;
     topic: boolean;
+    theme: boolean;
     ukmlaTopic: boolean;
     concept: boolean;
     station: boolean;
@@ -95,6 +99,7 @@ export interface IForcedChecks {
 export interface IForcedInserts {
     question: boolean;
     topic: boolean;
+    theme: boolean;
     ukmlaTopic: boolean;
     concept: boolean;
     station: boolean;

package/models/OsceStation.d.ts

@@ -1,7 +1,7 @@
 import { IConcept } from './Concept';
 import { EDifficultyType } from './Difficulty';
 import { IUserStationNote } from './Note';
-import { IPaceScore } from './Paces';
+import { EPaceType, IPaceScore } from './Paces';
 import { IPicture } from './Picture';
 import { IEntitlement } from './Product';
 import { ITopic } from './Topic';
@@ -50,7 +50,7 @@ export interface IOsceStation {
     deletedAt: number | Date;
     name: string;
     hiddenName: string;
-    osceTypeId: Id;
+    osceTypeId: EOsceType | EPaceType;
     entitlement: IEntitlement;
     osceType?: IOsceType;
     difficulty: EDifficultyType;

package/models/Product.d.ts

@@ -39,7 +39,12 @@ export declare enum EProductType {
     NEUROLOGY = 32,
     RESPIRATORY = 33,
     PLAB1 = 34,
-    PLAB2 = 35
+    PLAB2 = 35,
+    UCAT = 48,
+    VERBAL = 49,
+    DECISION_MAKING = 50,
+    QUANTITATIVE_REASONING = 51,
+    SITUATIONAL_JUDGEMENT = 52
 }
 export declare enum EEntitlementType {
     ALL = 0,
@@ -72,7 +77,11 @@ export declare enum EEntitlementType {
     INTERVIEW_IMT = 42,
     INTERVIEW_RADIOLOGY = 43,
     INTERVIEW_PAEDIATRICS = 46,
-    PLAB_1 = 44
+    PLAB_1 = 44,
+    VERBAL = 49,
+    DECISION_MAKING = 50,
+    QUANTITATIVE_REASONING = 51,
+    SITUATIONAL_JUDGEMENT = 52
 }
 export interface IProduct {
     id: Id;

package/models/Product.js

@@ -43,6 +43,11 @@ var EProductType;
     EProductType[EProductType["RESPIRATORY"] = 33] = "RESPIRATORY";
     EProductType[EProductType["PLAB1"] = 34] = "PLAB1";
     EProductType[EProductType["PLAB2"] = 35] = "PLAB2";
+    EProductType[EProductType["UCAT"] = 48] = "UCAT";
+    EProductType[EProductType["VERBAL"] = 49] = "VERBAL";
+    EProductType[EProductType["DECISION_MAKING"] = 50] = "DECISION_MAKING";
+    EProductType[EProductType["QUANTITATIVE_REASONING"] = 51] = "QUANTITATIVE_REASONING";
+    EProductType[EProductType["SITUATIONAL_JUDGEMENT"] = 52] = "SITUATIONAL_JUDGEMENT";
 })(EProductType = exports.EProductType || (exports.EProductType = {}));
 var EEntitlementType;
 (function (EEntitlementType) {
@@ -77,6 +82,10 @@ var EEntitlementType;
     EEntitlementType[EEntitlementType["INTERVIEW_RADIOLOGY"] = 43] = "INTERVIEW_RADIOLOGY";
     EEntitlementType[EEntitlementType["INTERVIEW_PAEDIATRICS"] = 46] = "INTERVIEW_PAEDIATRICS";
     EEntitlementType[EEntitlementType["PLAB_1"] = 44] = "PLAB_1";
+    EEntitlementType[EEntitlementType["VERBAL"] = 49] = "VERBAL";
+    EEntitlementType[EEntitlementType["DECISION_MAKING"] = 50] = "DECISION_MAKING";
+    EEntitlementType[EEntitlementType["QUANTITATIVE_REASONING"] = 51] = "QUANTITATIVE_REASONING";
+    EEntitlementType[EEntitlementType["SITUATIONAL_JUDGEMENT"] = 52] = "SITUATIONAL_JUDGEMENT";
 })(EEntitlementType = exports.EEntitlementType || (exports.EEntitlementType = {}));
 var EAppType;
 (function (EAppType) {

package/models/Question.d.ts

@@ -1,3 +1,4 @@
+import { IChapter } from './Chapter';
 import { IConcept } from './Concept';
 import { ICondition } from './Condition';
 import { EDifficultyType } from './Difficulty';
@@ -6,6 +7,7 @@ import { IPicture } from './Picture';
 import { IPresentation } from './Presentation';
 import { ITopic } from './Topic';
 import { Id } from './Type';
+import { ITheme } from './Ucat';
 import { IUkmlaTopic } from './UkmlaTopic';
 import { EUserLearningPoint, IUser } from './User';
 export declare enum EPsaSectionType {
@@ -18,6 +20,11 @@ export declare enum EPsaSectionType {
     DRUG_MONITORING = 7,
     DATA_INTERPRETATION = 8
 }
+export declare enum EVeracityAnswer {
+    TRUE = "a",
+    FALSE = "b",
+    UNCERTAIN = "c"
+}
 export declare enum EQuestionType {
     SINGLE_BEST_ANSWER = 1,
     QUESTION_ANSWER = 2,
@@ -26,7 +33,14 @@ export declare enum EQuestionType {
     EXTENDED_MATCHING_ANSWER = 5,
     SELECT_THREE_ANSWER = 6,
     RANKING_ANSWER = 7,
-    SBA_WITH_MULTIPLE_CHOICES = 8
+    SBA_WITH_MULTIPLE_CHOICES = 8,
+    VERBAL_VERACITY = 9,
+    VERBAL_READING_COMPREHENSION = 10,
+    QUANTITATIVE_REASONING_SBA = 11,
+    DECISION_MAKING_SBA = 12,
+    DECISION_MAKING_YES_NO = 13,
+    SJT_SINGLE_CHOICE = 14,
+    SJT_TWO_ANSWERS = 15
 }
 export declare enum EQuestionLike {
     NONE = 0,
@@ -61,8 +75,8 @@ export interface IQuestionCommentLike {
     comment: IQuestionComment;
     likeTrueDislikeFalse: boolean;
 }
-export type IQuestionAnswer = string | [string] | [IQuestionQAAnswer] | [string[], string[]] | IPrescribeMark[] | [string, string][] | [string, string, string] | string[];
-export type IQuestionAll = IQuestion | IQuestionSBA | IQuestionQA | IQuestionMultiQ | IQuestionPrescribe | IQuestionEMQ | IQuestionSelect3 | IQuestionRanking;
+export type IQuestionAnswer = string | [string] | [IQuestionQAAnswer] | [string[], string[]] | IPrescribeMark[] | [string, string][] | [string, string, string] | string[] | [string, string];
+export type IQuestionAll = IQuestion | IQuestionSBA | IQuestionQA | IQuestionMultiQ | IQuestionPrescribe | IQuestionEMQ | IQuestionSelect3 | IQuestionRanking | IQuestionVerbalVeracity | IQuestionVerbalReading | IQuestionDecisionSBA | IQuestionDecisionYesNo | IQuestionQuantitativeSBA | IQuestionSjtSingleChoice | IQuestionSjtTwoAnswer;
 export interface IQuestion {
     id: Id;
     createdAt: Date | number;
@@ -71,7 +85,10 @@ export interface IQuestion {
     deleted: Boolean;
     typeId: EQuestionType;
     conceptId: Id;
+    stemId: Id | null;
     public: boolean;
+    stem?: Pick<IChapter, 'id' | 'explanation'>;
+    themes?: ITheme[];
     concept?: IConcept;
     conditions?: ICondition[];
     presentations?: IPresentation[];
@@ -142,6 +159,11 @@ export interface IQuestionEntitlement {
     entitlementId: Id;
     questionId: Id;
 }
+export interface IQuestionTheme {
+    id: Id;
+    themeId: Id;
+    questionId: Id;
+}
 export declare function isQuestionSBA(data: IQuestionAll): data is IQuestionSBA;
 export interface IQuestionSBA extends IQuestion {
     answer: [string];
@@ -176,6 +198,34 @@ export interface IQuestionRanking extends IQuestion {
     answer: string[];
     rankingAnswer: string[];
 }
+export interface IQuestionVerbalVeracity extends IQuestion {
+    answer: [string];
+    verbalVeracityAnswer: [string];
+}
+export interface IQuestionVerbalReading extends IQuestion {
+    answer: [string];
+    verbalReadingAnswer: [string];
+}
+export interface IQuestionQuantitativeSBA extends IQuestion {
+    answer: [string];
+    quantitativeSbaAnswer: [string];
+}
+export interface IQuestionDecisionSBA extends IQuestion {
+    answer: [string];
+    decisionSbaAnswer: [string];
+}
+export interface IQuestionDecisionYesNo extends IQuestion {
+    answer: [string[], string[]];
+    decisionYesNoAnswer: [string];
+}
+export interface IQuestionSjtSingleChoice extends IQuestion {
+    answer: [string];
+    sjtSingleChoiceAnswer: [string];
+}
+export interface IQuestionSjtTwoAnswer extends IQuestion {
+    answer: [string, string];
+    sjtTwoAnswer: [string, string];
+}
 export declare function isQuestionPrescribe(data: IQuestionAll): data is IQuestionPrescribe;
 export interface IQuestionPrescribe extends IQuestion {
     answer: IPrescribeMark[];

package/models/Question.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isQuestionPrescribe = exports.isQuestionRanking = exports.isQuestionSelect3 = exports.isQuestionEMQ = exports.isQuestionMultiQ = exports.isQuestionQA = exports.isQuestionSBA = exports.EQuestionLike = exports.EQuestionType = exports.EPsaSectionType = void 0;
+exports.isQuestionPrescribe = exports.isQuestionRanking = exports.isQuestionSelect3 = exports.isQuestionEMQ = exports.isQuestionMultiQ = exports.isQuestionQA = exports.isQuestionSBA = exports.EQuestionLike = exports.EQuestionType = exports.EVeracityAnswer = exports.EPsaSectionType = void 0;
 var EPsaSectionType;
 (function (EPsaSectionType) {
     EPsaSectionType[EPsaSectionType["PRESCRIBING"] = 1] = "PRESCRIBING";
@@ -12,6 +12,12 @@ var EPsaSectionType;
     EPsaSectionType[EPsaSectionType["DRUG_MONITORING"] = 7] = "DRUG_MONITORING";
     EPsaSectionType[EPsaSectionType["DATA_INTERPRETATION"] = 8] = "DATA_INTERPRETATION";
 })(EPsaSectionType = exports.EPsaSectionType || (exports.EPsaSectionType = {}));
+var EVeracityAnswer;
+(function (EVeracityAnswer) {
+    EVeracityAnswer["TRUE"] = "a";
+    EVeracityAnswer["FALSE"] = "b";
+    EVeracityAnswer["UNCERTAIN"] = "c";
+})(EVeracityAnswer = exports.EVeracityAnswer || (exports.EVeracityAnswer = {}));
 var EQuestionType;
 (function (EQuestionType) {
     EQuestionType[EQuestionType["SINGLE_BEST_ANSWER"] = 1] = "SINGLE_BEST_ANSWER";
@@ -22,6 +28,13 @@ var EQuestionType;
     EQuestionType[EQuestionType["SELECT_THREE_ANSWER"] = 6] = "SELECT_THREE_ANSWER";
     EQuestionType[EQuestionType["RANKING_ANSWER"] = 7] = "RANKING_ANSWER";
     EQuestionType[EQuestionType["SBA_WITH_MULTIPLE_CHOICES"] = 8] = "SBA_WITH_MULTIPLE_CHOICES";
+    EQuestionType[EQuestionType["VERBAL_VERACITY"] = 9] = "VERBAL_VERACITY";
+    EQuestionType[EQuestionType["VERBAL_READING_COMPREHENSION"] = 10] = "VERBAL_READING_COMPREHENSION";
+    EQuestionType[EQuestionType["QUANTITATIVE_REASONING_SBA"] = 11] = "QUANTITATIVE_REASONING_SBA";
+    EQuestionType[EQuestionType["DECISION_MAKING_SBA"] = 12] = "DECISION_MAKING_SBA";
+    EQuestionType[EQuestionType["DECISION_MAKING_YES_NO"] = 13] = "DECISION_MAKING_YES_NO";
+    EQuestionType[EQuestionType["SJT_SINGLE_CHOICE"] = 14] = "SJT_SINGLE_CHOICE";
+    EQuestionType[EQuestionType["SJT_TWO_ANSWERS"] = 15] = "SJT_TWO_ANSWERS";
 })(EQuestionType = exports.EQuestionType || (exports.EQuestionType = {}));
 var EQuestionLike;
 (function (EQuestionLike) {

package/models/Ucat.d.ts

@@ -0,0 +1,17 @@
+import { EEntitlementType, IEntitlement } from './Product';
+export interface IQuestionStem {
+    id: number;
+    explanation: string;
+    public: boolean;
+    createdAt: number | Date;
+    updatedAt: number | Date;
+}
+export interface ITheme {
+    id: number;
+    name: string;
+    public: boolean;
+    entitlementId: EEntitlementType;
+    entitlement?: IEntitlement;
+    createdAt: number | Date;
+    updatedAt: number | Date;
+}

package/models/Ucat.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/models/index.d.ts

@@ -31,6 +31,7 @@ export * from './Todo';
 export * from './Token';
 export * from './Topic';
 export * from './Type';
+export * from './Ucat';
 export * from './UkmlaTopic';
 export * from './University';
 export * from './User';

package/models/index.js

@@ -47,6 +47,7 @@ __exportStar(require("./Todo"), exports);
 __exportStar(require("./Token"), exports);
 __exportStar(require("./Topic"), exports);
 __exportStar(require("./Type"), exports);
+__exportStar(require("./Ucat"), exports);
 __exportStar(require("./UkmlaTopic"), exports);
 __exportStar(require("./University"), exports);
 __exportStar(require("./User"), exports);

package/package.json

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

package/resolvers/enums.d.ts

@@ -5,5 +5,6 @@ export declare enum ESortOrder {
 export declare enum DB_TYPE {
     ALL = 0,
     FINALS = 1,
-    MRCP = 2
+    MRCP = 2,
+    UCAT = 3
 }

package/resolvers/enums.js

@@ -11,4 +11,5 @@ var DB_TYPE;
     DB_TYPE[DB_TYPE["ALL"] = 0] = "ALL";
     DB_TYPE[DB_TYPE["FINALS"] = 1] = "FINALS";
     DB_TYPE[DB_TYPE["MRCP"] = 2] = "MRCP";
+    DB_TYPE[DB_TYPE["UCAT"] = 3] = "UCAT";
 })(DB_TYPE = exports.DB_TYPE || (exports.DB_TYPE = {}));

package/resolvers/mutation/admin/content.d.ts

@@ -27,6 +27,14 @@ export interface IValidateQuestionsVar {
 }
 export type IValidateQuestionsData = AdminData<IContentResult, 'validateQuestions'>;
 export declare const VALIDATE_QUESTIONS: import("@apollo/client").DocumentNode;
+export interface IUcatQueOptions extends IContentArgs {
+    entitlementId: EEntitlementType;
+}
+export interface IValidateUcatQuestionsVar {
+    input: IUcatQueOptions;
+}
+export type IValidateUcatQuestionsData = AdminData<IContentResult, 'validateUcatQuestions'>;
+export declare const VALIDATE_UCAT_QUESTIONS: import("@apollo/client").DocumentNode;
 export interface IMockOptions extends IContentArgs {
     mockTypeId: EMockTestType;
     topicTypeId: ETopicType;

package/resolvers/mutation/admin/content.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.REDIS_CALL = exports.GET_PRODUCT_TRANSACTIONS = exports.CONTACT_SYNC_STATUS = exports.CONTACT_SYNC = exports.CLONE_CONTENT = exports.DELETE_IMAGES = exports.QUEUE_STATUS = exports.DELETE_RECORDS = exports.DOWNLOAD_IMAGES = exports.UPLOAD_FILES = exports.DELETE_FILES = exports.ES3Folder = exports.UPLOAD_IMAGES = exports.PUBLIC_BATCH = exports.UPDATE_BATCH = exports.IMPORT_BATCH = exports.VALIDATE_MOCKTEST = exports.VALIDATE_QUESTIONS = exports.VALIDATE_STATIONS = exports.VALIDATE_BOOK = void 0;
+exports.REDIS_CALL = exports.GET_PRODUCT_TRANSACTIONS = exports.CONTACT_SYNC_STATUS = exports.CONTACT_SYNC = exports.CLONE_CONTENT = exports.DELETE_IMAGES = exports.QUEUE_STATUS = exports.DELETE_RECORDS = exports.DOWNLOAD_IMAGES = exports.UPLOAD_FILES = exports.DELETE_FILES = exports.ES3Folder = exports.UPLOAD_IMAGES = exports.PUBLIC_BATCH = exports.UPDATE_BATCH = exports.IMPORT_BATCH = exports.VALIDATE_MOCKTEST = exports.VALIDATE_UCAT_QUESTIONS = exports.VALIDATE_QUESTIONS = exports.VALIDATE_STATIONS = exports.VALIDATE_BOOK = void 0;
 const client_1 = require("@apollo/client");
 exports.VALIDATE_BOOK = (0, client_1.gql) `
   mutation ValidateBook($input: ValidateBookInput!) {
@@ -41,6 +41,19 @@ exports.VALIDATE_QUESTIONS = (0, client_1.gql) `
     }
   }
 `;
+exports.VALIDATE_UCAT_QUESTIONS = (0, client_1.gql) `
+  mutation ValidateUcatQuestions($input: ValidateUcatQuestionInput!) {
+    admin {
+      validateUcatQuestions(input: $input) {
+        batchId
+        logFile
+        status
+        message
+        errors
+      }
+    }
+  }
+`;
 exports.VALIDATE_MOCKTEST = (0, client_1.gql) `
   mutation validateMockTest($input: ValidateMockTestInput!) {
     admin {

package/resolvers/mutation/restricted/questionDiscussion.js

@@ -40,6 +40,13 @@ const getQuestionTypeName = (typeId) => {
         [models_1.EQuestionType.EXTENDED_MATCHING_ANSWER]: 'QuestionEMQ',
         [models_1.EQuestionType.RANKING_ANSWER]: 'QuestionRanking',
         [models_1.EQuestionType.SELECT_THREE_ANSWER]: 'QuestionSelect3',
+        [models_1.EQuestionType.VERBAL_READING_COMPREHENSION]: 'QuestionVerbalComprehension',
+        [models_1.EQuestionType.VERBAL_VERACITY]: 'QuestionVerbalVeracity',
+        [models_1.EQuestionType.DECISION_MAKING_SBA]: 'QuestionDecisionMakingSBA',
+        [models_1.EQuestionType.DECISION_MAKING_YES_NO]: 'QuestionDecisionMakingYesNo',
+        [models_1.EQuestionType.QUANTITATIVE_REASONING_SBA]: 'QuestionQuantitativeReasoningSBA',
+        [models_1.EQuestionType.SJT_SINGLE_CHOICE]: 'QuestionSJTSingleChoice',
+        [models_1.EQuestionType.SJT_TWO_ANSWERS]: 'QuestionSJTTwoAnswers',
     };
     return mappedObj[typeId] ?? 'QuestionSBA';
 };

package/resolvers/query/admin/dashboard.d.ts

@@ -36,6 +36,7 @@ export type IEarningsVar = {
     subType: ESubType;
     source: ESubSource;
     universityId: number | null;
+    useNetEarning: boolean;
 };
 export type IEarningsData = AdminData<IRevenue[], 'earnings'>;
 export declare const USER_STATUS: import("@apollo/client").DocumentNode;
@@ -133,6 +134,7 @@ export type IEarningsGraphVar = {
     source: ESubSource;
     universityId: number | null;
     force: boolean;
+    useNetEarning: boolean;
 };
 export type IEarningsGraphData = AdminData<Array<ITimeSeriesData>, 'earningsGraph'>;
 export declare const QUESTION_STATS: import("@apollo/client").DocumentNode;

package/resolvers/query/admin/dashboard.js

@@ -24,6 +24,7 @@ exports.EARNINGS = (0, client_1.gql) `
     $force: Boolean!
     $source: Int
     $universityId: Int
+    $useNetEarning: Boolean
   ) {
     admin {
       earnings(
@@ -34,6 +35,7 @@ exports.EARNINGS = (0, client_1.gql) `
         to: $to
         force: $force
         source: $source
+        useNetEarning: $useNetEarning
       ) {
         entitlement {
           id
@@ -182,6 +184,7 @@ exports.EARNINGS_GRAPH = (0, client_1.gql) `
     $source: Int
     $universityId: Int
     $force: Boolean
+    $useNetEarning: Boolean
   ) {
     admin {
       earningsGraph(
@@ -191,6 +194,7 @@ exports.EARNINGS_GRAPH = (0, client_1.gql) `
         source: $source
         universityId: $universityId
         force: $force
+        useNetEarning: $useNetEarning
       ) {
         month
         count

package/utils/commonFunctions.js

@@ -54,6 +54,11 @@ function correctMark(mark) {
         if ([
             models_1.EQuestionType.SINGLE_BEST_ANSWER,
             models_1.EQuestionType.SBA_WITH_MULTIPLE_CHOICES,
+            models_1.EQuestionType.VERBAL_VERACITY,
+            models_1.EQuestionType.VERBAL_READING_COMPREHENSION,
+            models_1.EQuestionType.DECISION_MAKING_SBA,
+            models_1.EQuestionType.QUANTITATIVE_REASONING_SBA,
+            models_1.EQuestionType.SJT_SINGLE_CHOICE,
         ].includes(mark.question.typeId)) {
             const answer = flatAnswer;
             const attempt = flatAttempt;
@@ -79,7 +84,10 @@ function correctMark(mark) {
                 data.incorrect = true;
             }
         }
-        else if (models_1.EQuestionType.MULTIPLE_ANSWERS === mark.question.typeId) {
+        else if ([
+            models_1.EQuestionType.MULTIPLE_ANSWERS,
+            models_1.EQuestionType.DECISION_MAKING_YES_NO,
+        ].includes(mark.question.typeId)) {
             const [answerA, answerB] = answer.map((x) => x.sort());
             let [attemptA, attemptB] = [[], []];
             if (Array.isArray(jsonAnswer) &&
@@ -182,6 +190,19 @@ function correctMark(mark) {
                 }
             }
         }
+        else if (models_1.EQuestionType.SJT_TWO_ANSWERS === mark.question.typeId) {
+            const twoAnswer = answer;
+            const attempt = jsonAnswer;
+            if (twoAnswer.length !== 2 || attempt.length !== 2) {
+                data.incorrect = true;
+            }
+            else if (twoAnswer.join(',') !== attempt.join(',')) {
+                data.incorrect = true;
+            }
+            else {
+                data.correct = true;
+            }
+        }
     }
     catch (e) {
         console.error(e);