metriport · thomasyopes · Jun 6, 2025 · May 20, 2025 · May 20, 2025 · May 20, 2025
@@ -1,4 +1,5 @@
-import AthenaHealthApi from "@metriport/core/external/ehr/athenahealth/index";
+import { AppointmentMethods } from "@metriport/core/external/ehr/command/get-appointments/ehr-get-appointments";
+import { buildEhrGetAppointmentsHandler } from "@metriport/core/external/ehr/command/get-appointments/ehr-get-appointments-factory";
 import { buildEhrSyncPatientHandler } from "@metriport/core/external/ehr/command/sync-patient/ehr-sync-patient-factory";
 import { executeAsynchronously } from "@metriport/core/util/concurrency";
 import { out } from "@metriport/core/util/log";
@@ -23,7 +24,7 @@ import {
   parallelPatients,
   parallelPractices,
 } from "../../shared/utils/appointment";
-import { LookupMode, LookupModes, createAthenaClient } from "../shared";
+import { LookupMode, LookupModes, createAthenaClientWithTokenIdAndEnvironment } from "../shared";
 import { SyncAthenaPatientIntoMetriportParams } from "./sync-patient";
 
 dayjs.extend(duration);
@@ -149,11 +150,15 @@ async function getAppointments({
   const { log } = out(
     `AthenaHealth getAppointments - cxId ${cxId} practiceId ${practiceId} departmentIds ${departmentIds} lookupMode ${lookupMode}`
   );
-  const api = await createAthenaClient({ cxId, practiceId });
+  const { tokenId, client } = await createAthenaClientWithTokenIdAndEnvironment({
+    cxId,
+    practiceId,
+  });
   try {
     let appointments = await getAppointmentsFromApi({
-      api,
+      tokenId,
       cxId,
+      practiceId,
       departmentIds,
       lookupMode,
       log,
@@ -168,8 +173,8 @@ async function getAppointments({
         return {
           cxId,
           practiceId,
-          patientId: api.createPatientId(appointment.patientid),
-          departmentId: api.createDepartmentId(appointment.departmentid),
+          patientId: client.createPatientId(appointment.patientid),
+          departmentId: client.createDepartmentId(appointment.departmentid),
         };
       }),
     };
@@ -180,44 +185,55 @@ async function getAppointments({
   }
 }
 
-type GetAppointmentsFromApiParams = Omit<GetAppointmentsParams, "practiceId"> & {
-  api: AthenaHealthApi;
+type GetAppointmentsFromApiParams = GetAppointmentsParams & {
+  tokenId: string;
   log: typeof console.log;
 };
 
 async function getAppointmentsFromApi({
-  api,
+  tokenId,
   cxId,
+  practiceId,
   departmentIds,
   lookupMode,
   log,
 }: GetAppointmentsFromApiParams): Promise<BookedAppointment[]> {
+  const handler = buildEhrGetAppointmentsHandler();
+  const handlerParams = {
+    tokenId,
+    cxId,
+    practiceId,
+    departmentIds,
+  };
   if (lookupMode === LookupModes.Appointments) {
     const { startRange, endRange } = getLookForwardTimeRange({
       lookForward: appointmentsLookForward,
     });
     log(`Getting appointments from ${startRange} to ${endRange}`);
-    return await api.getAppointments({
-      cxId,
-      departmentIds,
-      startAppointmentDate: startRange,
-      endAppointmentDate: endRange,
+    return await handler.getAppointments<BookedAppointment>({
+      ...handlerParams,
+      method: AppointmentMethods.athenaGetAppointments,
+      fromDate: startRange,
+      toDate: endRange,
     });
   }
   if (lookupMode === LookupModes.FromSubscription) {
     log(`Getting change events since last call`);
-    return await api.getAppointmentsFromSubscription({ cxId, departmentIds });
+    return await handler.getAppointments<BookedAppointment>({
+      ...handlerParams,
+      method: AppointmentMethods.athenaGetAppointmentFromSubscriptionEvents,
+    });
   }
   if (lookupMode === LookupModes.FromSubscriptionBackfill) {
     const { startRange, endRange } = getLookBackTimeRange({
       lookBack: subscriptionBackfillLookBack,
     });
     log(`Getting already-processed change events from ${startRange} to ${endRange}`);
-    return await api.getAppointmentsFromSubscription({
-      cxId,
-      departmentIds,
-      startProcessedDate: startRange,
-      endProcessedDate: endRange,
+    return await handler.getAppointments<BookedAppointment>({
+      ...handlerParams,
+      method: AppointmentMethods.athenaGetAppointmentFromSubscriptionEvents,
+      fromDate: startRange,
+      toDate: endRange,
     });
   }
   throw new MetriportError("Invalid lookup mode @ AthenaHealth", undefined, { cxId, lookupMode });

@@ -2,12 +2,12 @@ import { getAthenaEnv } from "@metriport/core/external/ehr/athenahealth/environm
 import AthenaHealthApi, { AthenaEnv } from "@metriport/core/external/ehr/athenahealth/index";
 import { EhrPerPracticeParams } from "@metriport/core/external/ehr/environment";
 import { athenaClientSource } from "@metriport/shared/interface/external/ehr/athenahealth/jwt-token";
-import { createEhrClient } from "../shared/utils/client";
+import { createEhrClientWithClientCredentials } from "../shared/utils/client";
 
 export async function createAthenaClientWithTokenIdAndEnvironment(
   perPracticeParams: EhrPerPracticeParams
 ): Promise<{ client: AthenaHealthApi; tokenId: string; environment: AthenaEnv }> {
-  return await createEhrClient<AthenaEnv, AthenaHealthApi>({
+  return await createEhrClientWithClientCredentials<AthenaEnv, AthenaHealthApi>({
     ...perPracticeParams,
     source: athenaClientSource,
     getEnv: { params: undefined, getEnv: getAthenaEnv },

@@ -2,12 +2,12 @@ import { getCanvasEnv } from "@metriport/core/external/ehr/canvas/environment";
 import CanvasApi, { CanvasEnv } from "@metriport/core/external/ehr/canvas/index";
 import { EhrPerPracticeParams } from "@metriport/core/external/ehr/environment";
 import { canvasClientSource } from "@metriport/shared/interface/external/ehr/canvas/jwt-token";
-import { createEhrClient } from "../shared/utils/client";
+import { createEhrClientWithClientCredentials } from "../shared/utils/client";
 
 export async function createCanvasClientWithTokenIdAndEnvironment(
   perPracticeParams: EhrPerPracticeParams
 ): Promise<{ client: CanvasApi; tokenId: string; environment: CanvasEnv }> {
-  return await createEhrClient<CanvasEnv, CanvasApi, EhrPerPracticeParams>({
+  return await createEhrClientWithClientCredentials<CanvasEnv, CanvasApi, EhrPerPracticeParams>({
     ...perPracticeParams,
     source: canvasClientSource,
     getEnv: { params: perPracticeParams, getEnv: getCanvasEnv },

@@ -1,5 +1,7 @@
-import { buildEhrSyncPatientHandler } from "@metriport/core/external/ehr/command/sync-patient/ehr-sync-patient-factory";
 import { buildElationLinkPatientHandler } from "@metriport/core/external/ehr/elation/command/link-patient/elation-link-patient-factory";
+import { AppointmentMethods } from "@metriport/core/external/ehr/command/get-appointments/ehr-get-appointments";
+import { buildEhrGetAppointmentsHandler } from "@metriport/core/external/ehr/command/get-appointments/ehr-get-appointments-factory";
+import { buildEhrSyncPatientHandler } from "@metriport/core/external/ehr/command/sync-patient/ehr-sync-patient-factory";
 import { executeAsynchronously } from "@metriport/core/util/concurrency";
 import { out } from "@metriport/core/util/log";
 import { capture } from "@metriport/core/util/notifications";
@@ -8,6 +10,7 @@ import {
   ElationSecondaryMappings,
   elationSecondaryMappingsSchema,
 } from "@metriport/shared/interface/external/ehr/elation/cx-mapping";
+import { BookedAppointment } from "@metriport/shared/interface/external/ehr/elation/index";
 import { EhrSources } from "@metriport/shared/interface/external/ehr/source";
 import dayjs from "dayjs";
 import duration from "dayjs/plugin/duration";
@@ -21,7 +24,7 @@ import {
   parallelPatients,
   parallelPractices,
 } from "../../shared/utils/appointment";
-import { createElationClient } from "../shared";
+import { createElationClientWithTokenIdAndEnvironment } from "../shared";
 import {
   CreateOrUpdateElationPatientMetadataParams,
   SyncElationPatientIntoMetriportParams,
@@ -143,14 +146,21 @@ async function getAppointments({
   practiceId,
 }: GetAppointmentsParams): Promise<{ appointments?: Appointment[]; error?: unknown }> {
   const { log } = out(`Elation getAppointments - cxId ${cxId} practiceId ${practiceId}`);
-  const api = await createElationClient({ cxId, practiceId });
+  const { tokenId } = await createElationClientWithTokenIdAndEnvironment({
+    cxId,
+    practiceId,
+  });
   const { startRange, endRange } = getLookForwardTimeRange({
     lookForward: appointmentsLookForward,
   });
   log(`Getting appointments from ${startRange} to ${endRange}`);
   try {
-    const appointments = await api.getAppointments({
+    const handler = buildEhrGetAppointmentsHandler();
+    const appointments = await handler.getAppointments<BookedAppointment>({
+      method: AppointmentMethods.elationGetAppointments,
+      tokenId,
       cxId,
+      practiceId,
       fromDate: startRange,
       toDate: endRange,
     });

@@ -19,7 +19,7 @@ import { Patient as ElationPatient } from "@metriport/shared/interface/external/
 import { SubscriptionResource } from "@metriport/shared/interface/external/ehr/elation/subscription";
 import dayjs from "dayjs";
 import { getCxMappingOrFail } from "../../../command/mapping/cx";
-import { createEhrClient } from "../shared/utils/client";
+import { createEhrClientWithClientCredentials } from "../shared/utils/client";
 
 export const elationClientJwtTokenSource = "elation-client";
 export const elationWebhookJwtTokenSource = "elation-webhook";
@@ -98,7 +98,7 @@ function getCxIdAndPracticeIdFromElationApplicationId(applicationId: string): {
 export async function createElationClientWithTokenIdAndEnvironment(
   perPracticeParams: EhrPerPracticeParams
 ): Promise<{ client: ElationApi; tokenId: string; environment: ElationEnv }> {
-  return await createEhrClient<ElationEnv, ElationApi, EhrPerPracticeParams>({
+  return await createEhrClientWithClientCredentials<ElationEnv, ElationApi, EhrPerPracticeParams>({
     ...perPracticeParams,
     source: elationClientJwtTokenSource,
     getEnv: { params: perPracticeParams, getEnv: getElationEnv },

@@ -1,5 +1,6 @@
+import { AppointmentMethods } from "@metriport/core/external/ehr/command/get-appointments/ehr-get-appointments";
+import { buildEhrGetAppointmentsHandler } from "@metriport/core/external/ehr/command/get-appointments/ehr-get-appointments-factory";
 import { buildEhrSyncPatientHandler } from "@metriport/core/external/ehr/command/sync-patient/ehr-sync-patient-factory";
-import HealthieApi from "@metriport/core/external/ehr/healthie";
 import { buildHealthieLinkPatientHandler } from "@metriport/core/external/ehr/healthie/command/link-patient/healthie-link-patient-factory";
 import { executeAsynchronously } from "@metriport/core/util/concurrency";
 import { out } from "@metriport/core/util/log";
@@ -24,7 +25,7 @@ import {
   parallelPatients,
   parallelPractices,
 } from "../../shared/utils/appointment";
-import { createHealthieClient, LookupMode, LookupModes } from "../shared";
+import { LookupMode, LookupModes } from "../shared";
 import {
   SyncHealthiePatientIntoMetriportParams,
   UpdateHealthiePatientQuickNotesParams,
@@ -175,11 +176,10 @@ async function getAppointments({
   const { log } = out(
     `Healthie getAppointments - cxId ${cxId} practiceId ${practiceId} lookupMode ${lookupMode}`
   );
-  const api = await createHealthieClient({ cxId, practiceId });
   try {
     const appointments = await getAppointmentsFromApi({
-      api,
       cxId,
+      practiceId,
       lookupMode,
       log,
     });
@@ -195,26 +195,31 @@ async function getAppointments({
   }
 }
 
-type GetAppointmentsFromApiParams = Omit<GetAppointmentsParams, "practiceId"> & {
-  api: HealthieApi;
+type GetAppointmentsFromApiParams = GetAppointmentsParams & {
   log: typeof console.log;
 };
 
 async function getAppointmentsFromApi({
-  api,
   cxId,
+  practiceId,
   lookupMode,
   log,
 }: GetAppointmentsFromApiParams): Promise<AppointmentWithAttendee[]> {
+  const handler = buildEhrGetAppointmentsHandler();
+  const handlerParams = {
+    cxId,
+    practiceId,
+  };
   if (lookupMode === LookupModes.Appointments) {
     const { startRange, endRange } = getLookForwardTimeRange({
       lookForward: appointmentsLookForward,
     });
     log(`Getting appointments from ${startRange} to ${endRange}`);
-    return await api.getAppointments({
-      cxId,
-      startAppointmentDate: startRange,
-      endAppointmentDate: endRange,
+    return await handler.getAppointments({
+      ...handlerParams,
+      method: AppointmentMethods.healthieGetAppointments,
+      fromDate: startRange,
+      toDate: endRange,
     });
   }
   if (lookupMode === LookupModes.Appointments48hr) {
@@ -223,10 +228,11 @@ async function getAppointmentsFromApi({
       offset: oneDayOffset,
     });
     log(`Getting appointments from ${startRange} to ${endRange}`);
-    return await api.getAppointments({
-      cxId,
-      startAppointmentDate: startRange,
-      endAppointmentDate: endRange,
+    return await handler.getAppointments({
+      ...handlerParams,
+      method: AppointmentMethods.healthieGetAppointments,
+      fromDate: startRange,
+      toDate: endRange,
     });
   }
   throw new MetriportError("Invalid lookup mode @ Healthie", undefined, { cxId, lookupMode });