@admin-layout/timetracker-module-server 1.0.3-alpha.2 → 1.0.3-alpha.31

package/lib/index.js

@@ -1369,7 +1369,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 TimeRecords {\n#  orgId: String\n#  userId: String\n#  timeRecords: [TimeRecord]\n#}\n\ntype 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\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");
 
 /***/ }),
 
@@ -1382,7 +1382,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 Timesheets {\n  orgId: String\n  userId: String\n  timesheets: [Timesheet]\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  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  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");
 
 /***/ }),
 
@@ -1469,13 +1469,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 +1482,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,7 +1499,7 @@ 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,
         };
         this.pubsub.publish("TimeRecordDeleted" /* TimeRecordDeleted */, { SubscribeToTimeTracker: record });
         return true;
@@ -1573,7 +1571,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,
@@ -1699,6 +1697,103 @@ 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");
+const PauseStatusSchema = new mongoose_1.Schema({
+    pausedTime: { type: Date },
+    restartTime: { type: Date },
+});
+// ===> TimeRecord
+const TimeRecordSchema = new mongoose_1.Schema({
+    orgId: { type: String, index: true },
+    userId: { type: String, index: true },
+    startTime: { type: Date },
+    endTime: { type: Date, default: null },
+    taskName: { type: String },
+    description: { type: String },
+    taskId: { type: String },
+    tags: { type: [String] },
+    isBillable: { type: Boolean },
+    projectId: { type: String },
+    timesheetId: { type: String },
+    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 });
+exports.TimeRecordsModelFunc = (db) => db.model('timerecords', TimeRecordSchema);
+
+
+/***/ }),
+
+/***/ "./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({
+    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] },
+});
+const TimesheetsSchema = new mongoose_1.Schema({
+    orgId: { type: String, index: true },
+    timesheets: [TimesheetSchema],
+});
+TimesheetsSchema.virtual('id').get(function () {
+    return this._id.toHexString();
+});
+TimesheetsSchema.set('toJSON', {
+    virtuals: true,
+});
+TimesheetsSchema.set('toObject', { virtuals: true });
+exports.TimesheetsModelFunc = (db) => db.model('timesheets', TimesheetsSchema);
+
+
 /***/ }),
 
 /***/ "./src/store/models/timetracker-model.ts":
@@ -1764,6 +1859,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 },
@@ -1835,82 +1931,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 +1995,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 +2008,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 +2020,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;
@@ -1977,15 +2036,15 @@ let TimeRecordRepository = class TimeRecordRepository {
     }
     async approveTimeRecords(orgId, sheetId, startDate, endDate) {
         try {
-            await this.timeTrackerModel.updateMany({
+            await this.timeRecordsModel.updateMany({
                 orgId,
-            }, { $set: { 'timeRecords.$[el].timesheetId': sheetId } }, {
+            }, { $set: { 'timesheetId': sheetId } }, {
                 multi: true,
                 arrayFilters: [
                     {
-                        'el.startTime': { $gte: startDate },
-                        'el.endTime': { $lte: endDate },
-                        'el.timesheetId': null,
+                        'startTime': { $gte: startDate },
+                        'endTime': { $lte: endDate },
+                        'timesheetId': null,
                     },
                 ],
             });
@@ -1997,13 +2056,13 @@ let TimeRecordRepository = class TimeRecordRepository {
     }
     async disapproveTimeRecords(orgId, sheetId) {
         try {
-            await this.timeTrackerModel.updateMany({
+            await this.timeRecordsModel.updateMany({
                 orgId,
-            }, { $set: { 'timeRecords.$[el].timesheetId': null } }, {
+            }, { $set: { 'timesheetId': null } }, {
                 multi: true,
                 arrayFilters: [
                     {
-                        'el.timesheetId': sheetId,
+                        'timesheetId': sheetId,
                     },
                 ],
             });
@@ -2045,16 +2104,17 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TimesheetRepository = void 0;
 const inversify_1 = __webpack_require__(/*! inversify */ "inversify");
+const _ = __webpack_require__(/*! lodash */ "lodash");
 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 });
+        const trackDoc = await this.timesheetsModel.findOne({ orgId });
         if (trackDoc && trackDoc.timesheets) {
             return trackDoc.timesheets;
         }
@@ -2066,7 +2126,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.update({ orgId }, { $push: { timesheets: request } }, { upsert: true });
             return true;
         }
         catch (err) {
@@ -2075,7 +2135,11 @@ let TimesheetRepository = class TimesheetRepository {
     }
     async updateTimesheet(orgId, sheetId, request) {
         try {
-            const response = await this.timeTrackerModel.update({ orgId, timesheets: { $elemMatch: { _id: sheetId } } }, { $set: { 'timesheets.$': request } });
+            let setRequest = {};
+            _.forIn(request, (value, key) => {
+                setRequest = Object.assign(Object.assign({}, setRequest), { [`timesheets.$.${key}`]: value });
+            });
+            const response = await this.timesheetsModel.update({ orgId, timesheets: { $elemMatch: { _id: sheetId } } }, { $set: Object.assign({}, setRequest) });
             return response;
         }
         catch (err) {
@@ -2084,7 +2148,7 @@ 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 },
             }, {
@@ -2100,7 +2164,7 @@ let TimesheetRepository = class TimesheetRepository {
     }
     async removeTimesheet(userId, orgId, sheetId) {
         try {
-            await this.timeTrackerModel.update({
+            await this.timesheetsModel.update({
                 orgId,
             }, {
                 $pull: { timesheets: { _id: sheetId } },