@quesmed/types 2.6.9 → 2.6.11

package/dist/cjs/index.d.ts

@@ -7,6 +7,7 @@ export declare const ERRORS: {
     TOKEN_EXPIRED: string;
     SUBSCRIPTION_EXPIRED: string;
     PERMISSION_INVALID: string;
+    SESSION_MISSING: string;
 };
 export declare enum AlgoliaIndex {
     Questions = "questions",

package/dist/cjs/index.js

@@ -37,6 +37,7 @@ exports.ERRORS = {
     TOKEN_EXPIRED: 'Expired token.',
     SUBSCRIPTION_EXPIRED: 'Expired subscription.',
     PERMISSION_INVALID: 'Invalid permission.',
+    SESSION_MISSING: 'No Session Found, Please login again',
 };
 var AlgoliaIndex;
 (function (AlgoliaIndex) {

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

@@ -11,6 +11,14 @@ export declare enum EMarksheetState {
     STATION = 3,
     RESULT = 4
 }
+export declare enum MARKSHEET_SOURCE {
+    QUIZ = "Quiz",
+    QUICK_BUILD_QUIZ = "Quick build quiz",
+    UKMLA_QUIZ = "UKMLA Quiz",
+    GROUP_STUDY = "Qbank group study",
+    FLAGGED_QUESTIONS_REVIEW = "Flagged Questions Review",
+    FLAGGED_QUESTIONS_QUIZ = "Flagged Questions Quiz"
+}
 export declare enum EStudyAction {
     START = 0,
     JOIN = 1

package/dist/cjs/models/Marksheet.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EMarksheetAction = exports.EMarksheetType = exports.EStudyAction = exports.EMarksheetState = void 0;
+exports.EMarksheetAction = exports.EMarksheetType = exports.EStudyAction = exports.MARKSHEET_SOURCE = exports.EMarksheetState = void 0;
 var EMarksheetState;
 (function (EMarksheetState) {
     EMarksheetState[EMarksheetState["LOBBY"] = 0] = "LOBBY";
@@ -9,6 +9,15 @@ var EMarksheetState;
     EMarksheetState[EMarksheetState["STATION"] = 3] = "STATION";
     EMarksheetState[EMarksheetState["RESULT"] = 4] = "RESULT";
 })(EMarksheetState = exports.EMarksheetState || (exports.EMarksheetState = {}));
+var MARKSHEET_SOURCE;
+(function (MARKSHEET_SOURCE) {
+    MARKSHEET_SOURCE["QUIZ"] = "Quiz";
+    MARKSHEET_SOURCE["QUICK_BUILD_QUIZ"] = "Quick build quiz";
+    MARKSHEET_SOURCE["UKMLA_QUIZ"] = "UKMLA Quiz";
+    MARKSHEET_SOURCE["GROUP_STUDY"] = "Qbank group study";
+    MARKSHEET_SOURCE["FLAGGED_QUESTIONS_REVIEW"] = "Flagged Questions Review";
+    MARKSHEET_SOURCE["FLAGGED_QUESTIONS_QUIZ"] = "Flagged Questions Quiz";
+})(MARKSHEET_SOURCE = exports.MARKSHEET_SOURCE || (exports.MARKSHEET_SOURCE = {}));
 var EStudyAction;
 (function (EStudyAction) {
     EStudyAction[EStudyAction["START"] = 0] = "START";

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

@@ -1,6 +1,6 @@
-import { ETopicType, ITopic } from './Topic';
+import { IConcept } from './Concept';
+import { ETopicType } from './Topic';
 import { Id } from './Type';
-import { IUniversity } from './University';
 export declare enum EPresetType {
     PRE_DEFINED = 0,
     CUSTOM = 1
@@ -22,8 +22,7 @@ export interface IPreset {
     redCards: number;
     completedCards: number;
     totalCards: number;
-    university: IUniversity;
-    topics: ITopic[];
+    concepts: IConcept[];
 }
 export interface IPresetConcepts {
     id: Id;

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

@@ -0,0 +1,24 @@
+import { Id } from "./Type";
+export declare enum ESessionStatus {
+    INVALID = 0,
+    VALID = 1,
+    STRIPE_SUB_CHANGE = 2,
+    REVENUECAT_SUB_CHANGE = 3,
+    PASSWORD_CHANGE = 4
+}
+export interface ISession {
+    id: Id;
+    createdAt: number | Date;
+    updatedAt: number | Date;
+    userId: Id;
+    sessionId: string;
+    ip: string;
+    status: ESessionStatus;
+    meta: {
+        'accept-language': string;
+        'user-agent': string;
+        'sec-ch-ua-platform': string;
+        'sec-ch-ua': string;
+        'sec-ch-ua-mobile': string;
+    };
+}

package/dist/cjs/models/UserSession.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ESessionStatus = void 0;
+var ESessionStatus;
+(function (ESessionStatus) {
+    ESessionStatus[ESessionStatus["INVALID"] = 0] = "INVALID";
+    ESessionStatus[ESessionStatus["VALID"] = 1] = "VALID";
+    ESessionStatus[ESessionStatus["STRIPE_SUB_CHANGE"] = 2] = "STRIPE_SUB_CHANGE";
+    ESessionStatus[ESessionStatus["REVENUECAT_SUB_CHANGE"] = 3] = "REVENUECAT_SUB_CHANGE";
+    ESessionStatus[ESessionStatus["PASSWORD_CHANGE"] = 4] = "PASSWORD_CHANGE";
+})(ESessionStatus = exports.ESessionStatus || (exports.ESessionStatus = {}));

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

@@ -29,4 +29,5 @@ export * from './Type';
 export * from './UkmlaTopic';
 export * from './University';
 export * from './User';
+export * from './UserSession';
 export * from './Video';

package/dist/cjs/models/index.js

@@ -45,4 +45,5 @@ __exportStar(require("./Type"), exports);
 __exportStar(require("./UkmlaTopic"), exports);
 __exportStar(require("./University"), exports);
 __exportStar(require("./User"), exports);
+__exportStar(require("./UserSession"), exports);
 __exportStar(require("./Video"), exports);

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

@@ -1,6 +1,6 @@
 import { DefaultContext, FetchResult } from '@apollo/client';
 export type ApolloUpdateResultRestricted<T> = Omit<FetchResult<T>, 'context'>;
-export interface ApolloUpdateOptions {
+export interface ApolloUpdateOptions<T = Record<string, any>> {
     context?: DefaultContext;
-    variables?: Record<string, any>;
+    variables?: T;
 }

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

@@ -25,6 +25,7 @@ exports.USER_FIELDS = (0, client_1.gql) `
       id
       productId
       periodEndAt
+      endedAt
       product {
         id
         name

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

@@ -64,18 +64,10 @@ exports.DUPLICATE_PRESET = (0, client_1.gql) `
         completedCards
         totalCards
         userId
-        university {
+        concepts {
           id
           name
-          country
-        }
-        topics {
-          id
-          name
-          concepts {
-            id
-            name
-          }
+          topicId
         }
       }
     }
@@ -125,18 +117,10 @@ exports.EDIT_PRESET = (0, client_1.gql) `
         completedCards
         totalCards
         userId
-        university {
+        concepts {
           id
           name
-          country
-        }
-        topics {
-          id
-          name
-          concepts {
-            id
-            name
-          }
+          topicId
         }
       }
     }
@@ -162,18 +146,10 @@ exports.CREATE_PRESET = (0, client_1.gql) `
         completedCards
         totalCards
         userId
-        university {
-          id
-          name
-          country
-        }
-        topics {
+        concepts {
           id
           name
-          concepts {
-            id
-            name
-          }
+          topicId
         }
       }
     }

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

@@ -1,6 +1,10 @@
+import { ApolloCache } from '@apollo/client';
+import { ISubscription } from '../../../models';
+import { ApolloUpdateOptions, ApolloUpdateResultRestricted } from '../../apollo';
 import { RestrictedData, graphqlNormalize } from '../../types';
 export interface ICancelSubscriptionVar {
     subscriptionId: number;
 }
-export type ICancelSubscriptionData = RestrictedData<graphqlNormalize & string, 'cancelSubscription'>;
+export type ICancelSubscriptionData = RestrictedData<graphqlNormalize & ISubscription, 'cancelSubscription'>;
 export declare const CANCEL_SUBSCRIPTION: import("@apollo/client").DocumentNode;
+export declare const updateSubscriptionOnCancelOrRenew: (cache: ApolloCache<any>, result: ApolloUpdateResultRestricted<ICancelSubscriptionData>, options: ApolloUpdateOptions<ICancelSubscriptionVar>) => void;

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

@@ -1,11 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CANCEL_SUBSCRIPTION = void 0;
+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!) {
     restricted {
-      cancelSubscription(subscriptionId: $subscriptionId)
+      cancelSubscription(subscriptionId: $subscriptionId) {
+        id
+        endedAt
+        periodEndAt
+        stripeSubscriptionId
+        userId
+        productId
+      }
     }
   }
 `;
+const updateSubscriptionOnCancelOrRenew = (cache, result, options) => {
+    const { cancelSubscription } = result?.data?.restricted || {};
+    const { variables } = options || {};
+    if (!variables || !cancelSubscription) {
+        return;
+    }
+    const prevData = cache.readQuery({
+        query: restricted_1.USER,
+    });
+    if (!prevData) {
+        return;
+    }
+    const { subscriptionId } = variables;
+    const { subscriptions } = prevData.restricted.user;
+    prevData.restricted.user.subscriptions = subscriptions.map((s) => Number(s.id) === Number(subscriptionId)
+        ? { ...s, ...cancelSubscription }
+        : s);
+    cache.writeQuery({ query: restricted_1.USER, data: { ...prevData } });
+};
+exports.updateSubscriptionOnCancelOrRenew = updateSubscriptionOnCancelOrRenew;

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

@@ -2,6 +2,11 @@ import { ApolloCache } from '@apollo/client';
 import { EUserLearningStatus, IUser, IUserConceptStatus, IUserStationStatus, IUserVideoStatus, Id } from '../../../models';
 import { ApolloUpdateOptions, ApolloUpdateResultRestricted } from '../../apollo';
 import { RestrictedData, graphqlNormalize } from '../../types';
+export declare const LOGOUT_USER: import("@apollo/client").DocumentNode;
+export interface ILogoutUserVar {
+    all: boolean;
+}
+export type ILogoutUserData = RestrictedData<graphqlNormalize & boolean, 'logoutUser'>;
 export declare const RESET_PROGRESS: import("@apollo/client").DocumentNode;
 export interface IResetProgressVar {
     questions?: boolean;

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

@@ -1,8 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.optimisticVideoLearningStatus = exports.updateCacheOnVideoLearningStatusUpdate = exports.UPSERT_USER_VIDEO_STATUS = exports.optimisticStationLearningStatus = exports.updateCacheOnStationLearningStatusUpdate = exports.UPSERT_USER_STATION_STATUS = exports.optimisticConceptLearningStatus = exports.updateCacheOnConceptLearningStatusUpdate = exports.UPSERT_USER_CONCEPT_STATUS = exports.TOC_ACCEPT = exports.RENEW_TOKEN = exports.UPDATE_USER = exports.DELETE_USER = exports.RESET_CATEGORY_PROGRESS = exports.RESET_PROGRESS = void 0;
+exports.optimisticVideoLearningStatus = exports.updateCacheOnVideoLearningStatusUpdate = exports.UPSERT_USER_VIDEO_STATUS = exports.optimisticStationLearningStatus = exports.updateCacheOnStationLearningStatusUpdate = exports.UPSERT_USER_STATION_STATUS = exports.optimisticConceptLearningStatus = exports.updateCacheOnConceptLearningStatusUpdate = exports.UPSERT_USER_CONCEPT_STATUS = exports.TOC_ACCEPT = exports.RENEW_TOKEN = exports.UPDATE_USER = exports.DELETE_USER = exports.RESET_CATEGORY_PROGRESS = exports.RESET_PROGRESS = exports.LOGOUT_USER = void 0;
 const client_1 = require("@apollo/client");
 const models_1 = require("../../../models");
+exports.LOGOUT_USER = (0, client_1.gql) `
+  mutation LogoutUser($all: Boolean!) {
+    restricted {
+      logoutUser(all: $all)
+      }
+    }
+`;
 exports.RESET_PROGRESS = (0, client_1.gql) `
   mutation ResetProgress($questions: Boolean, $cards: Boolean) {
     restricted {

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

@@ -1019,6 +1019,7 @@ exports.MARKSHEETS = (0, client_1.gql) `
       marksheets(filter: $filter) {
         results {
           id
+          source
           endedAt
           topicNames
           correct
@@ -1057,6 +1058,7 @@ exports.MARKSHEETS_WINDOW = (0, client_1.gql) `
           date
           result {
             id
+            source
             endedAt
             topicNames
             correct

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

@@ -34,18 +34,10 @@ exports.PRESETS = (0, client_1.gql) `
         completedCards
         totalCards
         userId
-        university {
+        concepts {
           id
           name
-          country
-        }
-        topics {
-          id
-          name
-          concepts {
-            id
-            name
-          }
+          topicId
         }
       }
     }
@@ -71,18 +63,10 @@ exports.PRE_DEFINED_PRESETS = (0, client_1.gql) `
         completedCards
         totalCards
         userId
-        university {
+        concepts {
           id
           name
-          country
-        }
-        topics {
-          id
-          name
-          concepts {
-            id
-            name
-          }
+          topicId
         }
       }
     }
@@ -108,18 +92,10 @@ exports.PRESET = (0, client_1.gql) `
         completedCards
         totalCards
         userId
-        university {
-          id
-          name
-          country
-        }
-        topics {
+        concepts {
           id
           name
-          concepts {
-            id
-            name
-          }
+          topicId
         }
       }
     }

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

@@ -22,6 +22,7 @@ exports.GET_USER_SUBSCRIPTIONS = (0, client_1.gql) `
           id
           productId
           periodEndAt
+          endedAt
           product {
             id
             name

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

@@ -16,6 +16,7 @@ exports.VIDEO = (0, client_1.gql) `
         concepts {
           id
           name
+          status
           topic {
             id
             name

package/dist/mjs/index.d.ts

@@ -7,6 +7,7 @@ export declare const ERRORS: {
     TOKEN_EXPIRED: string;
     SUBSCRIPTION_EXPIRED: string;
     PERMISSION_INVALID: string;
+    SESSION_MISSING: string;
 };
 export declare enum AlgoliaIndex {
     Questions = "questions",

package/dist/mjs/index.js

@@ -8,6 +8,7 @@ export const ERRORS = {
     TOKEN_EXPIRED: 'Expired token.',
     SUBSCRIPTION_EXPIRED: 'Expired subscription.',
     PERMISSION_INVALID: 'Invalid permission.',
+    SESSION_MISSING: 'No Session Found, Please login again',
 };
 export var AlgoliaIndex;
 (function (AlgoliaIndex) {

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

@@ -11,6 +11,14 @@ export declare enum EMarksheetState {
     STATION = 3,
     RESULT = 4
 }
+export declare enum MARKSHEET_SOURCE {
+    QUIZ = "Quiz",
+    QUICK_BUILD_QUIZ = "Quick build quiz",
+    UKMLA_QUIZ = "UKMLA Quiz",
+    GROUP_STUDY = "Qbank group study",
+    FLAGGED_QUESTIONS_REVIEW = "Flagged Questions Review",
+    FLAGGED_QUESTIONS_QUIZ = "Flagged Questions Quiz"
+}
 export declare enum EStudyAction {
     START = 0,
     JOIN = 1

package/dist/mjs/models/Marksheet.js

@@ -6,6 +6,15 @@ export var EMarksheetState;
     EMarksheetState[EMarksheetState["STATION"] = 3] = "STATION";
     EMarksheetState[EMarksheetState["RESULT"] = 4] = "RESULT";
 })(EMarksheetState || (EMarksheetState = {}));
+export var MARKSHEET_SOURCE;
+(function (MARKSHEET_SOURCE) {
+    MARKSHEET_SOURCE["QUIZ"] = "Quiz";
+    MARKSHEET_SOURCE["QUICK_BUILD_QUIZ"] = "Quick build quiz";
+    MARKSHEET_SOURCE["UKMLA_QUIZ"] = "UKMLA Quiz";
+    MARKSHEET_SOURCE["GROUP_STUDY"] = "Qbank group study";
+    MARKSHEET_SOURCE["FLAGGED_QUESTIONS_REVIEW"] = "Flagged Questions Review";
+    MARKSHEET_SOURCE["FLAGGED_QUESTIONS_QUIZ"] = "Flagged Questions Quiz";
+})(MARKSHEET_SOURCE || (MARKSHEET_SOURCE = {}));
 export var EStudyAction;
 (function (EStudyAction) {
     EStudyAction[EStudyAction["START"] = 0] = "START";

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

@@ -1,6 +1,6 @@
-import { ETopicType, ITopic } from './Topic';
+import { IConcept } from './Concept';
+import { ETopicType } from './Topic';
 import { Id } from './Type';
-import { IUniversity } from './University';
 export declare enum EPresetType {
     PRE_DEFINED = 0,
     CUSTOM = 1
@@ -22,8 +22,7 @@ export interface IPreset {
     redCards: number;
     completedCards: number;
     totalCards: number;
-    university: IUniversity;
-    topics: ITopic[];
+    concepts: IConcept[];
 }
 export interface IPresetConcepts {
     id: Id;

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

@@ -0,0 +1,24 @@
+import { Id } from "./Type";
+export declare enum ESessionStatus {
+    INVALID = 0,
+    VALID = 1,
+    STRIPE_SUB_CHANGE = 2,
+    REVENUECAT_SUB_CHANGE = 3,
+    PASSWORD_CHANGE = 4
+}
+export interface ISession {
+    id: Id;
+    createdAt: number | Date;
+    updatedAt: number | Date;
+    userId: Id;
+    sessionId: string;
+    ip: string;
+    status: ESessionStatus;
+    meta: {
+        'accept-language': string;
+        'user-agent': string;
+        'sec-ch-ua-platform': string;
+        'sec-ch-ua': string;
+        'sec-ch-ua-mobile': string;
+    };
+}

package/dist/mjs/models/UserSession.js

@@ -0,0 +1,8 @@
+export var ESessionStatus;
+(function (ESessionStatus) {
+    ESessionStatus[ESessionStatus["INVALID"] = 0] = "INVALID";
+    ESessionStatus[ESessionStatus["VALID"] = 1] = "VALID";
+    ESessionStatus[ESessionStatus["STRIPE_SUB_CHANGE"] = 2] = "STRIPE_SUB_CHANGE";
+    ESessionStatus[ESessionStatus["REVENUECAT_SUB_CHANGE"] = 3] = "REVENUECAT_SUB_CHANGE";
+    ESessionStatus[ESessionStatus["PASSWORD_CHANGE"] = 4] = "PASSWORD_CHANGE";
+})(ESessionStatus || (ESessionStatus = {}));

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

@@ -29,4 +29,5 @@ export * from './Type';
 export * from './UkmlaTopic';
 export * from './University';
 export * from './User';
+export * from './UserSession';
 export * from './Video';

package/dist/mjs/models/index.js

@@ -29,4 +29,5 @@ export * from './Type';
 export * from './UkmlaTopic';
 export * from './University';
 export * from './User';
+export * from './UserSession';
 export * from './Video';

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

@@ -1,6 +1,6 @@
 import { DefaultContext, FetchResult } from '@apollo/client';
 export type ApolloUpdateResultRestricted<T> = Omit<FetchResult<T>, 'context'>;
-export interface ApolloUpdateOptions {
+export interface ApolloUpdateOptions<T = Record<string, any>> {
     context?: DefaultContext;
-    variables?: Record<string, any>;
+    variables?: T;
 }

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

@@ -22,6 +22,7 @@ export const USER_FIELDS = gql `
       id
       productId
       periodEndAt
+      endedAt
       product {
         id
         name

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

@@ -60,18 +60,10 @@ export const DUPLICATE_PRESET = gql `
         completedCards
         totalCards
         userId
-        university {
+        concepts {
           id
           name
-          country
-        }
-        topics {
-          id
-          name
-          concepts {
-            id
-            name
-          }
+          topicId
         }
       }
     }
@@ -120,18 +112,10 @@ export const EDIT_PRESET = gql `
         completedCards
         totalCards
         userId
-        university {
+        concepts {
           id
           name
-          country
-        }
-        topics {
-          id
-          name
-          concepts {
-            id
-            name
-          }
+          topicId
         }
       }
     }
@@ -157,18 +141,10 @@ export const CREATE_PRESET = gql `
         completedCards
         totalCards
         userId
-        university {
-          id
-          name
-          country
-        }
-        topics {
+        concepts {
           id
           name
-          concepts {
-            id
-            name
-          }
+          topicId
         }
       }
     }

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

@@ -1,6 +1,10 @@
+import { ApolloCache } from '@apollo/client';
+import { ISubscription } from '../../../models';
+import { ApolloUpdateOptions, ApolloUpdateResultRestricted } from '../../apollo';
 import { RestrictedData, graphqlNormalize } from '../../types';
 export interface ICancelSubscriptionVar {
     subscriptionId: number;
 }
-export type ICancelSubscriptionData = RestrictedData<graphqlNormalize & string, 'cancelSubscription'>;
+export type ICancelSubscriptionData = RestrictedData<graphqlNormalize & ISubscription, 'cancelSubscription'>;
 export declare const CANCEL_SUBSCRIPTION: import("@apollo/client").DocumentNode;
+export declare const updateSubscriptionOnCancelOrRenew: (cache: ApolloCache<any>, result: ApolloUpdateResultRestricted<ICancelSubscriptionData>, options: ApolloUpdateOptions<ICancelSubscriptionVar>) => void;

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

@@ -1,8 +1,35 @@
 import { gql } from '@apollo/client';
+import { USER } from '../../query/restricted';
 export const CANCEL_SUBSCRIPTION = gql `
   mutation Mutation($subscriptionId: Int!) {
     restricted {
-      cancelSubscription(subscriptionId: $subscriptionId)
+      cancelSubscription(subscriptionId: $subscriptionId) {
+        id
+        endedAt
+        periodEndAt
+        stripeSubscriptionId
+        userId
+        productId
+      }
     }
   }
 `;
+export const updateSubscriptionOnCancelOrRenew = (cache, result, options) => {
+    const { cancelSubscription } = result?.data?.restricted || {};
+    const { variables } = options || {};
+    if (!variables || !cancelSubscription) {
+        return;
+    }
+    const prevData = cache.readQuery({
+        query: USER,
+    });
+    if (!prevData) {
+        return;
+    }
+    const { subscriptionId } = variables;
+    const { subscriptions } = prevData.restricted.user;
+    prevData.restricted.user.subscriptions = subscriptions.map((s) => Number(s.id) === Number(subscriptionId)
+        ? { ...s, ...cancelSubscription }
+        : s);
+    cache.writeQuery({ query: USER, data: { ...prevData } });
+};

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

@@ -2,6 +2,11 @@ import { ApolloCache } from '@apollo/client';
 import { EUserLearningStatus, IUser, IUserConceptStatus, IUserStationStatus, IUserVideoStatus, Id } from '../../../models';
 import { ApolloUpdateOptions, ApolloUpdateResultRestricted } from '../../apollo';
 import { RestrictedData, graphqlNormalize } from '../../types';
+export declare const LOGOUT_USER: import("@apollo/client").DocumentNode;
+export interface ILogoutUserVar {
+    all: boolean;
+}
+export type ILogoutUserData = RestrictedData<graphqlNormalize & boolean, 'logoutUser'>;
 export declare const RESET_PROGRESS: import("@apollo/client").DocumentNode;
 export interface IResetProgressVar {
     questions?: boolean;

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

@@ -1,5 +1,12 @@
 import { gql } from '@apollo/client';
 import { EUserLearningStatus, } from '../../../models';
+export const LOGOUT_USER = gql `
+  mutation LogoutUser($all: Boolean!) {
+    restricted {
+      logoutUser(all: $all)
+      }
+    }
+`;
 export const RESET_PROGRESS = gql `
   mutation ResetProgress($questions: Boolean, $cards: Boolean) {
     restricted {

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

@@ -1016,6 +1016,7 @@ export const MARKSHEETS = gql `
       marksheets(filter: $filter) {
         results {
           id
+          source
           endedAt
           topicNames
           correct
@@ -1054,6 +1055,7 @@ export const MARKSHEETS_WINDOW = gql `
           date
           result {
             id
+            source
             endedAt
             topicNames
             correct

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

@@ -31,18 +31,10 @@ export const PRESETS = gql `
         completedCards
         totalCards
         userId
-        university {
+        concepts {
           id
           name
-          country
-        }
-        topics {
-          id
-          name
-          concepts {
-            id
-            name
-          }
+          topicId
         }
       }
     }
@@ -68,18 +60,10 @@ export const PRE_DEFINED_PRESETS = gql `
         completedCards
         totalCards
         userId
-        university {
+        concepts {
           id
           name
-          country
-        }
-        topics {
-          id
-          name
-          concepts {
-            id
-            name
-          }
+          topicId
         }
       }
     }
@@ -105,18 +89,10 @@ export const PRESET = gql `
         completedCards
         totalCards
         userId
-        university {
-          id
-          name
-          country
-        }
-        topics {
+        concepts {
           id
           name
-          concepts {
-            id
-            name
-          }
+          topicId
         }
       }
     }

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

@@ -19,6 +19,7 @@ export const GET_USER_SUBSCRIPTIONS = gql `
           id
           productId
           periodEndAt
+          endedAt
           product {
             id
             name

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

@@ -13,6 +13,7 @@ export const VIDEO = gql `
         concepts {
           id
           name
+          status
           topic {
             id
             name

package/package.json

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