@quesmed/types 1.4.32 → 1.5.0

package/index.js

@@ -72,7 +72,7 @@ exports.medicalWords = [
     ['JAK', 'Juice', 'Jargon', 'Jaundice'],
     ['Kinin', 'Ketone', 'Kawasaki', 'Kinase'],
     ['Lung', 'Liver', 'Lymph', 'Loose', 'Lumbar', 'Lateral'],
-    ['Malignant', 'Monoclonal', 'Myopathy', 'Myotonia', 'Metabolism'],
+    ['Monoclonal', 'Myopathy', 'Myotonia', 'Metabolism', 'Migraine'],
     ['Neoplasia', 'NICU', 'Nightshift'],
     ['Outpatient', 'Osteoporosis', 'Otitis', 'Odor'],
     ['Prognosis', 'Power', 'Poisoning', 'Pudendal', 'Polyps', 'Prone'],

package/index.mjs

@@ -47,7 +47,7 @@ export const medicalWords = [
     ['JAK', 'Juice', 'Jargon', 'Jaundice'],
     ['Kinin', 'Ketone', 'Kawasaki', 'Kinase'],
     ['Lung', 'Liver', 'Lymph', 'Loose', 'Lumbar', 'Lateral'],
-    ['Malignant', 'Monoclonal', 'Myopathy', 'Myotonia', 'Metabolism'],
+    ['Monoclonal', 'Myopathy', 'Myotonia', 'Metabolism', 'Migraine'],
     ['Neoplasia', 'NICU', 'Nightshift'],
     ['Outpatient', 'Osteoporosis', 'Otitis', 'Odor'],
     ['Prognosis', 'Power', 'Poisoning', 'Pudendal', 'Polyps', 'Prone'],

package/models/OsceMarksheet.d.ts

@@ -37,6 +37,11 @@ export declare enum EOsceMarksheetAction {
     LEFT = 8,
     KICK = 9
 }
+export declare enum EOsceMarksheetState {
+    LOBBY = 0,
+    PRESTART = 1,
+    STATION = 2
+}
 export interface IOsceMarksheet {
     id: Id;
     createdAt: number | Date;
@@ -56,10 +61,11 @@ export interface IOsceMarksheet {
     feedbackTime: number;
     startedAt: number | Date;
     endedAt: number | Date;
-    timeRemaining: number;
+    pausedAt: number | Date;
     marks: IOsceMarksheetMark[];
     users: IOsceMarksheetUser[];
     members: IUser[];
+    state: EOsceMarksheetState;
     completed: boolean;
 }
 export interface IDashboardOsce {
@@ -74,3 +80,14 @@ export interface IOsceTypeDashboard extends IOsceType {
     total: number;
     avgScore: number;
 }
+export declare enum EOsceTimerState {
+    START = 0,
+    PAUSE = 1,
+    COMPLETED = 2
+}
+export interface IOsceMarksheetTimer {
+    osceMarksheetId: number;
+    timeRemaining: string;
+    stationTime: string;
+    state: EOsceTimerState;
+}

package/models/OsceMarksheet.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EOsceMarksheetAction = exports.EOsceRoles = void 0;
+exports.EOsceTimerState = exports.EOsceMarksheetState = exports.EOsceMarksheetAction = exports.EOsceRoles = void 0;
 var EOsceRoles;
 (function (EOsceRoles) {
     EOsceRoles[EOsceRoles["ALL"] = 0] = "ALL";
@@ -22,3 +22,15 @@ var EOsceMarksheetAction;
     EOsceMarksheetAction[EOsceMarksheetAction["LEFT"] = 8] = "LEFT";
     EOsceMarksheetAction[EOsceMarksheetAction["KICK"] = 9] = "KICK";
 })(EOsceMarksheetAction = exports.EOsceMarksheetAction || (exports.EOsceMarksheetAction = {}));
+var EOsceMarksheetState;
+(function (EOsceMarksheetState) {
+    EOsceMarksheetState[EOsceMarksheetState["LOBBY"] = 0] = "LOBBY";
+    EOsceMarksheetState[EOsceMarksheetState["PRESTART"] = 1] = "PRESTART";
+    EOsceMarksheetState[EOsceMarksheetState["STATION"] = 2] = "STATION";
+})(EOsceMarksheetState = exports.EOsceMarksheetState || (exports.EOsceMarksheetState = {}));
+var EOsceTimerState;
+(function (EOsceTimerState) {
+    EOsceTimerState[EOsceTimerState["START"] = 0] = "START";
+    EOsceTimerState[EOsceTimerState["PAUSE"] = 1] = "PAUSE";
+    EOsceTimerState[EOsceTimerState["COMPLETED"] = 2] = "COMPLETED";
+})(EOsceTimerState = exports.EOsceTimerState || (exports.EOsceTimerState = {}));

package/models/OsceMarksheet.mjs

@@ -19,3 +19,15 @@ export var EOsceMarksheetAction;
     EOsceMarksheetAction[EOsceMarksheetAction["LEFT"] = 8] = "LEFT";
     EOsceMarksheetAction[EOsceMarksheetAction["KICK"] = 9] = "KICK";
 })(EOsceMarksheetAction || (EOsceMarksheetAction = {}));
+export var EOsceMarksheetState;
+(function (EOsceMarksheetState) {
+    EOsceMarksheetState[EOsceMarksheetState["LOBBY"] = 0] = "LOBBY";
+    EOsceMarksheetState[EOsceMarksheetState["PRESTART"] = 1] = "PRESTART";
+    EOsceMarksheetState[EOsceMarksheetState["STATION"] = 2] = "STATION";
+})(EOsceMarksheetState || (EOsceMarksheetState = {}));
+export var EOsceTimerState;
+(function (EOsceTimerState) {
+    EOsceTimerState[EOsceTimerState["START"] = 0] = "START";
+    EOsceTimerState[EOsceTimerState["PAUSE"] = 1] = "PAUSE";
+    EOsceTimerState[EOsceTimerState["COMPLETED"] = 2] = "COMPLETED";
+})(EOsceTimerState || (EOsceTimerState = {}));

package/models/User.d.ts

@@ -35,6 +35,8 @@ export interface IUser {
     firstName: string;
     lastName: string;
     tocAccepted: boolean;
+    dailyFeedResetTime: number;
+    dailyFeedMax: number;
     classYear: IClassYear;
     graduationYear: number;
     universityId: number;

package/package.json

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

package/resolvers/fragments/osce.d.ts

@@ -2,6 +2,4 @@ export declare const OSCE_STATION_MARK_FIELDS: import("@apollo/client").Document
 export declare const OSCE_STATION_FIELDS: import("@apollo/client").DocumentNode;
 export declare const OSCE_MARKSHEET_MARK_FIELDS: import("@apollo/client").DocumentNode;
 export declare const OSCE_MARKSHEET_FIELDS: import("@apollo/client").DocumentNode;
-export declare const OSCE_GROUP_FIELDS: import("@apollo/client").DocumentNode;
-export declare const OSCE_MARKSHEET_ACTION_FIELDS: import("@apollo/client").DocumentNode;
 export declare const OSCE_MATCHMAKING_ACTION_FIELDS: import("@apollo/client").DocumentNode;

package/resolvers/fragments/osce.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OSCE_MATCHMAKING_ACTION_FIELDS = exports.OSCE_MARKSHEET_ACTION_FIELDS = exports.OSCE_GROUP_FIELDS = exports.OSCE_MARKSHEET_FIELDS = exports.OSCE_MARKSHEET_MARK_FIELDS = exports.OSCE_STATION_FIELDS = exports.OSCE_STATION_MARK_FIELDS = void 0;
+exports.OSCE_MATCHMAKING_ACTION_FIELDS = exports.OSCE_MARKSHEET_FIELDS = exports.OSCE_MARKSHEET_MARK_FIELDS = exports.OSCE_STATION_FIELDS = exports.OSCE_STATION_MARK_FIELDS = void 0;
 const client_1 = require("@apollo/client");
 const picture_1 = require("./picture");
 exports.OSCE_STATION_MARK_FIELDS = (0, client_1.gql) `
@@ -87,7 +87,7 @@ exports.OSCE_MARKSHEET_FIELDS = (0, client_1.gql) `
     feedbackTime
     startedAt
     endedAt
-    timeRemaining
+    pausedAt
     marks {
       ...OsceMarksheetMarkFields
     }
@@ -105,39 +105,10 @@ exports.OSCE_MARKSHEET_FIELDS = (0, client_1.gql) `
       id
       displayName
     }
+    state
     completed
   }
 `;
-exports.OSCE_GROUP_FIELDS = (0, client_1.gql) `
-  fragment OsceGroupFields on OsceGroup {
-    osceMarksheetId
-    agoraId
-    members {
-      osceMarksheetId
-      userId
-      user {
-        id
-        displayName
-      }
-      role
-    }
-  }
-`;
-exports.OSCE_MARKSHEET_ACTION_FIELDS = (0, client_1.gql) `
-  fragment OsceMarksheetActionFields on OsceMarksheetAction {
-    osceMarksheetId
-    agoraId
-    userId
-    user {
-      id
-      displayName
-      universityId
-    }
-    startedAt
-    endedAt
-    action
-  }
-`;
 exports.OSCE_MATCHMAKING_ACTION_FIELDS = (0, client_1.gql) `
   fragment OsceMatchmakingActionFields on OsceMatchmakingAction {
     osceMarksheetId

package/resolvers/fragments/osce.mjs

@@ -84,7 +84,7 @@ export const OSCE_MARKSHEET_FIELDS = gql `
     feedbackTime
     startedAt
     endedAt
-    timeRemaining
+    pausedAt
     marks {
       ...OsceMarksheetMarkFields
     }
@@ -102,39 +102,10 @@ export const OSCE_MARKSHEET_FIELDS = gql `
       id
       displayName
     }
+    state
     completed
   }
 `;
-export const OSCE_GROUP_FIELDS = gql `
-  fragment OsceGroupFields on OsceGroup {
-    osceMarksheetId
-    agoraId
-    members {
-      osceMarksheetId
-      userId
-      user {
-        id
-        displayName
-      }
-      role
-    }
-  }
-`;
-export const OSCE_MARKSHEET_ACTION_FIELDS = gql `
-  fragment OsceMarksheetActionFields on OsceMarksheetAction {
-    osceMarksheetId
-    agoraId
-    userId
-    user {
-      id
-      displayName
-      universityId
-    }
-    startedAt
-    endedAt
-    action
-  }
-`;
 export const OSCE_MATCHMAKING_ACTION_FIELDS = gql `
   fragment OsceMatchmakingActionFields on OsceMatchmakingAction {
     osceMarksheetId

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

@@ -1,4 +1,4 @@
-import { EOsceMarksheetAction, EOsceRoles, Id, IOsceMarksheet, IOsceMarksheetMark } from '../../../models';
+import { EOsceMarksheetAction, EOsceRoles, Id, IOsceMarksheet, IOsceMarksheetMark, IOsceMarksheetTimer } from '../../../models';
 import { IOsceMatchmakingAction } from '../../subscription/osce';
 import { graphqlNormalize, RestrictedData } from '../../types';
 export declare const START_OSCE_MATCHMAKING: import("@apollo/client").DocumentNode;
@@ -50,6 +50,11 @@ export interface IStartOsceMarksheetVar {
     osceMarksheetId: Id;
 }
 export declare type IStartOsceMarksheetData = RestrictedData<graphqlNormalize & IOsceMarksheet, 'startOsceMarksheet'>;
+export declare const START_OSCE_TIMER: import("@apollo/client").DocumentNode;
+export interface IStartOsceTimerVar {
+    osceMarksheetId: Id;
+}
+export declare type IStartOsceTimerData = RestrictedData<graphqlNormalize & IOsceMarksheetTimer, 'startOsceTimer'>;
 export declare const PRESTART_OSCE_MARKSHEET: import("@apollo/client").DocumentNode;
 export interface IPrestartOsceMarksheetVar {
     osceMarksheetId: Id;
@@ -70,7 +75,6 @@ export declare const OSCE_MARKSHEET_ACTIONS: import("@apollo/client").DocumentNo
 export interface IOsceMarksheetActionsVar {
     osceMarksheetId: Id;
     agoraId: string;
-    timeRemaining?: number;
     action: EOsceMarksheetAction;
 }
 export declare type IOsceMarksheetActionsData = RestrictedData<number, 'osceMarksheetActions'>;

package/resolvers/mutation/restricted/osce.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LEAVE_OSCE_MARKSHEET = exports.END_OSCE_MARKSHEET = exports.OSCE_MARKSHEET_ACTIONS = exports.SAVE_OSCE_MARKSHEET = exports.PRESTART_OSCE_MARKSHEET = exports.START_OSCE_MARKSHEET = exports.SELECT_OSCE_STATION = exports.optimisticMarkOsceMarksheetMark = exports.MARK_OSCE_MARKSHEET_MARK = exports.CHANGE_OSCE_ROLE = exports.BUILD_OSCE_MARKSHEET = exports.CANCEL_OSCE_MATCHMAKING = exports.CHECK_OSCE_MATCHMAKING = exports.ACCEPT_OSCE_MATCHMAKING = exports.START_OSCE_MATCHMAKING = void 0;
+exports.LEAVE_OSCE_MARKSHEET = exports.END_OSCE_MARKSHEET = exports.OSCE_MARKSHEET_ACTIONS = exports.SAVE_OSCE_MARKSHEET = exports.PRESTART_OSCE_MARKSHEET = exports.START_OSCE_TIMER = exports.START_OSCE_MARKSHEET = exports.SELECT_OSCE_STATION = exports.optimisticMarkOsceMarksheetMark = exports.MARK_OSCE_MARKSHEET_MARK = exports.CHANGE_OSCE_ROLE = exports.BUILD_OSCE_MARKSHEET = exports.CANCEL_OSCE_MATCHMAKING = exports.CHECK_OSCE_MATCHMAKING = exports.ACCEPT_OSCE_MATCHMAKING = exports.START_OSCE_MATCHMAKING = void 0;
 const client_1 = require("@apollo/client");
 const osce_1 = require("../../fragments/osce");
 const osce_2 = require("./../../fragments/osce");
@@ -126,6 +126,18 @@ exports.START_OSCE_MARKSHEET = (0, client_1.gql) `
     }
   }
 `;
+exports.START_OSCE_TIMER = (0, client_1.gql) `
+  mutation StartOsceTimer($osceMarksheetId: Int!) {
+    restricted {
+      startOsceTimer(osceMarksheetId: $osceMarksheetId) {
+        osceMarksheetId
+        timeRemaining
+        stationTime
+        state
+      }
+    }
+  }
+`;
 exports.PRESTART_OSCE_MARKSHEET = (0, client_1.gql) `
   ${osce_2.OSCE_STATION_FIELDS}
   ${osce_1.OSCE_MARKSHEET_FIELDS}
@@ -174,14 +186,12 @@ exports.OSCE_MARKSHEET_ACTIONS = (0, client_1.gql) `
   mutation OsceMarksheetActions(
     $osceMarksheetId: Int!
     $agoraId: String!
-    $timeRemaining: Int
     $action: Int!
   ) {
     restricted {
       osceMarksheetActions(
         osceMarksheetId: $osceMarksheetId
         agoraId: $agoraId
-        timeRemaining: $timeRemaining
         action: $action
       )
     }

package/resolvers/mutation/restricted/osce.mjs

@@ -122,6 +122,18 @@ export const START_OSCE_MARKSHEET = gql `
     }
   }
 `;
+export const START_OSCE_TIMER = gql `
+  mutation StartOsceTimer($osceMarksheetId: Int!) {
+    restricted {
+      startOsceTimer(osceMarksheetId: $osceMarksheetId) {
+        osceMarksheetId
+        timeRemaining
+        stationTime
+        state
+      }
+    }
+  }
+`;
 export const PRESTART_OSCE_MARKSHEET = gql `
   ${OSCE_STATION_FIELDS}
   ${OSCE_MARKSHEET_FIELDS}
@@ -170,14 +182,12 @@ export const OSCE_MARKSHEET_ACTIONS = gql `
   mutation OsceMarksheetActions(
     $osceMarksheetId: Int!
     $agoraId: String!
-    $timeRemaining: Int
     $action: Int!
   ) {
     restricted {
       osceMarksheetActions(
         osceMarksheetId: $osceMarksheetId
         agoraId: $agoraId
-        timeRemaining: $timeRemaining
         action: $action
       )
     }

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

@@ -15,6 +15,8 @@ export interface IUserInput {
     password?: string;
     oldPassword?: string;
     examDate?: number | Date;
+    dailyFeedResetTime?: number;
+    dailyFeedMax?: number;
 }
 export interface IUpdateUserVar {
     id?: number;

package/resolvers/subscription/osce.d.ts

@@ -1,8 +1,9 @@
-import { EOsceMarksheetAction, EOsceRoles, IClassYear, Id, IOsceMarksheetUser, IUser } from '../../models';
+import { EOsceMarksheetAction, EOsceRoles, IClassYear, Id, IOsceMarksheetTimer, IOsceMarksheetUser, IUser } from '../../models';
 import { RootData } from '../types';
 import { EClassYearGroup } from './../../models/User';
 export declare const OSCE_ROLE_CHANGE_KEY = "OSCE_ROLE_CHANGE";
 export declare const OSCE_MARKSHEET_ACTION_KEY = "OSCE_MARKSHEET_ACTION";
+export declare const OSCE_MARKSHEET_TIMER_KEY = "OSCE_MARKSHEET_TIMER";
 export declare const OSCE_MATCHMAKING_KEY = "OSCE_MATCHMAKING";
 export declare const OSCE_MATCHMAKING_USERS_KEY = "OSCE_MATCHMAKING_USERS";
 export interface IOsceGroupMember {
@@ -13,6 +14,7 @@ export interface IOsceGroup {
     osceMarksheetId: Id;
     agoraId: string;
     members: IOsceMarksheetUser[];
+    users: IUser[];
 }
 export declare const OsceGroupInit: (osceMarksheetId: number) => IOsceMarksheetUser[];
 export declare const OSCE_ROLE_CHANGE: import("@apollo/client").DocumentNode;
@@ -47,13 +49,18 @@ export interface IOsceMatchmakingAction {
     grouped: boolean;
     completed: boolean;
 }
-export declare type IOsceMatchmakingData = RootData<IOsceMatchmakingAction, 'osceMatchmaking'>;
 export interface IOsceMatchmakingVar {
     userId: Id;
 }
+export declare type IOsceMatchmakingData = RootData<IOsceMatchmakingAction, 'osceMatchmaking'>;
 export declare const OSCE_MATCHMAKING_USERS: import("@apollo/client").DocumentNode;
+export declare type IOsceMatchmakingUsersVar = null;
 export declare type IOsceMatchmakingUsersData = RootData<[
     number,
     number
 ], 'osceMatchmakingUsers'>;
-export declare type IOsceMatchmakingUsersVar = null;
+export declare const OSCE_MARKSHEET_TIMER: import("@apollo/client").DocumentNode;
+export interface IOsceMarksheetTimerVar {
+    osceMarksheetId: number;
+}
+export declare type IOsceMarksheetTimerData = RootData<IOsceMarksheetTimer, 'osceMarksheetTimer'>;

package/resolvers/subscription/osce.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OSCE_MATCHMAKING_USERS = exports.OSCE_MATCHMAKING = exports.OSCE_MARKSHEET_ACTION = exports.OSCE_ROLE_CHANGE = exports.OsceGroupInit = exports.OSCE_MATCHMAKING_USERS_KEY = exports.OSCE_MATCHMAKING_KEY = exports.OSCE_MARKSHEET_ACTION_KEY = exports.OSCE_ROLE_CHANGE_KEY = void 0;
+exports.OSCE_MARKSHEET_TIMER = exports.OSCE_MATCHMAKING_USERS = exports.OSCE_MATCHMAKING = exports.OSCE_MARKSHEET_ACTION = exports.OSCE_ROLE_CHANGE = exports.OsceGroupInit = exports.OSCE_MATCHMAKING_USERS_KEY = exports.OSCE_MATCHMAKING_KEY = exports.OSCE_MARKSHEET_TIMER_KEY = exports.OSCE_MARKSHEET_ACTION_KEY = exports.OSCE_ROLE_CHANGE_KEY = void 0;
 const client_1 = require("@apollo/client");
 const models_1 = require("../../models");
-const osce_1 = require("../fragments/osce");
+const fragments_1 = require("../fragments");
 exports.OSCE_ROLE_CHANGE_KEY = 'OSCE_ROLE_CHANGE';
 exports.OSCE_MARKSHEET_ACTION_KEY = 'OSCE_MARKSHEET_ACTION';
+exports.OSCE_MARKSHEET_TIMER_KEY = 'OSCE_MARKSHEET_TIMER';
 exports.OSCE_MATCHMAKING_KEY = 'OSCE_MATCHMAKING';
 exports.OSCE_MATCHMAKING_USERS_KEY = 'OSCE_MATCHMAKING_USERS';
 const OsceGroupInit = (osceMarksheetId) => [
@@ -44,23 +45,45 @@ const OsceGroupInit = (osceMarksheetId) => [
 ];
 exports.OsceGroupInit = OsceGroupInit;
 exports.OSCE_ROLE_CHANGE = (0, client_1.gql) `
-  ${osce_1.OSCE_GROUP_FIELDS}
   subscription osceRoleChangeSubscription($osceMarksheetId: Int!) {
     osceRoleChange(osceMarksheetId: $osceMarksheetId) {
-      ...OsceGroupFields
+      osceMarksheetId
+      agoraId
+      members {
+        osceMarksheetId
+        userId
+        user {
+          id
+          displayName
+        }
+        role
+      }
+      users {
+        id
+        displayName
+      }
     }
   }
 `;
 exports.OSCE_MARKSHEET_ACTION = (0, client_1.gql) `
-  ${osce_1.OSCE_MARKSHEET_ACTION_FIELDS}
   subscription OsceMarksheetAction($osceMarksheetId: Int!) {
     osceMarksheetAction(osceMarksheetId: $osceMarksheetId) {
-      ...OsceMarksheetActionFields
+      osceMarksheetId
+      agoraId
+      userId
+      user {
+        id
+        displayName
+        universityId
+      }
+      startedAt
+      endedAt
+      action
     }
   }
 `;
 exports.OSCE_MATCHMAKING = (0, client_1.gql) `
-  ${osce_1.OSCE_MATCHMAKING_ACTION_FIELDS}
+  ${fragments_1.OSCE_MATCHMAKING_ACTION_FIELDS}
   subscription OsceMatchmaking($userId: Int!) {
     osceMatchmaking(userId: $userId) {
       ...OsceMatchmakingActionFields
@@ -72,3 +95,13 @@ exports.OSCE_MATCHMAKING_USERS = (0, client_1.gql) `
     osceMatchmakingUsers
   }
 `;
+exports.OSCE_MARKSHEET_TIMER = (0, client_1.gql) `
+  subscription OsceMarksheetTimer($osceMarksheetId: Int!) {
+    osceMarksheetTimer(osceMarksheetId: $osceMarksheetId) {
+      osceMarksheetId
+      timeRemaining
+      stationTime
+      state
+    }
+  }
+`;

package/resolvers/subscription/osce.mjs

@@ -1,8 +1,9 @@
 import { gql } from '@apollo/client';
 import { EOsceRoles, } from '../../models';
-import { OSCE_GROUP_FIELDS, OSCE_MARKSHEET_ACTION_FIELDS, OSCE_MATCHMAKING_ACTION_FIELDS, } from '../fragments/osce';
+import { OSCE_MATCHMAKING_ACTION_FIELDS } from '../fragments';
 export const OSCE_ROLE_CHANGE_KEY = 'OSCE_ROLE_CHANGE';
 export const OSCE_MARKSHEET_ACTION_KEY = 'OSCE_MARKSHEET_ACTION';
+export const OSCE_MARKSHEET_TIMER_KEY = 'OSCE_MARKSHEET_TIMER';
 export const OSCE_MATCHMAKING_KEY = 'OSCE_MATCHMAKING';
 export const OSCE_MATCHMAKING_USERS_KEY = 'OSCE_MATCHMAKING_USERS';
 export const OsceGroupInit = (osceMarksheetId) => [
@@ -40,18 +41,40 @@ export const OsceGroupInit = (osceMarksheetId) => [
     },
 ];
 export const OSCE_ROLE_CHANGE = gql `
-  ${OSCE_GROUP_FIELDS}
   subscription osceRoleChangeSubscription($osceMarksheetId: Int!) {
     osceRoleChange(osceMarksheetId: $osceMarksheetId) {
-      ...OsceGroupFields
+      osceMarksheetId
+      agoraId
+      members {
+        osceMarksheetId
+        userId
+        user {
+          id
+          displayName
+        }
+        role
+      }
+      users {
+        id
+        displayName
+      }
     }
   }
 `;
 export const OSCE_MARKSHEET_ACTION = gql `
-  ${OSCE_MARKSHEET_ACTION_FIELDS}
   subscription OsceMarksheetAction($osceMarksheetId: Int!) {
     osceMarksheetAction(osceMarksheetId: $osceMarksheetId) {
-      ...OsceMarksheetActionFields
+      osceMarksheetId
+      agoraId
+      userId
+      user {
+        id
+        displayName
+        universityId
+      }
+      startedAt
+      endedAt
+      action
     }
   }
 `;
@@ -68,3 +91,13 @@ export const OSCE_MATCHMAKING_USERS = gql `
     osceMatchmakingUsers
   }
 `;
+export const OSCE_MARKSHEET_TIMER = gql `
+  subscription OsceMarksheetTimer($osceMarksheetId: Int!) {
+    osceMarksheetTimer(osceMarksheetId: $osceMarksheetId) {
+      osceMarksheetId
+      timeRemaining
+      stationTime
+      state
+    }
+  }
+`;