pha-hermes 1.12.0 → 1.13.0

package/src/api/timesheet/timesheetClient.ts

@@ -2,29 +2,6 @@ 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
 
@@ -61,23 +38,13 @@ export class SFTimesheetClient {
         }
     }
 
-    async getTimesheetIds(workorderId: string, periodStartDate?: Date, periodEndDate?: Date): Promise<string[]> {
+    async getTimesheetId(workorderId: string): Promise<string> {
         // Find all timesheet Ids that belong to this WO
         const url = `/services/data/${SF_API_VERSION}/query`
-        let query = `SELECT Id
+        const query = `SELECT Id
                        FROM Timesheet__c
-                       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)
-        }
+                       WHERE WorkOrder__c = '${workorderId}'
+                       `
         const {
             data: { records }
         } = await this.axiosInstance.get(url, {
@@ -110,34 +77,63 @@ export class SFTimesheetClient {
         return timesheets
     }
 
-    async getTimesheetHours(workorderId: string, fields?: SFTimesheetHourFieldKeys[], periodStartDate?: Date, periodEndDate?: Date): Promise<TimesheetDayEntry[]> {
-        const timesheetIds = await this.getTimesheetIds(workorderId, periodStartDate, periodEndDate)
+    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)
+    }
 
-        const allHours: SFTimesheetHourField[] = []
+    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 url = `/services/data/${SF_API_VERSION}/query`
+
         for (const timesheetId of timesheetIds) {
-            let query = `
-                    SELECT ${fields?.join(',') || 'FIELDS(STANDARD)'}
-                    FROM TimesheetHour__c
-                    WHERE Timesheet__c = '${timesheetId}'`
+            const query = `
+            SELECT Id
+            FROM TimesheetHour__c
+            WHERE Timesheet__c = '${timesheetId}'
+            AND Date__c = ${formattedDate}
+        `
             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<{ records: SFTimesheetHourField[] }>(url, {
+                } = await this.axiosInstance.get(url, {
                     params: { q: query }
                 })
-                allHours.push(...records)
+
+                const ids = records.map(record => record.Id)
+                allHourIds.push(...ids)
             } catch (err) {
                 console.error(`Failed to fetch`, err)
+                return []
             }
         }
-        return allHours.map(toTimesheetDayEntry)
+
+        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)
+            )
+        )
     }
 
     async getPayPeriods(): Promise<any> {
@@ -218,7 +214,7 @@ export class SFTimesheetClient {
     }
 }
 
-function toTimesheetDayEntry(raw: SFTimesheetHourField): TimesheetDayEntry {
+function toTimesheetDayEntry(raw: any): TimesheetDayEntry {
     return {
         id: raw.Id,
         date: raw.Date__c,