@quesmed/types 1.6.1 → 2.0.0

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

@@ -1,5 +1,5 @@
 import { IConcept } from './Concept';
-import { ICardPicture } from './Picture';
+import { IPicture } from './Picture';
 import { ITopic } from './Topic';
 import { Id } from './Type';
 export interface ICard {
@@ -12,5 +12,5 @@ export interface ICard {
     question: string;
     explanation: string;
     public: boolean;
-    pictures: ICardPicture[];
+    pictures: IPicture[];
 }

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

@@ -1,13 +1,15 @@
 import { IFile } from './File';
-import { IChapterPicture } from './Picture';
+import { IPicture } from './Picture';
 import { ETopicType } from './Topic';
 import { Id } from './Type';
+import { IVideo } from './Video';
 export interface IChapter {
     id: Id;
     createdAt: number | Date;
     updatedAt: number | Date;
     explanation: string | null;
     typeId: ETopicType | null;
-    pictures: IChapterPicture[];
-    files: IFile[];
+    pictures?: IPicture[];
+    videos?: IVideo[];
+    files?: IFile[];
 }

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

@@ -7,17 +7,9 @@ export interface IConcept {
     createdAt: number | Date;
     updatedAt: number | Date;
     name: string;
-    chapterId: Id;
-    chapter: IChapter;
     topicId: Id;
     topic?: ITopic;
+    chapterId: Id;
+    chapter?: IChapter;
     videos?: IVideo[];
 }
-export interface IAnatomyConcept {
-    id: number;
-    name: string;
-    totalCards: number;
-    ConfidentCards: number;
-    ReviewCards: number;
-    LearnCards: number;
-}

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

@@ -5,6 +5,6 @@ export interface IFile {
     updatedAt: number | Date;
     title: string;
     url: string;
-    videoId?: number;
-    chapterId?: number;
+    videoId: Id | null;
+    chapterId: Id | null;
 }

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

@@ -1,47 +1,36 @@
-import { IPrescribeMark, IQuestion, IQuestionQAAnswer } from './Question';
+import { IPrescribeAnswer, IPrescribeMark, IQuestion, IQuestionChoice, IQuestionQAAnswer } from './Question';
 import { Id } from './Type';
+import { IUser } from './User';
 export interface IMarksheet {
     id: Id;
     createdAt: number | Date;
+    updatedAt: number | Date;
+    startedAt: number | Date;
     endedAt: number | Date;
+    topicIds: number[];
+    topicNames?: string[];
     source: string;
+    userId: Id;
+    user?: IUser;
     marks: IMarksheetMark[];
     mockTestId: number | null;
+    correct?: number;
+    incorrect?: number;
+    totalQuestions?: number;
+    isTestMarksheet?: boolean;
 }
-export declare enum EQuestionLike {
-    NONE = 0,
-    LIKE = 1,
-    DISLIKE = 2
-}
-export declare type IMarksheetMarkJSONB = string | [string] | [IQuestionQAAnswer] | [string[], string[]] | [IPrescribeMark] | null;
+export declare type IMarksheetMarkJSONB = string | [string] | [IQuestionQAAnswer] | [string[], string[]] | [IPrescribeMark] | IPrescribeAnswer | null;
 export interface IMarksheetMark {
     id: Id;
+    createdAt: number | Date;
+    updatedAt: number | Date;
     index: number;
     marksheetId: Id;
-    questionChoiceId: Id;
+    questionChoiceId: Id | null;
+    questionChoices?: IQuestionChoice;
     timeTaken: number;
     flagged: boolean;
     questionId: Id;
     question: IQuestion;
     mark: IMarksheetMarkJSONB;
-    like: number;
-    dislike: number;
-    isLikeByMe: EQuestionLike;
-    discussion: IDiscussion[];
-}
-export interface IDiscussion {
-    username: string;
-    userId: Id;
-    createdAt: number | Date;
-    comment: string;
-    like: number;
-    dislike: number;
-    isLikeByMe: EQuestionLike;
-    commentId: number;
-    questionId: number;
-    reply: IDiscussion[];
-}
-export interface ILikeDislikeCount {
-    like: number;
-    dislike: number;
 }

package/dist/cjs/models/Marksheet.js

@@ -1,9 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EQuestionLike = void 0;
-var EQuestionLike;
-(function (EQuestionLike) {
-    EQuestionLike[EQuestionLike["NONE"] = 0] = "NONE";
-    EQuestionLike[EQuestionLike["LIKE"] = 1] = "LIKE";
-    EQuestionLike[EQuestionLike["DISLIKE"] = 2] = "DISLIKE";
-})(EQuestionLike = exports.EQuestionLike || (exports.EQuestionLike = {}));

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

@@ -3,6 +3,7 @@ import { ETopicType } from './Topic';
 import { Id } from './Type';
 export interface IMockTest {
     id: Id;
+    createdAt: number | Date;
     title: string;
     typeId: ETopicType | null;
     passingMark: number;

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

@@ -7,7 +7,7 @@ export interface IOsceMarksheetUser {
     osceMarksheetId: Id;
     userId: Id | null;
     user: IUser | null;
-    role: EOsceRoles;
+    role: EOsceRoles | null;
 }
 export interface IOsceMarksheetMark {
     id: Id;
@@ -74,7 +74,7 @@ export interface IOsceMarksheet {
 }
 export interface IDashboardOsce {
     lastAgoraId: string;
-    types: IOsceTypeDashboard[];
+    types: IOsceType[];
     avgScore: number;
     completed: number;
     total: number;

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

@@ -1,14 +1,18 @@
 import { EDifficultyType } from './Difficulty';
-import { IOsceActorPicture, IOsceCandidatePicture, IOsceExaminerPicture, IOsceWalkthroughPicture } from './Picture';
+import { IPicture } from './Picture';
 import { ITopic } from './Topic';
 import { Id } from './Type';
 import { IVideo } from './Video';
 export interface IOsceType {
     id: Id;
     name: string;
+    completed: number;
+    total: number;
+    avgScore: number;
 }
 export interface IOsceStationMark {
     id: Id;
+    updatedAt: number | Date;
     index: number;
     osceStationId: Id;
     header: string;
@@ -37,15 +41,13 @@ export interface IOsceStation {
     explanation: string;
     marks: IOsceStationMark[];
     topics?: ITopic[];
-    candidatePictures?: IOsceCandidatePicture[];
-    actorPictures?: IOsceActorPicture[];
-    examinerPictures?: IOsceExaminerPicture[];
-    walkthroughPictures?: IOsceWalkthroughPicture[];
+    candidatePictures?: IPicture[];
+    actorPictures?: IPicture[];
+    examinerPictures?: IPicture[];
+    walkthroughPictures?: IPicture[];
     videos?: IVideo[];
-}
-export interface IOsceStationItem extends IOsceStation {
-    lastOsceMarksheetId: Id;
-    score: number;
+    lastOsceMarksheetId?: Id;
+    score?: number;
 }
 export declare const OSCE_GLOBAL_RATING: {
     [key: number]: string;

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

@@ -12,36 +12,3 @@ export interface IPicture {
     topicId: Id;
     topic: ITopic;
 }
-export interface IQuestionPicture {
-    id: Id;
-    pictureId: Id;
-    questionId: Id;
-    choiceId: Id | null;
-    picture: IPicture;
-}
-export interface ICardPicture {
-    id: Id;
-    pictureId: Id;
-    cardId: Id;
-    picture: IPicture;
-}
-export interface IChapterPicture {
-    id: Id;
-    pictureId: Id;
-    chapterId: Id;
-    picture: IPicture;
-}
-export interface IOscePicture {
-    id: Id;
-    osceStationId: Id;
-    pictureId: Id;
-    picture: IPicture;
-}
-export interface IOsceCandidatePicture extends IOscePicture {
-}
-export interface IOsceActorPicture extends IOscePicture {
-}
-export interface IOsceExaminerPicture extends IOscePicture {
-}
-export interface IOsceWalkthroughPicture extends IOscePicture {
-}

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

@@ -1,7 +1,8 @@
 import { IConcept } from './Concept';
 import { EDifficultyType } from './Difficulty';
-import { IQuestionPicture } from './Picture';
+import { IPicture } from './Picture';
 import { Id } from './Type';
+import { IUser } from './User';
 export declare enum EPsaSectionType {
     PRESCRIBING = 1,
     PRESCRIPTION_REVIEW = 2,
@@ -18,6 +19,25 @@ export declare enum EQuestionType {
     MULTIPLE_ANSWERS = 3,
     PRESCRIPTION_ANSWER = 4
 }
+export declare enum EQuestionLike {
+    NONE = 0,
+    LIKE = 1,
+    DISLIKE = 2
+}
+export interface IQuestionComment {
+    id: Id;
+    createdAt: number | Date;
+    updatedAt: number | Date;
+    userId: Id;
+    user?: IUser;
+    username?: string | null;
+    questionId: number;
+    comment: string;
+    replies?: IQuestionComment[];
+    likes?: number;
+    dislikes?: number;
+    isLikedByMe?: EQuestionLike;
+}
 export declare type IQuestionAnswer = string | [string] | [IQuestionQAAnswer] | [string[], string[]] | IPrescribeAnswer[];
 export declare type IQuestionAll = IQuestion | IQuestionSBA | IQuestionQA | IQuestionMultiQ | IQuestionPrescribe;
 export interface IQuestion {
@@ -31,10 +51,14 @@ export interface IQuestion {
     answer: IQuestionAnswer;
     totalVotes: number;
     choices: IQuestionChoice[];
-    pictures: IQuestionPicture[];
+    pictures?: IPicture[];
     difficulty: EDifficultyType;
     elo: number;
     psaSectionId: EPsaSectionType;
+    likes?: number;
+    dislikes?: number;
+    isLikedByMe?: EQuestionLike;
+    comments?: IQuestionComment[];
 }
 export interface IQuestionChoice {
     id: Id;
@@ -43,6 +67,7 @@ export interface IQuestionChoice {
     label: string;
     answer: boolean;
     votes: number;
+    picture?: IPicture | null;
 }
 export declare function isQuestionSBA(data: IQuestionAll): data is IQuestionSBA;
 export interface IQuestionSBA extends IQuestion {

package/dist/cjs/models/Question.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isQuestionPrescribe = exports.isQuestionMultiQ = exports.isQuestionQA = exports.isQuestionSBA = exports.EQuestionType = exports.EPsaSectionType = void 0;
+exports.isQuestionPrescribe = exports.isQuestionMultiQ = exports.isQuestionQA = exports.isQuestionSBA = exports.EQuestionLike = exports.EQuestionType = exports.EPsaSectionType = void 0;
 var EPsaSectionType;
 (function (EPsaSectionType) {
     EPsaSectionType[EPsaSectionType["PRESCRIBING"] = 1] = "PRESCRIBING";
@@ -19,6 +19,12 @@ var EQuestionType;
     EQuestionType[EQuestionType["MULTIPLE_ANSWERS"] = 3] = "MULTIPLE_ANSWERS";
     EQuestionType[EQuestionType["PRESCRIPTION_ANSWER"] = 4] = "PRESCRIPTION_ANSWER";
 })(EQuestionType = exports.EQuestionType || (exports.EQuestionType = {}));
+var EQuestionLike;
+(function (EQuestionLike) {
+    EQuestionLike[EQuestionLike["NONE"] = 0] = "NONE";
+    EQuestionLike[EQuestionLike["LIKE"] = 1] = "LIKE";
+    EQuestionLike[EQuestionLike["DISLIKE"] = 2] = "DISLIKE";
+})(EQuestionLike = exports.EQuestionLike || (exports.EQuestionLike = {}));
 function isQuestionSBA(data) {
     return data.typeId === EQuestionType.SINGLE_BEST_ANSWER;
 }

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

@@ -1,19 +1,28 @@
 import { ICard } from './Card';
+import { ITopic } from './Topic';
 import { Id } from './Type';
+import { IUser } from './User';
 export interface ITodo {
     id: Id;
     createdAt: number | Date;
     updatedAt: number | Date;
     userId: Id;
+    user?: IUser;
     dailyTask: boolean;
     marks: ITodoMark[];
     source: string;
+    topics?: ITopic[];
+    redCards?: number | null;
+    yellowCards?: number | null;
+    greenCards?: number | null;
 }
 export interface ITodoMark {
     id: Id;
+    createdAt: number | Date;
+    updatedAt: number | Date;
     todoId: Id;
     cardId: Id;
-    card: ICard;
+    card?: ICard;
     score: number;
     timeTaken: number;
 }

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

@@ -1,6 +1,8 @@
 import { Id } from './Type';
 export interface IToken {
     id: Id;
+    createdAt: number | Date;
+    updatedAt: number | Date;
     userId: Id;
     token: string;
     deviceId: string;

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

@@ -9,9 +9,24 @@ export declare enum ETopicType {
     PSA = 5,
     OSCE = 6
 }
+export interface ITopicType {
+    id: ETopicType;
+    name: string;
+}
 export interface ITopic {
     id: Id;
+    createdAt: number | Date;
+    updatedAt: number | Date;
     name: string;
-    typeId: ETopicType | null;
     concepts?: IConcept[];
+    typeId: ETopicType | null;
+    type?: ITopicType | null;
+    totalQuestions?: number | null;
+    correctQuestions?: number | null;
+    incorrectQuestions?: number | null;
+    totalCards?: number | null;
+    greenCards?: number | null;
+    yellowCards?: number | null;
+    redCards?: number | null;
+    dailyFeedCards?: number | null;
 }

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

@@ -1,10 +1,10 @@
 import { ICard } from './Card';
 import { IConcept } from './Concept';
-import { IMarksheetMark } from './Marksheet';
+import { IMarksheet, IMarksheetMark } from './Marksheet';
 import { IQuestion } from './Question';
 import { ISubscription } from './Subscription';
-import { ITopic } from './Topic';
 import { Id } from './Type';
+import { IUniversity } from './University';
 export declare type IAccessLevel = 'subscriber' | 'administrator' | 'tutor';
 export declare type IClassYear = 'Year 1' | 'Year 2' | 'Year 3' | 'Year 4' | 'Year 5' | 'Graduated' | 'PhD' | 'BSc' | 'MSc' | 'Beta Tester';
 export declare const classYears: IClassYear[];
@@ -24,13 +24,14 @@ export interface IPayload {
     accessLevel: IAccessLevel;
     tocAccepted: boolean;
     exp: number;
-    stripeSubscriptionEndDate: number | null;
     stripeQBankSubscriptionEndDate: number | null;
     stripeOsceSubscriptionEndDate: number | null;
     stripeBundleSubscriptionEndDate: number | null;
 }
 export interface IUser {
     id: Id;
+    createdAt: number | Date;
+    updatedAt: number | Date;
     displayName: string;
     username: string;
     firstName: string;
@@ -38,24 +39,39 @@ export interface IUser {
     tocAccepted: boolean;
     dailyFeedResetTime: number;
     dailyFeedMax: number;
-    classYear: IClassYear;
-    graduationYear: number;
-    universityId: number;
-    examDate: number | Date | null;
     stripeCustomerId: string;
-    qBankSubscriptionId: Id | null;
+    stripeLastSyncAt: number | Date | null;
+    qBankSubscriptionId: Id;
     qBankSubscription: ISubscription | null;
-    stripeQBankSubscriptionEndDate: number | Date | null;
-    osceSubscriptionId: Id | null;
+    stripeQBankSubscriptionId: string;
+    stripeQBankSubscriptionEndDate: number | Date;
+    osceSubscriptionId: Id;
     osceSubscription: ISubscription | null;
-    stripeOsceSubscriptionEndDate: number | Date | null;
-    bundleSubscriptionId: Id | null;
+    stripeOsceSubscriptionId: string;
+    stripeOsceSubscriptionEndDate: number | Date;
+    bundleSubscriptionId: Id;
     bundleSubscription: ISubscription | null;
-    stripeBundleSubscriptionEndDate: number | Date | null;
-    subscriptionId: Id | null;
-    subscription?: ISubscription | null;
-    stripeSubscriptionEndDate: number | Date | null;
-    stripePriceNickname: string | null;
+    stripeBundleSubscriptionId: string;
+    stripeBundleSubscriptionEndDate: number | Date;
+    referralCount: number;
+    classYear: IClassYear;
+    graduationYear: number;
+    universityId: Id;
+    university: IUniversity;
+    examDate: number | Date | null;
+    accessLevel: IAccessLevel;
+    elo: number;
+    marksheets: IMarksheet[];
+    completedQuestions: IUserCompletedQuestions[];
+    completedCards: IUserCompletedCards[];
+    marksheetsCount?: number | null;
+    completedQuestionsCount?: number | null;
+    completedCorrectQuestionsCount?: number | null;
+    completedIncorrectQuestionsCount?: number | null;
+    completedCardsCount?: number | null;
+    completedGreenCardsCount?: number | null;
+    completedYellowCardsCount?: number | null;
+    completedRedCardsCount?: number | null;
 }
 export declare function currentClassYear(createdAtUnix: number, classYear: IClassYear): IClassYear;
 export declare function currentClassGroup(createdAtUnix: number, classYear: IClassYear): EClassYearGroup;
@@ -67,7 +83,6 @@ export interface IUserCompletedQuestions {
     userId: Id;
     correct: boolean;
     question: IQuestion;
-    topic: ITopic;
     concept: IConcept;
 }
 export interface IUserCompletedCards {
@@ -77,14 +92,13 @@ export interface IUserCompletedCards {
     cardId: Id;
     card: ICard;
     userId: Id;
-    topic: ITopic;
     concept: IConcept;
     lastSeen: number | Date;
     score: number;
     iteration: number;
     optimalFactor: number;
 }
-export interface IUserFlaggedQuestions {
+export interface IUserFlaggedQuestion {
     id: Id;
     createdAt: number | Date;
     updatedAt: number | Date;

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

@@ -22,4 +22,5 @@ export interface IVideo {
     sent1hrPushAt: number | Date | null;
     send24hrPushAt: number | Date | null;
     sent24hrPushAt: number | Date | null;
+    viewsToday?: number | null;
 }

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

@@ -1,2 +1 @@
-export declare const CHAPTER_FILE_FIELDS: import("@apollo/client").DocumentNode;
 export declare const CHAPTER_FIELDS: import("@apollo/client").DocumentNode;

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

@@ -1,20 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CHAPTER_FIELDS = exports.CHAPTER_FILE_FIELDS = void 0;
+exports.CHAPTER_FIELDS = void 0;
 const client_1 = require("@apollo/client");
 const picture_1 = require("./picture");
-exports.CHAPTER_FILE_FIELDS = (0, client_1.gql) `
-  fragment ChapterFileFields on File {
-    id
-    title
-    url
-    videoId
-    conceptId
-  }
-`;
 exports.CHAPTER_FIELDS = (0, client_1.gql) `
-  ${exports.CHAPTER_FILE_FIELDS}
-  ${picture_1.CHAPTER_PICTURE_FIELDS}
+  ${picture_1.PICTURE_FIELDS}
   fragment ChapterFields on Chapter {
     id
     createdAt
@@ -22,10 +12,14 @@ exports.CHAPTER_FIELDS = (0, client_1.gql) `
     explanation
     typeId
     pictures {
-      ...ChapterPictureFields
+      ...PictureFields
     }
     files {
-      ...ChapterFileFields
+      id
+      title
+      url
+      videoId
+      conceptId
     }
   }
 `;

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

@@ -13,12 +13,11 @@ exports.OSCE_STATION_MARK_FIELDS = (0, client_1.gql) `
   }
 `;
 exports.OSCE_STATION_FIELDS = (0, client_1.gql) `
-  ${picture_1.OSCE_PICTURE_FIELDS}
+  ${picture_1.PICTURE_FIELDS}
   ${exports.OSCE_STATION_MARK_FIELDS}
   fragment OsceStationFields on OsceStation {
     id
     updatedAt
-    deleted
     name
     osceType {
       id
@@ -37,16 +36,16 @@ exports.OSCE_STATION_FIELDS = (0, client_1.gql) `
       name
     }
     candidatePictures {
-      ...OscePictureFields
+      ...PictureFields
     }
     actorPictures {
-      ...OscePictureFields
+      ...PictureFields
     }
     examinerPictures {
-      ...OscePictureFields
+      ...PictureFields
     }
     walkthroughPictures {
-      ...OscePictureFields
+      ...PictureFields
     }
     videos {
       id

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

@@ -1,3 +1 @@
 export declare const PICTURE_FIELDS: import("@apollo/client").DocumentNode;
-export declare const OSCE_PICTURE_FIELDS: import("@apollo/client").DocumentNode;
-export declare const CHAPTER_PICTURE_FIELDS: import("@apollo/client").DocumentNode;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CHAPTER_PICTURE_FIELDS = exports.OSCE_PICTURE_FIELDS = exports.PICTURE_FIELDS = void 0;
+exports.PICTURE_FIELDS = void 0;
 const client_1 = require("@apollo/client");
 exports.PICTURE_FIELDS = (0, client_1.gql) `
   fragment PictureFields on Picture {
@@ -20,25 +20,3 @@ exports.PICTURE_FIELDS = (0, client_1.gql) `
     }
   }
 `;
-exports.OSCE_PICTURE_FIELDS = (0, client_1.gql) `
-  ${exports.PICTURE_FIELDS}
-  fragment OscePictureFields on OscePicture {
-    id
-    osceStationId
-    pictureId
-    picture {
-      ...PictureFields
-    }
-  }
-`;
-exports.CHAPTER_PICTURE_FIELDS = (0, client_1.gql) `
-  ${exports.PICTURE_FIELDS}
-  fragment ChapterPictureFields on ChapterPicture {
-    id
-    pictureId
-    chapterId
-    picture {
-      ...PictureFields
-    }
-  }
-`;

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

@@ -5,6 +5,8 @@ const client_1 = require("@apollo/client");
 exports.USER_FIELDS = (0, client_1.gql) `
   fragment UserFields on User {
     id
+    createdAt
+    updatedAt
     username
     firstName
     lastName
@@ -22,5 +24,16 @@ exports.USER_FIELDS = (0, client_1.gql) `
     # TODO: Remove this from backwards compatibility
     stripePriceNickname
     stripeSubscriptionEndDate
+
+    # user-specific keys
+    # marksheets
+    # marksheetsCount
+    # completedQuestionsCount
+    # completedCorrectQuestionsCount
+    # completedIncorrectQuestionsCount
+    # completedCardsCount
+    # completedGreenCardsCount
+    # completedYellowCardsCount
+    # completedRedCardsCount
   }
 `;

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

@@ -13,7 +13,7 @@ exports.VIDEO_FILE_FIELDS = (0, client_1.gql) `
   }
 `;
 exports.VIDEO_FIELDS = (0, client_1.gql) `
-  ${picture_1.CHAPTER_PICTURE_FIELDS}
+  ${picture_1.PICTURE_FIELDS}
   fragment VideoFields on Video {
     id
     title
@@ -33,7 +33,7 @@ exports.VIDEO_FIELDS = (0, client_1.gql) `
         explanation
         typeId
         pictures {
-          ...ChapterPictureFields
+          ...PictureFields
         }
         files {
           ...VideoFileFields
@@ -53,5 +53,6 @@ exports.VIDEO_FIELDS = (0, client_1.gql) `
     files {
       ...VideoFileFields
     }
+    viewsToday
   }
 `;