pha-hermes 1.12.0 → 1.13.0

package/dist/api/timesheet/timesheetClient.d.ts

@@ -1,35 +1,15 @@
 /// <reference types="node" />
 import { AxiosInstance } from 'axios';
 import { TimesheetDayEntry } from '../../models';
-interface SFTimesheetHourField {
-    Id: string;
-    Date__c: Date;
-    Callback__c: number;
-    HoursEBAdjusted__c: number;
-    Misc__c: number;
-    OT1__c: number;
-    OT2__c: number;
-    OnCall__c: number;
-    Misc1__c: number;
-    Misc_1_Hours__c: number;
-    Misc_2_Hours__c: number;
-    Misc_3_Hours__c: number;
-    Misc_4_Hours__c: number;
-    Stat1__c: number;
-    Stat2__c: number;
-    In_Charge__c: number;
-    Shift_Travel_Stipend__c: number;
-    LastModifiedDate: Date;
-}
-declare type SFTimesheetHourFieldKeys = (keyof SFTimesheetHourField)[];
 export declare class SFTimesheetClient {
     private axiosInstance;
     constructor(axiosInstance: AxiosInstance);
     updateTimesheetHour(timesheetHourId: string, timesheet: TimesheetDayEntry): Promise<void>;
-    getTimesheetIds(workorderId: string, periodStartDate?: Date, periodEndDate?: Date): Promise<string[]>;
+    getTimesheetId(workorderId: string): Promise<string>;
     getTimesheetsForPractitioner(personnelID: string): Promise<any[]>;
-    getTimesheetHours(workorderId: string, fields?: SFTimesheetHourFieldKeys[], periodStartDate?: Date, periodEndDate?: Date): Promise<TimesheetDayEntry[]>;
+    getTimesheetHoursIds(workorderId: string): Promise<string[]>;
+    getTimesheetHoursId(workorderId: string, timesheetDate: Date): Promise<string[]>;
+    getTimesheetHours(workorderId: string): Promise<TimesheetDayEntry[]>;
     getPayPeriods(): Promise<any>;
     uploadImageToTimesheet(file: Buffer, filename: string, timesheetId: string): Promise<void>;
 }
-export {};

package/dist/pha-hermes.cjs.development.js

@@ -575,44 +575,37 @@ var SFTimesheetClient = /*#__PURE__*/function () {
     }
     return updateTimesheetHour;
   }();
-  _proto.getTimesheetIds = /*#__PURE__*/function () {
-    var _getTimesheetIds = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(workorderId, periodStartDate, periodEndDate) {
+  _proto.getTimesheetId = /*#__PURE__*/function () {
+    var _getTimesheetId = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(workorderId) {
       var url, query, _yield$this$axiosInst, records;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             // Find all timesheet Ids that belong to this WO
             url = "/services/data/" + SF_API_VERSION + "/query";
-            query = "SELECT Id\n                       FROM Timesheet__c\n                       WHERE WorkOrder__c = '" + workorderId + "'";
-            try {
-              if (periodStartDate && periodEndDate) {
-                query += "\n                    AND PayPeriodStartDate__c <= " + new Date(periodStartDate).toISOString().substring(0, 10) + "\n                    AND PayPeriodEndDate__c >= " + new Date(periodEndDate).toISOString().substring(0, 10) + "\n                ";
-              }
-            } catch (error) {
-              console.error('Invalid period dates', error);
-            }
-            _context2.next = 5;
+            query = "SELECT Id\n                       FROM Timesheet__c\n                       WHERE WorkOrder__c = '" + workorderId + "'\n                       ";
+            _context2.next = 4;
             return this.axiosInstance.get(url, {
               params: {
                 q: query
               }
             });
-          case 5:
+          case 4:
             _yield$this$axiosInst = _context2.sent;
             records = _yield$this$axiosInst.data.records;
             return _context2.abrupt("return", records.map(function (record) {
               return record.Id;
             }));
-          case 8:
+          case 7:
           case "end":
             return _context2.stop();
         }
       }, _callee2, this);
     }));
-    function getTimesheetIds(_x3, _x4, _x5) {
-      return _getTimesheetIds.apply(this, arguments);
+    function getTimesheetId(_x3) {
+      return _getTimesheetId.apply(this, arguments);
     }
-    return getTimesheetIds;
+    return getTimesheetId;
   }();
   _proto.getTimesheetsForPractitioner = /*#__PURE__*/function () {
     var _getTimesheetsForPractitioner = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(personnelID) {
@@ -646,83 +639,162 @@ var SFTimesheetClient = /*#__PURE__*/function () {
         }
       }, _callee3, this);
     }));
-    function getTimesheetsForPractitioner(_x6) {
+    function getTimesheetsForPractitioner(_x4) {
       return _getTimesheetsForPractitioner.apply(this, arguments);
     }
     return getTimesheetsForPractitioner;
   }();
-  _proto.getTimesheetHours = /*#__PURE__*/function () {
-    var _getTimesheetHours = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(workorderId, fields, periodStartDate, periodEndDate) {
-      var timesheetIds, allHours, url, _iterator2, _step2, timesheetId, query, _yield$this$axiosInst2, records;
+  _proto.getTimesheetHoursIds = /*#__PURE__*/function () {
+    var _getTimesheetHoursIds = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(workorderId) {
+      var timesheetIds, timesheetId, url, query, _yield$this$axiosInst2, records;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
             _context4.next = 2;
-            return this.getTimesheetIds(workorderId, periodStartDate, periodEndDate);
+            return this.getTimesheetId(workorderId);
           case 2:
             timesheetIds = _context4.sent;
-            allHours = [];
+            timesheetId = timesheetIds[0]; // First we find the correct timesheet hours id
+            url = "/services/data/" + SF_API_VERSION + "/query";
+            query = "SELECT Id\n                       FROM TimesheetHour__c\n                       WHERE Timesheet__c = '" + timesheetId + "'";
+            _context4.next = 8;
+            return this.axiosInstance.get(url, {
+              params: {
+                q: query
+              }
+            });
+          case 8:
+            _yield$this$axiosInst2 = _context4.sent;
+            records = _yield$this$axiosInst2.data.records;
+            return _context4.abrupt("return", records.map(function (_ref) {
+              var Id = _ref.Id;
+              return Id;
+            }));
+          case 11:
+          case "end":
+            return _context4.stop();
+        }
+      }, _callee4, this);
+    }));
+    function getTimesheetHoursIds(_x5) {
+      return _getTimesheetHoursIds.apply(this, arguments);
+    }
+    return getTimesheetHoursIds;
+  }();
+  _proto.getTimesheetHoursId = /*#__PURE__*/function () {
+    var _getTimesheetHoursId = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(workorderId, timesheetDate) {
+      var timesheetIds, formattedDate, allHourIds, url, _iterator2, _step2, timesheetId, query, _yield$this$axiosInst3, records, ids;
+      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
+          case 0:
+            _context5.next = 2;
+            return this.getTimesheetId(workorderId);
+          case 2:
+            timesheetIds = _context5.sent;
+            formattedDate = timesheetDate.toISOString().split('T')[0];
+            allHourIds = [];
             url = "/services/data/" + SF_API_VERSION + "/query";
             _iterator2 = _createForOfIteratorHelperLoose(timesheetIds);
-          case 6:
+          case 7:
             if ((_step2 = _iterator2()).done) {
-              _context4.next = 23;
+              _context5.next = 25;
               break;
             }
             timesheetId = _step2.value;
-            query = "\n                    SELECT " + ((fields == null ? void 0 : fields.join(',')) || 'FIELDS(STANDARD)') + "\n                    FROM TimesheetHour__c\n                    WHERE Timesheet__c = '" + timesheetId + "'";
-            _context4.prev = 9;
-            if (fields != null && fields.length) {
-              query += "\n                        AND Date__c >= " + new Date(periodStartDate).toISOString().substring(0, 10) + "\n                        AND Date__c <= " + new Date(periodEndDate).toISOString().substring(0, 10);
-            }
-            _context4.next = 13;
+            query = "\n            SELECT Id\n            FROM TimesheetHour__c\n            WHERE Timesheet__c = '" + timesheetId + "'\n            AND Date__c = " + formattedDate + "\n        ";
+            _context5.prev = 10;
+            _context5.next = 13;
             return this.axiosInstance.get(url, {
               params: {
                 q: query
               }
             });
           case 13:
-            _yield$this$axiosInst2 = _context4.sent;
-            records = _yield$this$axiosInst2.data.records;
-            allHours.push.apply(allHours, records);
-            _context4.next = 21;
-            break;
-          case 18:
-            _context4.prev = 18;
-            _context4.t0 = _context4["catch"](9);
-            console.error("Failed to fetch", _context4.t0);
-          case 21:
-            _context4.next = 6;
+            _yield$this$axiosInst3 = _context5.sent;
+            records = _yield$this$axiosInst3.data.records;
+            ids = records.map(function (record) {
+              return record.Id;
+            });
+            allHourIds.push.apply(allHourIds, ids);
+            _context5.next = 23;
             break;
+          case 19:
+            _context5.prev = 19;
+            _context5.t0 = _context5["catch"](10);
+            console.error("Failed to fetch", _context5.t0);
+            return _context5.abrupt("return", []);
           case 23:
-            return _context4.abrupt("return", allHours.map(toTimesheetDayEntry));
-          case 24:
+            _context5.next = 7;
+            break;
+          case 25:
+            return _context5.abrupt("return", allHourIds);
+          case 26:
           case "end":
-            return _context4.stop();
+            return _context5.stop();
+        }
+      }, _callee5, this, [[10, 19]]);
+    }));
+    function getTimesheetHoursId(_x6, _x7) {
+      return _getTimesheetHoursId.apply(this, arguments);
+    }
+    return getTimesheetHoursId;
+  }();
+  _proto.getTimesheetHours = /*#__PURE__*/function () {
+    var _getTimesheetHours = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(workorderId) {
+      var _this = this;
+      var timesheetHourIds;
+      return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
+          case 0:
+            _context7.next = 2;
+            return this.getTimesheetHoursIds(workorderId);
+          case 2:
+            timesheetHourIds = _context7.sent;
+            return _context7.abrupt("return", Promise.all(timesheetHourIds.map(/*#__PURE__*/function () {
+              var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(id) {
+                return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+                  while (1) switch (_context6.prev = _context6.next) {
+                    case 0:
+                      return _context6.abrupt("return", _this.axiosInstance.get("/services/data/" + SF_API_VERSION + "/sobjects/TimeSheetHour__c/" + id).then(function (res) {
+                        return res.data;
+                      }).then(toTimesheetDayEntry));
+                    case 1:
+                    case "end":
+                      return _context6.stop();
+                  }
+                }, _callee6);
+              }));
+              return function (_x9) {
+                return _ref2.apply(this, arguments);
+              };
+            }())));
+          case 4:
+          case "end":
+            return _context7.stop();
         }
-      }, _callee4, this, [[9, 18]]);
+      }, _callee7, this);
     }));
-    function getTimesheetHours(_x7, _x8, _x9, _x10) {
+    function getTimesheetHours(_x8) {
       return _getTimesheetHours.apply(this, arguments);
     }
     return getTimesheetHours;
   }();
   _proto.getPayPeriods = /*#__PURE__*/function () {
-    var _getPayPeriods = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+    var _getPayPeriods = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
       var url, query, data, payPeriods, _iterator3, _step3, payPeriod;
-      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
+      return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+        while (1) switch (_context8.prev = _context8.next) {
           case 0:
             url = "/services/data/" + SF_API_VERSION + "/query";
             query = "SELECT Name,\n                              StartDate__c,\n                              EndDate__c\n                       FROM PayPeriod__c";
-            _context5.next = 4;
+            _context8.next = 4;
             return this.axiosInstance.get(url, {
               params: {
                 q: query
               }
             });
           case 4:
-            data = _context5.sent;
+            data = _context8.sent;
             payPeriods = [];
             for (_iterator3 = _createForOfIteratorHelperLoose(data.data.records); !(_step3 = _iterator3()).done;) {
               payPeriod = _step3.value;
@@ -732,12 +804,12 @@ var SFTimesheetClient = /*#__PURE__*/function () {
                 endDate: payPeriod.EndDate__c
               });
             }
-            return _context5.abrupt("return", payPeriods);
+            return _context8.abrupt("return", payPeriods);
           case 8:
           case "end":
-            return _context5.stop();
+            return _context8.stop();
         }
-      }, _callee5, this);
+      }, _callee8, this);
     }));
     function getPayPeriods() {
       return _getPayPeriods.apply(this, arguments);
@@ -745,12 +817,12 @@ var SFTimesheetClient = /*#__PURE__*/function () {
     return getPayPeriods;
   }();
   _proto.uploadImageToTimesheet = /*#__PURE__*/function () {
-    var _uploadImageToTimesheet = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(file, filename, timesheetId) {
-      var form, uploadRes, versionId, _yield$this$axiosInst3, data, contentDocumentId, _err$response;
-      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
+    var _uploadImageToTimesheet = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9(file, filename, timesheetId) {
+      var form, uploadRes, versionId, _yield$this$axiosInst4, data, contentDocumentId, _err$response;
+      return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+        while (1) switch (_context9.prev = _context9.next) {
           case 0:
-            _context6.prev = 0;
+            _context9.prev = 0;
             form = new FormData();
             form.append('entity_content', JSON.stringify({
               Title: filename,
@@ -762,24 +834,24 @@ var SFTimesheetClient = /*#__PURE__*/function () {
               filename: filename,
               contentType: 'application/octet-stream'
             });
-            _context6.next = 6;
+            _context9.next = 6;
             return this.axiosInstance.post("/services/data/" + SF_API_VERSION + "/sobjects/ContentVersion", form, {
               headers: form.getHeaders()
             });
           case 6:
-            uploadRes = _context6.sent;
+            uploadRes = _context9.sent;
             versionId = uploadRes.data.id; //get ContentDocumentId
-            _context6.next = 10;
+            _context9.next = 10;
             return this.axiosInstance.get("/services/data/" + SF_API_VERSION + "/query", {
               params: {
                 q: "SELECT ContentDocumentId FROM ContentVersion WHERE Id = '" + versionId + "'"
               }
             });
           case 10:
-            _yield$this$axiosInst3 = _context6.sent;
-            data = _yield$this$axiosInst3.data;
+            _yield$this$axiosInst4 = _context9.sent;
+            data = _yield$this$axiosInst4.data;
             contentDocumentId = data.records[0].ContentDocumentId;
-            _context6.next = 15;
+            _context9.next = 15;
             return this.axiosInstance.post("/services/data/" + SF_API_VERSION + "/sobjects/ContentDocumentLink", {
               ContentDocumentId: contentDocumentId,
               LinkedEntityId: timesheetId,
@@ -787,20 +859,20 @@ var SFTimesheetClient = /*#__PURE__*/function () {
               Visibility: 'AllUsers'
             });
           case 15:
-            _context6.next = 21;
+            _context9.next = 21;
             break;
           case 17:
-            _context6.prev = 17;
-            _context6.t0 = _context6["catch"](0);
-            console.error('Salesforce error response:', _context6.t0 == null || (_err$response = _context6.t0.response) == null ? void 0 : _err$response.data);
-            console.error('Error uploading and linking image:', _context6.t0 == null ? void 0 : _context6.t0.message);
+            _context9.prev = 17;
+            _context9.t0 = _context9["catch"](0);
+            console.error('Salesforce error response:', _context9.t0 == null || (_err$response = _context9.t0.response) == null ? void 0 : _err$response.data);
+            console.error('Error uploading and linking image:', _context9.t0 == null ? void 0 : _context9.t0.message);
           case 21:
           case "end":
-            return _context6.stop();
+            return _context9.stop();
         }
-      }, _callee6, this, [[0, 17]]);
+      }, _callee9, this, [[0, 17]]);
     }));
-    function uploadImageToTimesheet(_x11, _x12, _x13) {
+    function uploadImageToTimesheet(_x10, _x11, _x12) {
       return _uploadImageToTimesheet.apply(this, arguments);
     }
     return uploadImageToTimesheet;