pha-hermes 1.0.5 → 1.2.0

package/package.json

@@ -1,5 +1,5 @@
 {
-    "version": "1.0.5",
+    "version": "1.2.0",
     "main": "dist/index.js",
     "typings": "dist/index.d.ts",
     "files": [
@@ -24,10 +24,13 @@
         }
     },
     "prettier": {
-        "printWidth": 80,
-        "semi": true,
         "singleQuote": true,
-        "trailingComma": "es5"
+        "trailingComma": "none",
+        "printWidth": 100,
+        "semi": false,
+        "arrowParens": "avoid",
+        "bracketSpacing": true,
+        "tabWidth": 4
     },
     "name": "pha-hermes",
     "author": "Pierre Seguin",
@@ -52,6 +55,7 @@
         "size-limit": "^11.1.6",
         "tsdx": "^0.14.1",
         "tslib": "^2.8.1",
-        "typescript": "^3.9.10"
+        "typescript": "^3.9.10",
+        "vitest": "^3.0.5"
     }
 }

package/src/api/apiClient.ts

@@ -2,7 +2,9 @@ import axios, { AxiosInstance } from 'axios'
 import { SFAuthenticator } from './auth/auth'
 import { SFTimesheetClient } from './timesheet/timesheetClient'
 import { SFPractitionerClient } from './practitioner/practitionerClient'
-import { Role, Workorder } from '../models'
+import { Role } from '../models'
+import { SFWorkorderClient } from './workorder/workorderClient'
+
 export const SF_API_VERSION: string = 'v57.0'
 
 export class SFApiClient {
@@ -11,6 +13,7 @@ export class SFApiClient {
     private authenticator: SFAuthenticator
     private baseUrl: string
     timesheetClient: SFTimesheetClient
+    workorderClient: SFWorkorderClient
     practitionerClient: SFPractitionerClient
 
     constructor(baseUrl?: string) {
@@ -19,6 +22,7 @@ export class SFApiClient {
             baseUrl ?? 'https://do0000000d247eaa--phealth.sandbox.my.salesforce.com'
         this.authenticator = new SFAuthenticator(this.axiosInstance, this.baseUrl)
         this.timesheetClient = new SFTimesheetClient(this.axiosInstance)
+        this.workorderClient = new SFWorkorderClient(this.axiosInstance)
         this.practitionerClient = new SFPractitionerClient(this.axiosInstance)
     }
 
@@ -34,32 +38,6 @@ export class SFApiClient {
         return this.instance
     }
 
-    async fetchWorkOrders(assignedStaffId?: string): Promise<Workorder[]> {
-        try {
-            const url = `/services/data/${SF_API_VERSION}/query`
-            const query = assignedStaffId
-                ? `SELECT Id, HospitalID__c, HospitalName__c, ProfessionalDesignation__c FROM WorkOrder__c WHERE Personnel__c = '${assignedStaffId}'`
-                : `SELECT Id, HospitalID__c, HospitalName__c, ProfessionalDesignation__c FROM WorkOrder__c`
-            return await this.axiosInstance
-                .get(url, {
-                    params: { q: query }
-                })
-                .then(({ data: { records } }) =>
-                    records.map(
-                        (record): Workorder => ({
-                            id: record.Id,
-                            establishmentId: record.HospitalID__c,
-                            establishmentName: record.HospitalName__c,
-                            role: record.ProfessionalDesignation__c
-                        })
-                    )
-                )
-        } catch (error) {
-            console.error('Error fetching work orders: ', error.message)
-            throw error
-        }
-    }
-
     async fetchRoles(): Promise<Role[]> {
         try {
             const url = `/services/data/${SF_API_VERSION}/query`
@@ -72,7 +50,12 @@ export class SFApiClient {
                     params: { q: query }
                 })
                 .then(({ data: { records } }) =>
-                    records.map((record): Role => ({ label: record.Label, value: record.Value }))
+                    records.map(
+                        (record): Role => ({
+                            label: record.Label,
+                            value: record.Value
+                        })
+                    )
                 )
         } catch (error) {
             console.error('Error fetching roles: ', error.message)

package/src/api/auth/auth.ts

@@ -1,48 +1,48 @@
-import axios, { AxiosInstance } from 'axios'
-import FormData from 'form-data'
-
-export class SFAuthenticator {
-    axiosTokenInstance: AxiosInstance = axios.create()
-    authenticatedAxiosInstance: AxiosInstance
-    token: string | undefined = undefined
-    private refreshToken: string | undefined = undefined
-
-    constructor(authenticatedAxiosInstance: AxiosInstance, baseUrl?: string) {
-        this.axiosTokenInstance.defaults.baseURL =
-            baseUrl ?? 'https://do0000000d247eaa--phealth.sandbox.my.salesforce.com'
-        this.authenticatedAxiosInstance = authenticatedAxiosInstance
-    }
-
-    async initializeAuth(clientId: string, clientSecret: string) {
-        const token = await this.postToken(clientId, clientSecret)
-        this.authenticatedAxiosInstance.defaults.headers.common['Authorization'] = `Bearer ${token}`
-    }
-
-    async postToken(clientId?: string, clientSecret?: string): Promise<string> {
-        const tokenFormRequestBody = new FormData()
-        if (this.refreshToken) {
-            tokenFormRequestBody.append('refresh_token', this.refreshToken)
-            tokenFormRequestBody.append('grant_type', 'refresh_token')
-        } else if (clientId && clientSecret) {
-            tokenFormRequestBody.append('client_id', clientId)
-            tokenFormRequestBody.append('client_secret', clientSecret)
-            tokenFormRequestBody.append('grant_type', 'client_credentials')
-        } else {
-            throw new Error(
-                'Authentication failed, either the RefreshToken, or ClientId and ClientSecret need to be provided'
-            )
-        }
-
-        const response = await this.axiosTokenInstance.post(
-            '/services/oauth2/token',
-            tokenFormRequestBody,
-            {
-                headers: tokenFormRequestBody.getHeaders()
-            }
-        )
-
-        this.token = response?.data?.['access_token']
-        if (!this.token) throw new Error('Authentication failed, could not get the access token')
-        return this.token
-    }
-}
+import axios, { AxiosInstance } from 'axios'
+import FormData from 'form-data'
+
+export class SFAuthenticator {
+    axiosTokenInstance: AxiosInstance = axios.create()
+    authenticatedAxiosInstance: AxiosInstance
+    token: string | undefined = undefined
+    private refreshToken: string | undefined = undefined
+
+    constructor(authenticatedAxiosInstance: AxiosInstance, baseUrl?: string) {
+        this.axiosTokenInstance.defaults.baseURL =
+            baseUrl ?? 'https://do0000000d247eaa--phealth.sandbox.my.salesforce.com'
+        this.authenticatedAxiosInstance = authenticatedAxiosInstance
+    }
+
+    async initializeAuth(clientId: string, clientSecret: string) {
+        const token = await this.postToken(clientId, clientSecret)
+        this.authenticatedAxiosInstance.defaults.headers.common['Authorization'] = `Bearer ${token}`
+    }
+
+    async postToken(clientId?: string, clientSecret?: string): Promise<string> {
+        const tokenFormRequestBody = new FormData()
+        if (this.refreshToken) {
+            tokenFormRequestBody.append('refresh_token', this.refreshToken)
+            tokenFormRequestBody.append('grant_type', 'refresh_token')
+        } else if (clientId && clientSecret) {
+            tokenFormRequestBody.append('client_id', clientId)
+            tokenFormRequestBody.append('client_secret', clientSecret)
+            tokenFormRequestBody.append('grant_type', 'client_credentials')
+        } else {
+            throw new Error(
+                'Authentication failed, either the RefreshToken, or ClientId and ClientSecret need to be provided'
+            )
+        }
+
+        const response = await this.axiosTokenInstance.post(
+            '/services/oauth2/token',
+            tokenFormRequestBody,
+            {
+                headers: tokenFormRequestBody.getHeaders()
+            }
+        )
+
+        this.token = response?.data?.['access_token']
+        if (!this.token) throw new Error('Authentication failed, could not get the access token')
+        return this.token
+    }
+}

package/src/api/timesheet/timesheetClient.ts

@@ -13,7 +13,7 @@ export class SFTimesheetClient {
         try {
             const url = `/services/data/${SF_API_VERSION}/sobjects/TimeSheetHour__c/${timesheetHourId}`
             const response = await this.axiosInstance.patch(url, {
-                Date__c: timesheet.date, 
+                Date__c: timesheet.date,
                 Callback__c: timesheet.callbackHours,
                 HoursEBAdjusted__c: timesheet.regularHours,
                 Misc__c: timesheet.miscHours,
@@ -41,7 +41,10 @@ export class SFTimesheetClient {
     async getTimesheetId(workorderId: string): Promise<string> {
         // First we find the correct timesheet id
         const url = `/services/data/${SF_API_VERSION}/query`
-        const query = `SELECT Id FROM Timesheet__c WHERE WorkOrder__c = '${workorderId}' LIMIT 1`
+        const query = `SELECT Id
+                       FROM Timesheet__c
+                       WHERE WorkOrder__c = '${workorderId}'
+                       LIMIT 1`
         const {
             data: { records }
         } = await this.axiosInstance.get(url, {
@@ -50,11 +53,42 @@ export class SFTimesheetClient {
         return records[0].Id
     }
 
+    async getTimesheetsForPractitioner(personnelID: string) {
+        const url = `/services/data/${SF_API_VERSION}/query`
+
+        const query = `SELECT FIELDS(STANDARD), WorkOrder__c
+                       FROM TimeSheet__c
+                       WHERE WorkOrder__c IN (SELECT Id
+                                              FROM WorkOrder__c
+                                              WHERE Personnel__c = '${personnelID}')`
+
+        const data = await this.axiosInstance.get(url, { params: { q: query } })
+
+        return data.data.records
+    }
+
+    async getTimesheetsIdAndDateForPractitioner(personnelID: string) {
+        const url = `/services/data/${SF_API_VERSION}/query`
+
+        const query = `SELECT Id, LastModifiedDate
+                       FROM TimeSheet__c
+                       WHERE WorkOrder__c IN (SELECT Id
+                                              FROM WorkOrder__c
+                                              WHERE Personnel__c = '${personnelID}')`
+
+        const data = await this.axiosInstance.get(url, { params: { q: query } })
+
+        return data.data.records.map(({Id, LastModifiedDate}) => ({Id, LastModifiedDate}))
+    }
+
+
     async getTimesheetHoursIds(workorderId: string): Promise<string[]> {
         const timesheetId = await this.getTimesheetId(workorderId)
         // 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 query = `SELECT Id
+                       FROM TimesheetHour__c
+                       WHERE Timesheet__c = '${timesheetId}'`
         const {
             data: { records }
         } = await this.axiosInstance.get(url, {

package/src/api/workorder/workorderClient.ts

@@ -0,0 +1,43 @@
+import { AxiosInstance } from 'axios'
+import { SF_API_VERSION } from '../apiClient'
+import { Workorder } from '../../models'
+
+export class SFWorkorderClient {
+    private axiosInstance: AxiosInstance
+
+    constructor(axiosInstance: AxiosInstance) {
+        this.axiosInstance = axiosInstance
+    }
+
+
+    async getWorkordersForPractitioner(assignedStaffId?: string): Promise<Workorder[]> {
+        try {
+            const url = `/services/data/${SF_API_VERSION}/query`
+            const query = assignedStaffId
+                ? `SELECT Id, HospitalID__c, HospitalName__c, ProfessionalDesignation__c, Personnel__c, startdate__c, EndDate__c, CreatedDate, LastModifiedDate FROM WorkOrder__c WHERE Personnel__c = '${assignedStaffId}'`
+                : `SELECT Id, HospitalID__c, HospitalName__c, ProfessionalDesignation__c, Personnel__c, startdate__c, EndDate__c, CreatedDate, LastModifiedDate FROM WorkOrder__c`
+            return await this.axiosInstance
+                .get(url, {
+                    params: { q: query }
+                })
+                .then(({ data: { records } }) =>
+                    records.map(
+                        (record): Workorder => ({
+                            id: record.Id,
+                            establishmentId: record.HospitalID__c,
+                            establishmentName: record.HospitalName__c,
+                            role: record.ProfessionalDesignation__c,
+                            assignedStaffId: record.Personnel__c,
+                            startDate: new Date(record.startdate__c),
+                            endDate: new Date(record.EndDate__c),
+                            createdAt: new Date(record.CreatedDate),
+                            updatedAt: new Date(record.LastModifiedDate)
+                        })
+                    )
+                )
+        } catch (error) {
+            console.error('Error fetching work orders: ', error.message)
+            throw error
+        }
+    }
+}

package/src/models/index.ts

@@ -8,6 +8,11 @@ export interface Workorder {
     establishmentName: string
     establishmentId: string
     role: string
+    assignedStaffId: string
+    startDate: Date
+    endDate: Date
+    createdAt: Date
+    updatedAt: Date
 }
 
 export * from './timesheet'

package/src/models/practitioner.ts

@@ -4,4 +4,4 @@ export interface Practitioner {
     lastName: string
     email: string
     staffId: string
-}
+}

package/src/models/timesheet.ts

@@ -1,21 +1,21 @@
-export interface TimesheetDayEntry {
-    date?: Date
-    callbackHours?: number
-    regularHours?: number
-    miscHours?: number
-    overtime1Hours?: number
-    overtime2Hours?: number
-    onCallHours?: number
-    misc1HoursA?: number
-    misc1HoursB?: number
-    misc2Hours?: number
-    misc3Hours?: number
-    misc4Hours?: number
-    stat1Hours?: number
-    stat2Hours?: number
-    // "EmployeeTimeCardEntry__c": null, // unknown entry in salesforce
-    inChargeHours?: number
-    // "Shift_Differential__c": number, // unknown entry in salesforce
-    shiftTravelPerDiemHours?: number
-    // "Weekend_Differential__c": number // unknown entry in salesforce
-}
+export interface TimesheetDayEntry {
+    date?: Date
+    callbackHours?: number
+    regularHours?: number
+    miscHours?: number
+    overtime1Hours?: number
+    overtime2Hours?: number
+    onCallHours?: number
+    misc1HoursA?: number
+    misc1HoursB?: number
+    misc2Hours?: number
+    misc3Hours?: number
+    misc4Hours?: number
+    stat1Hours?: number
+    stat2Hours?: number
+    // "EmployeeTimeCardEntry__c": null, // unknown entry in salesforce
+    inChargeHours?: number
+    // "Shift_Differential__c": number, // unknown entry in salesforce
+    shiftTravelPerDiemHours?: number
+    // "Weekend_Differential__c": number // unknown entry in salesforce
+}