@quesmed/types 2.2.55 → 2.2.58

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

@@ -0,0 +1,17 @@
+import { Id } from './Type';
+export declare enum EProductType {
+    QBANK = 1,
+    OSCE = 2,
+    BUNDLE = 3
+}
+export interface IProduct {
+    id: Id;
+    createdAt: number | Date;
+    name: string;
+    description: string | null;
+    price: number;
+    stripePriceId: string;
+    duration: number;
+    public: boolean;
+    typeId: EProductType;
+}

package/dist/cjs/models/Product.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EProductType = void 0;
+var EProductType;
+(function (EProductType) {
+    EProductType[EProductType["QBANK"] = 1] = "QBANK";
+    EProductType[EProductType["OSCE"] = 2] = "OSCE";
+    EProductType[EProductType["BUNDLE"] = 3] = "BUNDLE";
+})(EProductType = exports.EProductType || (exports.EProductType = {}));

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

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

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

@@ -1,17 +1,18 @@
+import { IProduct } from './Product';
 import { Id } from './Type';
+import { IClassYear, IUser } from './User';
 export interface ISubscription {
     id: Id;
     createdAt: number | Date;
-    name: string;
-    description: string | null;
-    price: number;
-    stripePriceId: string;
-    duration: number;
-    public: boolean;
-    typeId: Id;
-}
-export declare enum ESubscriptionType {
-    QBANK = 1,
-    OSCE = 2,
-    BUNDLE = 3
+    updatedAt: number | Date;
+    startedAt: number | Date;
+    endedAt: number | Date;
+    periodEndAt: number | Date;
+    stripeSubscriptionId: string;
+    userId: Id;
+    user?: IUser;
+    productId: Id;
+    product?: IProduct;
+    classYear: IClassYear;
+    invoiced: number;
 }

package/dist/cjs/models/Subscription.js

@@ -1,9 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ESubscriptionType = void 0;
-var ESubscriptionType;
-(function (ESubscriptionType) {
-    ESubscriptionType[ESubscriptionType["QBANK"] = 1] = "QBANK";
-    ESubscriptionType[ESubscriptionType["OSCE"] = 2] = "OSCE";
-    ESubscriptionType[ESubscriptionType["BUNDLE"] = 3] = "BUNDLE";
-})(ESubscriptionType = exports.ESubscriptionType || (exports.ESubscriptionType = {}));

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

@@ -26,9 +26,9 @@ export interface IPayload {
     accessLevel: IAccessLevel;
     tocAccepted: boolean;
     exp: number;
-    stripeQBankSubscriptionEndDate: number | null;
-    stripeOsceSubscriptionEndDate: number | null;
-    stripeBundleSubscriptionEndDate: number | null;
+    qbankSubscriptionEndDate: number | null;
+    osceSubscriptionEndDate: number | null;
+    bundleSubscriptionEndDate: number | null;
 }
 export interface IDailyProgressInfo {
     totalCount: number;
@@ -48,18 +48,6 @@ export interface IUser {
     dailyFeedMax: number;
     stripeCustomerId: string;
     stripeLastSyncAt: number | Date | null;
-    qBankSubscriptionId: Id;
-    qBankSubscription: ISubscription | null;
-    stripeQBankSubscriptionId: string;
-    stripeQBankSubscriptionEndDate: number | Date;
-    osceSubscriptionId: Id;
-    osceSubscription: ISubscription | null;
-    stripeOsceSubscriptionId: string;
-    stripeOsceSubscriptionEndDate: number | Date;
-    bundleSubscriptionId: Id;
-    bundleSubscription: ISubscription | null;
-    stripeBundleSubscriptionId: string;
-    stripeBundleSubscriptionEndDate: number | Date;
     referralCount: number;
     classYear: IClassYear;
     graduationYear: number;
@@ -82,8 +70,12 @@ export interface IUser {
     dailyFeed: ITodo;
     dailyProgress: IDailyProgressInfo[];
     notifications: INotification[];
+    subscriptions: ISubscription[];
+    qbankSubscriptionEndDate: number | Date | null;
+    osceSubscriptionEndDate: number | Date | null;
+    bundleSubscriptionEndDate: number | Date | null;
 }
-export declare function currentClassYear(createdAtUnix: number, classYear: IClassYear): IClassYear;
+export declare function currentClassYear(createdAtUnix: number, classYear: IClassYear, compareUnix?: number): IClassYear;
 export declare function currentClassGroup(createdAtUnix: number, classYear: IClassYear): EClassYearGroup;
 export interface IUserCompletedQuestion {
     id: Id;

package/dist/cjs/models/User.js

@@ -26,7 +26,7 @@ exports.classYearGroup = {
     MSc: EClassYearGroup.CLINICAL,
     'Beta Tester': EClassYearGroup.CLINICAL,
 };
-function currentClassYear(createdAtUnix, classYear) {
+function currentClassYear(createdAtUnix, classYear, compareUnix = new Date().getTime()) {
     if (createdAtUnix === 0) {
         throw new Error('createdAt not given in Unix');
     }
@@ -38,10 +38,10 @@ function currentClassYear(createdAtUnix, classYear) {
     if (classYearsIdx === -1) {
         return exports.classYears[lastClassYearIdx];
     }
-    const now = new Date();
-    const currentYear = now.getFullYear();
+    const compareDate = new Date(compareUnix * 1000);
+    const currentYear = compareDate.getFullYear();
     const createdAt = new Date(createdAtUnix * 1000);
-    if (createdAt.getFullYear() > now.getFullYear()) {
+    if (createdAt.getFullYear() > compareDate.getFullYear()) {
         throw new Error('createdAt not given in Unix');
     }
     const createdYear = createdAt.getFullYear();
@@ -51,7 +51,7 @@ function currentClassYear(createdAtUnix, classYear) {
     if (createdAt > createdAcademicYear) {
         yearsAdded--;
     }
-    if (now > nowAcademicYear) {
+    if (compareDate > nowAcademicYear) {
         yearsAdded++;
     }
     const newClassYearIdx = classYearsIdx + yearsAdded;

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

@@ -13,8 +13,10 @@ export * from './Notification';
 export * from './OsceMarksheet';
 export * from './OsceStation';
 export * from './Picture';
+export * from './Product';
 export * from './Promo';
 export * from './Question';
+export * from './Referrals';
 export * from './Subscription';
 export * from './Todo';
 export * from './Token';
@@ -23,4 +25,3 @@ export * from './Type';
 export * from './University';
 export * from './User';
 export * from './Video';
-export * from './Referrals';

package/dist/cjs/models/index.js

@@ -25,8 +25,10 @@ __exportStar(require("./Notification"), exports);
 __exportStar(require("./OsceMarksheet"), exports);
 __exportStar(require("./OsceStation"), exports);
 __exportStar(require("./Picture"), exports);
+__exportStar(require("./Product"), exports);
 __exportStar(require("./Promo"), exports);
 __exportStar(require("./Question"), exports);
+__exportStar(require("./Referrals"), exports);
 __exportStar(require("./Subscription"), exports);
 __exportStar(require("./Todo"), exports);
 __exportStar(require("./Token"), exports);
@@ -35,4 +37,3 @@ __exportStar(require("./Type"), exports);
 __exportStar(require("./University"), exports);
 __exportStar(require("./User"), exports);
 __exportStar(require("./Video"), exports);
-__exportStar(require("./Referrals"), exports);

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

@@ -18,12 +18,9 @@ exports.USER_FIELDS = (0, client_1.gql) `
     dailyFeedResetTime
     dailyFeedMax
     stripeCustomerId
-    stripeQBankSubscriptionId
-    stripeQBankSubscriptionEndDate
-    stripeOsceSubscriptionId
-    stripeOsceSubscriptionEndDate
-    stripeBundleSubscriptionId
-    stripeBundleSubscriptionEndDate
+    qbankSubscriptionEndDate
+    osceSubscriptionEndDate
+    bundleSubscriptionEndDate
 
     # user-specific keys
     # marksheets

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

@@ -188,7 +188,7 @@ export declare const LEAVE_MARKSHEET: import("@apollo/client").DocumentNode;
 export interface IEndMarksheetVar {
     marksheetId: Id;
 }
-export declare type IEndMarksheetData = RestrictedData<graphqlNormalize & boolean, 'endMarksheet'>;
+export declare type IEndMarksheetData = RestrictedData<graphqlNormalize & IMarksheet, 'endMarksheet'>;
 export declare const END_MARKSHEET: import("@apollo/client").DocumentNode;
 /**
  * toggleStrikeOptions

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

@@ -2427,6 +2427,7 @@ exports.REMOVE_FLAGGED_QUESTION = (0, client_1.gql) `
     restricted {
       removeFlaggedQuestion(questionId: $questionId) {
         id
+        markId
       }
     }
   }
@@ -2487,8 +2488,8 @@ exports.START_OR_JOIN_MARKSHEET = (0, client_1.gql) `
           questionChoiceId
           marksheetId
           timeTaken
-          isAnswered
           striked
+          isAnswered
           mark
           question {
             ... on QuestionSBA {
@@ -3063,8 +3064,8 @@ exports.MODIFY_MARKSHEET_INFO = (0, client_1.gql) `
           questionChoiceId
           marksheetId
           timeTaken
-          isAnswered
           striked
+          isAnswered
           mark
           question {
             ... on QuestionSBA {
@@ -3586,7 +3587,11 @@ exports.LEAVE_MARKSHEET = (0, client_1.gql) `
 exports.END_MARKSHEET = (0, client_1.gql) `
   mutation EndMarksheet($marksheetId: Int!) {
     restricted {
-      endMarksheet(marksheetId: $marksheetId)
+      endMarksheet(marksheetId: $marksheetId) {
+        id
+        timeTaken
+        endedAt
+      }
     }
   }
 `;

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

@@ -3,9 +3,9 @@ export * from './author';
 export * from './blog';
 export * from './book';
 export * from './feedback';
+export * from './product';
 export * as restricted from './restricted';
 export * from './sample';
-export * from './subscription';
 export * from './university';
 export * from './user';
 export * from './video';

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

@@ -28,9 +28,9 @@ __exportStar(require("./author"), exports);
 __exportStar(require("./blog"), exports);
 __exportStar(require("./book"), exports);
 __exportStar(require("./feedback"), exports);
+__exportStar(require("./product"), exports);
 exports.restricted = __importStar(require("./restricted"));
 __exportStar(require("./sample"), exports);
-__exportStar(require("./subscription"), exports);
 __exportStar(require("./university"), exports);
 __exportStar(require("./user"), exports);
 __exportStar(require("./video"), exports);

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

@@ -0,0 +1,4 @@
+import { IProduct } from '../../models';
+import { graphqlNormalize, RootData } from '../types';
+export declare type IProductsData = RootData<(graphqlNormalize & IProduct)[], 'products'>;
+export declare const PRODUCTS: import("@apollo/client").DocumentNode;

package/dist/cjs/resolvers/query/{subscription.js → product.js}

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SUBSCRIPTIONS = void 0;
+exports.PRODUCTS = void 0;
 const client_1 = require("@apollo/client");
-exports.SUBSCRIPTIONS = (0, client_1.gql) `
-  query Subscriptions {
-    subscriptions {
+exports.PRODUCTS = (0, client_1.gql) `
+  query Products {
+    products {
       id
       createdAt
       description

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

@@ -0,0 +1,17 @@
+import { Id } from './Type';
+export declare enum EProductType {
+    QBANK = 1,
+    OSCE = 2,
+    BUNDLE = 3
+}
+export interface IProduct {
+    id: Id;
+    createdAt: number | Date;
+    name: string;
+    description: string | null;
+    price: number;
+    stripePriceId: string;
+    duration: number;
+    public: boolean;
+    typeId: EProductType;
+}

package/dist/mjs/models/Product.js

@@ -0,0 +1,6 @@
+export var EProductType;
+(function (EProductType) {
+    EProductType[EProductType["QBANK"] = 1] = "QBANK";
+    EProductType[EProductType["OSCE"] = 2] = "OSCE";
+    EProductType[EProductType["BUNDLE"] = 3] = "BUNDLE";
+})(EProductType || (EProductType = {}));

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

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

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

@@ -1,17 +1,18 @@
+import { IProduct } from './Product';
 import { Id } from './Type';
+import { IClassYear, IUser } from './User';
 export interface ISubscription {
     id: Id;
     createdAt: number | Date;
-    name: string;
-    description: string | null;
-    price: number;
-    stripePriceId: string;
-    duration: number;
-    public: boolean;
-    typeId: Id;
-}
-export declare enum ESubscriptionType {
-    QBANK = 1,
-    OSCE = 2,
-    BUNDLE = 3
+    updatedAt: number | Date;
+    startedAt: number | Date;
+    endedAt: number | Date;
+    periodEndAt: number | Date;
+    stripeSubscriptionId: string;
+    userId: Id;
+    user?: IUser;
+    productId: Id;
+    product?: IProduct;
+    classYear: IClassYear;
+    invoiced: number;
 }

package/dist/mjs/models/Subscription.js

@@ -1,6 +1 @@
-export var ESubscriptionType;
-(function (ESubscriptionType) {
-    ESubscriptionType[ESubscriptionType["QBANK"] = 1] = "QBANK";
-    ESubscriptionType[ESubscriptionType["OSCE"] = 2] = "OSCE";
-    ESubscriptionType[ESubscriptionType["BUNDLE"] = 3] = "BUNDLE";
-})(ESubscriptionType || (ESubscriptionType = {}));
+export {};

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

@@ -26,9 +26,9 @@ export interface IPayload {
     accessLevel: IAccessLevel;
     tocAccepted: boolean;
     exp: number;
-    stripeQBankSubscriptionEndDate: number | null;
-    stripeOsceSubscriptionEndDate: number | null;
-    stripeBundleSubscriptionEndDate: number | null;
+    qbankSubscriptionEndDate: number | null;
+    osceSubscriptionEndDate: number | null;
+    bundleSubscriptionEndDate: number | null;
 }
 export interface IDailyProgressInfo {
     totalCount: number;
@@ -48,18 +48,6 @@ export interface IUser {
     dailyFeedMax: number;
     stripeCustomerId: string;
     stripeLastSyncAt: number | Date | null;
-    qBankSubscriptionId: Id;
-    qBankSubscription: ISubscription | null;
-    stripeQBankSubscriptionId: string;
-    stripeQBankSubscriptionEndDate: number | Date;
-    osceSubscriptionId: Id;
-    osceSubscription: ISubscription | null;
-    stripeOsceSubscriptionId: string;
-    stripeOsceSubscriptionEndDate: number | Date;
-    bundleSubscriptionId: Id;
-    bundleSubscription: ISubscription | null;
-    stripeBundleSubscriptionId: string;
-    stripeBundleSubscriptionEndDate: number | Date;
     referralCount: number;
     classYear: IClassYear;
     graduationYear: number;
@@ -82,8 +70,12 @@ export interface IUser {
     dailyFeed: ITodo;
     dailyProgress: IDailyProgressInfo[];
     notifications: INotification[];
+    subscriptions: ISubscription[];
+    qbankSubscriptionEndDate: number | Date | null;
+    osceSubscriptionEndDate: number | Date | null;
+    bundleSubscriptionEndDate: number | Date | null;
 }
-export declare function currentClassYear(createdAtUnix: number, classYear: IClassYear): IClassYear;
+export declare function currentClassYear(createdAtUnix: number, classYear: IClassYear, compareUnix?: number): IClassYear;
 export declare function currentClassGroup(createdAtUnix: number, classYear: IClassYear): EClassYearGroup;
 export interface IUserCompletedQuestion {
     id: Id;

package/dist/mjs/models/User.js

@@ -23,7 +23,7 @@ export const classYearGroup = {
     MSc: EClassYearGroup.CLINICAL,
     'Beta Tester': EClassYearGroup.CLINICAL,
 };
-export function currentClassYear(createdAtUnix, classYear) {
+export function currentClassYear(createdAtUnix, classYear, compareUnix = new Date().getTime()) {
     if (createdAtUnix === 0) {
         throw new Error('createdAt not given in Unix');
     }
@@ -35,10 +35,10 @@ export function currentClassYear(createdAtUnix, classYear) {
     if (classYearsIdx === -1) {
         return classYears[lastClassYearIdx];
     }
-    const now = new Date();
-    const currentYear = now.getFullYear();
+    const compareDate = new Date(compareUnix * 1000);
+    const currentYear = compareDate.getFullYear();
     const createdAt = new Date(createdAtUnix * 1000);
-    if (createdAt.getFullYear() > now.getFullYear()) {
+    if (createdAt.getFullYear() > compareDate.getFullYear()) {
         throw new Error('createdAt not given in Unix');
     }
     const createdYear = createdAt.getFullYear();
@@ -48,7 +48,7 @@ export function currentClassYear(createdAtUnix, classYear) {
     if (createdAt > createdAcademicYear) {
         yearsAdded--;
     }
-    if (now > nowAcademicYear) {
+    if (compareDate > nowAcademicYear) {
         yearsAdded++;
     }
     const newClassYearIdx = classYearsIdx + yearsAdded;

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

@@ -13,8 +13,10 @@ export * from './Notification';
 export * from './OsceMarksheet';
 export * from './OsceStation';
 export * from './Picture';
+export * from './Product';
 export * from './Promo';
 export * from './Question';
+export * from './Referrals';
 export * from './Subscription';
 export * from './Todo';
 export * from './Token';
@@ -23,4 +25,3 @@ export * from './Type';
 export * from './University';
 export * from './User';
 export * from './Video';
-export * from './Referrals';

package/dist/mjs/models/index.js

@@ -13,8 +13,10 @@ export * from './Notification';
 export * from './OsceMarksheet';
 export * from './OsceStation';
 export * from './Picture';
+export * from './Product';
 export * from './Promo';
 export * from './Question';
+export * from './Referrals';
 export * from './Subscription';
 export * from './Todo';
 export * from './Token';
@@ -23,4 +25,3 @@ export * from './Type';
 export * from './University';
 export * from './User';
 export * from './Video';
-export * from './Referrals';

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

@@ -15,12 +15,9 @@ export const USER_FIELDS = gql `
     dailyFeedResetTime
     dailyFeedMax
     stripeCustomerId
-    stripeQBankSubscriptionId
-    stripeQBankSubscriptionEndDate
-    stripeOsceSubscriptionId
-    stripeOsceSubscriptionEndDate
-    stripeBundleSubscriptionId
-    stripeBundleSubscriptionEndDate
+    qbankSubscriptionEndDate
+    osceSubscriptionEndDate
+    bundleSubscriptionEndDate
 
     # user-specific keys
     # marksheets

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

@@ -188,7 +188,7 @@ export declare const LEAVE_MARKSHEET: import("@apollo/client").DocumentNode;
 export interface IEndMarksheetVar {
     marksheetId: Id;
 }
-export declare type IEndMarksheetData = RestrictedData<graphqlNormalize & boolean, 'endMarksheet'>;
+export declare type IEndMarksheetData = RestrictedData<graphqlNormalize & IMarksheet, 'endMarksheet'>;
 export declare const END_MARKSHEET: import("@apollo/client").DocumentNode;
 /**
  * toggleStrikeOptions

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

@@ -2422,6 +2422,7 @@ export const REMOVE_FLAGGED_QUESTION = gql `
     restricted {
       removeFlaggedQuestion(questionId: $questionId) {
         id
+        markId
       }
     }
   }
@@ -2482,8 +2483,8 @@ export const START_OR_JOIN_MARKSHEET = gql `
           questionChoiceId
           marksheetId
           timeTaken
-          isAnswered
           striked
+          isAnswered
           mark
           question {
             ... on QuestionSBA {
@@ -3057,8 +3058,8 @@ export const MODIFY_MARKSHEET_INFO = gql `
           questionChoiceId
           marksheetId
           timeTaken
-          isAnswered
           striked
+          isAnswered
           mark
           question {
             ... on QuestionSBA {
@@ -3580,7 +3581,11 @@ export const LEAVE_MARKSHEET = gql `
 export const END_MARKSHEET = gql `
   mutation EndMarksheet($marksheetId: Int!) {
     restricted {
-      endMarksheet(marksheetId: $marksheetId)
+      endMarksheet(marksheetId: $marksheetId) {
+        id
+        timeTaken
+        endedAt
+      }
     }
   }
 `;

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

@@ -3,9 +3,9 @@ export * from './author';
 export * from './blog';
 export * from './book';
 export * from './feedback';
+export * from './product';
 export * as restricted from './restricted';
 export * from './sample';
-export * from './subscription';
 export * from './university';
 export * from './user';
 export * from './video';

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

@@ -3,9 +3,9 @@ export * from './author';
 export * from './blog';
 export * from './book';
 export * from './feedback';
+export * from './product';
 export * as restricted from './restricted';
 export * from './sample';
-export * from './subscription';
 export * from './university';
 export * from './user';
 export * from './video';

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

@@ -0,0 +1,4 @@
+import { IProduct } from '../../models';
+import { graphqlNormalize, RootData } from '../types';
+export declare type IProductsData = RootData<(graphqlNormalize & IProduct)[], 'products'>;
+export declare const PRODUCTS: import("@apollo/client").DocumentNode;

package/dist/mjs/resolvers/query/{subscription.js → product.js}

@@ -1,7 +1,7 @@
 import { gql } from '@apollo/client';
-export const SUBSCRIPTIONS = gql `
-  query Subscriptions {
-    subscriptions {
+export const PRODUCTS = gql `
+  query Products {
+    products {
       id
       createdAt
       description

package/package.json

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

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

@@ -1,4 +0,0 @@
-import { ISubscription } from '../../models';
-import { graphqlNormalize, RootData } from '../types';
-export declare type ISubscriptionsData = RootData<(graphqlNormalize & ISubscription)[], 'subscriptions'>;
-export declare const SUBSCRIPTIONS: import("@apollo/client").DocumentNode;

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

@@ -1,4 +0,0 @@
-import { ISubscription } from '../../models';
-import { graphqlNormalize, RootData } from '../types';
-export declare type ISubscriptionsData = RootData<(graphqlNormalize & ISubscription)[], 'subscriptions'>;
-export declare const SUBSCRIPTIONS: import("@apollo/client").DocumentNode;