@quesmed/types 1.0.26 → 1.1.1

package/models/Author.d.ts

@@ -0,0 +1,14 @@
+import { Id } from './Type';
+export interface IAuthor {
+    id: Id;
+    createdAt: string | Date;
+    updatedAt: string | Date;
+    name: string;
+    qualifications: string | null;
+    title: string;
+    description: string;
+    avatar: string;
+    linkedIn: string;
+    twitter: string;
+    facebook: string;
+}

package/models/Author.js

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

package/models/Book.d.ts

@@ -0,0 +1,22 @@
+import { IAuthor } from './Author';
+import { Id } from './Type';
+export interface IBook {
+    id: Id;
+    createdAt: string | Date;
+    updatedAt: string | Date;
+    name: string;
+    publisher: string;
+    publishDate: string | Date;
+    pages: number;
+    format: string;
+    language: string;
+    type: string;
+    ISBN: number;
+    price: number;
+    avatar: string;
+    heroImg: string;
+    description: string;
+    chapters: string | string[];
+    stripePriceId: string;
+    authors: IAuthor[];
+}

package/models/Book.js

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

package/models/Chapter.d.ts

@@ -5,7 +5,7 @@ export interface IChapter {
     id: Id;
     createdAt: string | Date;
     updatedAt: string | Date;
-    explanation: string;
+    explanation: string | null;
     clinical: boolean;
     pictures: IChapterPicture[];
     files: IFile[];

package/models/Marksheet.d.ts

@@ -1,4 +1,4 @@
-import { IPrescribeAnswer, IQuestion, IQuestionQAAnswer } from './Question';
+import { IPrescribeMark, IQuestion, IQuestionQAAnswer } from './Question';
 import { Id } from './Type';
 export interface IMarksheet {
     id: Id;
@@ -9,11 +9,11 @@ export interface IMarksheet {
     mockTestId: number | null;
 }
 export declare enum EQuestionLike {
-    LIKE = 0,
-    DISLIKE = 1,
-    REMOVE = 2
+    NONE = 0,
+    LIKE = 1,
+    DISLIKE = 2
 }
-export declare type IMarksheetMarkJSONB = string | [string] | [IQuestionQAAnswer] | [string[], string[]] | [IPrescribeAnswer] | null;
+export declare type IMarksheetMarkJSONB = string | [string] | [IQuestionQAAnswer] | [string[], string[]] | [IPrescribeMark] | null;
 export interface IMarksheetMark {
     id: Id;
     index: number;
@@ -26,7 +26,7 @@ export interface IMarksheetMark {
     mark: IMarksheetMarkJSONB;
     like: number;
     dislike: number;
-    isLikeByMe: string;
+    isLikeByMe: EQuestionLike;
     discussion: IDiscussion[];
 }
 export interface IDiscussion {
@@ -36,7 +36,7 @@ export interface IDiscussion {
     comment: string;
     like: number;
     dislike: number;
-    isLikeByMe: string;
+    isLikeByMe: EQuestionLike;
     commentId: number;
     questionId: number;
     reply: IDiscussion[];

package/models/Marksheet.js

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

package/models/Question.d.ts

@@ -38,7 +38,7 @@ export interface IQuestion {
 export interface IQuestionChoice {
     id: Id;
     name: string;
-    explanation: string;
+    explanation: string | null;
     label: string;
     answer: boolean;
     votes: number;
@@ -67,7 +67,19 @@ export interface IQuestionPrescribe extends IQuestion {
     answer: IPrescribeAnswer[];
     prescribeAnswer: IPrescribeAnswer[];
 }
+export declare type IPrescribeAnswerData<T> = {
+    value: T;
+    display: boolean;
+};
 export interface IPrescribeAnswer {
+    drug: IPrescribeAnswerData<string>;
+    dose: IPrescribeAnswerData<number>;
+    units: IPrescribeAnswerData<string>;
+    route: IPrescribeAnswerData<string>;
+    frequency: IPrescribeAnswerData<string>;
+    duration: IPrescribeAnswerData<string>;
+}
+export interface IPrescribeMark {
     drug: string;
     dose: number;
     units: string;

package/models/Topic.d.ts

@@ -1,8 +1,17 @@
 import { IConcept } from './Concept';
 import { Id } from './Type';
+export declare enum ETopicType {
+    ALL = 0,
+    BASIC_SCIENCE = 1,
+    CLINICAL = 2,
+    ANATOMY = 3,
+    DATA_INTERPRETATION = 4,
+    PSA = 5
+}
 export interface ITopic {
     id: Id;
     name: string;
     clinical: boolean;
     concepts?: IConcept[];
+    typeId: ETopicType | null;
 }

package/models/Topic.js

@@ -1,2 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ETopicType = void 0;
+var ETopicType;
+(function (ETopicType) {
+    ETopicType[ETopicType["ALL"] = 0] = "ALL";
+    ETopicType[ETopicType["BASIC_SCIENCE"] = 1] = "BASIC_SCIENCE";
+    ETopicType[ETopicType["CLINICAL"] = 2] = "CLINICAL";
+    ETopicType[ETopicType["ANATOMY"] = 3] = "ANATOMY";
+    ETopicType[ETopicType["DATA_INTERPRETATION"] = 4] = "DATA_INTERPRETATION";
+    ETopicType[ETopicType["PSA"] = 5] = "PSA";
+})(ETopicType = exports.ETopicType || (exports.ETopicType = {}));

package/models/Type.d.ts

@@ -1,7 +1,7 @@
 export declare type Id = number;
 export declare type Count = {
-    count: number;
-}[];
+    count: string;
+};
 export declare type Sum = {
-    sum: number;
-}[];
+    sum: string;
+};

package/models/index.d.ts

@@ -1,3 +1,5 @@
+export * from './Author';
+export * from './Book';
 export * from './Card';
 export * from './Chapter';
 export * from './Concept';

package/models/index.js

@@ -10,6 +10,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./Author"), exports);
+__exportStar(require("./Book"), exports);
 __exportStar(require("./Card"), exports);
 __exportStar(require("./Chapter"), exports);
 __exportStar(require("./Concept"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quesmed/types",
-  "version": "1.0.26",
+  "version": "1.1.1",
   "description": "Typescript types for Quesmed",
   "main": "index.js",
   "types": "dist/index.d.ts",

package/resolvers/query/author.d.ts

@@ -0,0 +1,3 @@
+import { IAuthor } from '../../models';
+export interface IAuthorData extends IAuthor {
+}

package/resolvers/query/author.js

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

package/resolvers/query/book.d.ts

@@ -0,0 +1,6 @@
+import { IBook } from '../../models';
+export interface IBookData extends IBook {
+}
+export interface IBookVar {
+    id: number;
+}

package/resolvers/query/book.js

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

package/resolvers/query/index.d.ts

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

package/resolvers/query/index.js

@@ -10,6 +10,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./author"), exports);
+__exportStar(require("./book"), exports);
 __exportStar(require("./feedback"), exports);
 __exportStar(require("./sampleCards"), exports);
 __exportStar(require("./sampleQuestions"), exports);

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

@@ -1,10 +1,10 @@
-import { Id, ITopic } from '../../../models';
+import { ETopicType, Id, ITopic } from '../../../models';
 export interface ITopicVar {
     id: Id;
 }
 export declare type ITopicData = ITopic;
 export interface ITopicsVar {
-    filter: 'clinical' | 'pre-clinical' | 'interpretation';
+    filter: ETopicType;
 }
 export interface ITopicInfo {
     id: number;

package/utils/commonFunctions.js

@@ -3,67 +3,95 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.correctMark = void 0;
 const models_1 = require("../models");
 const floatRegex = /([0-9]*[.])?[0-9]+/gm;
+function mapPrescribeMarkToAnswer(obj) {
+    return {
+        drug: {
+            value: obj.drug,
+            display: false,
+        },
+        dose: {
+            value: obj.dose,
+            display: false,
+        },
+        units: {
+            value: obj.units,
+            display: false,
+        },
+        route: {
+            value: obj.route,
+            display: false,
+        },
+        frequency: {
+            value: obj.frequency,
+            display: false,
+        },
+        duration: {
+            value: obj.duration,
+            display: false,
+        },
+    };
+}
 function formatPrescribeAnswer(obj) {
-    obj.drug = obj.drug.toLowerCase().replace(/\s/g, '');
-    obj.route = obj.route.toLowerCase().replace(/\s/g, '');
-    if (obj.route === 'oral') {
-        obj.route = 'po';
+    obj.drug.value = obj.drug.value.toLowerCase().replace(/\s/g, '');
+    obj.route.value = obj.route.value.toLowerCase().replace(/\s/g, '');
+    if (obj.route.value === 'oral') {
+        obj.route.value = 'po';
     }
-    else if (obj.route.includes('intravenous')) {
-        obj.route = 'iv';
+    else if (obj.route.value.includes('intravenous')) {
+        obj.route.value = 'iv';
     }
-    else if (obj.route.includes('intramuscular')) {
-        obj.route = 'im';
+    else if (obj.route.value.includes('intramuscular')) {
+        obj.route.value = 'im';
     }
-    else if (obj.route.includes('subcutaneous')) {
-        obj.route = 'sc';
+    else if (obj.route.value.includes('subcutaneous')) {
+        obj.route.value = 'sc';
     }
-    else if (obj.route.includes('inhale')) {
-        obj.route = 'inh';
+    else if (obj.route.value.includes('inhale')) {
+        obj.route.value = 'inh';
     }
-    else if (obj.route.includes('nebuli')) {
-        obj.route = 'neb';
+    else if (obj.route.value.includes('nebuli')) {
+        obj.route.value = 'neb';
     }
-    else if (obj.route.includes('topical')) {
-        obj.route = 'top';
+    else if (obj.route.value.includes('topical')) {
+        obj.route.value = 'top';
     }
-    obj.units = obj.units.toLowerCase().replace(/\s/g, '');
-    if (obj.units === 'milligram' || obj.units === 'milligrams') {
-        obj.units = 'mg';
+    obj.units.value = obj.units.value.toLowerCase().replace(/\s/g, '');
+    if (obj.units.value === 'milligram' || obj.units.value === 'milligrams') {
+        obj.units.value = 'mg';
     }
-    else if (obj.units === 'microgram' || obj.units === 'micrograms') {
-        obj.units = 'mcg';
+    else if (obj.units.value === 'microgram' || obj.units.value === 'micrograms') {
+        obj.units.value = 'mcg';
     }
-    else if (obj.units === 'gram' || obj.units === 'grams') {
-        obj.units = 'g';
+    else if (obj.units.value === 'gram' || obj.units.value === 'grams') {
+        obj.units.value = 'g';
     }
-    else if (obj.units === 'unit') {
-        obj.units = 'units';
+    else if (obj.units.value === 'unit') {
+        obj.units.value = 'units';
     }
     let m;
     const durationMatches = [];
-    while ((m = floatRegex.exec(obj.duration)) !== null) {
+    while ((m = floatRegex.exec(obj.duration.value)) !== null) {
         if (m.index === floatRegex.lastIndex) {
             floatRegex.lastIndex++;
         }
         m.forEach((match) => durationMatches.push(match));
     }
-    obj.duration = durationMatches.join(',');
-    obj.frequency = obj.frequency.toLowerCase().replace(/\s/g, '');
-    if (obj.frequency === 'once-off') {
-        obj.frequency = 'stat';
+    obj.duration.value = durationMatches.join(',');
+    obj.frequency.value = obj.frequency.value.toLowerCase().replace(/\s/g, '');
+    if (obj.frequency.value === 'once-off') {
+        obj.frequency.value = 'stat';
     }
-    else if (obj.frequency.includes('once')) {
-        obj.frequency = 'od';
+    else if (obj.frequency.value.includes('once')) {
+        obj.frequency.value = 'od';
     }
-    else if (obj.frequency.includes('nightly')) {
-        obj.frequency = 'od';
+    else if (obj.frequency.value.includes('nightly')) {
+        obj.frequency.value = 'od';
     }
-    else if (obj.frequency.includes('twice')) {
-        obj.frequency = 'bd';
+    else if (obj.frequency.value.includes('twice')) {
+        obj.frequency.value = 'bd';
     }
-    else if (obj.frequency.includes('trice')) {
-        obj.frequency = 'tds';
+    else if (obj.frequency.value.includes('trice')) {
+        obj.frequency.value = 'tds';
     }
     return obj;
 }
@@ -77,69 +105,94 @@ function correctMark(mark) {
     if (!mark || !mark.mark) {
         return data;
     }
-    const qKeys = Object.keys(mark.question);
-    const answerKey = qKeys.find((k) => answerRegex.exec(k)) || 'answer';
-    const answer = mark.question[answerKey];
-    const flatAnswer = answer[0];
-    const flatAttempt = mark.mark[0];
-    if (models_1.EQuestionType.SINGLE_BEST_ANSWER === mark.question.typeId) {
-        const answer = flatAnswer;
-        const attempt = flatAttempt;
-        if (answer === attempt) {
-            data.correct = true;
-        }
-        else {
-            data.incorrect = true;
-        }
-    }
-    else if (models_1.EQuestionType.QUESTION_ANSWER === mark.question.typeId) {
-        const answer = flatAnswer.dose.toLowerCase().replace(/\s/g, '');
-        const attempt = flatAttempt.toLowerCase().replace(/\s/g, '');
-        if (answer === attempt) {
-            data.correct = true;
-        }
-        else {
-            data.incorrect = true;
-        }
-    }
-    else if (models_1.EQuestionType.MULTIPLE_ANSWERS === mark.question.typeId) {
-        const [answerA, answerB] = answer.map((x) => x.sort());
-        const [attemptA, attemptB] = mark.mark.map((x) => x.sort());
-        if (answerA.length !== attemptA.length || answerB.length !== attemptB.length) {
-            data.incorrect = true;
-        }
-        else if (attemptA.every((x, i) => x === answerA[i]) && attemptB.every((x, i) => answerB[i])) {
-            data.correct = true;
-        }
-        else {
-            data.incorrect = true;
+    try {
+        const qKeys = Object.keys(mark.question);
+        const answerKey = qKeys.find((k) => answerRegex.exec(k)) || 'answer';
+        const answer = mark.question[answerKey];
+        const flatAnswer = answer[0];
+        const flatAttempt = mark.mark[0];
+        if (models_1.EQuestionType.SINGLE_BEST_ANSWER === mark.question.typeId) {
+            const answer = flatAnswer;
+            const attempt = flatAttempt;
+            if (answer === attempt) {
+                data.correct = true;
+            }
+            else {
+                data.incorrect = true;
+            }
         }
-    }
-    else if (models_1.EQuestionType.PRESCRIPTION_ANSWER === mark.question.typeId) {
-        const answers = answer.map(formatPrescribeAnswer);
-        const attempt = formatPrescribeAnswer(flatAttempt);
-        let foundCorrect = false;
-        let index = 0;
-        for (const answer of answers) {
-            if (answer.dose === attempt.dose &&
-                answer.drug === attempt.drug &&
-                answer.duration.split(',').includes(attempt.duration) &&
-                answer.frequency === attempt.frequency &&
-                answer.route === attempt.route &&
-                answer.units === attempt.units) {
-                foundCorrect = true;
-                break;
+        else if (models_1.EQuestionType.QUESTION_ANSWER === mark.question.typeId) {
+            const answer = flatAnswer.dose.toLowerCase().replace(/\s/g, '');
+            let attempt = '';
+            if (flatAttempt) {
+                attempt = flatAttempt.toLowerCase().replace(/\s/g, '');
+            }
+            if (answer === attempt) {
+                data.correct = true;
+            }
+            else {
+                data.incorrect = true;
             }
-            index++;
         }
-        if (foundCorrect) {
-            data.correct = true;
-            data.correctIndex = index;
+        else if (models_1.EQuestionType.MULTIPLE_ANSWERS === mark.question.typeId) {
+            const [answerA, answerB] = answer.map((x) => x.sort());
+            let [attemptA, attemptB] = [[], []];
+            if (Array.isArray(mark.mark) &&
+                mark.mark.length === 2 &&
+                Array.isArray(mark.mark[0]) &&
+                Array.isArray(mark.mark[1])) {
+                [attemptA, attemptB] = mark.mark.map((x) => x.sort());
+            }
+            if (answerA.length !== attemptA.length || answerB.length !== attemptB.length) {
+                data.incorrect = true;
+            }
+            else if (attemptA.every((x, i) => x === answerA[i]) &&
+                attemptB.every((_, i) => answerB[i])) {
+                data.correct = true;
+            }
+            else {
+                data.incorrect = true;
+            }
         }
-        else {
-            data.incorrect = true;
+        else if (models_1.EQuestionType.PRESCRIPTION_ANSWER === mark.question.typeId) {
+            const answers = answer.map(formatPrescribeAnswer);
+            let attempt = formatPrescribeAnswer(mapPrescribeMarkToAnswer({
+                drug: '',
+                dose: -1,
+                units: '',
+                route: '',
+                frequency: '',
+                duration: '',
+            }));
+            if (typeof flatAttempt === 'object' && Object.keys(flatAttempt).length === 6) {
+                attempt = formatPrescribeAnswer(mapPrescribeMarkToAnswer(flatAttempt));
+            }
+            let foundCorrect = false;
+            let index = 0;
+            for (const answer of answers) {
+                if (answer.dose.value === attempt.dose.value &&
+                    answer.drug.value === attempt.drug.value &&
+                    answer.duration.value.split(',').includes(attempt.duration.value) &&
+                    answer.frequency.value === attempt.frequency.value &&
+                    answer.route.value === attempt.route.value &&
+                    answer.units.value === attempt.units.value) {
+                    foundCorrect = true;
+                    break;
+                }
+                index++;
+            }
+            if (foundCorrect) {
+                data.correct = true;
+                data.correctIndex = index;
+            }
+            else {
+                data.incorrect = true;
+            }
         }
     }
+    catch (e) {
+        console.error(e);
+    }
     return data;
 }
 exports.correctMark = correctMark;