@admin-layout/timetracker-module-server 1.0.3-alpha.7 → 1.0.3-alpha.72

package/lib/index.js

@@ -126,7 +126,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
+    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(__webpack_require__(/*! ./config */ "./src/config/config.ts"), exports);
@@ -199,7 +199,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
+    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(__webpack_require__(/*! ./constants */ "./src/constants/constants.ts"), exports);
@@ -217,20 +217,32 @@ __exportStar(__webpack_require__(/*! ./constants */ "./src/constants/constants.t
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.timeTrackerModule = void 0;
+exports.timeTrackerProxyModule = exports.timeTrackerModule = exports.timeTrackerMailModule = exports.timeTrackerStoreModule = void 0;
 const inversify_1 = __webpack_require__(/*! inversify */ "inversify");
 const constants_1 = __webpack_require__(/*! ../constants */ "./src/constants/index.ts");
 const services_1 = __webpack_require__(/*! ../services */ "./src/services/index.ts");
 const repository_1 = __webpack_require__(/*! ../store/repository */ "./src/store/repository/index.ts");
 const migration_1 = __webpack_require__(/*! ../migration */ "./src/migration/index.ts");
-exports.timeTrackerModule = (setting) => new inversify_1.ContainerModule((bind) => {
-    bind(constants_1.TYPES.ITimeRecordRepository).to(repository_1.TimeRecordRepository).inSingletonScope().whenTargetIsDefault();
-    bind(constants_1.TYPES.ITimesheetRepository).to(repository_1.TimesheetRepository).inSingletonScope().whenTargetIsDefault();
-    bind(constants_1.TYPES.ITimeRecordService).to(services_1.TimeRecordService).inSingletonScope().whenTargetIsDefault();
-    bind(constants_1.TYPES.ITimesheetService).to(services_1.TimesheetService).inSingletonScope().whenTargetIsDefault();
+const timeTrackerStoreModule = (setting) => new inversify_1.ContainerModule((bind) => {
+    bind(constants_1.TYPES.ITimeRecordRepository).to(repository_1.TimeRecordRepository).inSingletonScope();
+    bind(constants_1.TYPES.ITimesheetRepository).to(repository_1.TimesheetRepository).inSingletonScope();
+});
+exports.timeTrackerStoreModule = timeTrackerStoreModule;
+const timeTrackerMailModule = (setting) => new inversify_1.ContainerModule((bind) => {
     bind('MongodbMigration').to(migration_1.TimesheetApprovalMailTemplate).whenTargetNamed(migration_1.TimesheetApprovalMailTemplate.name);
     bind('MongodbMigration').to(migration_1.TimesheetSubmitMailTemplate).whenTargetNamed(migration_1.TimesheetSubmitMailTemplate.name);
 });
+exports.timeTrackerMailModule = timeTrackerMailModule;
+const timeTrackerModule = (setting) => new inversify_1.ContainerModule((bind) => {
+    bind(constants_1.TYPES.ITimeRecordService).to(services_1.TimeRecordService).inSingletonScope();
+    bind(constants_1.TYPES.ITimesheetService).to(services_1.TimesheetService).inSingletonScope();
+});
+exports.timeTrackerModule = timeTrackerModule;
+const timeTrackerProxyModule = (setting) => new inversify_1.ContainerModule((bind) => {
+    bind(constants_1.TYPES.ITimeRecordService).to(services_1.TimeRecordProxyService).inSingletonScope();
+    bind(constants_1.TYPES.ITimesheetService).to(services_1.TimesheetProxyService).inSingletonScope();
+});
+exports.timeTrackerProxyModule = timeTrackerProxyModule;
 
 
 /***/ }),
@@ -252,7 +264,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
+    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(__webpack_require__(/*! ./containers */ "./src/containers/containers.ts"), exports);
@@ -277,7 +289,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const server_core_1 = __webpack_require__(/*! @common-stack/server-core */ "@common-stack/server-core");
@@ -285,6 +297,7 @@ const module_1 = __webpack_require__(/*! ./module */ "./src/module.ts");
 __exportStar(__webpack_require__(/*! ./constants */ "./src/constants/index.ts"), exports);
 __exportStar(__webpack_require__(/*! ./store/repository */ "./src/store/repository/index.ts"), exports);
 __exportStar(__webpack_require__(/*! ./store/models/timetracker-model */ "./src/store/models/timetracker-model.ts"), exports);
+__exportStar(__webpack_require__(/*! ./containers */ "./src/containers/index.ts"), exports);
 exports.default = new server_core_1.Feature(module_1.default);
 
 
@@ -307,7 +320,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
+    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(__webpack_require__(/*! ./service-initialization */ "./src/initialization/service-initialization.ts"), exports);
@@ -329,7 +342,7 @@ exports.mainLoadConfigurationPre = void 0;
 const core_1 = __webpack_require__(/*! @workbench-stack/core */ "@workbench-stack/core");
 const core_2 = __webpack_require__(/*! @common-stack/core */ "@common-stack/core");
 const preferences_1 = __webpack_require__(/*! ../preferences */ "./src/preferences/index.ts");
-exports.mainLoadConfigurationPre = async (_, container) => {
+const mainLoadConfigurationPre = async (_, container) => {
     const logger = container.get(core_2.CommonType.LOGGER);
     logger.info('PRESTART START: --  load TimeTrackerContribution to registry');
     const registry = container.get(core_1.TYPES.IRegistry);
@@ -337,6 +350,7 @@ exports.mainLoadConfigurationPre = async (_, container) => {
     configurationRegistry.registerConfiguration(preferences_1.TimeTrackerContribution);
     logger.info('PRESTART ENDS:  -- load TimeTrackerContribution to registry');
 };
+exports.mainLoadConfigurationPre = mainLoadConfigurationPre;
 
 
 /***/ }),
@@ -371,7 +385,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
+    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(__webpack_require__(/*! ./mail-template */ "./src/migration/mail-template.ts"), exports);
@@ -507,6 +521,7 @@ const resolvers_1 = __webpack_require__(/*! ./resolvers */ "./src/resolvers/inde
 const constants_1 = __webpack_require__(/*! ./constants */ "./src/constants/index.ts");
 const initialization_1 = __webpack_require__(/*! ./initialization */ "./src/initialization/index.ts");
 const preferences_1 = __webpack_require__(/*! ./preferences */ "./src/preferences/index.ts");
+const plugins_1 = __webpack_require__(/*! ./plugins */ "./src/plugins/index.ts");
 const createServiceFunc = (container) => ({
     timeRecordService: container.get(constants_1.TYPES.ITimeRecordService),
     timesheetService: container.get(constants_1.TYPES.ITimesheetService),
@@ -514,8 +529,10 @@ const createServiceFunc = (container) => ({
 exports.default = new server_core_1.Feature({
     schema: schema_1.schema,
     createResolversFunc: resolvers_1.resolvers,
-    createContainerFunc: [containers_1.timeTrackerModule],
+    createContainerFunc: [containers_1.timeTrackerProxyModule, containers_1.timeTrackerMailModule],
+    createHemeraContainerFunc: [containers_1.timeTrackerModule, containers_1.timeTrackerStoreModule],
     createServiceFunc,
+    addBrokerClientServiceClass: [plugins_1.TimeRecordMoleculerService, plugins_1.TimesheetMoleculerService],
     preStartFunc: [initialization_1.mainLoadConfigurationPre],
     addPermissions: {
         createPermissions: [preferences_1.TimeTrackerRolesContribution],
@@ -526,6 +543,206 @@ exports.default = new server_core_1.Feature({
 });
 
 
+/***/ }),
+
+/***/ "./src/plugins/index.ts":
+/*!******************************!*\
+  !*** ./src/plugins/index.ts ***!
+  \******************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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(__webpack_require__(/*! ./timesheet-moleculer-service */ "./src/plugins/timesheet-moleculer-service.ts"), exports);
+__exportStar(__webpack_require__(/*! ./timerecord-moleculer-service */ "./src/plugins/timerecord-moleculer-service.ts"), exports);
+
+
+/***/ }),
+
+/***/ "./src/plugins/timerecord-moleculer-service.ts":
+/*!*****************************************************!*\
+  !*** ./src/plugins/timerecord-moleculer-service.ts ***!
+  \*****************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TimeRecordMoleculerService = void 0;
+const moleculer_1 = __webpack_require__(/*! moleculer */ "moleculer");
+const constants_1 = __webpack_require__(/*! ../constants */ "./src/constants/index.ts");
+class TimeRecordMoleculerService extends moleculer_1.Service {
+    constructor(broker, _a) {
+        var { container } = _a, settings = __rest(_a, ["container"]);
+        super(broker);
+        const topic = "TimeRecord" /* TimeRecord */;
+        this.timerecordService = container.get(constants_1.TYPES.ITimeRecordService);
+        this.parseServiceSchema({
+            name: topic,
+            actions: {
+                ["getTimeRecords" /* getTimeRecords */]: {
+                    handler: async (ctx) => {
+                        return await this.timerecordService.getTimeRecords(ctx.params.orgId, ctx.params.userId);
+                    }
+                },
+                ["getDurationTimeRecords" /* getDurationTimeRecords */]: {
+                    handler: async (ctx) => {
+                        return await this.timerecordService.getDurationTimeRecords(ctx.params.orgId, ctx.params.startTime, ctx.params.endTime, ctx.params.userId);
+                    }
+                },
+                ["getPlayingTimeRecord" /* getPlayingTimeRecord */]: {
+                    handler: async (ctx) => {
+                        return await this.timerecordService.getPlayingTimeRecord(ctx.params.userId, ctx.params.orgId);
+                    }
+                },
+                ["createTimeRecord" /* createTimeRecord */]: {
+                    handler: async (ctx) => {
+                        return await this.timerecordService.createTimeRecord(ctx.params.userId, ctx.params.orgId, ctx.params.request);
+                    }
+                },
+                ["updateTimeRecord" /* updateTimeRecord */]: {
+                    handler: async (ctx) => {
+                        return await this.timerecordService.updateTimeRecord(ctx.params.userId, ctx.params.orgId, ctx.params.recordId, ctx.params.request);
+                    }
+                },
+                ["removeTimeRecord" /* removeTimeRecord */]: {
+                    handler: async (ctx) => {
+                        return await this.timerecordService.removeTimeRecord(ctx.params.userId, ctx.params.orgId, ctx.params.recordId);
+                    }
+                },
+                ["removeDurationTimeRecords" /* removeDurationTimeRecords */]: {
+                    handler: async (ctx) => {
+                        return await this.timerecordService.removeDurationTimeRecords(ctx.params.userId, ctx.params.orgId, ctx.params.startTime, ctx.params.endTime, ctx.params.projectId);
+                    }
+                },
+                ["approveTimeRecords" /* approveTimeRecords */]: {
+                    handler: async (ctx) => {
+                        return await this.timerecordService.approveTimeRecords(ctx.params.orgId, ctx.params.sheetId, ctx.params.timeRecordsId);
+                    }
+                },
+                ["disapproveTimeRecords" /* disapproveTimeRecords */]: {
+                    handler: async (ctx) => {
+                        return await this.timerecordService.disapproveTimeRecords(ctx.params.orgId, ctx.params.sheetId);
+                    }
+                },
+            },
+        });
+    }
+}
+exports.TimeRecordMoleculerService = TimeRecordMoleculerService;
+
+
+/***/ }),
+
+/***/ "./src/plugins/timesheet-moleculer-service.ts":
+/*!****************************************************!*\
+  !*** ./src/plugins/timesheet-moleculer-service.ts ***!
+  \****************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TimesheetMoleculerService = void 0;
+const moleculer_1 = __webpack_require__(/*! moleculer */ "moleculer");
+const core_1 = __webpack_require__(/*! @common-stack/core */ "@common-stack/core");
+const constants_1 = __webpack_require__(/*! ../constants */ "./src/constants/index.ts");
+class TimesheetMoleculerService extends moleculer_1.Service {
+    constructor(broker, _a) {
+        var { container } = _a, settings = __rest(_a, ["container"]);
+        super(broker);
+        this.container = container;
+        const topic = "Timesheet" /* Timesheet */;
+        this.container.bind(core_1.ClientTypes.ApolloClient).toConstantValue(this.apolloClient);
+        this.timesheetService = this.container.get(constants_1.TYPES.ITimesheetService);
+        this.parseServiceSchema({
+            name: topic,
+            events: {
+                ["onRemoveTimeRecordIdFromTimesheet" /* onRemoveTimeRecordIdFromTimesheet */]: {
+                    handler: async (ctx) => {
+                        return await this.timesheetService.removeTimeRecordIdFromTimesheet(ctx.params.recordId, ctx.params.orgId);
+                    }
+                }
+            },
+            actions: {
+                ["getTimesheets" /* getTimesheets */]: {
+                    handler: async (ctx) => {
+                        return await this.timesheetService.getTimesheets(ctx.params.orgId);
+                    }
+                },
+                ["getTimesheetsWithTotalHours" /* getTimesheetsWithTotalHours */]: {
+                    handler: async (ctx) => {
+                        return await this.timesheetService.getTimesheetsWithTotalHours(ctx.params.orgId, ctx.params.userId);
+                    }
+                },
+                ["getDurationTimesheets" /* getDurationTimesheets */]: {
+                    handler: async (ctx) => {
+                        return await this.timesheetService.getDurationTimesheets(ctx.params.orgId, ctx.params.start, ctx.params.end);
+                    }
+                },
+                ["createTimesheet" /* createTimesheet */]: {
+                    handler: async (ctx) => {
+                        return await this.timesheetService.createTimesheet(ctx.params.userId, ctx.params.orgId, ctx.params.request);
+                    }
+                },
+                ["updateTimesheet" /* updateTimesheet */]: {
+                    handler: async (ctx) => {
+                        return await this.timesheetService.updateTimesheet(ctx.params.userId, ctx.params.orgId, ctx.params.sheetId, ctx.params.request, ctx.params.userContext);
+                    }
+                },
+                ["removeTimesheet" /* removeTimesheet */]: {
+                    handler: async (ctx) => {
+                        return await this.timesheetService.removeTimesheet(ctx.params.userId, ctx.params.orgId, ctx.params.sheetId);
+                    }
+                },
+                ["updateTimesheetStatus" /* updateTimesheetStatus */]: {
+                    handler: async (ctx) => {
+                        return await this.timesheetService.updateTimesheetStatus(ctx.params.orgId, ctx.params.sheetId, ctx.params.state);
+                    }
+                },
+            },
+        });
+    }
+}
+exports.TimesheetMoleculerService = TimesheetMoleculerService;
+
+
 /***/ }),
 
 /***/ "./src/preferences/index.ts":
@@ -545,7 +762,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
+    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(__webpack_require__(/*! ./settings */ "./src/preferences/settings/index.ts"), exports);
@@ -571,7 +788,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
+    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(__webpack_require__(/*! ./timing-permissions-contribution */ "./src/preferences/permissions/timing-permissions-contribution.ts"), exports);
@@ -1219,7 +1436,7 @@ exports.resolvers = [timerecord_resolver_1.resolver, timesheet_resolver_1.resolv
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolver = void 0;
 const graphql_subscriptions_1 = __webpack_require__(/*! graphql-subscriptions */ "graphql-subscriptions");
-exports.resolver = (options) => ({
+const resolver = (options) => ({
     TimeRecord: {
         id: (root) => root.id || root._id,
     },
@@ -1274,6 +1491,7 @@ exports.resolver = (options) => ({
         },
     },
 });
+exports.resolver = resolver;
 
 
 /***/ }),
@@ -1290,7 +1508,7 @@ exports.resolver = (options) => ({
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolver = void 0;
 /* eslint-disable no-underscore-dangle */
-exports.resolver = (options) => ({
+const resolver = (options) => ({
     Query: {
         getTimesheets: (root, args, { timesheetService, userContext }) => {
             options.logger.trace('(Query.getTimeSheets) args %j', args);
@@ -1322,6 +1540,7 @@ exports.resolver = (options) => ({
         },
     },
 });
+exports.resolver = resolver;
 
 
 /***/ }),
@@ -1369,7 +1588,7 @@ exports.schema = schema;
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony default export */ __webpack_exports__["default"] = ("type TimeRecord {\n  id: String\n  startTime: DateTime\n  endTime: DateTime\n  taskId: String\n  taskName: String\n  description: String\n  tags: [String]\n  isBillable: Boolean\n  projectId: String\n  clientId: String\n  userId: String\n  orgId: String\n  timesheetId: String\n  editable: Boolean\n  isPause: Boolean\n  isTimeout: Boolean\n  pauseStatus: [PauseStatus]\n}\n\ntype PauseStatus {\n  pausedTime: DateTime\n  restartTime: DateTime\n}\n\ninput PauseStatus_Input {\n  pausedTime: DateTime\n  restartTime: DateTime\n}\n\ninput TimeRecordRequest {\n  userId: String\n  startTime: DateTime\n  endTime: DateTime\n  taskName: String\n  description: String\n  tags: [String]\n  isBillable: Boolean\n  projectId: String\n  clientId: String\n  timesheetId: String\n  isPause: Boolean\n  isTimeout: Boolean\n  pauseStatus: [PauseStatus_Input]\n}\n\n\"\"\"\n Subscription event for timer\n\"\"\"\nenum TimeRecordPubSubEvents {\n    TimeRecordCreated\n    TimeRecordUpdated\n    TimeRecordStopped\n    TimeRecordDeleted\n    TimeRecordConfigurationUpdate\n}\n\ntype SubscriptionTimeRecord {\n  mutation: TimeRecordPubSubEvents\n  timeRecord: TimeRecord\n}\n\nextend type Query {\n  getTimeRecords(userId: String): [TimeRecord] @addAccountContext\n  getDurationTimeRecords(startTime: DateTime, endTime: DateTime, userId: String): [TimeRecord] @addAccountContext\n  getPlayingTimeRecord: TimeRecord @addAccountContext\n}\n\nextend type Mutation {\n  createTimeRecord(request: TimeRecordRequest): String @addAccountContext\n  updateTimeRecord(recordId: String!, request: TimeRecordRequest): Boolean @addAccountContext\n  removeTimeRecord(recordId: String!): Boolean @addAccountContext\n  removeDurationTimeRecords(startTime: DateTime, endTime: DateTime, projectId: String): Boolean @addAccountContext\n}\n\nextend type Subscription {\n  SubscribeToTimeTracker(orgName: String, userId: String): SubscriptionTimeRecord\n}\n");
+/* harmony default export */ __webpack_exports__["default"] = ("type TimeRecord {\n  id: ID\n  startTime: DateTime\n  endTime: DateTime\n  taskId: String\n  taskName: String\n  description: String\n  tags: [String]\n  isBillable: Boolean\n  projectId: String\n  clientId: String\n  userId: String\n  orgId: String\n  timesheetId: String\n  editable: Boolean\n  isPause: Boolean\n  isTimeout: Boolean\n  pauseStatus: [PauseStatus]\n}\n\nenum PauseStatusDescription {\n    BY_USER\n    DUE_TO_INACTIVITY\n}\n\ntype PauseStatus {\n  pausedTime: DateTime\n  restartTime: DateTime\n  status: PauseStatusDescription\n}\n\ninput PauseStatus_Input {\n  pausedTime: DateTime\n  restartTime: DateTime\n  status: PauseStatusDescription\n}\n\ninput TimeRecordRequest {\n  userId: String\n  startTime: DateTime\n  endTime: DateTime\n  taskName: String\n  description: String\n  tags: [String]\n  isBillable: Boolean\n  projectId: String\n  clientId: String\n  timesheetId: String\n  isPause: Boolean\n  isTimeout: Boolean\n  pauseStatus: [PauseStatus_Input]\n}\n\n\"\"\"\n Subscription event for timer\n\"\"\"\nenum TimeRecordPubSubEvents {\n    TimeRecordCreated\n    TimeRecordUpdated\n    TimeRecordStopped\n    TimeRecordDeleted\n    TimeRecordConfigurationUpdate\n}\n\ntype SubscriptionTimeRecord {\n  mutation: TimeRecordPubSubEvents\n  timeRecord: TimeRecord\n}\n\nextend type Query {\n  getTimeRecords(userId: String): [TimeRecord] @addAccountContext\n  getDurationTimeRecords(startTime: DateTime, endTime: DateTime, userId: String): [TimeRecord] @addAccountContext\n  getPlayingTimeRecord: TimeRecord @addAccountContext\n}\n\nextend type Mutation {\n  createTimeRecord(request: TimeRecordRequest): String @addAccountContext\n  updateTimeRecord(recordId: String!, request: TimeRecordRequest): Boolean @addAccountContext\n  removeTimeRecord(recordId: String!): Boolean @addAccountContext\n  removeDurationTimeRecords(startTime: DateTime, endTime: DateTime, projectId: String): Boolean @addAccountContext\n}\n\nextend type Subscription {\n  SubscribeToTimeTracker(orgName: String, userId: String): SubscriptionTimeRecord\n}\n");
 
 /***/ }),
 
@@ -1382,7 +1601,7 @@ __webpack_require__.r(__webpack_exports__);
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony default export */ __webpack_exports__["default"] = ("# scalar DateTime\nenum TimesheetState {\n  OPEN\n  APPROVED_PENDING\n  APPROVED\n  APPROVED_FINALIZED # --- which means no going back\n  DENYED\n  SUBMITTED\n  DENYED_FINALIZED # --- which means no going back\n}\n\ntype Timesheet {\n  id: ID\n  userId: String\n  startDate: DateTime\n  endDate: DateTime\n  state: TimesheetState\n  submittedOn: DateTime\n  approvedOn: DateTime\n  approvedBy: String\n  updatedBy: String # ---> userId\n  updatedOn: DateTime\n}\n\ninput TimesheetCreateRequest {\n  userId: String\n  startDate: DateTime\n  endDate: DateTime\n  state: TimesheetState\n  submittedOn: DateTime\n  approvedOn: DateTime\n  approvedBy: String\n  updatedBy: String # ---> userId\n  updatedOn: DateTime\n}\n\ntype TimesheetResponse {\n  id: ID\n  startDate: DateTime\n  endDate: DateTime\n  state: TimesheetState\n  submittedOn: DateTime\n  approvedOn: DateTime\n  approvedBy: String\n  updatedBy: String # ---> userId\n  updatedOn: DateTime\n  userId: String\n  orgId: String\n  totalDuration: Int\n}\n\nextend type Query {\n  getTimesheets(userId: String, withTotalHours: Boolean): [TimesheetResponse] @addAccountContext\n  getDurationTimesheets(start: DateTime, end: DateTime): [TimesheetResponse] @addAccountContext\n}\n\nextend type Mutation {\n  createTimesheet(request: TimesheetCreateRequest): Boolean @addAccountContext\n  updateTimesheet(sheetId: String, request: TimesheetCreateRequest): Boolean @addAccountContext\n  removeTimesheet(sheetId: String): Boolean @addAccountContext\n  updateTimesheetStatus(sheetId: String, state: TimesheetState): Boolean @addAccountContext\n}\n");
+/* harmony default export */ __webpack_exports__["default"] = ("# scalar DateTime\nenum TimesheetState {\n  OPEN\n  APPROVED_PENDING\n  APPROVED\n  APPROVED_FINALIZED # --- which means no going back\n  DENYED\n  SUBMITTED\n  DENYED_FINALIZED # --- which means no going back\n}\n\ntype Timesheet {\n  id: ID\n  orgId: String\n  userId: String\n  startDate: DateTime\n  endDate: DateTime\n  state: TimesheetState\n  submittedOn: DateTime\n  approvedOn: DateTime\n  approvedBy: String\n  updatedBy: String # ---> userId\n  updatedOn: DateTime\n  timeRecordsId: [String]\n}\n\ninput TimesheetCreateRequest {\n  userId: String\n  startDate: DateTime\n  endDate: DateTime\n  state: TimesheetState\n  submittedOn: DateTime\n  approvedOn: DateTime\n  approvedBy: String\n  updatedBy: String # ---> userId\n  updatedOn: DateTime\n  timeRecordsId: [String]\n}\n\ntype TimesheetResponse {\n  id: ID\n  startDate: DateTime\n  endDate: DateTime\n  state: TimesheetState\n  submittedOn: DateTime\n  approvedOn: DateTime\n  approvedBy: String\n  updatedBy: String # ---> userId\n  updatedOn: DateTime\n  userId: String\n  orgId: String\n  timeRecordsId: [String]\n  totalDuration: Int\n}\n\nextend type Query {\n  getTimesheets(userId: String, withTotalHours: Boolean): [TimesheetResponse] @addAccountContext\n  getDurationTimesheets(start: DateTime, end: DateTime): [TimesheetResponse] @addAccountContext\n}\n\nextend type Mutation {\n  createTimesheet(request: TimesheetCreateRequest): Boolean @addAccountContext\n  updateTimesheet(sheetId: String, request: TimesheetCreateRequest): Boolean @addAccountContext\n  removeTimesheet(sheetId: String): Boolean @addAccountContext\n  updateTimesheetStatus(sheetId: String, state: TimesheetState): Boolean @addAccountContext\n}\n");
 
 /***/ }),
 
@@ -1416,11 +1635,88 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
+    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(__webpack_require__(/*! ./timesheet-service */ "./src/services/timesheet-service.ts"), exports);
 __exportStar(__webpack_require__(/*! ./timerecord-service */ "./src/services/timerecord-service.ts"), exports);
+__exportStar(__webpack_require__(/*! ./timerecord-proxy-service */ "./src/services/timerecord-proxy-service.ts"), exports);
+__exportStar(__webpack_require__(/*! ./timesheet-proxy-service */ "./src/services/timesheet-proxy-service.ts"), exports);
+
+
+/***/ }),
+
+/***/ "./src/services/timerecord-proxy-service.ts":
+/*!**************************************************!*\
+  !*** ./src/services/timerecord-proxy-service.ts ***!
+  \**************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TimeRecordProxyService = void 0;
+const inversify_1 = __webpack_require__(/*! inversify */ "inversify");
+const core_1 = __webpack_require__(/*! @common-stack/core */ "@common-stack/core");
+let TimeRecordProxyService = class TimeRecordProxyService {
+    constructor(broker, logger) {
+        this.broker = broker;
+        this.topic = "TimeRecord" /* TimeRecord */;
+        this.logger = logger.child({ className: 'TimeRecordProxyService' });
+    }
+    approveTimeRecords(orgId, sheetId, timeRecordsId) {
+        return this.callAction("approveTimeRecords" /* approveTimeRecords */, { orgId, sheetId, timeRecordsId });
+    }
+    createTimeRecord(userId, orgId, request) {
+        return this.callAction("createTimeRecord" /* createTimeRecord */, { userId, orgId, request });
+    }
+    disapproveTimeRecords(orgId, sheetId) {
+        return this.callAction("disapproveTimeRecords" /* disapproveTimeRecords */, { orgId, sheetId });
+    }
+    getDurationTimeRecords(orgId, startTime, endTime, userId) {
+        return this.callAction("getDurationTimeRecords" /* getDurationTimeRecords */, { orgId, startTime, endTime, userId });
+    }
+    getPlayingTimeRecord(userId, orgId) {
+        return this.callAction("getPlayingTimeRecord" /* getPlayingTimeRecord */, { userId, orgId });
+    }
+    getTimeRecords(orgId, userId) {
+        return this.callAction("getTimeRecords" /* getTimeRecords */, { orgId, userId });
+    }
+    removeDurationTimeRecords(userId, orgId, startTime, endTime, projectId) {
+        return this.callAction("removeDurationTimeRecords" /* removeDurationTimeRecords */, {
+            userId,
+            orgId,
+            startTime,
+            endTime,
+            projectId,
+        });
+    }
+    removeTimeRecord(userId, orgId, recordId) {
+        return this.callAction("removeTimeRecord" /* removeTimeRecord */, { userId, orgId, recordId });
+    }
+    updateTimeRecord(userId, orgId, recordId, request) {
+        return this.callAction("updateTimeRecord" /* updateTimeRecord */, { userId, orgId, recordId, request });
+    }
+    async callAction(command, params) {
+        return this.broker.call(`${this.topic}.${command}`, params);
+    }
+};
+TimeRecordProxyService = __decorate([
+    inversify_1.injectable(),
+    __param(0, inversify_1.inject(core_1.CommonType.MOLECULER_BROKER)),
+    __param(1, inversify_1.inject('Logger'))
+], TimeRecordProxyService);
+exports.TimeRecordProxyService = TimeRecordProxyService;
 
 
 /***/ }),
@@ -1446,13 +1742,15 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TimeRecordService = void 0;
 const inversify_1 = __webpack_require__(/*! inversify */ "inversify");
-const core_1 = __webpack_require__(/*! @adminide-stack/core */ "@adminide-stack/core");
-const core_2 = __webpack_require__(/*! @common-stack/core */ "@common-stack/core");
+const core_1 = __webpack_require__(/*! @common-stack/core */ "@common-stack/core");
 const constants_1 = __webpack_require__(/*! ../constants */ "./src/constants/index.ts");
+const moment = __webpack_require__(/*! moment */ "moment");
 let TimeRecordService = class TimeRecordService {
-    constructor(timeRecordRepository, preferencesService, broker, pubsub, logger) {
+    constructor(timeRecordRepository, 
+    // @inject(ServerTypes.IPreferenceEditorService)
+    // private preferencesService: IPreferencesService,
+    broker, pubsub, logger) {
         this.timeRecordRepository = timeRecordRepository;
-        this.preferencesService = preferencesService;
         this.broker = broker;
         this.pubsub = pubsub;
         this.logger = logger;
@@ -1461,7 +1759,7 @@ let TimeRecordService = class TimeRecordService {
         return this.timeRecordRepository.getTimeRecords(orgId, userId);
     }
     async getDurationTimeRecords(orgId, startTime, endTime, userId) {
-        const timeRecords = await this.timeRecordRepository.getTimeRecords(orgId, userId, startTime, endTime);
+        const timeRecords = await this.timeRecordRepository.getTimeRecords(orgId, userId, startTime && moment(startTime).toDate(), endTime && moment(endTime).toDate());
         return timeRecords.filter((r) => r.endTime !== null);
     }
     async getPlayingTimeRecord(userId, orgId) {
@@ -1469,13 +1767,12 @@ let TimeRecordService = class TimeRecordService {
     }
     async createTimeRecord(userId, orgId, request) {
         const data = await this.timeRecordRepository.createTimeRecord(userId, orgId, request);
-        const timeRecord = data === null || data === void 0 ? void 0 : data.timeRecords[0];
-        if (timeRecord) {
+        if (data) {
             const record = {
                 orgName: data.orgId,
-                userId: timeRecord.userId,
+                userId: data.userId,
                 mutation: "TimeRecordCreated" /* TimeRecordCreated */,
-                timeRecord,
+                timeRecord: data,
             };
             this.pubsub.publish("TimeRecordCreated" /* TimeRecordCreated */, { SubscribeToTimeTracker: record });
         }
@@ -1483,13 +1780,12 @@ let TimeRecordService = class TimeRecordService {
     }
     async updateTimeRecord(userId, orgId, recordId, request) {
         const data = await this.timeRecordRepository.updateTimeRecord(userId, orgId, recordId, request);
-        const timeRecord = data === null || data === void 0 ? void 0 : data.timeRecords[0];
-        if (timeRecord) {
+        if (data) {
             const record = {
                 orgName: data.orgId,
-                userId: timeRecord.userId,
+                userId: data.userId,
                 mutation: "TimeRecordUpdated" /* TimeRecordUpdated */,
-                timeRecord,
+                timeRecord: data,
             };
             this.pubsub.publish("TimeRecordUpdated" /* TimeRecordUpdated */, { SubscribeToTimeTracker: record });
         }
@@ -1501,16 +1797,43 @@ let TimeRecordService = class TimeRecordService {
             orgName: data.orgId,
             userId: data.userId,
             mutation: "TimeRecordDeleted" /* TimeRecordDeleted */,
-            timeRecord: data === null || data === void 0 ? void 0 : data.timeRecords[0],
+            timeRecord: data,
         };
+        // remove record activities
+        await this.broker.broadcast("onRemoveTimeRecord" /* onRemoveTimeRecord */, { userId, orgId, recordId }, [
+            "TimeRecord" /* TimeRecord */,
+            "Timesheet" /* Timesheet */,
+            "Activity" /* Activity */,
+        ]);
+        //remove record id from timesheet
+        await this.broker.broadcast("onRemoveTimeRecordIdFromTimesheet" /* onRemoveTimeRecordIdFromTimesheet */, { recordId, orgId }, [
+            "TimeRecord" /* TimeRecord */,
+            "Timesheet" /* Timesheet */,
+        ]);
         this.pubsub.publish("TimeRecordDeleted" /* TimeRecordDeleted */, { SubscribeToTimeTracker: record });
         return true;
     }
     async removeDurationTimeRecords(userId, orgId, startTime, endTime, projectId) {
-        return this.timeRecordRepository.removeDurationTimeRecords(userId, orgId, startTime, endTime, projectId);
+        const records = await this.timeRecordRepository.getTimeRecords(orgId, userId);
+        if (records && records.length > 0) {
+            const timeRecords = records.filter((tr) => tr.startTime > moment(startTime) && tr.startTime < moment(endTime) && tr.projectId === projectId);
+            for (const record of timeRecords) {
+                await this.broker.broadcast("onRemoveTimeRecord" /* onRemoveTimeRecord */, { userId, orgId, recordId: record._id }, [
+                    "TimeRecord" /* TimeRecord */,
+                    "Timesheet" /* Timesheet */,
+                    "Activity" /* Activity */,
+                ]);
+                //remove record id from timesheet
+                await this.broker.broadcast("onRemoveTimeRecordIdFromTimesheet" /* onRemoveTimeRecordIdFromTimesheet */, { recordId: record._id, orgId }, [
+                    "TimeRecord" /* TimeRecord */,
+                    "Timesheet" /* Timesheet */,
+                ]);
+            }
+        }
+        return this.timeRecordRepository.removeDurationTimeRecords(userId, orgId, moment(startTime), moment(endTime), projectId);
     }
-    async approveTimeRecords(orgId, sheetId, startDate, endDate) {
-        this.timeRecordRepository.approveTimeRecords(orgId, sheetId, startDate, endDate);
+    async approveTimeRecords(orgId, sheetId, timeRecordsId) {
+        this.timeRecordRepository.approveTimeRecords(orgId, sheetId, timeRecordsId);
     }
     async disapproveTimeRecords(orgId, sheetId) {
         this.timeRecordRepository.disapproveTimeRecords(orgId, sheetId);
@@ -1519,14 +1842,79 @@ let TimeRecordService = class TimeRecordService {
 TimeRecordService = __decorate([
     inversify_1.injectable(),
     __param(0, inversify_1.inject(constants_1.TYPES.ITimeRecordRepository)),
-    __param(1, inversify_1.inject(core_1.ServerTypes.IPreferenceEditorService)),
-    __param(2, inversify_1.inject(core_2.CommonType.MOLECULER_BROKER)),
-    __param(3, inversify_1.inject('PubSub')),
-    __param(4, inversify_1.inject('Logger'))
+    __param(1, inversify_1.inject(core_1.CommonType.MOLECULER_BROKER)),
+    __param(2, inversify_1.inject('PubSub')),
+    __param(3, inversify_1.inject('Logger'))
 ], TimeRecordService);
 exports.TimeRecordService = TimeRecordService;
 
 
+/***/ }),
+
+/***/ "./src/services/timesheet-proxy-service.ts":
+/*!*************************************************!*\
+  !*** ./src/services/timesheet-proxy-service.ts ***!
+  \*************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TimesheetProxyService = void 0;
+const inversify_1 = __webpack_require__(/*! inversify */ "inversify");
+const core_1 = __webpack_require__(/*! @common-stack/core */ "@common-stack/core");
+let TimesheetProxyService = class TimesheetProxyService {
+    constructor(broker, logger) {
+        this.broker = broker;
+        this.topic = "Timesheet" /* Timesheet */;
+        this.logger = logger.child({ className: 'TimesheetProxyService' });
+    }
+    createTimesheet(userId, orgId, request) {
+        return this.callAction("createTimesheet" /* createTimesheet */, { userId, orgId, request });
+    }
+    getDurationTimesheets(orgId, start, end) {
+        return this.callAction("getDurationTimesheets" /* getDurationTimesheets */, { orgId, start, end });
+    }
+    getTimesheets(orgId) {
+        return this.callAction("getTimesheets" /* getTimesheets */, { orgId });
+    }
+    getTimesheetsWithTotalHours(orgId, userId) {
+        return this.callAction("getTimesheetsWithTotalHours" /* getTimesheetsWithTotalHours */, { orgId, userId });
+    }
+    removeTimesheet(userId, orgId, sheetId) {
+        return this.callAction("removeTimesheet" /* removeTimesheet */, { userId, orgId, sheetId });
+    }
+    removeTimeRecordIdFromTimesheet(recordId, orgId) {
+        return this.callAction("removeTimeRecordIdFromTimesheet" /* removeTimeRecordIdFromTimesheet */, { recordId, orgId });
+    }
+    updateTimesheet(userId, orgId, sheetId, request, userContext) {
+        return this.callAction("updateTimesheet" /* updateTimesheet */, { userId, orgId, sheetId, request });
+    }
+    updateTimesheetStatus(orgId, sheetId, state) {
+        return this.callAction("updateTimesheetStatus" /* updateTimesheetStatus */, { orgId, sheetId, state });
+    }
+    async callAction(command, params) {
+        return this.broker.call(`${this.topic}.${command}`, params);
+    }
+};
+TimesheetProxyService = __decorate([
+    inversify_1.injectable(),
+    __param(0, inversify_1.inject(core_1.CommonType.MOLECULER_BROKER)),
+    __param(1, inversify_1.inject('Logger'))
+], TimesheetProxyService);
+exports.TimesheetProxyService = TimesheetProxyService;
+
+
 /***/ }),
 
 /***/ "./src/services/timesheet-service.ts":
@@ -1573,7 +1961,7 @@ let TimesheetService = class TimesheetService {
         const timeRecords = await this.timeRecordRepository.getTimeRecords(orgId, userId);
         return timesheets.map((timesheet) => {
             const sheetTotalDuration = timeRecords
-                .filter((tr) => tr.userId === timesheet.userId && tr.startTime > timesheet.startDate && tr.endTime < timesheet.endDate)
+                .filter((tr) => { var _a; return (_a = timesheet.timeRecordsId) === null || _a === void 0 ? void 0 : _a.includes(tr._id.toString()); })
                 .reduce((duration, tr) => duration + Math.floor((moment(tr.endTime).valueOf() - moment(tr.startTime).valueOf()) / 1000), 0);
             return {
                 id: timesheet.id,
@@ -1587,6 +1975,7 @@ let TimesheetService = class TimesheetService {
                 submittedOn: timesheet.submittedOn,
                 updatedBy: timesheet.updatedBy,
                 updatedOn: timesheet.updatedOn,
+                timeRecordsId: timesheet.timeRecordsId,
                 totalDuration: sheetTotalDuration,
             };
         });
@@ -1604,7 +1993,7 @@ let TimesheetService = class TimesheetService {
             await this.timesheetRepository.updateTimesheet(orgId, sheetId, request);
             if (request.state === "APPROVED" /* APPROVED */) {
                 // approve time records from startDate to endDate
-                this.timeRecordService.approveTimeRecords(orgId, sheetId, request.startDate, request.endDate);
+                this.timeRecordService.approveTimeRecords(orgId, sheetId, request.timeRecordsId);
             }
             else if (request.state === "DENYED" /* DENYED */) {
                 // approve time records from startDate to endDate
@@ -1618,7 +2007,7 @@ let TimesheetService = class TimesheetService {
             if (request.state === "APPROVED" /* APPROVED */ &&
                 settings.timetracker.notifications.approvalNotifications &&
                 settings.timetracker.notifications.enableTimetrackerNotifications) {
-                const mailTopic = 'Timsheet approved';
+                const mailTopic = 'Timesheet approved';
                 const mailTo = userContext.emailId;
                 const mailFrom = config_1.config.MAIL_SEND_DEFAULT_EMAIL;
                 const templateId = constants_1.EmailTemplateCodes.TIMESHEET_APPROVAL;
@@ -1634,7 +2023,7 @@ let TimesheetService = class TimesheetService {
             if (request.state === "SUBMITTED" /* SUBMITTED */ &&
                 settings.timetracker.notifications.submitNotifications &&
                 settings.timetracker.notifications.enableTimetrackerNotifications) {
-                const mailTopic = 'Timsheet submitted';
+                const mailTopic = 'Timesheet submitted';
                 const mailTo = userContext.emailId;
                 const mailFrom = config_1.config.MAIL_SEND_DEFAULT_EMAIL;
                 const templateId = constants_1.EmailTemplateCodes.SUBMIT_TIME;
@@ -1681,6 +2070,9 @@ let TimesheetService = class TimesheetService {
             },
         }, "MailService" /* MailService */);
     }
+    async removeTimeRecordIdFromTimesheet(recordId, orgId) {
+        return await this.timesheetRepository.removeTimeRecordIdFromTimesheet(recordId, orgId);
+    }
     async callAction(command, params, topic, opts) {
         return this.broker.call(`${topic}.${command}@${this.settings.adminApiNamespace}`, params, opts);
     }
@@ -1699,6 +2091,108 @@ TimesheetService = __decorate([
 exports.TimesheetService = TimesheetService;
 
 
+/***/ }),
+
+/***/ "./src/store/models/timerecords-model.ts":
+/*!***********************************************!*\
+  !*** ./src/store/models/timerecords-model.ts ***!
+  \***********************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TimeRecordsModelFunc = void 0;
+const mongoose_1 = __webpack_require__(/*! mongoose */ "mongoose");
+var PauseStatusDescription;
+(function (PauseStatusDescription) {
+    PauseStatusDescription["BY_USER"] = "BY_USER";
+    PauseStatusDescription["DUE_TO_INACTIVITY"] = "DUE_TO_INACTIVITY";
+})(PauseStatusDescription || (PauseStatusDescription = {}));
+const PauseStatusSchema = new mongoose_1.Schema({
+    pausedTime: { type: Date },
+    restartTime: { type: Date },
+    status: { type: PauseStatusDescription },
+});
+// ===> TimeRecord
+const TimeRecordSchema = new mongoose_1.Schema({
+    orgId: { type: String, index: true },
+    userId: { type: String, index: true },
+    startTime: { type: Date, index: true },
+    endTime: { type: Date, default: null, index: true },
+    taskName: { type: String },
+    description: { type: String },
+    taskId: { type: String },
+    tags: { type: [String] },
+    isBillable: { type: Boolean },
+    projectId: { type: String },
+    timesheetId: { type: String, index: true },
+    isPause: { type: Boolean, default: false },
+    isTimeout: { type: Boolean, default: false },
+    pauseStatus: { type: [PauseStatusSchema] }
+});
+TimeRecordSchema.index({ endTime: 1, startTime: 1, userId: 1 });
+TimeRecordSchema.virtual('id').get(function () {
+    return this._id.toHexString();
+});
+TimeRecordSchema.set('toJSON', {
+    virtuals: true,
+});
+TimeRecordSchema.set('toObject', { virtuals: true });
+const TimeRecordsModelFunc = (db) => db.model('timerecords', TimeRecordSchema);
+exports.TimeRecordsModelFunc = TimeRecordsModelFunc;
+
+
+/***/ }),
+
+/***/ "./src/store/models/timesheets-model.ts":
+/*!**********************************************!*\
+  !*** ./src/store/models/timesheets-model.ts ***!
+  \**********************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TimesheetsModelFunc = void 0;
+const mongoose_1 = __webpack_require__(/*! mongoose */ "mongoose");
+var TimesheetState;
+(function (TimesheetState) {
+    TimesheetState[TimesheetState["OPEN"] = 0] = "OPEN";
+    TimesheetState[TimesheetState["APPROVED_PENDING"] = 1] = "APPROVED_PENDING";
+    TimesheetState[TimesheetState["APPROVED"] = 2] = "APPROVED";
+    TimesheetState[TimesheetState["APPROVED_FINALIZED"] = 3] = "APPROVED_FINALIZED";
+    TimesheetState[TimesheetState["DENYED"] = 4] = "DENYED";
+    TimesheetState[TimesheetState["SUBMITTED"] = 5] = "SUBMITTED";
+    TimesheetState[TimesheetState["DENYED_FINALIZED"] = 6] = "DENYED_FINALIZED";
+})(TimesheetState || (TimesheetState = {}));
+// ===> Timesheet
+const TimesheetSchema = new mongoose_1.Schema({
+    orgId: { type: String, index: true },
+    userId: { type: String, index: true },
+    startDate: { type: Date },
+    endDate: { type: Date },
+    state: { type: TimesheetState },
+    submittedOn: { type: Date },
+    approvedOn: { type: Date },
+    approvedBy: { type: String },
+    updatedBy: { type: String },
+    updatedOn: { type: Date },
+    timeRecordsId: { type: [String] },
+});
+TimesheetSchema.virtual('id').get(function () {
+    return this._id.toHexString();
+});
+TimesheetSchema.set('toJSON', {
+    virtuals: true,
+});
+TimesheetSchema.set('toObject', { virtuals: true });
+const TimesheetsModelFunc = (db) => db.model('timesheets', TimesheetSchema);
+exports.TimesheetsModelFunc = TimesheetsModelFunc;
+
+
 /***/ }),
 
 /***/ "./src/store/models/timetracker-model.ts":
@@ -1750,7 +2244,7 @@ const TimeRecordSchema = new mongoose_1.Schema({
     activities: [TimeActivitySchema],
     isPause: { type: Boolean, default: false },
     isTimeout: { type: Boolean, default: false },
-    pauseStatus: { type: [PauseStatusSchema] },
+    pauseStatus: { type: [PauseStatusSchema] }
 });
 TimeRecordSchema.index({ endTime: 1, startTime: 1, userId: 1 });
 // ===> Timesheet
@@ -1764,6 +2258,7 @@ const TimesheetSchema = new mongoose_1.Schema({
     approvedBy: { type: String },
     updatedBy: { type: String },
     updatedOn: { type: Date },
+    timeRecordsId: { type: [String] },
 });
 const TimeTrackerSchema = new mongoose_1.Schema({
     orgId: { type: String, index: true },
@@ -1783,7 +2278,8 @@ TimeTrackerSchema.set('toJSON', {
     virtuals: true,
 });
 TimeTrackerSchema.set('toObject', { virtuals: true });
-exports.TimeTrackerModelFunc = (db) => db.model('timetracker', TimeTrackerSchema);
+const TimeTrackerModelFunc = (db) => db.model('timetracker', TimeTrackerSchema);
+exports.TimeTrackerModelFunc = TimeTrackerModelFunc;
 
 
 /***/ }),
@@ -1805,7 +2301,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
+    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(__webpack_require__(/*! ./timerecord-repository */ "./src/store/repository/timerecord-repository.ts"), exports);
@@ -1835,82 +2331,60 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TimeRecordRepository = void 0;
 const inversify_1 = __webpack_require__(/*! inversify */ "inversify");
-const _ = __webpack_require__(/*! lodash */ "lodash");
-const timetracker_model_1 = __webpack_require__(/*! ../models/timetracker-model */ "./src/store/models/timetracker-model.ts");
+const timerecords_model_1 = __webpack_require__(/*! ../models/timerecords-model */ "./src/store/models/timerecords-model.ts");
 let TimeRecordRepository = class TimeRecordRepository {
     constructor(db, logger) {
         this.logger = logger.child({ className: 'TimeRecordRepository' });
-        this.timeTrackerModel = timetracker_model_1.TimeTrackerModelFunc(db);
+        this.timeRecordsModel = timerecords_model_1.TimeRecordsModelFunc(db);
     }
     async getTimeRecords(orgId, userId, from, until) {
         if (!userId) {
             userId = /.*/;
         }
         let match = {
-            'timeRecords.userId': userId,
+            'userId': userId,
         };
         if (from) {
-            match = Object.assign(Object.assign({}, match), { 'timeRecords.startTime': { $gte: from } });
+            match = Object.assign(Object.assign({}, match), { 'startTime': { $gte: from } });
         }
         if (until) {
-            match = Object.assign(Object.assign({}, match), { 'timeRecords.endTime': { $lte: until } });
+            match = Object.assign(Object.assign({}, match), { 'endTime': { $lte: until } });
         }
-        const result = await this.timeTrackerModel.aggregate([
+        const result = await this.timeRecordsModel.aggregate([
             {
                 $match: {
                     orgId,
                 },
             },
-            {
-                $unwind: '$timeRecords',
-            },
             {
                 $match: Object.assign({}, match),
             },
-            {
-                $group: {
-                    _id: '$orgId',
-                    timeRecords: {
-                        $push: '$timeRecords',
-                    },
-                },
-            },
-            {
-                $project: {
-                    orgId: 1,
-                    timeRecords: 1,
-                },
-            },
         ]);
         if (result.length === 0) {
             return [];
         }
-        return result[0].timeRecords;
+        return result;
     }
     async getOrganizationTimeRecords(orgId) {
-        const trackDoc = await this.timeTrackerModel.findOne({ orgId });
-        if (trackDoc && trackDoc.timeRecords) {
-            return trackDoc.timeRecords;
+        const trackDoc = await this.timeRecordsModel.find({ orgId });
+        if (trackDoc) {
+            return trackDoc;
         }
         return [];
     }
     async getPlayingTimeRecord(userId, orgId) {
-        const trackDoc = await this.timeTrackerModel.findOne({ orgId });
+        const trackDoc = await this.timeRecordsModel.find({ orgId });
         if (trackDoc) {
             let res;
-            if (trackDoc.timeRecords)
-                res = trackDoc.timeRecords.find((tr) => tr.userId === userId && tr.endTime === null);
+            if (trackDoc)
+                res = trackDoc.find((tr) => tr.userId === userId && tr.endTime === null);
             return res;
         }
         return null;
     }
     async createTimeRecord(userId, orgId, request) {
         try {
-            const response = await this.timeTrackerModel.findOneAndUpdate({ orgId }, { orgId, $push: { timeRecords: request } }, {
-                upsert: true,
-                new: true,
-                projection: { userId, orgId, timeRecords: { $elemMatch: { startTime: request.startTime } } },
-            });
+            const response = await this.timeRecordsModel.create(Object.assign(Object.assign({}, request), { orgId, userId }));
             return response.toObject();
         }
         catch (err) {
@@ -1921,21 +2395,12 @@ let TimeRecordRepository = class TimeRecordRepository {
         try {
             if (recordId === null || recordId === undefined)
                 throw new Error('TimeRecord id not specified!');
-            let setRequest = {};
-            _.forIn(request, (value, key) => {
-                setRequest = Object.assign(Object.assign({}, setRequest), { [`timeRecords.$.${key}`]: value });
-            });
-            const response = await this.timeTrackerModel.findOneAndUpdate({ orgId, timeRecords: { $elemMatch: { _id: recordId } } }, {
-                $set: Object.assign({}, setRequest),
+            const response = await this.timeRecordsModel.findOneAndUpdate({ orgId, _id: recordId }, {
+                $set: Object.assign({}, request),
             }, {
                 new: true,
-                projection: {
-                    userId,
-                    orgId,
-                    timeRecords: { $elemMatch: { _id: recordId } },
-                },
             });
-            return response.toObject();
+            return response === null || response === void 0 ? void 0 : response.toObject();
         }
         catch (err) {
             throw new Error(err.message);
@@ -1943,15 +2408,11 @@ let TimeRecordRepository = class TimeRecordRepository {
     }
     async removeTimeRecord(userId, orgId, recordId) {
         try {
-            const result = await this.timeTrackerModel.update({
-                orgId,
-            }, {
-                $pull: { timeRecords: { _id: recordId } },
-            });
-            if (result.nModified !== 1) {
+            const result = await this.timeRecordsModel.remove({ userId, orgId, _id: recordId });
+            if (result.n !== 1) {
                 throw new Error('TimeRecord is not modified');
             }
-            return { userId, orgId, timeRecords: [{ _id: recordId }] };
+            return { userId, orgId, _id: recordId };
         }
         catch (err) {
             throw new Error(err.message);
@@ -1959,14 +2420,12 @@ let TimeRecordRepository = class TimeRecordRepository {
     }
     async removeDurationTimeRecords(userId, orgId, startTime, endTime, projectId) {
         try {
-            const trackerDoc = await this.timeTrackerModel.find({ orgId });
+            const trackerDoc = await this.timeRecordsModel.find({ orgId });
             if (trackerDoc && trackerDoc.length > 0) {
-                const timeRecords = trackerDoc[0].timeRecords.filter((tr) => tr.startTime < startTime || tr.startTime > endTime || tr.projectId !== projectId);
-                await this.timeTrackerModel.update({
-                    orgId,
-                }, {
-                    timeRecords,
-                });
+                const timeRecords = trackerDoc.filter((tr) => tr.startTime > startTime && tr.startTime < endTime && tr.projectId === projectId);
+                for (const record of timeRecords) {
+                    await this.timeRecordsModel.remove({ _id: record._id });
+                }
                 return true;
             }
             return false;
@@ -1975,20 +2434,11 @@ let TimeRecordRepository = class TimeRecordRepository {
             throw new Error(err.message);
         }
     }
-    async approveTimeRecords(orgId, sheetId, startDate, endDate) {
+    async approveTimeRecords(orgId, sheetId, timeRecordsId) {
         try {
-            await this.timeTrackerModel.updateMany({
-                orgId,
-            }, { $set: { 'timeRecords.$[el].timesheetId': sheetId } }, {
-                multi: true,
-                arrayFilters: [
-                    {
-                        'el.startTime': { $gte: startDate },
-                        'el.endTime': { $lte: endDate },
-                        'el.timesheetId': null,
-                    },
-                ],
-            });
+            for (const id of timeRecordsId) {
+                const res = await this.timeRecordsModel.updateOne({ orgId, _id: id }, { $set: { 'timesheetId': sheetId } });
+            }
         }
         catch (e) {
             this.logger.debug('approveTimeRecords =>', e.message);
@@ -1997,15 +2447,11 @@ let TimeRecordRepository = class TimeRecordRepository {
     }
     async disapproveTimeRecords(orgId, sheetId) {
         try {
-            await this.timeTrackerModel.updateMany({
+            const res = await this.timeRecordsModel.updateMany({
                 orgId,
-            }, { $set: { 'timeRecords.$[el].timesheetId': null } }, {
+                timesheetId: sheetId
+            }, { $set: { 'timesheetId': null } }, {
                 multi: true,
-                arrayFilters: [
-                    {
-                        'el.timesheetId': sheetId,
-                    },
-                ],
             });
         }
         catch (e) {
@@ -2046,17 +2492,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TimesheetRepository = void 0;
 const inversify_1 = __webpack_require__(/*! inversify */ "inversify");
 const core_1 = __webpack_require__(/*! @common-stack/core */ "@common-stack/core");
-const timetracker_model_1 = __webpack_require__(/*! ../models/timetracker-model */ "./src/store/models/timetracker-model.ts");
+const timesheets_model_1 = __webpack_require__(/*! ../models/timesheets-model */ "./src/store/models/timesheets-model.ts");
 let TimesheetRepository = class TimesheetRepository {
     constructor(db, logger, broker) {
         this.broker = broker;
         this.logger = logger.child({ className: 'TimesheetRepository' });
-        this.timeTrackerModel = timetracker_model_1.TimeTrackerModelFunc(db);
+        this.timesheetsModel = timesheets_model_1.TimesheetsModelFunc(db);
     }
     async getOrganizationTimesheets(orgId) {
-        const trackDoc = await this.timeTrackerModel.findOne({ orgId });
-        if (trackDoc && trackDoc.timesheets) {
-            return trackDoc.timesheets;
+        const trackDoc = await this.timesheetsModel.find({ orgId });
+        if (trackDoc && trackDoc) {
+            return trackDoc;
         }
         return [];
     }
@@ -2066,7 +2512,7 @@ let TimesheetRepository = class TimesheetRepository {
     }
     async createTimesheet(userId, orgId, request) {
         try {
-            const response = await this.timeTrackerModel.update({ orgId }, { $push: { timesheets: request } }, { upsert: true });
+            const response = await this.timesheetsModel.create(Object.assign({ orgId }, request));
             return true;
         }
         catch (err) {
@@ -2075,7 +2521,7 @@ let TimesheetRepository = class TimesheetRepository {
     }
     async updateTimesheet(orgId, sheetId, request) {
         try {
-            const response = await this.timeTrackerModel.update({ orgId, timesheets: { $elemMatch: { _id: sheetId } } }, { $set: { 'timesheets.$': request } });
+            const response = await this.timesheetsModel.update({ orgId, _id: sheetId }, { $set: Object.assign({}, request) });
             return response;
         }
         catch (err) {
@@ -2084,12 +2530,12 @@ let TimesheetRepository = class TimesheetRepository {
     }
     async updateTimesheetStatus(orgId, sheetId, state) {
         try {
-            const response = await this.timeTrackerModel.update({
+            const response = await this.timesheetsModel.update({
                 orgId,
-                $elemMatch: { 'timesheets.id': sheetId },
+                _id: sheetId,
             }, {
                 $set: {
-                    'timesheets.$.status': state,
+                    'status': state,
                 },
             });
             return response;
@@ -2100,17 +2546,17 @@ let TimesheetRepository = class TimesheetRepository {
     }
     async removeTimesheet(userId, orgId, sheetId) {
         try {
-            await this.timeTrackerModel.update({
-                orgId,
-            }, {
-                $pull: { timesheets: { _id: sheetId } },
-            });
+            await this.timesheetsModel.remove({ orgId, _id: sheetId });
             return true;
         }
         catch (err) {
             throw new Error(err.message);
         }
     }
+    async removeTimeRecordIdFromTimesheet(recordId, orgId) {
+        const res = await this.timesheetsModel.updateMany({ orgId, timeRecordsId: recordId }, { $pullAll: { timeRecordsId: [recordId] } });
+        return true;
+    }
 };
 TimesheetRepository = __decorate([
     inversify_1.injectable(),
@@ -2211,14 +2657,14 @@ module.exports = require("inversify");
 
 /***/ }),
 
-/***/ "lodash":
-/*!*************************!*\
-  !*** external "lodash" ***!
-  \*************************/
+/***/ "moleculer":
+/*!****************************!*\
+  !*** external "moleculer" ***!
+  \****************************/
 /*! no static exports found */
 /***/ (function(module, exports) {
 
-module.exports = require("lodash");
+module.exports = require("moleculer");
 
 /***/ }),