@quesmed/types-rn 2.6.132 → 2.6.133

package/models/Product.d.ts

@@ -106,7 +106,8 @@ export declare enum EAppType {
     MRCP = 3,
     INTERVIEW = 4,
     MSRA = 5,
-    PLAB = 6
+    PLAB = 6,
+    UCAT = 7
 }
 export declare enum EProductDuration {
     ALL = 0,

package/models/Product.js

@@ -95,6 +95,7 @@ var EAppType;
     EAppType[EAppType["INTERVIEW"] = 4] = "INTERVIEW";
     EAppType[EAppType["MSRA"] = 5] = "MSRA";
     EAppType[EAppType["PLAB"] = 6] = "PLAB";
+    EAppType[EAppType["UCAT"] = 7] = "UCAT";
 })(EAppType = exports.EAppType || (exports.EAppType = {}));
 var EProductDuration;
 (function (EProductDuration) {

package/models/Question.d.ts

@@ -76,7 +76,7 @@ export interface IQuestionCommentLike {
     likeTrueDislikeFalse: boolean;
 }
 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 type IQuestionAll = IQuestion | IQuestionSBA | IQuestionQA | IQuestionMultiQ | IQuestionPrescribe | IQuestionEMQ | IQuestionSelect3 | IQuestionRanking | IQuestionSjtTwoAnswer;
 export interface IQuestion {
     id: Id;
     createdAt: Date | number;
@@ -87,7 +87,7 @@ export interface IQuestion {
     conceptId: Id;
     stemId: Id | null;
     public: boolean;
-    stem?: Pick<IChapter, 'id' | 'explanation'>;
+    stem?: IChapter;
     themes?: ITheme[];
     concept?: IConcept;
     conditions?: ICondition[];
@@ -173,15 +173,10 @@ export interface IQuestionQAAnswer {
     dose: string;
     units: string;
 }
-export declare function isQuestionQA(data: IQuestionAll): data is IQuestionQA;
 export interface IQuestionQA extends IQuestion {
     answer: [IQuestionQAAnswer];
     qaAnswer: [IQuestionQAAnswer];
 }
-export declare function isQuestionMultiQ(data: IQuestionAll): data is IQuestionMultiQ;
-export declare function isQuestionEMQ(data: IQuestionAll): data is IQuestionEMQ;
-export declare function isQuestionSelect3(data: IQuestionAll): data is IQuestionSelect3;
-export declare function isQuestionRanking(data: IQuestionAll): data is IQuestionRanking;
 export interface IQuestionMultiQ extends IQuestion {
     answer: [string[], string[]];
     multiAnswer: [string[], string[]];
@@ -198,35 +193,10 @@ 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[];
     prescribeAnswer: IPrescribeAnswer[];
@@ -236,6 +206,13 @@ export type IPrescribeAnswerData = {
     visible: boolean;
     label: string;
 };
+export declare function isQuestionQA(data: IQuestionAll): data is IQuestionQA;
+export declare function isQuestionMultiQ(data: IQuestionAll): data is IQuestionMultiQ;
+export declare function isQuestionEMQ(data: IQuestionAll): data is IQuestionEMQ;
+export declare function isQuestionSelect3(data: IQuestionAll): data is IQuestionSelect3;
+export declare function isQuestionRanking(data: IQuestionAll): data is IQuestionRanking;
+export declare function isQuestionSjtTwoAnswer(data: IQuestionAll): data is IQuestionSjtTwoAnswer;
+export declare function isQuestionPrescribe(data: IQuestionAll): data is IQuestionPrescribe;
 export interface IPrescribeAnswer {
     drug: IPrescribeAnswerData;
     dose: IPrescribeAnswerData;

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.EVeracityAnswer = exports.EPsaSectionType = void 0;
+exports.isQuestionPrescribe = exports.isQuestionSjtTwoAnswer = 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";
@@ -46,6 +46,11 @@ function isQuestionSBA(data) {
     return [
         EQuestionType.SINGLE_BEST_ANSWER,
         EQuestionType.SBA_WITH_MULTIPLE_CHOICES,
+        EQuestionType.VERBAL_VERACITY,
+        EQuestionType.VERBAL_READING_COMPREHENSION,
+        EQuestionType.DECISION_MAKING_SBA,
+        EQuestionType.QUANTITATIVE_REASONING_SBA,
+        EQuestionType.SJT_SINGLE_CHOICE,
     ].includes(data.typeId);
 }
 exports.isQuestionSBA = isQuestionSBA;
@@ -54,7 +59,10 @@ function isQuestionQA(data) {
 }
 exports.isQuestionQA = isQuestionQA;
 function isQuestionMultiQ(data) {
-    return data.typeId === EQuestionType.MULTIPLE_ANSWERS;
+    return [
+        EQuestionType.MULTIPLE_ANSWERS,
+        EQuestionType.DECISION_MAKING_YES_NO,
+    ].includes(data.typeId);
 }
 exports.isQuestionMultiQ = isQuestionMultiQ;
 function isQuestionEMQ(data) {
@@ -69,6 +77,10 @@ function isQuestionRanking(data) {
     return data.typeId === EQuestionType.RANKING_ANSWER;
 }
 exports.isQuestionRanking = isQuestionRanking;
+function isQuestionSjtTwoAnswer(data) {
+    return data.typeId === EQuestionType.SJT_TWO_ANSWERS;
+}
+exports.isQuestionSjtTwoAnswer = isQuestionSjtTwoAnswer;
 function isQuestionPrescribe(data) {
     return data.typeId === EQuestionType.PRESCRIPTION_ANSWER;
 }

package/models/Ucat.d.ts

@@ -1,11 +1,4 @@
 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;

package/models/User.d.ts

@@ -75,6 +75,7 @@ export interface IPayload {
     paediatricsInterviewSubscriptionEndDate: number | null;
     plab1SubscriptionEndDate: number | null;
     plab2SubscriptionEndDate: number | null;
+    ucatSubscriptionEndDate: number | null;
     ver: number;
 }
 export interface IDailyProgressVar {
@@ -182,6 +183,7 @@ export interface IUser {
     paediatricsInterviewSubscriptionEndDate: number | Date | null;
     plab1SubscriptionEndDate: number | Date | null;
     plab2SubscriptionEndDate: number | Date | null;
+    ucatSubscriptionEndDate: number | Date | null;
     settings: IUserSettings;
 }
 export declare function currentClassYear(createdAtUnix: number, classYear: IClassYear, compareUnix?: number): IClassYear;

package/models/User.js

@@ -46,6 +46,7 @@ exports.subscriptionDates = [
     'paediatricsInterviewSubscriptionEndDate',
     'plab1SubscriptionEndDate',
     'plab2SubscriptionEndDate',
+    'ucatSubscriptionEndDate',
 ];
 exports.dateProductMapping = {
     qbankSubscriptionEndDate: Product_1.EProductType.QBANK,
@@ -65,6 +66,7 @@ exports.dateProductMapping = {
     paediatricsInterviewSubscriptionEndDate: Product_1.EProductType.INTERVIEW_PAEDIATRICS,
     plab1SubscriptionEndDate: Product_1.EProductType.PLAB1,
     plab2SubscriptionEndDate: Product_1.EProductType.PLAB2,
+    ucatSubscriptionEndDate: Product_1.EProductType.UCAT,
 };
 var EClassYearGroup;
 (function (EClassYearGroup) {

package/package.json

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

package/resolvers/fragments/question.d.ts

@@ -1,5 +1,6 @@
 export declare const QUESTION_COMMENT_FIELDS: import("@apollo/client").DocumentNode;
 export declare const QUESTION_UKMLA_FIELDS: import("@apollo/client").DocumentNode;
+export declare const QUESTION_UCAT_FIELDS: import("@apollo/client").DocumentNode;
 export declare const QUESTION_CATEGORY_FIELDS: import("@apollo/client").DocumentNode;
 export declare const QUESTION_FIELDS: import("@apollo/client").DocumentNode;
 export declare const QUESTION_WITH_HIGHLIGHT_FIELDS: import("@apollo/client").DocumentNode;

package/resolvers/fragments/question.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.QUESTION_WITH_LEARNING_FIELDS = exports.QUESTION_WITH_COMMENT_FIELDS = exports.QUESTION_WITH_HIGHLIGHT_FIELDS = exports.QUESTION_FIELDS = exports.QUESTION_CATEGORY_FIELDS = exports.QUESTION_UKMLA_FIELDS = exports.QUESTION_COMMENT_FIELDS = void 0;
+exports.QUESTION_WITH_LEARNING_FIELDS = exports.QUESTION_WITH_COMMENT_FIELDS = exports.QUESTION_WITH_HIGHLIGHT_FIELDS = exports.QUESTION_FIELDS = exports.QUESTION_CATEGORY_FIELDS = exports.QUESTION_UCAT_FIELDS = exports.QUESTION_UKMLA_FIELDS = exports.QUESTION_COMMENT_FIELDS = void 0;
 const client_1 = require("@apollo/client");
+const chapter_1 = require("./chapter");
 const concept_1 = require("./concept");
 const highlight_1 = require("./highlight");
 const picture_1 = require("./picture");
@@ -59,6 +60,23 @@ exports.QUESTION_UKMLA_FIELDS = (0, client_1.gql) `
     }
   }
 `;
+exports.QUESTION_UCAT_FIELDS = (0, client_1.gql) `
+  ${chapter_1.CHAPTER_FIELDS}
+  fragment QuestionUcatFields on Question {
+    themes {
+      id
+      name
+      entitlementId
+      entitlement {
+        id
+        name
+      }
+    }
+    stem {
+      ...ChapterFields
+    }
+  }
+`;
 exports.QUESTION_CATEGORY_FIELDS = (0, client_1.gql) `
   fragment QuestionCategoryFields on Question {
     ... on QuestionSBA {
@@ -121,6 +139,7 @@ exports.QUESTION_CATEGORY_FIELDS = (0, client_1.gql) `
   }
 `;
 exports.QUESTION_FIELDS = (0, client_1.gql) `
+  ${exports.QUESTION_UCAT_FIELDS}
   ${exports.QUESTION_UKMLA_FIELDS}
   ${highlight_1.HIGHLIGHT_FIELDS}
   ${exports.QUESTION_CATEGORY_FIELDS}
@@ -168,6 +187,7 @@ exports.QUESTION_FIELDS = (0, client_1.gql) `
     }
     ...QuestionUkmlaFields
     ...QuestionCategoryFields
+    ...QuestionUcatFields
   }
 `;
 // used in cache updator

package/resolvers/fragments/user.js

@@ -125,6 +125,9 @@ exports.USER_FIELDS = (0, client_1.gql) `
     plab1SubscriptionEndDate
     plab2SubscriptionEndDate
 
+    # ucat
+    ucatSubscriptionEndDate
+
     # user-specific keys
     # marksheets
     # marksheetsCount

package/resolvers/mutation/restricted/questionDiscussion.js

@@ -40,13 +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',
+        [models_1.EQuestionType.VERBAL_READING_COMPREHENSION]: 'QuestionSBA',
+        [models_1.EQuestionType.VERBAL_VERACITY]: 'QuestionSBA',
+        [models_1.EQuestionType.QUANTITATIVE_REASONING_SBA]: 'QuestionSBA',
+        [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',
     };
     return mappedObj[typeId] ?? 'QuestionSBA';
 };