@quesmed/types 1.4.4 → 1.4.8

package/models/Author.d.ts

@@ -1,8 +1,8 @@
 import { Id } from './Type';
 export interface IAuthor {
     id: Id;
-    createdAt: string | Date;
-    updatedAt: string | Date;
+    createdAt: number | Date;
+    updatedAt: number | Date;
     name: string;
     qualifications: string | null;
     title: string;

package/models/Book.d.ts

@@ -2,11 +2,11 @@ import { IAuthor } from './Author';
 import { Id } from './Type';
 export interface IBook {
     id: Id;
-    createdAt: string | Date;
-    updatedAt: string | Date;
+    createdAt: number | Date;
+    updatedAt: number | Date;
     name: string;
     publisher: string;
-    publishDate: string | Date;
+    publishDate: number | Date;
     pages: number;
     format: string;
     language: string;

package/models/Card.d.ts

@@ -4,8 +4,8 @@ import { ITopic } from './Topic';
 import { Id } from './Type';
 export interface ICard {
     id: Id;
-    createdAt: Date | string;
-    updatedAt: Date | string;
+    createdAt: number | Date;
+    updatedAt: number | Date;
     topic: ITopic;
     conceptId: Id;
     concept: IConcept;

package/models/Chapter.d.ts

@@ -4,8 +4,8 @@ import { ETopicType } from './Topic';
 import { Id } from './Type';
 export interface IChapter {
     id: Id;
-    createdAt: string | Date;
-    updatedAt: string | Date;
+    createdAt: number | Date;
+    updatedAt: number | Date;
     explanation: string | null;
     typeId: ETopicType | null;
     pictures: IChapterPicture[];

package/models/Concept.d.ts

@@ -4,8 +4,8 @@ import { Id } from './Type';
 import { IVideo } from './Video';
 export interface IConcept {
     id: Id;
-    createdAt: string | Date;
-    updatedAt: string | Date;
+    createdAt: number | Date;
+    updatedAt: number | Date;
     name: string;
     chapterId: Id;
     chapter: IChapter;

package/models/Feedback.d.ts

@@ -1,7 +1,7 @@
 import { Id } from './Type';
 export interface IFeedback {
     id: Id;
-    createdAt: string | Date;
+    createdAt: number | Date;
     name: string;
     feedback: string;
     university: string;

package/models/File.d.ts

@@ -1,8 +1,8 @@
 import { Id } from './Type';
 export interface IFile {
     id: Id;
-    createdAt: string | Date;
-    updatedAt: string | Date;
+    createdAt: number | Date;
+    updatedAt: number | Date;
     title: string;
     url: string;
     videoId?: number;

package/models/Marksheet.d.ts

@@ -2,8 +2,8 @@ import { IPrescribeMark, IQuestion, IQuestionQAAnswer } from './Question';
 import { Id } from './Type';
 export interface IMarksheet {
     id: Id;
-    createdAt: Date | string;
-    endedAt: Date | string;
+    createdAt: number | Date;
+    endedAt: number | Date;
     source: string;
     marks: IMarksheetMark[];
     mockTestId: number | null;
@@ -32,7 +32,7 @@ export interface IMarksheetMark {
 export interface IDiscussion {
     username: string;
     userId: Id;
-    createdAt: Date | string;
+    createdAt: number | Date;
     comment: string;
     like: number;
     dislike: number;

package/models/MockTest.d.ts

@@ -16,6 +16,6 @@ export interface IUserMockTest {
     incorrect: number;
     totalQuestions: number;
     lastMarksheetId?: Id;
-    lastMarksheetStartedAt?: Date | string;
-    lastMarksheetEndedAt?: Date | string;
+    lastMarksheetStartedAt?: number | Date;
+    lastMarksheetEndedAt?: number | Date;
 }

package/models/OsceMarksheet.d.ts

@@ -3,7 +3,7 @@ import { Id } from './Type';
 import { IUser } from './User';
 export interface IOsceMarksheetUser {
     id: Id | null;
-    createdAt: Date | string | null;
+    createdAt: number | Date | null;
     osceMarksheetId: Id;
     userId: Id | null;
     user: IUser | null;
@@ -38,8 +38,8 @@ export declare enum EOsceMarksheetAction {
 }
 export interface IOsceMarksheet {
     id: Id;
-    createdAt: Date | string;
-    updatedAt: Date | string;
+    createdAt: number | Date;
+    updatedAt: number | Date;
     timeTaken: number;
     osceStationId: Id;
     osceStation?: IOsceStation;
@@ -53,8 +53,8 @@ export interface IOsceMarksheet {
     readingTime: number;
     stationTime: number;
     feedbackTime: number;
-    startedAt: Date | string;
-    endedAt: Date | string;
+    startedAt: number | Date;
+    endedAt: number | Date;
     timeRemaining: number;
     marks: IOsceMarksheetMark[];
     users: IOsceMarksheetUser[];

package/models/OsceStation.d.ts

@@ -24,8 +24,8 @@ export declare enum EOsceType {
 }
 export interface IOsceStation {
     id: Id;
-    createdAt: Date | string;
-    updatedAt: Date | string;
+    createdAt: number | Date;
+    updatedAt: number | Date;
     name: string;
     osceTypeId: Id;
     osceType?: IOsceType;

package/models/Picture.d.ts

@@ -2,8 +2,8 @@ import { ITopic } from './Topic';
 import { Id } from './Type';
 export interface IPicture {
     id: Id;
-    createdAt: string | Date;
-    updatedAt: string | Date;
+    createdAt: number | Date;
+    updatedAt: number | Date;
     name: string;
     caption: string;
     path: string;

package/models/Picture.js

@@ -1,6 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-;
-;
-;
-;

package/models/Picture.mjs

@@ -1,5 +1 @@
-;
-;
-;
-;
 export {};

package/models/Promo.d.ts

@@ -1,13 +1,13 @@
 import { Id } from './Type';
 export interface ICoupon {
     id: Id;
-    createdAt: string | Date;
+    createdAt: number | Date;
     name: string;
     affiliateId: Id;
 }
 export interface IPromoReport {
     id: Id;
-    date: string | Date;
+    date: number | Date;
     couponId: Id;
     userId: Id;
     subscriptionId: Id;

package/models/Subscription.d.ts

@@ -1,7 +1,7 @@
 import { Id } from './Type';
 export interface ISubscription {
     id: Id;
-    createdAt: string | Date;
+    createdAt: number | Date;
     name: string;
     description: string | null;
     price: number;

package/models/Todo.d.ts

@@ -2,8 +2,8 @@ import { ICard } from './Card';
 import { Id } from './Type';
 export interface ITodo {
     id: Id;
-    createdAt: Date | string;
-    updatedAt: Date | string;
+    createdAt: number | Date;
+    updatedAt: number | Date;
     userId: Id;
     dailyTask: boolean;
     marks: ITodoMark[];

package/models/User.d.ts

@@ -26,26 +26,26 @@ export interface IUser {
     classYear: IClassYear;
     graduationYear: number;
     universityId: number;
-    examDate: Date | string | null;
+    examDate: number | Date | null;
     stripeCustomerId: string;
     qBankSubscriptionId: Id | null;
     qBankSubscription: ISubscription | null;
-    stripeQBankSubscriptionEndDate: Date | string | null;
+    stripeQBankSubscriptionEndDate: number | Date | null;
     osceSubscriptionId: Id | null;
     osceSubscription: ISubscription | null;
-    stripeOsceSubscriptionEndDate: Date | string | null;
+    stripeOsceSubscriptionEndDate: number | Date | null;
     bundleSubscriptionId: Id | null;
     bundleSubscription: ISubscription | null;
-    stripeBundleSubscriptionEndDate: Date | string | null;
+    stripeBundleSubscriptionEndDate: number | Date | null;
     subscriptionId: Id | null;
     subscription?: ISubscription | null;
-    stripeSubscriptionEndDate: Date | string | null;
+    stripeSubscriptionEndDate: number | Date | null;
     stripePriceNickname: string | null;
 }
 export interface IUserCompletedQuestions {
     id: Id;
-    createdAt: Date | string;
-    updatedAt: Date | string;
+    createdAt: number | Date;
+    updatedAt: number | Date;
     questionId: Id;
     userId: Id;
     correct: boolean;
@@ -55,22 +55,22 @@ export interface IUserCompletedQuestions {
 }
 export interface IUserCompletedCards {
     id: Id;
-    createdAt: Date | string;
-    updatedAt: Date | string;
+    createdAt: number | Date;
+    updatedAt: number | Date;
     cardId: Id;
     card: ICard;
     userId: Id;
     topic: ITopic;
     concept: IConcept;
-    lastSeen: Date | string;
+    lastSeen: number | Date;
     score: number;
     iteration: number;
     optimalFactor: number;
 }
 export interface IUserFlaggedQuestions {
     id: Id;
-    createdAt: Date | string;
-    updatedAt: Date | string;
+    createdAt: number | Date;
+    updatedAt: number | Date;
     questionId: Id;
     question: IQuestion;
     userId: Id;
@@ -79,7 +79,7 @@ export interface IUserFlaggedQuestions {
 }
 export interface IUserProgress {
     id: Id;
-    date: Date | string;
+    date: number | Date;
     userId: Id;
     topicId: Id;
     count: number;

package/models/Video.d.ts

@@ -1,12 +1,12 @@
-import { IConcept } from "./Concept";
-import { IFile } from "./File";
-import { Id } from "./Type";
+import { IConcept } from './Concept';
+import { IFile } from './File';
+import { Id } from './Type';
 export interface IVideo {
     id: Id;
-    createdAt: string | Date;
-    updatedAt: string | Date;
-    startTime: string | Date;
-    endTime: string | Date;
+    createdAt: number | Date;
+    updatedAt: number | Date;
+    startTime: number | Date;
+    endTime: number | Date;
     title: string;
     museId: string;
     thumbnail: string;
@@ -16,8 +16,8 @@ export interface IVideo {
     duration: number;
     concepts: IConcept[];
     files: IFile[];
-    send1hrPushAt: string | Date | null;
-    sent1hrPushAt: string | Date | null;
-    send24hrPushAt: string | Date | null;
-    sent24hrPushAt: string | Date | null;
+    send1hrPushAt: number | Date | null;
+    sent1hrPushAt: number | Date | null;
+    send24hrPushAt: number | Date | null;
+    sent24hrPushAt: number | Date | null;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quesmed/types",
-  "version": "1.4.4",
+  "version": "1.4.8",
   "description": "Typescript types for Quesmed",
   "main": "index.js",
   "module": "index.mjs",

package/resolvers/fragments/osce.js

@@ -75,7 +75,7 @@ exports.OSCE_STATION_FIELDS = (0, client_1.gql) `
 exports.OSCE_MARKSHEET_USER_FIELDS = (0, client_1.gql) `
   ${user_1.USER_FIELDS}
   fragment OsceMarksheetUserFields on OsceMarksheetUser {
-    id
+    # id - do not pass otherwise all unassigned roles = candidate
     osceMarksheetId
     userId
     user {

package/resolvers/fragments/osce.mjs

@@ -72,7 +72,7 @@ export const OSCE_STATION_FIELDS = gql `
 export const OSCE_MARKSHEET_USER_FIELDS = gql `
   ${USER_FIELDS}
   fragment OsceMarksheetUserFields on OsceMarksheetUser {
-    id
+    # id - do not pass otherwise all unassigned roles = candidate
     osceMarksheetId
     userId
     user {

package/resolvers/mutation/restricted/osce.d.ts

@@ -1,3 +1,4 @@
+import { ApolloClient } from '@apollo/client';
 import { EOsceMarksheetAction, EOsceRoles, Id, IOsceMarksheet, IOsceMarksheetMark } from '../../../models';
 import { IOsceMatchmakingAction } from '../../subscription/osce';
 import { graphqlNormalize, RestrictedData } from '../../types';
@@ -38,7 +39,7 @@ export interface IMarkOsceMarksheetMarkVar {
     mark: boolean;
 }
 export declare type IMarkOsceMarksheetMarkData = RestrictedData<graphqlNormalize & Partial<IOsceMarksheetMark>, 'markOsceMarksheetMark'>;
-export declare const optimisticMarkOsceMarksheetMark: (variables: IMarkOsceMarksheetMarkVar) => IMarkOsceMarksheetMarkData;
+export declare const optimisticMarkOsceMarksheetMark: (client: ApolloClient<any>, variables: IMarkOsceMarksheetMarkVar) => IMarkOsceMarksheetMarkData;
 export declare const SELECT_OSCE_STATION: import("@apollo/client").DocumentNode;
 export interface ISelectOsceMarksheetStationVar {
     osceMarksheetId: Id;

package/resolvers/mutation/restricted/osce.js

@@ -75,14 +75,16 @@ exports.MARK_OSCE_MARKSHEET_MARK = (0, client_1.gql) `
     }
   }
 `;
-const optimisticMarkOsceMarksheetMark = (variables) => {
+const optimisticMarkOsceMarksheetMark = (client, variables) => {
+    const __typename = 'OsceMarksheetMark';
+    const markOsceMarksheetMark = client.readFragment({
+        id: `${__typename}:${variables.osceStationMarkId}`,
+        fragment: osce_1.OSCE_MARKSHEET_MARK_FIELDS,
+        fragmentName: 'OsceMarksheetMarkFields',
+    });
     return {
         restricted: {
-            markOsceMarksheetMark: {
-                id: variables.osceStationMarkId,
-                mark: variables.mark,
-                __typename: 'OsceMarksheetMark',
-            },
+            markOsceMarksheetMark: Object.assign(Object.assign({}, markOsceMarksheetMark), { mark: variables.mark, __typename }),
         },
     };
 };

package/resolvers/mutation/restricted/osce.mjs

@@ -72,14 +72,16 @@ export const MARK_OSCE_MARKSHEET_MARK = gql `
     }
   }
 `;
-export const optimisticMarkOsceMarksheetMark = (variables) => {
+export const optimisticMarkOsceMarksheetMark = (client, variables) => {
+    const __typename = 'OsceMarksheetMark';
+    const markOsceMarksheetMark = client.readFragment({
+        id: `${__typename}:${variables.osceStationMarkId}`,
+        fragment: OSCE_MARKSHEET_MARK_FIELDS,
+        fragmentName: 'OsceMarksheetMarkFields',
+    });
     return {
         restricted: {
-            markOsceMarksheetMark: {
-                id: variables.osceStationMarkId,
-                mark: variables.mark,
-                __typename: 'OsceMarksheetMark',
-            },
+            markOsceMarksheetMark: Object.assign(Object.assign({}, markOsceMarksheetMark), { mark: variables.mark, __typename }),
         },
     };
 };

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

@@ -12,7 +12,7 @@ export interface IUserInput {
     graduationYear?: number;
     password?: string;
     oldPassword?: string;
-    examDate?: Date | string;
+    examDate?: number | Date;
 }
 export interface IUpdateUserVar {
     id?: number;

package/resolvers/query/restricted/marksheet.d.ts

@@ -31,8 +31,8 @@ export interface IDashboardPastQuizzesInfoRes {
     totalQuestions: number;
     totalMarksheet: number;
     isTestMarksheet: boolean;
-    startedAt: Date | string;
-    endedAt: Date | string;
+    startedAt: number | Date;
+    endedAt: number | Date;
 }
 export declare type IDashboardPastQuizzesInfoData = IDashboardPastQuizzesInfoRes[];
 export declare type ILatestPastMarksheetIdVar = null;

package/resolvers/query/restricted/osce.d.ts

@@ -32,7 +32,7 @@ export interface IOsceStationVar {
 export declare type IOsceStationData = RestrictedData<graphqlNormalize & IOsceStation, 'osceStation'>;
 export declare const OSCE_TOPICS: import("@apollo/client").DocumentNode;
 export declare type IOsceTopicsVar = null;
-export declare type IOsceTopicsData = RestrictedData<graphqlNormalize & ITopic, 'osceTopics'>;
+export declare type IOsceTopicsData = RestrictedData<(graphqlNormalize & ITopic)[], 'osceTopics'>;
 export declare const SEARCH_OSCE_STATIONS: import("@apollo/client").DocumentNode;
 export interface ISearchOsceStationsVar {
     search: string;

package/resolvers/query/restricted/university.d.ts

@@ -7,7 +7,7 @@ export interface IUniversitiesRankSpeciality {
     rank: number;
 }
 export interface IUniversityLeaderboard {
-    updatedAt: Date | string | null;
+    updatedAt: number | Date | null;
     month: IUniversitiesRankSpeciality[];
     quarter: IUniversitiesRankSpeciality[];
 }

package/resolvers/query/restricted/user.d.ts

@@ -1,7 +1,7 @@
 import { ISubscription, IUser } from '../../../models';
 export declare type IDashboardUserVar = null;
 export interface IDashboardUserData {
-    examDate: Date | string;
+    examDate: number | Date;
     totalQuestions: number;
     completedQuestionsCount: number;
     completedCorrectQuestionsCount: number;