@quesmed/types 1.0.12 → 1.0.16

package/models/Feedback.d.ts

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

package/models/Feedback.js

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

package/models/Marksheet.d.ts

@@ -13,6 +13,7 @@ export declare enum EQuestionLike {
     DISLIKE = 1,
     REMOVE = 2
 }
+export declare type IMarksheetMarkJSONB = string | [string] | [string[], string[]] | [IPrescribeAnswer] | null;
 export interface IMarksheetMark {
     id: Id;
     index: number;
@@ -22,7 +23,7 @@ export interface IMarksheetMark {
     flagged: boolean;
     questionId: Id;
     question: IQuestion;
-    mark: string | string[] | [string[], string[]] | IPrescribeAnswer | null;
+    mark: IMarksheetMarkJSONB;
     like: number;
     dislike: number;
     isLikeByMe: string;

package/models/MockTest.d.ts

@@ -4,6 +4,7 @@ export interface IMockTest {
     id: Id;
     title: string;
     clinical: boolean;
+    passingMark: number;
     questions: IQuestion[];
 }
 export interface IUserMockTest {

package/models/OsceMarksheet.d.ts

@@ -1,6 +1,14 @@
-import { IOsceGroup } from "../resolvers/subscription";
-import { IOsceStation, IOsceStationMark, IOsceType } from "./OsceStation";
-import { Id } from "./Type";
+import { IOsceStation, IOsceStationMark, IOsceType } from './OsceStation';
+import { Id } from './Type';
+import { IUser } from './User';
+export interface IOsceMarksheetUser {
+    id: Id | null;
+    createdAt: Date | string | null;
+    osceMarksheetId: Id;
+    userId: Id | null;
+    user: IUser | null;
+    role: EOsceRoles;
+}
 export interface IOsceMarksheetMark {
     id: Id;
     mark: boolean;
@@ -23,7 +31,8 @@ export declare enum EOsceMarksheetAction {
     CONTINUE = 4,
     CONNECT = 5,
     DISCONNECT = 6,
-    SELECT = 7
+    SELECT = 7,
+    LEFT = 8
 }
 export interface IOsceMarksheet {
     id: Id;
@@ -32,9 +41,9 @@ export interface IOsceMarksheet {
     timeTaken: number;
     osceStationId: Id;
     osceStation?: IOsceStation;
-    userId: Id;
+    userId?: Id;
+    role?: EOsceRoles;
     solo: boolean;
-    role: EOsceRoles;
     score: number;
     globalScore: number;
     feedback: string;
@@ -46,7 +55,7 @@ export interface IOsceMarksheet {
     endedAt: Date | string;
     timeRemaining: number;
     marks: IOsceMarksheetMark[];
-    users: IOsceGroup["members"];
+    users: IOsceMarksheetUser[];
     completed: boolean;
 }
 export interface IDashboardOsce {

package/models/OsceMarksheet.js

@@ -18,4 +18,5 @@ var EOsceMarksheetAction;
     EOsceMarksheetAction[EOsceMarksheetAction["CONNECT"] = 5] = "CONNECT";
     EOsceMarksheetAction[EOsceMarksheetAction["DISCONNECT"] = 6] = "DISCONNECT";
     EOsceMarksheetAction[EOsceMarksheetAction["SELECT"] = 7] = "SELECT";
+    EOsceMarksheetAction[EOsceMarksheetAction["LEFT"] = 8] = "LEFT";
 })(EOsceMarksheetAction = exports.EOsceMarksheetAction || (exports.EOsceMarksheetAction = {}));

package/models/Question.d.ts

@@ -7,6 +7,7 @@ export declare enum EQuestionType {
     MULTIPLE_ANSWERS = 3,
     PRESCRIPTION_ANSWER = 4
 }
+export declare type IQuestionAnswer = [string] | [string[], string[]] | IPrescribeAnswer[];
 export interface IQuestion {
     id: Id;
     typeId: Id;
@@ -15,7 +16,7 @@ export interface IQuestion {
     concept?: IConcept;
     question: string;
     explanation?: string;
-    answer: any;
+    answer: IQuestionAnswer;
     totalVotes: number;
     choices: IQuestionChoice[];
     pictures: IQuestionPicture[];

package/models/Subscription.d.ts

@@ -3,7 +3,7 @@ export interface ISubscription {
     id: Id;
     createdAt: string | Date;
     name: string;
-    description?: string;
+    description: string | null;
     price: number;
     stripePriceId: string;
     duration: number;

package/models/index.d.ts

@@ -1,6 +1,7 @@
 export * from './Card';
 export * from './Chapter';
 export * from './Concept';
+export * from './Feedback';
 export * from './File';
 export * from './Marksheet';
 export * from './MockTest';
@@ -14,6 +15,6 @@ export * from './Todo';
 export * from './Token';
 export * from './Topic';
 export * from './Type';
+export * from './University';
 export * from './User';
 export * from './Video';
-export * from './University';

package/models/index.js

@@ -13,6 +13,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./Card"), exports);
 __exportStar(require("./Chapter"), exports);
 __exportStar(require("./Concept"), exports);
+__exportStar(require("./Feedback"), exports);
 __exportStar(require("./File"), exports);
 __exportStar(require("./Marksheet"), exports);
 __exportStar(require("./MockTest"), exports);
@@ -26,6 +27,6 @@ __exportStar(require("./Todo"), exports);
 __exportStar(require("./Token"), exports);
 __exportStar(require("./Topic"), exports);
 __exportStar(require("./Type"), exports);
+__exportStar(require("./University"), exports);
 __exportStar(require("./User"), exports);
 __exportStar(require("./Video"), exports);
-__exportStar(require("./University"), exports);

package/package.json

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

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

@@ -24,7 +24,8 @@ export interface ISelectOsceMarksheetStationVar {
     osceMarksheetId: Id;
     osceStationId: Id;
 }
-export declare type ISelectOsceMarksheetStationData = boolean;
+export interface ISelectOsceMarksheetStationData extends IOsceMarksheet {
+}
 export interface IStartOsceMarksheetData extends IOsceMarksheet {
 }
 export interface IPrestartOsceMarksheetVar {

package/resolvers/query/feedback.d.ts

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

package/resolvers/query/feedback.js

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

package/resolvers/query/index.d.ts

@@ -1,5 +1,7 @@
+export * from './feedback';
 export * from './sampleCards';
 export * from './sampleQuestions';
+export * from './subscription';
 export * from './university';
 export * from './user';
 export * from './video';

package/resolvers/query/index.js

@@ -10,8 +10,10 @@ 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("./feedback"), exports);
 __exportStar(require("./sampleCards"), exports);
 __exportStar(require("./sampleQuestions"), exports);
+__exportStar(require("./subscription"), exports);
 __exportStar(require("./university"), exports);
 __exportStar(require("./user"), exports);
 __exportStar(require("./video"), exports);

package/resolvers/query/subscription.d.ts

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

package/resolvers/query/subscription.js

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

package/resolvers/subscription/osce.d.ts

@@ -1,4 +1,4 @@
-import { EOsceMarksheetAction, EOsceRoles, Id, IUser } from '../../models';
+import { EOsceMarksheetAction, EOsceRoles, Id, IOsceMarksheetUser, IUser } from '../../models';
 export declare const ROLE_CHANGED = "ROLE_CHANGED";
 export declare const OSCE_MARKSHEET_ACTION = "OSCE_MARKSHEET_ACTION";
 export interface IOsceGroupMember {
@@ -7,26 +7,9 @@ export interface IOsceGroupMember {
 }
 export interface IOsceGroup {
     agoraId: string;
-    members: [
-        {
-            role: EOsceRoles.CANDIDATE;
-            user: IUser | null;
-        },
-        {
-            role: EOsceRoles.EXAMINER;
-            user: IUser | null;
-        },
-        {
-            role: EOsceRoles.ACTOR;
-            user: IUser | null;
-        },
-        {
-            role: EOsceRoles.OBSERVER;
-            user: IUser | null;
-        }
-    ];
+    members: IOsceMarksheetUser[];
 }
-export declare const OsceGroupInit: IOsceGroup['members'];
+export declare const OsceGroupInit: (osceMarksheetId: number) => IOsceMarksheetUser[];
 export interface IRoleChangedVar {
     agoraId: string;
 }

package/resolvers/subscription/osce.js

@@ -4,21 +4,38 @@ exports.OsceGroupInit = exports.OSCE_MARKSHEET_ACTION = exports.ROLE_CHANGED = v
 const models_1 = require("../../models");
 exports.ROLE_CHANGED = 'ROLE_CHANGED';
 exports.OSCE_MARKSHEET_ACTION = 'OSCE_MARKSHEET_ACTION';
-exports.OsceGroupInit = [
+const OsceGroupInit = (osceMarksheetId) => [
     {
-        role: models_1.EOsceRoles.CANDIDATE,
+        id: null,
+        createdAt: null,
+        osceMarksheetId,
+        userId: null,
         user: null,
+        role: models_1.EOsceRoles.CANDIDATE,
     },
     {
-        role: models_1.EOsceRoles.EXAMINER,
+        id: null,
+        createdAt: null,
+        osceMarksheetId,
+        userId: null,
         user: null,
+        role: models_1.EOsceRoles.EXAMINER,
     },
     {
-        role: models_1.EOsceRoles.ACTOR,
+        id: null,
+        createdAt: null,
+        osceMarksheetId,
+        userId: null,
         user: null,
+        role: models_1.EOsceRoles.ACTOR,
     },
     {
-        role: models_1.EOsceRoles.OBSERVER,
+        id: null,
+        createdAt: null,
+        osceMarksheetId,
+        userId: null,
         user: null,
+        role: models_1.EOsceRoles.OBSERVER,
     },
 ];
+exports.OsceGroupInit = OsceGroupInit;

package/utils/commonFunctions.js

@@ -61,6 +61,7 @@ function formatPrescribeAnswer(obj) {
     }
     return obj;
 }
+const answerRegex = /answer/gi;
 function correctMark(mark) {
     const data = {
         correct: false,
@@ -70,9 +71,14 @@ 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 = mark.question.answer[0];
-        const attempt = mark.mark[0];
+        const answer = flatAnswer;
+        const attempt = flatAttempt;
         if (answer === attempt) {
             data.correct = true;
         }
@@ -81,8 +87,8 @@ function correctMark(mark) {
         }
     }
     else if (models_1.EQuestionType.QUESTION_ANSWER === mark.question.typeId) {
-        const answer = mark.question.answer.toLowerCase().replace(/\s/g, '');
-        const attempt = mark.mark.toLowerCase().replace(/\s/g, '');
+        const answer = flatAnswer.toLowerCase().replace(/\s/g, '');
+        const attempt = flatAttempt.toLowerCase().replace(/\s/g, '');
         if (answer === attempt) {
             data.correct = true;
         }
@@ -91,7 +97,7 @@ function correctMark(mark) {
         }
     }
     else if (models_1.EQuestionType.MULTIPLE_ANSWERS === mark.question.typeId) {
-        const [answerA, answerB] = mark.question.answer.map((x) => x.sort());
+        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;
@@ -104,8 +110,8 @@ function correctMark(mark) {
         }
     }
     else if (models_1.EQuestionType.PRESCRIPTION_ANSWER === mark.question.typeId) {
-        const answers = mark.question.answer.map(formatPrescribeAnswer);
-        const attempt = formatPrescribeAnswer(mark.mark);
+        const answers = answer.map(formatPrescribeAnswer);
+        const attempt = formatPrescribeAnswer(flatAttempt);
         let foundCorrect = false;
         let index = 0;
         for (const answer of answers) {