pha-hermes 1.11.0 → 1.12.0

package/src/api/timesheet/timesheetClient.ts

@@ -2,6 +2,29 @@ import { AxiosInstance } from 'axios'
 import { TimesheetDayEntry } from '../../models'
 import { SF_API_VERSION } from '../apiClient'
 import FormData from 'form-data'
+
+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
+}
+type SFTimesheetHourFieldKeys = (keyof SFTimesheetHourField)[]
+
 export class SFTimesheetClient {
     private axiosInstance: AxiosInstance
 
@@ -38,13 +61,23 @@ export class SFTimesheetClient {
         }
     }
 
-    async getTimesheetId(workorderId: string): Promise<string> {
+    async getTimesheetIds(workorderId: string, periodStartDate?: Date, periodEndDate?: Date): Promise<string[]> {
         // Find all timesheet Ids that belong to this WO
         const url = `/services/data/${SF_API_VERSION}/query`
-        const query = `SELECT Id
+        let query = `SELECT Id
                        FROM Timesheet__c
-                       WHERE WorkOrder__c = '${workorderId}'
-                       `
+                       WHERE WorkOrder__c = '${workorderId}'`
+        try {
+            if (periodStartDate && periodEndDate) {
+                query += `
+                    AND PayPeriodStartDate__c <= ${new Date(periodStartDate).toISOString().substring(0, 10)}
+                    AND PayPeriodEndDate__c >= ${new Date(periodEndDate).toISOString().substring(0, 10)}
+                `
+            }
+        }
+        catch (error) {
+            console.error('Invalid period dates', error)
+        }
         const {
             data: { records }
         } = await this.axiosInstance.get(url, {
@@ -77,63 +110,34 @@ export class SFTimesheetClient {
         return timesheets
     }
 
-    async getTimesheetHoursIds(workorderId: string): Promise<string[]> {
-        const timesheetIds = await this.getTimesheetId(workorderId)
-        const timesheetId = timesheetIds[0]
-        // First we find the correct timesheet hours id
-        const url = `/services/data/${SF_API_VERSION}/query`
-        const query = `SELECT Id
-                       FROM TimesheetHour__c
-                       WHERE Timesheet__c = '${timesheetId}'`
-        const {
-            data: { records }
-        } = await this.axiosInstance.get(url, {
-            params: { q: query }
-        })
-        return records.map(({ Id }) => Id)
-    }
+    async getTimesheetHours(workorderId: string, fields?: SFTimesheetHourFieldKeys[], periodStartDate?: Date, periodEndDate?: Date): Promise<TimesheetDayEntry[]> {
+        const timesheetIds = await this.getTimesheetIds(workorderId, periodStartDate, periodEndDate)
 
-    async getTimesheetHoursId(workorderId: string, timesheetDate: Date): Promise<string[]> {
-        const timesheetIds = await this.getTimesheetId(workorderId)
-        const formattedDate = timesheetDate.toISOString().split('T')[0]
-        const allHourIds: string[] = []
+        const allHours: SFTimesheetHourField[] = []
         const url = `/services/data/${SF_API_VERSION}/query`
-
         for (const timesheetId of timesheetIds) {
-            const query = `
-            SELECT Id
-            FROM TimesheetHour__c
-            WHERE Timesheet__c = '${timesheetId}'
-            AND Date__c = ${formattedDate}
-        `
+            let query = `
+                    SELECT ${fields?.join(',') || 'FIELDS(STANDARD)'}
+                    FROM TimesheetHour__c
+                    WHERE Timesheet__c = '${timesheetId}'`
             try {
+                if (fields?.length) {
+                    query += `
+                        AND Date__c >= ${new Date(periodStartDate).toISOString().substring(0, 10)}
+                        AND Date__c <= ${new Date(periodEndDate).toISOString().substring(0, 10)}`
+                }
+
                 const {
                     data: { records }
-                } = await this.axiosInstance.get(url, {
+                } = await this.axiosInstance.get<{ records: SFTimesheetHourField[] }>(url, {
                     params: { q: query }
                 })
-
-                const ids = records.map(record => record.Id)
-                allHourIds.push(...ids)
+                allHours.push(...records)
             } catch (err) {
                 console.error(`Failed to fetch`, err)
-                return []
             }
         }
-
-        return allHourIds
-    }
-
-    async getTimesheetHours(workorderId: string): Promise<TimesheetDayEntry[]> {
-        const timesheetHourIds = await this.getTimesheetHoursIds(workorderId)
-        return Promise.all(
-            timesheetHourIds.map(async id =>
-                this.axiosInstance
-                    .get(`/services/data/${SF_API_VERSION}/sobjects/TimeSheetHour__c/${id}`)
-                    .then(res => res.data)
-                    .then(toTimesheetDayEntry)
-            )
-        )
+        return allHours.map(toTimesheetDayEntry)
     }
 
     async getPayPeriods(): Promise<any> {
@@ -166,10 +170,19 @@ export class SFTimesheetClient {
     ): Promise<void> {
         try {
             const form = new FormData()
-            form.append('Title', filename)
-            form.append('PathOnClient', filename)
-            form.append('VersionData', file, { filename })
+            form.append(
+                'entity_content',
+                JSON.stringify({
+                    Title: filename,
+                    PathOnClient: filename
+                }),
+                { contentType: 'application/json' }
+            )
 
+            form.append('VersionData', file, {
+                filename,
+                contentType: 'application/octet-stream'
+            })
             const uploadRes = await this.axiosInstance.post(
                 `/services/data/${SF_API_VERSION}/sobjects/ContentVersion`,
                 form,
@@ -199,12 +212,13 @@ export class SFTimesheetClient {
                 }
             )
         } catch (err) {
-            console.error('Error uploading and linking image:', err.message)
+            console.error('Salesforce error response:', err?.response?.data)
+            console.error('Error uploading and linking image:', err?.message)
         }
     }
 }
 
-function toTimesheetDayEntry(raw: any): TimesheetDayEntry {
+function toTimesheetDayEntry(raw: SFTimesheetHourField): TimesheetDayEntry {
     return {
         id: raw.Id,
         date: raw.Date__c,

package/src/api/.env

@@ -1,5 +0,0 @@
-I THINK THIS ONE IS WRONG
-SF_CLIENT_ID=3MVG9TZvGM_0NqB09H2fPRxeiDEsovly3D10kwNjOYJNTwBhMc5JHQgCdaSM.2N1V04tb_Tuyj_qktBPNueQd
-SF_CLIENT_SECRET=6F4D40003CF5B156A2AD2BFAD384E74AA9FFFD574E8753EAC485E3C478C50F9F
-GRANT_TYPE=client_credentials
-SALESFORCE_URL=https://do0000000d247eaa--phealth.sandbox.my.salesforce.com