@quesmed/types 1.4.13 → 1.4.17

package/models/Blog.d.ts

@@ -0,0 +1,15 @@
+import { Id } from './Type';
+export interface IBlogTag {
+    id: Id;
+    createdAt: number | Date;
+    name: string;
+}
+export interface IBlogPost {
+    id: Id;
+    createdAt: number | Date;
+    updatedAt: number | Date;
+    title: string;
+    body: string;
+    tags?: IBlogTag[];
+    relatedBlogPosts?: IBlogPost[];
+}

package/models/Blog.js

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

package/models/Blog.mjs

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

package/models/OsceMarksheet.d.ts

@@ -58,6 +58,7 @@ export interface IOsceMarksheet {
     timeRemaining: number;
     marks: IOsceMarksheetMark[];
     users: IOsceMarksheetUser[];
+    members: IUser[];
     completed: boolean;
 }
 export interface IDashboardOsce {

package/models/User.d.ts

@@ -8,10 +8,12 @@ import { Id } from './Type';
 export declare type IClassYear = 'Year 1' | 'Year 2' | 'Year 3' | 'Year 4' | 'Year 5' | 'Graduated' | 'PhD' | 'BSc' | 'MSc' | 'Beta Tester';
 export interface IPayload {
     id: Id;
+    displayName: string;
     firstName: string;
     lastName: string;
     username: string;
     accessLevel: string;
+    tocAccepted: boolean;
     exp: number;
     stripeSubscriptionEndDate: number | null;
     stripeQBankSubscriptionEndDate: number | null;
@@ -20,9 +22,11 @@ export interface IPayload {
 }
 export interface IUser {
     id: Id;
+    displayName: string;
     username: string;
     firstName: string;
     lastName: string;
+    tocAccepted: boolean;
     classYear: IClassYear;
     graduationYear: number;
     universityId: number;

package/models/index.d.ts

@@ -21,3 +21,4 @@ export * from './Type';
 export * from './University';
 export * from './User';
 export * from './Video';
+export * from './Blog';

package/models/index.js

@@ -33,3 +33,4 @@ __exportStar(require("./Type"), exports);
 __exportStar(require("./University"), exports);
 __exportStar(require("./User"), exports);
 __exportStar(require("./Video"), exports);
+__exportStar(require("./Blog"), exports);

package/models/index.mjs

@@ -21,3 +21,4 @@ export * from './Type';
 export * from './University';
 export * from './User';
 export * from './Video';
+export * from './Blog';

package/package.json

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

package/resolvers/fragments/blog.d.ts

@@ -0,0 +1 @@
+export declare const BLOG_POST_FIELDS: import("@apollo/client").DocumentNode;

package/resolvers/fragments/blog.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BLOG_POST_FIELDS = void 0;
+const client_1 = require("@apollo/client");
+exports.BLOG_POST_FIELDS = (0, client_1.gql) `
+  fragment BlogPostFields on BlogPost {
+    id
+    createdAt
+    updatedAt
+    title
+    body
+    tags {
+      id
+      name
+    }
+  }
+`;

package/resolvers/fragments/blog.mjs

@@ -0,0 +1,14 @@
+import { gql } from '@apollo/client';
+export const BLOG_POST_FIELDS = gql `
+  fragment BlogPostFields on BlogPost {
+    id
+    createdAt
+    updatedAt
+    title
+    body
+    tags {
+      id
+      name
+    }
+  }
+`;

package/resolvers/fragments/osce.js

@@ -79,7 +79,8 @@ exports.OSCE_MARKSHEET_USER_FIELDS = (0, client_1.gql) `
     osceMarksheetId
     userId
     user {
-      ...UserFields
+      id
+      displayName
     }
     role
   }
@@ -125,6 +126,10 @@ exports.OSCE_MARKSHEET_FIELDS = (0, client_1.gql) `
     users {
       ...OsceMarksheetUserFields
     }
+    members {
+      id
+      displayName
+    }
     completed
   }
 `;

package/resolvers/fragments/osce.mjs

@@ -76,7 +76,8 @@ export const OSCE_MARKSHEET_USER_FIELDS = gql `
     osceMarksheetId
     userId
     user {
-      ...UserFields
+      id
+      displayName
     }
     role
   }
@@ -122,6 +123,10 @@ export const OSCE_MARKSHEET_FIELDS = gql `
     users {
       ...OsceMarksheetUserFields
     }
+    members {
+      id
+      displayName
+    }
     completed
   }
 `;

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

@@ -1,4 +1,5 @@
 import { IUser } from '../../../models';
+import { RestrictedData } from '../../types';
 export interface IResetProgressVar {
     questions?: boolean;
     cards?: boolean;
@@ -6,6 +7,7 @@ export interface IResetProgressVar {
 export interface IResetProgressData extends IUser {
 }
 export interface IUserInput {
+    displayName?: string;
     firstName?: string;
     lastName?: string;
     classYear?: string;
@@ -23,3 +25,6 @@ export interface IRenewTokenVar {
     days?: number;
 }
 export declare type IRenewTokenData = string;
+export declare const TOC_ACCEPT: import("@apollo/client").DocumentNode;
+export declare type ITocAcceptVar = null;
+export declare type ITocAcceptData = RestrictedData<string, 'tocAccept'>;

package/resolvers/mutation/restricted/users.js

@@ -1,2 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.TOC_ACCEPT = void 0;
+const client_1 = require("@apollo/client");
+exports.TOC_ACCEPT = (0, client_1.gql) `
+  mutation TocAccept {
+    restricted {
+      tocAccept
+    }
+  }
+`;

package/resolvers/mutation/restricted/users.mjs

@@ -1 +1,8 @@
-export {};
+import { gql } from '@apollo/client';
+export const TOC_ACCEPT = gql `
+  mutation TocAccept {
+    restricted {
+      tocAccept
+    }
+  }
+`;

package/resolvers/mutation/users.d.ts

@@ -5,6 +5,7 @@ export interface ILoginUserVar {
 }
 export declare type ILoginUserData = string;
 export interface RegisterUserInput {
+    displayName: string;
     username: string;
     firstName: string;
     lastName: string;

package/resolvers/query/blog.d.ts

@@ -0,0 +1,12 @@
+import { IBlogPost } from '../../models';
+import { graphqlNormalize, RootData } from '../types';
+export declare const BLOG_POST: import("@apollo/client").DocumentNode;
+export interface IBlogPostVar {
+    id: number;
+}
+export declare type IBlogPostData = RootData<graphqlNormalize & IBlogPost, 'blogPost'>;
+export declare const BLOG_POSTS: import("@apollo/client").DocumentNode;
+export interface IBlogPostsVar {
+    tagIds: number[];
+}
+export declare type IBlogPostsData = RootData<(graphqlNormalize & IBlogPost)[], 'blogPosts'>;

package/resolvers/query/blog.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BLOG_POSTS = exports.BLOG_POST = void 0;
+const client_1 = require("@apollo/client");
+const blog_1 = require("../fragments/blog");
+exports.BLOG_POST = (0, client_1.gql) `
+  ${blog_1.BLOG_POST_FIELDS}
+  query BlogPost($id: Int!) {
+    blogPost(id: $id) {
+      ...BlogPostFields
+      relatedBlogPosts {
+        ...BlogPostFields
+      }
+    }
+  }
+`;
+exports.BLOG_POSTS = (0, client_1.gql) `
+  ${blog_1.BLOG_POST_FIELDS}
+  query BlogPosts($tags: [Int]!) {
+    blogPosts(tags: $tags) {
+      ...BlogPostFields
+      relatedBlogPosts {
+        ...BlogPostFields
+      }
+    }
+  }
+`;

package/resolvers/query/blog.mjs

@@ -0,0 +1,24 @@
+import { gql } from '@apollo/client';
+import { BLOG_POST_FIELDS } from '../fragments/blog';
+export const BLOG_POST = gql `
+  ${BLOG_POST_FIELDS}
+  query BlogPost($id: Int!) {
+    blogPost(id: $id) {
+      ...BlogPostFields
+      relatedBlogPosts {
+        ...BlogPostFields
+      }
+    }
+  }
+`;
+export const BLOG_POSTS = gql `
+  ${BLOG_POST_FIELDS}
+  query BlogPosts($tags: [Int]!) {
+    blogPosts(tags: $tags) {
+      ...BlogPostFields
+      relatedBlogPosts {
+        ...BlogPostFields
+      }
+    }
+  }
+`;

package/resolvers/query/index.d.ts

@@ -1,4 +1,5 @@
 export * from './author';
+export * from './blog';
 export * from './book';
 export * from './feedback';
 export * from './sampleCards';

package/resolvers/query/index.js

@@ -11,6 +11,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./author"), exports);
+__exportStar(require("./blog"), exports);
 __exportStar(require("./book"), exports);
 __exportStar(require("./feedback"), exports);
 __exportStar(require("./sampleCards"), exports);

package/resolvers/query/index.mjs

@@ -1,4 +1,5 @@
 export * from './author';
+export * from './blog';
 export * from './book';
 export * from './feedback';
 export * from './sampleCards';

package/utils/commonFunctions.js

@@ -41,7 +41,7 @@ function formatPrescribeAnswer(baseAnswer) {
         .toLowerCase()
         .replace(/\s/g, '')
         .replace(/\//g, '');
-    if (obj.route.value === 'oral') {
+    if (obj.route.value.includes('oral')) {
         obj.route.value = 'po';
     }
     else if (obj.route.value.includes('intravenous')) {

package/utils/commonFunctions.mjs

@@ -37,7 +37,7 @@ export function formatPrescribeAnswer(baseAnswer) {
         .toLowerCase()
         .replace(/\s/g, '')
         .replace(/\//g, '');
-    if (obj.route.value === 'oral') {
+    if (obj.route.value.includes('oral')) {
         obj.route.value = 'po';
     }
     else if (obj.route.value.includes('intravenous')) {