@quesmed/types 2.6.33 → 2.6.35

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

@@ -10,5 +10,5 @@ export interface IPromoReport {
     date: number | Date;
     couponId: Id;
     userId: Id;
-    productId: Id;
+    subscriptionId: Id;
 }

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

@@ -1,14 +1,17 @@
+import { ExtractKeysWithPattern } from '../resolvers/types';
 import { ICard } from './Card';
 import { IConcept } from './Concept';
 import { IMarksheet } from './Marksheet';
 import { INotification } from './Notification';
 import { IOsceStation } from './OsceStation';
+import { EProductType } from './Product';
 import { IQuestion, IQuestionHighlights } from './Question';
 import { ISubscription } from './Subscription';
 import { ITodo } from './Todo';
 import { Id } from './Type';
 import { IUniversity } from './University';
 import { IVideo } from './Video';
+export type IUserSubsriptionDates = keyof ExtractKeysWithPattern<IPayload, 'EndDate'>;
 export declare enum IAccessLevel {
     SUBSCRIBER = "subscriber",
     ADMINISTRATOR = "administrator",
@@ -18,6 +21,8 @@ export declare enum IAccessLevel {
 }
 export type IClassYear = 'Year 1' | 'Year 2' | 'Year 3' | 'Year 4' | 'Year 5' | 'Graduated' | 'PhD' | 'BSc' | 'MSc' | 'Beta Tester';
 export declare const classYears: IClassYear[];
+export declare const subscriptionDates: IUserSubsriptionDates[];
+export declare const dateProductMapping: Record<IUserSubsriptionDates, EProductType>;
 export declare enum EClassYearGroup {
     PRECLINICAL = 0,
     CLINICAL = 1

package/dist/cjs/models/User.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.currentClassGroup = exports.currentClassYear = exports.EPracticeIntensity = exports.classYearGroup = exports.EUserLearningStatus = exports.EClassYearGroup = exports.classYears = exports.IAccessLevel = void 0;
+exports.currentClassGroup = exports.currentClassYear = exports.EPracticeIntensity = exports.classYearGroup = exports.EUserLearningStatus = exports.EClassYearGroup = exports.dateProductMapping = exports.subscriptionDates = exports.classYears = exports.IAccessLevel = void 0;
 const luxon_1 = require("luxon");
+const Product_1 = require("./Product");
 var IAccessLevel;
 (function (IAccessLevel) {
     IAccessLevel["SUBSCRIBER"] = "subscriber";
@@ -18,6 +19,38 @@ exports.classYears = [
     'Year 5',
     'Graduated',
 ];
+exports.subscriptionDates = [
+    'qbankSubscriptionEndDate',
+    'osceSubscriptionEndDate',
+    'bundleSubscriptionEndDate',
+    'anatomySubscriptionEndDate',
+    'medicalSciencesSubscriptionEndDate',
+    'anatomyBundleSubscriptionEndDate',
+    'mrcpPart1SubscriptionEndDate',
+    'mrcpPart2SubscriptionEndDate',
+    'pacesSubscriptionEndDate',
+    'msraSubscriptionEndDate',
+    'anaestheticsInterviewSubscriptionEndDate',
+    'cstInterviewSubscriptionEndDate',
+    'imtInterviewSubscriptionEndDate',
+    'radiologyInterviewSubscriptionEndDate',
+];
+exports.dateProductMapping = {
+    qbankSubscriptionEndDate: Product_1.EProductType.QBANK,
+    osceSubscriptionEndDate: Product_1.EProductType.OSCE,
+    bundleSubscriptionEndDate: Product_1.EProductType.BUNDLE,
+    anatomySubscriptionEndDate: Product_1.EProductType.ANATOMY,
+    medicalSciencesSubscriptionEndDate: Product_1.EProductType.MEDICAL_SCIENCES,
+    anatomyBundleSubscriptionEndDate: Product_1.EProductType.ANATOMY_BUNDLE,
+    mrcpPart1SubscriptionEndDate: Product_1.EProductType.MRCP_PART1,
+    mrcpPart2SubscriptionEndDate: Product_1.EProductType.MRCP_PART2,
+    pacesSubscriptionEndDate: Product_1.EProductType.PACES,
+    msraSubscriptionEndDate: Product_1.EProductType.MSRA,
+    anaestheticsInterviewSubscriptionEndDate: Product_1.EProductType.INTERVIEW_ANAESTHETICS,
+    cstInterviewSubscriptionEndDate: Product_1.EProductType.INTERVIEW_IMT,
+    imtInterviewSubscriptionEndDate: Product_1.EProductType.QBANK,
+    radiologyInterviewSubscriptionEndDate: Product_1.EProductType.INTERVIEW_RADIOLOGY,
+};
 var EClassYearGroup;
 (function (EClassYearGroup) {
     EClassYearGroup[EClassYearGroup["PRECLINICAL"] = 0] = "PRECLINICAL";

package/dist/cjs/resolvers/constants.d.ts

@@ -1,12 +1,7 @@
-import { EMockTestType, EProductType, ETopicType } from "../models";
-import { DB_TYPE } from "./enums";
-/**
- * TODO:: move this config in database so that we can swap things in-out more easily
- * can be part of entitlement table or another
- */
+import { EMockTestType, EProductType, ETopicType } from '../models';
+import { DB_TYPE } from './enums';
 export declare const productMapping: Partial<Record<EProductType, {
     db: DB_TYPE;
-    builderTopicType: ETopicType[];
     topicType: ETopicType[];
     mockType: EMockTestType[];
 }>>;

package/dist/cjs/resolvers/constants.js

@@ -17,93 +17,78 @@ const ALL_MOCKS_WITHOUT_ANATOMY = [
     models_1.EMockTestType.UKMLA,
 ];
 const ALL_MOCKS = [models_1.EMockTestType.ANATOMY_SPOTTER, ...ALL_MOCKS_WITHOUT_ANATOMY];
-/**
- * TODO:: move this config in database so that we can swap things in-out more easily
- * can be part of entitlement table or another
- */
 exports.productMapping = {
     [models_1.EProductType.QBANK]: {
         db: enums_1.DB_TYPE.FINALS,
         topicType: ALL_TOPIC_TYPE_WITHOUT_ANATOMY,
-        builderTopicType: ALL_TOPIC_TYPE_WITHOUT_ANATOMY,
         mockType: ALL_MOCKS_WITHOUT_ANATOMY,
     },
     [models_1.EProductType.OSCE]: {
         db: enums_1.DB_TYPE.FINALS,
         topicType: ALL_TOPIC_TYPE,
-        builderTopicType: ALL_TOPIC_TYPE,
         mockType: ALL_MOCKS,
     },
     [models_1.EProductType.BUNDLE]: {
         db: enums_1.DB_TYPE.FINALS,
         topicType: ALL_TOPIC_TYPE_WITHOUT_ANATOMY,
-        builderTopicType: ALL_TOPIC_TYPE_WITHOUT_ANATOMY,
         mockType: ALL_MOCKS_WITHOUT_ANATOMY,
     },
     [models_1.EProductType.ANATOMY]: {
         db: enums_1.DB_TYPE.FINALS,
         topicType: [models_1.ETopicType.ANATOMY],
-        builderTopicType: [models_1.ETopicType.ANATOMY],
         mockType: [models_1.EMockTestType.ANATOMY_SPOTTER],
     },
     [models_1.EProductType.MEDICAL_SCIENCES]: {
         db: enums_1.DB_TYPE.FINALS,
-        builderTopicType: [models_1.ETopicType.PRE_CLINICAL],
         topicType: [models_1.ETopicType.PRE_CLINICAL],
         mockType: [models_1.EMockTestType.UNIVERSITY_SPECIFIC],
     },
     [models_1.EProductType.ANATOMY_BUNDLE]: {
         db: enums_1.DB_TYPE.FINALS,
         topicType: [models_1.ETopicType.ANATOMY, models_1.ETopicType.PRE_CLINICAL],
-        builderTopicType: [models_1.ETopicType.ANATOMY, models_1.ETopicType.PRE_CLINICAL],
-        mockType: [models_1.EMockTestType.ANATOMY_SPOTTER, models_1.EMockTestType.UNIVERSITY_SPECIFIC],
+        mockType: [
+            models_1.EMockTestType.ANATOMY_SPOTTER,
+            models_1.EMockTestType.UNIVERSITY_SPECIFIC,
+        ],
     },
     [models_1.EProductType.MRCP_PART1]: {
         db: enums_1.DB_TYPE.MRCP,
         topicType: [models_1.ETopicType.CLINICAL],
-        builderTopicType: [models_1.ETopicType.CLINICAL],
         mockType: [models_1.EMockTestType.MRCP],
     },
     [models_1.EProductType.MRCP_PART2]: {
         db: enums_1.DB_TYPE.MRCP,
         topicType: [models_1.ETopicType.CLINICAL],
-        builderTopicType: [models_1.ETopicType.CLINICAL],
         mockType: [models_1.EMockTestType.MRCP],
     },
     [models_1.EProductType.PACES]: {
         db: enums_1.DB_TYPE.MRCP,
         topicType: [models_1.ETopicType.OSCE],
-        builderTopicType: [models_1.ETopicType.OSCE],
         mockType: ALL_MOCKS,
     },
     [models_1.EProductType.MSRA]: {
         db: enums_1.DB_TYPE.FINALS,
         topicType: [models_1.ETopicType.CLINICAL],
-        builderTopicType: [models_1.ETopicType.CLINICAL, models_1.ETopicType.SJT],
         mockType: ALL_MOCKS,
     },
     [models_1.EProductType.INTERVIEW_ANAESTHETICS]: {
         db: enums_1.DB_TYPE.FINALS,
         topicType: [models_1.ETopicType.INTERVIEW_ANAESTHETICS],
-        builderTopicType: [models_1.ETopicType.INTERVIEW_ANAESTHETICS],
         mockType: ALL_MOCKS,
     },
     [models_1.EProductType.INTERVIEW_CST]: {
         db: enums_1.DB_TYPE.FINALS,
         topicType: [models_1.ETopicType.INTERVIEW_CST],
-        builderTopicType: [models_1.ETopicType.INTERVIEW_CST],
         mockType: ALL_MOCKS,
     },
     [models_1.EProductType.INTERVIEW_IMT]: {
         db: enums_1.DB_TYPE.FINALS,
         topicType: [models_1.ETopicType.INTERVIEW_IMT],
-        builderTopicType: [models_1.ETopicType.INTERVIEW_IMT],
         mockType: ALL_MOCKS,
     },
     [models_1.EProductType.INTERVIEW_RADIOLOGY]: {
         db: enums_1.DB_TYPE.FINALS,
         topicType: [models_1.ETopicType.INTERVIEW_RADIOLOGY],
-        builderTopicType: [models_1.ETopicType.INTERVIEW_RADIOLOGY],
         mockType: ALL_MOCKS,
     },
 };

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

@@ -11,5 +11,5 @@ export declare const MODIFY_MARKSHEET_STATE_FRAGMENT: import("@apollo/client").D
 export declare const MODIFY_TOPIC_SELECTION_FRAGMENT: import("@apollo/client").DocumentNode;
 export declare const MODIFY_CURRENT_MARK_FRAGMENT: import("@apollo/client").DocumentNode;
 export declare const MARK_FLAGGED_FIELD: import("@apollo/client").DocumentNode;
-export declare const MODIFY_COMPLETED_FRAGMENT: import("@apollo/client").DocumentNode;
+export declare const MODIFY_MARKSHEET_COMPLETED_FRAGMENT: import("@apollo/client").DocumentNode;
 export declare const NEW_MARK_FIELDS: import("@apollo/client").DocumentNode;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NEW_MARK_FIELDS = exports.MODIFY_COMPLETED_FRAGMENT = exports.MARK_FLAGGED_FIELD = exports.MODIFY_CURRENT_MARK_FRAGMENT = exports.MODIFY_TOPIC_SELECTION_FRAGMENT = exports.MODIFY_MARKSHEET_STATE_FRAGMENT = exports.MODIFY_MARKSHEET_MARK_STRIKED_FRAGMENT = exports.MODIFY_MARKSHEET_MARK_QUESTIONCHOICEID_FRAGMENT = exports.MODIFY_CURRENT_MARKSHEET_MARK_FRAGMENT = exports.MARKSHEET_FIELDS = exports.BUILDER_CONFIG_FIELDS = exports.MARKSHEET_MARK_FIELDS = void 0;
+exports.NEW_MARK_FIELDS = exports.MODIFY_MARKSHEET_COMPLETED_FRAGMENT = exports.MARK_FLAGGED_FIELD = exports.MODIFY_CURRENT_MARK_FRAGMENT = exports.MODIFY_TOPIC_SELECTION_FRAGMENT = exports.MODIFY_MARKSHEET_STATE_FRAGMENT = exports.MODIFY_MARKSHEET_MARK_STRIKED_FRAGMENT = exports.MODIFY_MARKSHEET_MARK_QUESTIONCHOICEID_FRAGMENT = exports.MODIFY_CURRENT_MARKSHEET_MARK_FRAGMENT = exports.MARKSHEET_FIELDS = exports.BUILDER_CONFIG_FIELDS = exports.MARKSHEET_MARK_FIELDS = void 0;
 const client_1 = require("@apollo/client");
 const question_1 = require("./question");
 exports.MARKSHEET_MARK_FIELDS = (0, client_1.gql) `
@@ -128,9 +128,14 @@ exports.MARK_FLAGGED_FIELD = (0, client_1.gql) `
     flagged
   }
 `;
-exports.MODIFY_COMPLETED_FRAGMENT = (0, client_1.gql) `
+exports.MODIFY_MARKSHEET_COMPLETED_FRAGMENT = (0, client_1.gql) `
   fragment MarksheetCompleted on Marksheet {
+    timeTaken
     completed
+    correct
+    incorrect
+    duration
+    endedAt
   }
 `;
 exports.NEW_MARK_FIELDS = (0, client_1.gql) `

package/dist/cjs/resolvers/fragments/mockTest.js

@@ -29,6 +29,7 @@ exports.COMPLETED_MOCK_TEST_MARKSHEET_FRAGMENT = (0, client_1.gql) `
   fragment MockTestCompleted on Marksheet {
     completed
     correct
+    timeTaken
     incorrect
     duration
     endedAt

package/dist/cjs/resolvers/fragments/question.js

@@ -140,6 +140,8 @@ exports.QUESTION_FIELDS = (0, client_1.gql) `
       ...QuestionCommentFields
     }
     concept {
+      # needed for daily stack
+      totalCards
       ...ConceptFields
     }
     pictures {

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

@@ -242,7 +242,7 @@ export interface IEndMarksheetVar {
 }
 export type IEndMarksheetData = RestrictedData<graphqlNormalize & IMarksheet, 'endMarksheet'>;
 export declare const END_MARKSHEET: import("@apollo/client").DocumentNode;
-export declare const updateCacheOnEndMarksheet: (cache: ApolloCache<any>, result: ApolloUpdateResultRestricted<IEndMarksheetData>, options: ApolloUpdateOptions) => void;
+export declare const updateCacheOnEndMarksheet: (cache: ApolloCache<any>, result: ApolloUpdateResultRestricted<IEndMarksheetData>, options: ApolloUpdateOptions<IEndMarksheetVar>) => void;
 export declare const optimisticEndMarksheet: (marksheet: IMarksheet) => {
     restricted: {
         __typename: string;

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

@@ -389,6 +389,7 @@ exports.END_MARKSHEET = (0, client_1.gql) `
       endMarksheet(marksheetId: $marksheetId) {
         id
         timeTaken
+        startedAt
         endedAt
         completed
         passingMark
@@ -411,8 +412,13 @@ const updateCacheOnEndMarksheet = (cache, result, options) => {
         id: cache.identify({ id, __typename: 'Marksheet' }),
         data: {
             completed: true,
+            timeTaken: endMarksheet.timeTaken,
+            correct: endMarksheet.correct,
+            incorrect: endMarksheet.incorrect,
+            duration: endMarksheet.duration,
+            endedAt: endMarksheet.endedAt,
         },
-        fragment: marksheet_1.MODIFY_COMPLETED_FRAGMENT,
+        fragment: marksheet_1.MODIFY_MARKSHEET_COMPLETED_FRAGMENT,
     });
 };
 exports.updateCacheOnEndMarksheet = updateCacheOnEndMarksheet;

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

@@ -60,6 +60,7 @@ exports.END_MOCK_TEST = (0, client_1.gql) `
     restricted {
       endMockTest(marksheetId: $marksheetId) {
         id
+        timeTaken
         startedAt
         endedAt
         mockTestId
@@ -83,6 +84,7 @@ const updateCacheOnEndMockTest = (cache, result, options) => {
         id: cache.identify({ id, __typename: 'Marksheet' }),
         data: {
             completed: true,
+            timeTaken: endMockTest.timeTaken,
             correct: endMockTest.correct,
             incorrect: endMockTest.incorrect,
             duration: endMockTest.duration,

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

@@ -279,7 +279,7 @@ const updateQuestionCommentsRemove = (typeId) => (cache, result, options) => {
         });
         if (dataFragment) {
             const { comments = [] } = dataFragment;
-            const createdAtDate = luxon_1.DateTime.fromJSDate(createdAt);
+            const createdAtDate = luxon_1.DateTime.fromSeconds(createdAt);
             const diffInHours = luxon_1.DateTime.now().diff(createdAtDate, 'hours').hours;
             let updatedComments = [];
             if (diffInHours >= 24) {

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

@@ -4,7 +4,7 @@ exports.updateSubscriptionOnCancelOrRenew = exports.CANCEL_SUBSCRIPTION = void 0
 const client_1 = require("@apollo/client");
 const restricted_1 = require("../../query/restricted");
 exports.CANCEL_SUBSCRIPTION = (0, client_1.gql) `
-  mutation Mutation($subscriptionId: Int!) {
+  mutation CancelSubscription($subscriptionId: Int!) {
     restricted {
       cancelSubscription(subscriptionId: $subscriptionId) {
         id

package/dist/cjs/resolvers/types.d.ts

@@ -9,3 +9,10 @@ export type AdminData<T, K extends keyof any> = {
 };
 export type RootData<T, K extends keyof any> = Record<K, T>;
 export type Nullable<T> = T | null;
+export type ExtractKeysWithPattern<U, V extends string> = {
+    [K in keyof U as K extends `${infer Prefix}${V}` ? K : never]: U[K];
+};
+export type DotPrefix<T extends string> = T extends '' ? '' : `.${T}`;
+export type WithRequired<T, K extends keyof T> = T & {
+    [P in K]-?: T[P];
+};

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

@@ -10,5 +10,5 @@ export interface IPromoReport {
     date: number | Date;
     couponId: Id;
     userId: Id;
-    productId: Id;
+    subscriptionId: Id;
 }

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

@@ -1,14 +1,17 @@
+import { ExtractKeysWithPattern } from '../resolvers/types';
 import { ICard } from './Card';
 import { IConcept } from './Concept';
 import { IMarksheet } from './Marksheet';
 import { INotification } from './Notification';
 import { IOsceStation } from './OsceStation';
+import { EProductType } from './Product';
 import { IQuestion, IQuestionHighlights } from './Question';
 import { ISubscription } from './Subscription';
 import { ITodo } from './Todo';
 import { Id } from './Type';
 import { IUniversity } from './University';
 import { IVideo } from './Video';
+export type IUserSubsriptionDates = keyof ExtractKeysWithPattern<IPayload, 'EndDate'>;
 export declare enum IAccessLevel {
     SUBSCRIBER = "subscriber",
     ADMINISTRATOR = "administrator",
@@ -18,6 +21,8 @@ export declare enum IAccessLevel {
 }
 export type IClassYear = 'Year 1' | 'Year 2' | 'Year 3' | 'Year 4' | 'Year 5' | 'Graduated' | 'PhD' | 'BSc' | 'MSc' | 'Beta Tester';
 export declare const classYears: IClassYear[];
+export declare const subscriptionDates: IUserSubsriptionDates[];
+export declare const dateProductMapping: Record<IUserSubsriptionDates, EProductType>;
 export declare enum EClassYearGroup {
     PRECLINICAL = 0,
     CLINICAL = 1

package/dist/mjs/models/User.js

@@ -1,4 +1,5 @@
 import { DateTime } from 'luxon';
+import { EProductType } from './Product';
 export var IAccessLevel;
 (function (IAccessLevel) {
     IAccessLevel["SUBSCRIBER"] = "subscriber";
@@ -15,6 +16,38 @@ export const classYears = [
     'Year 5',
     'Graduated',
 ];
+export const subscriptionDates = [
+    'qbankSubscriptionEndDate',
+    'osceSubscriptionEndDate',
+    'bundleSubscriptionEndDate',
+    'anatomySubscriptionEndDate',
+    'medicalSciencesSubscriptionEndDate',
+    'anatomyBundleSubscriptionEndDate',
+    'mrcpPart1SubscriptionEndDate',
+    'mrcpPart2SubscriptionEndDate',
+    'pacesSubscriptionEndDate',
+    'msraSubscriptionEndDate',
+    'anaestheticsInterviewSubscriptionEndDate',
+    'cstInterviewSubscriptionEndDate',
+    'imtInterviewSubscriptionEndDate',
+    'radiologyInterviewSubscriptionEndDate',
+];
+export const dateProductMapping = {
+    qbankSubscriptionEndDate: EProductType.QBANK,
+    osceSubscriptionEndDate: EProductType.OSCE,
+    bundleSubscriptionEndDate: EProductType.BUNDLE,
+    anatomySubscriptionEndDate: EProductType.ANATOMY,
+    medicalSciencesSubscriptionEndDate: EProductType.MEDICAL_SCIENCES,
+    anatomyBundleSubscriptionEndDate: EProductType.ANATOMY_BUNDLE,
+    mrcpPart1SubscriptionEndDate: EProductType.MRCP_PART1,
+    mrcpPart2SubscriptionEndDate: EProductType.MRCP_PART2,
+    pacesSubscriptionEndDate: EProductType.PACES,
+    msraSubscriptionEndDate: EProductType.MSRA,
+    anaestheticsInterviewSubscriptionEndDate: EProductType.INTERVIEW_ANAESTHETICS,
+    cstInterviewSubscriptionEndDate: EProductType.INTERVIEW_IMT,
+    imtInterviewSubscriptionEndDate: EProductType.QBANK,
+    radiologyInterviewSubscriptionEndDate: EProductType.INTERVIEW_RADIOLOGY,
+};
 export var EClassYearGroup;
 (function (EClassYearGroup) {
     EClassYearGroup[EClassYearGroup["PRECLINICAL"] = 0] = "PRECLINICAL";

package/dist/mjs/resolvers/constants.d.ts

@@ -1,12 +1,7 @@
-import { EMockTestType, EProductType, ETopicType } from "../models";
-import { DB_TYPE } from "./enums";
-/**
- * TODO:: move this config in database so that we can swap things in-out more easily
- * can be part of entitlement table or another
- */
+import { EMockTestType, EProductType, ETopicType } from '../models';
+import { DB_TYPE } from './enums';
 export declare const productMapping: Partial<Record<EProductType, {
     db: DB_TYPE;
-    builderTopicType: ETopicType[];
     topicType: ETopicType[];
     mockType: EMockTestType[];
 }>>;

package/dist/mjs/resolvers/constants.js

@@ -1,5 +1,5 @@
-import { EMockTestType, EProductType, ETopicType } from "../models";
-import { DB_TYPE } from "./enums";
+import { EMockTestType, EProductType, ETopicType } from '../models';
+import { DB_TYPE } from './enums';
 const ALL_TOPIC_TYPE_WITHOUT_ANATOMY = [
     ETopicType.CLINICAL,
     ETopicType.DATA_INTERPRETATION,
@@ -14,93 +14,78 @@ const ALL_MOCKS_WITHOUT_ANATOMY = [
     EMockTestType.UKMLA,
 ];
 const ALL_MOCKS = [EMockTestType.ANATOMY_SPOTTER, ...ALL_MOCKS_WITHOUT_ANATOMY];
-/**
- * TODO:: move this config in database so that we can swap things in-out more easily
- * can be part of entitlement table or another
- */
 export const productMapping = {
     [EProductType.QBANK]: {
         db: DB_TYPE.FINALS,
         topicType: ALL_TOPIC_TYPE_WITHOUT_ANATOMY,
-        builderTopicType: ALL_TOPIC_TYPE_WITHOUT_ANATOMY,
         mockType: ALL_MOCKS_WITHOUT_ANATOMY,
     },
     [EProductType.OSCE]: {
         db: DB_TYPE.FINALS,
         topicType: ALL_TOPIC_TYPE,
-        builderTopicType: ALL_TOPIC_TYPE,
         mockType: ALL_MOCKS,
     },
     [EProductType.BUNDLE]: {
         db: DB_TYPE.FINALS,
         topicType: ALL_TOPIC_TYPE_WITHOUT_ANATOMY,
-        builderTopicType: ALL_TOPIC_TYPE_WITHOUT_ANATOMY,
         mockType: ALL_MOCKS_WITHOUT_ANATOMY,
     },
     [EProductType.ANATOMY]: {
         db: DB_TYPE.FINALS,
         topicType: [ETopicType.ANATOMY],
-        builderTopicType: [ETopicType.ANATOMY],
         mockType: [EMockTestType.ANATOMY_SPOTTER],
     },
     [EProductType.MEDICAL_SCIENCES]: {
         db: DB_TYPE.FINALS,
-        builderTopicType: [ETopicType.PRE_CLINICAL],
         topicType: [ETopicType.PRE_CLINICAL],
         mockType: [EMockTestType.UNIVERSITY_SPECIFIC],
     },
     [EProductType.ANATOMY_BUNDLE]: {
         db: DB_TYPE.FINALS,
         topicType: [ETopicType.ANATOMY, ETopicType.PRE_CLINICAL],
-        builderTopicType: [ETopicType.ANATOMY, ETopicType.PRE_CLINICAL],
-        mockType: [EMockTestType.ANATOMY_SPOTTER, EMockTestType.UNIVERSITY_SPECIFIC],
+        mockType: [
+            EMockTestType.ANATOMY_SPOTTER,
+            EMockTestType.UNIVERSITY_SPECIFIC,
+        ],
     },
     [EProductType.MRCP_PART1]: {
         db: DB_TYPE.MRCP,
         topicType: [ETopicType.CLINICAL],
-        builderTopicType: [ETopicType.CLINICAL],
         mockType: [EMockTestType.MRCP],
     },
     [EProductType.MRCP_PART2]: {
         db: DB_TYPE.MRCP,
         topicType: [ETopicType.CLINICAL],
-        builderTopicType: [ETopicType.CLINICAL],
         mockType: [EMockTestType.MRCP],
     },
     [EProductType.PACES]: {
         db: DB_TYPE.MRCP,
         topicType: [ETopicType.OSCE],
-        builderTopicType: [ETopicType.OSCE],
         mockType: ALL_MOCKS,
     },
     [EProductType.MSRA]: {
         db: DB_TYPE.FINALS,
         topicType: [ETopicType.CLINICAL],
-        builderTopicType: [ETopicType.CLINICAL, ETopicType.SJT],
         mockType: ALL_MOCKS,
     },
     [EProductType.INTERVIEW_ANAESTHETICS]: {
         db: DB_TYPE.FINALS,
         topicType: [ETopicType.INTERVIEW_ANAESTHETICS],
-        builderTopicType: [ETopicType.INTERVIEW_ANAESTHETICS],
         mockType: ALL_MOCKS,
     },
     [EProductType.INTERVIEW_CST]: {
         db: DB_TYPE.FINALS,
         topicType: [ETopicType.INTERVIEW_CST],
-        builderTopicType: [ETopicType.INTERVIEW_CST],
         mockType: ALL_MOCKS,
     },
     [EProductType.INTERVIEW_IMT]: {
         db: DB_TYPE.FINALS,
         topicType: [ETopicType.INTERVIEW_IMT],
-        builderTopicType: [ETopicType.INTERVIEW_IMT],
         mockType: ALL_MOCKS,
     },
     [EProductType.INTERVIEW_RADIOLOGY]: {
         db: DB_TYPE.FINALS,
         topicType: [ETopicType.INTERVIEW_RADIOLOGY],
-        builderTopicType: [ETopicType.INTERVIEW_RADIOLOGY],
         mockType: ALL_MOCKS,
     },
 };

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

@@ -11,5 +11,5 @@ export declare const MODIFY_MARKSHEET_STATE_FRAGMENT: import("@apollo/client").D
 export declare const MODIFY_TOPIC_SELECTION_FRAGMENT: import("@apollo/client").DocumentNode;
 export declare const MODIFY_CURRENT_MARK_FRAGMENT: import("@apollo/client").DocumentNode;
 export declare const MARK_FLAGGED_FIELD: import("@apollo/client").DocumentNode;
-export declare const MODIFY_COMPLETED_FRAGMENT: import("@apollo/client").DocumentNode;
+export declare const MODIFY_MARKSHEET_COMPLETED_FRAGMENT: import("@apollo/client").DocumentNode;
 export declare const NEW_MARK_FIELDS: import("@apollo/client").DocumentNode;

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

@@ -125,9 +125,14 @@ export const MARK_FLAGGED_FIELD = gql `
     flagged
   }
 `;
-export const MODIFY_COMPLETED_FRAGMENT = gql `
+export const MODIFY_MARKSHEET_COMPLETED_FRAGMENT = gql `
   fragment MarksheetCompleted on Marksheet {
+    timeTaken
     completed
+    correct
+    incorrect
+    duration
+    endedAt
   }
 `;
 export const NEW_MARK_FIELDS = gql `

package/dist/mjs/resolvers/fragments/mockTest.js

@@ -26,6 +26,7 @@ export const COMPLETED_MOCK_TEST_MARKSHEET_FRAGMENT = gql `
   fragment MockTestCompleted on Marksheet {
     completed
     correct
+    timeTaken
     incorrect
     duration
     endedAt

package/dist/mjs/resolvers/fragments/question.js

@@ -137,6 +137,8 @@ export const QUESTION_FIELDS = gql `
       ...QuestionCommentFields
     }
     concept {
+      # needed for daily stack
+      totalCards
       ...ConceptFields
     }
     pictures {

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

@@ -242,7 +242,7 @@ export interface IEndMarksheetVar {
 }
 export type IEndMarksheetData = RestrictedData<graphqlNormalize & IMarksheet, 'endMarksheet'>;
 export declare const END_MARKSHEET: import("@apollo/client").DocumentNode;
-export declare const updateCacheOnEndMarksheet: (cache: ApolloCache<any>, result: ApolloUpdateResultRestricted<IEndMarksheetData>, options: ApolloUpdateOptions) => void;
+export declare const updateCacheOnEndMarksheet: (cache: ApolloCache<any>, result: ApolloUpdateResultRestricted<IEndMarksheetData>, options: ApolloUpdateOptions<IEndMarksheetVar>) => void;
 export declare const optimisticEndMarksheet: (marksheet: IMarksheet) => {
     restricted: {
         __typename: string;

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

@@ -1,5 +1,5 @@
 import { gql } from '@apollo/client';
-import { BUILDER_CONFIG_FIELDS, MARKSHEET_FIELDS, MARK_FLAGGED_FIELD, MODIFY_COMPLETED_FRAGMENT, NEW_MARK_FIELDS, } from '../../fragments/marksheet';
+import { BUILDER_CONFIG_FIELDS, MARKSHEET_FIELDS, MARK_FLAGGED_FIELD, MODIFY_MARKSHEET_COMPLETED_FRAGMENT, NEW_MARK_FIELDS, } from '../../fragments/marksheet';
 import { MARKSHEET, } from '../../query/restricted';
 export const BUILD_QUESTION_MARKSHEET = gql `
   ${MARKSHEET_FIELDS}
@@ -379,6 +379,7 @@ export const END_MARKSHEET = gql `
       endMarksheet(marksheetId: $marksheetId) {
         id
         timeTaken
+        startedAt
         endedAt
         completed
         passingMark
@@ -401,8 +402,13 @@ export const updateCacheOnEndMarksheet = (cache, result, options) => {
         id: cache.identify({ id, __typename: 'Marksheet' }),
         data: {
             completed: true,
+            timeTaken: endMarksheet.timeTaken,
+            correct: endMarksheet.correct,
+            incorrect: endMarksheet.incorrect,
+            duration: endMarksheet.duration,
+            endedAt: endMarksheet.endedAt,
         },
-        fragment: MODIFY_COMPLETED_FRAGMENT,
+        fragment: MODIFY_MARKSHEET_COMPLETED_FRAGMENT,
     });
 };
 export const optimisticEndMarksheet = (marksheet) => ({

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

@@ -55,6 +55,7 @@ export const END_MOCK_TEST = gql `
     restricted {
       endMockTest(marksheetId: $marksheetId) {
         id
+        timeTaken
         startedAt
         endedAt
         mockTestId
@@ -78,6 +79,7 @@ export const updateCacheOnEndMockTest = (cache, result, options) => {
         id: cache.identify({ id, __typename: 'Marksheet' }),
         data: {
             completed: true,
+            timeTaken: endMockTest.timeTaken,
             correct: endMockTest.correct,
             incorrect: endMockTest.incorrect,
             duration: endMockTest.duration,

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

@@ -270,7 +270,7 @@ export const updateQuestionCommentsRemove = (typeId) => (cache, result, options)
         });
         if (dataFragment) {
             const { comments = [] } = dataFragment;
-            const createdAtDate = DateTime.fromJSDate(createdAt);
+            const createdAtDate = DateTime.fromSeconds(createdAt);
             const diffInHours = DateTime.now().diff(createdAtDate, 'hours').hours;
             let updatedComments = [];
             if (diffInHours >= 24) {

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

@@ -1,7 +1,7 @@
 import { gql } from '@apollo/client';
 import { USER } from '../../query/restricted';
 export const CANCEL_SUBSCRIPTION = gql `
-  mutation Mutation($subscriptionId: Int!) {
+  mutation CancelSubscription($subscriptionId: Int!) {
     restricted {
       cancelSubscription(subscriptionId: $subscriptionId) {
         id

package/dist/mjs/resolvers/types.d.ts

@@ -9,3 +9,10 @@ export type AdminData<T, K extends keyof any> = {
 };
 export type RootData<T, K extends keyof any> = Record<K, T>;
 export type Nullable<T> = T | null;
+export type ExtractKeysWithPattern<U, V extends string> = {
+    [K in keyof U as K extends `${infer Prefix}${V}` ? K : never]: U[K];
+};
+export type DotPrefix<T extends string> = T extends '' ? '' : `.${T}`;
+export type WithRequired<T, K extends keyof T> = T & {
+    [P in K]-?: T[P];
+};

package/package.json

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