pha-hermes 1.16.0 → 1.18.0

package/src/api/expenses/expenseClient.ts

@@ -5,7 +5,7 @@ import { SF_API_VERSION } from '../salesforce/apiClient'
 type FrontendExpense = {
     workorderPeriodId: string
     amount: string
-    type: 'Other' | 'Lodging' | 'Transportation' | 'Travel (Hours or Amount)' | 'Per diem' | 'Meals'
+    type: 'Other' | 'Lodging' | 'Transportation' | 'Travel (Hours)' | 'Per diem' | 'Meals'
 }
 
 const EXPENSE_FIELD_MAP = {

package/src/api/salesforce/apiClient.ts

@@ -20,23 +20,20 @@ export class SFApiClient {
     payPeriodClient: SFPayPeriodClient
     expenseClient: SFExpenseClient
 
-    constructor(baseUrl?: string) {
+    async init(
+        baseUrl: string,
+        sfClientId: string,
+        sfClientSecret: string,
+        onTokenRefresh?: () => Promise<{ clientId: string; clientSecret: string }>
+    ) {
         this.baseUrl = baseUrl
-        this.axiosInstance.defaults.baseURL =
-            baseUrl ?? 'https://do0000000d247eaa--phealth.sandbox.my.salesforce.com'
+        this.axiosInstance.defaults.baseURL = baseUrl
         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)
         this.payPeriodClient = new SFPayPeriodClient(this.axiosInstance)
         this.expenseClient = new SFExpenseClient(this.axiosInstance)
-    }
-
-    async init(
-        sfClientId: string,
-        sfClientSecret: string,
-        onTokenRefresh?: () => Promise<{ clientId: string; clientSecret: string }>
-    ) {
         // creates authenticator and adds token to axios instance
         await this.authenticator.initializeAuth(sfClientId, sfClientSecret, onTokenRefresh)
     }
@@ -45,6 +42,9 @@ export class SFApiClient {
         this.instance = instance
     }
     getInstance(): SFApiClient {
+        if (!this.instance) {
+            throw new Error('Salesforce Api client not initialized')
+        }
         return this.instance
     }
 

package/src/api/salesforce/auth/auth.ts

@@ -8,9 +8,8 @@ export class SFAuthenticator {
     private refreshToken: string | undefined = undefined
     private tokenRefreshPromise: Promise<string> | null = null
 
-    constructor(authenticatedAxiosInstance: AxiosInstance, baseUrl?: string) {
-        this.axiosTokenInstance.defaults.baseURL =
-            baseUrl ?? 'https://do0000000d247eaa--phealth.sandbox.my.salesforce.com'
+    constructor(authenticatedAxiosInstance: AxiosInstance, baseUrl: string) {
+        this.axiosTokenInstance.defaults.baseURL = baseUrl
         this.authenticatedAxiosInstance = authenticatedAxiosInstance
     }
 
@@ -86,7 +85,6 @@ export class SFAuthenticator {
                 'Authentication failed, either the RefreshToken, or ClientId and ClientSecret need to be provided'
             )
         }
-
         const response = await this.axiosTokenInstance.post(
             '/services/oauth2/token',
             tokenFormRequestBody,
@@ -94,7 +92,6 @@ export class SFAuthenticator {
                 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/salesforce/practitioner/practitionerClient.ts

@@ -9,13 +9,27 @@ export class SFPractitionerClient {
         this.axiosInstance = axiosInstance
     }
 
-    async fetchPractitioners(): Promise<Practitioner[]> {
+    async fetchPractitioners(options?: {
+        createdAt?: string
+        limit?: number
+    }): Promise<Practitioner[]> {
         try {
+            const conditions: string[] = [`Status__c = 'Active'`]
+            if (options?.createdAt) {
+                conditions.push(`CreatedDate > ${options.createdAt}`)
+            }
+            const whereClause = conditions.length ? `WHERE ${conditions.join(' AND ')}` : ''
+            const limitClause =
+                typeof options?.limit === 'number' && options.limit > 0
+                    ? `LIMIT ${Math.floor(options.limit)}`
+                    : ''
             const url = `/services/data/${SF_API_VERSION}/query`
             const query = `
-                SELECT Id, FirstName__c, LastName__c, Email__c, StaffID__c
+                SELECT Id, FirstName__c, LastName__c, Email__c, StaffID__c, CreatedDate
                 FROM Personnel__c
-                WHERE Status__c = 'Active'
+                ${whereClause}
+                ORDER BY CreatedDate ASC, StaffID__c ASC
+                ${limitClause}
             `
             const {
                 data: { records }
@@ -34,7 +48,7 @@ export class SFPractitionerClient {
         try {
             const url = `/services/data/${SF_API_VERSION}/query`
             const query = `
-                SELECT Id, FirstName__c, LastName__c, Email__c, StaffID__c
+                SELECT Id, FirstName__c, LastName__c, Email__c, StaffID__c, CreatedDate
                 FROM Personnel__c
                 WHERE Status__c = 'Active' AND Email__c = '${email}'
             `
@@ -60,6 +74,7 @@ function toPractitioner(raw: any): Practitioner {
         firstName: raw.FirstName__c,
         lastName: raw.LastName__c,
         email: raw.Email__c,
-        staffId: raw.StaffID__c
+        staffId: raw.StaffID__c,
+        createdAt: raw.CreatedDate.replace(/\+0000$/, 'Z')
     }
 }

package/src/models/user.ts

@@ -4,9 +4,10 @@ export interface Practitioner {
     lastName: string
     email: string
     staffId: string
+    createdAt?: string
 }
 
 export interface Role {
     label: string
     value: string
-}
+}