refactor: apply executeWithRetries to lower level funcitons +

- apply executeWithRetries to lower level funcitons
- remove the deprecated S3Utils from lambdas package

Ref. metriport/metriport-internal#1827

Signed-off-by: Rafael Leite <[email protected]>

packages/core/src/command/patient-loader-metriport-api.ts

@@ -1,4 +1,5 @@
 import { PatientDTO, USState } from "@metriport/api-sdk";
+import { executeWithNetworkRetries } from "@metriport/shared";
 import axios from "axios";
 import { Patient } from "../domain/patient";
 import { errorToString } from "../util/error/shared";
@@ -12,34 +13,45 @@ export class PatientLoaderMetriportAPI implements PatientLoader {
   constructor(private readonly apiUrl: string) {}
 
   public async getStatesFromPatientIds(cxId: string, patientIds: string[]): Promise<string[]> {
-    const resp = await axios.get(`${this.apiUrl}/internal/patient/states`, {
-      params: {
-        cxId,
-        patientIds: patientIds.join(","),
-      },
-    });
+    const resp = await executeWithNetworkRetries(
+      () =>
+        axios.get(`${this.apiUrl}/internal/patient/states`, {
+          params: {
+            cxId,
+            patientIds: patientIds.join(","),
+          },
+        }),
+      { retryOnTimeout: true }
+    );
     return resp.data.states;
   }
 
   // TODO: Response is DTO not domain object
   async getOneOrFail({ id, cxId }: GetOne): Promise<Patient> {
-    const response = await axios.get(`${this.apiUrl}/internal/patient/${id}?cxId=${cxId}`);
+    const response = await executeWithNetworkRetries(
+      () => axios.get(`${this.apiUrl}/internal/patient/${id}?cxId=${cxId}`),
+      { retryOnTimeout: true }
+    );
     const patient = getDomainFromDTO(response.data);
     validatePatient(patient);
     return patient;
   }
 
   // TODO: Response is DTO not domain object
   async findBySimilarity({ cxId, data }: FindBySimilarity): Promise<Patient[]> {
-    const response = await axios.get(`${this.apiUrl}/internal/patient`, {
-      params: {
-        cxId: cxId,
-        dob: data?.dob,
-        genderAtBirth: data?.genderAtBirth,
-        firstNameInitial: data?.firstNameInitial,
-        lastNameInitial: data?.lastNameInitial,
-      },
-    });
+    const response = await executeWithNetworkRetries(
+      () =>
+        axios.get(`${this.apiUrl}/internal/patient`, {
+          params: {
+            cxId: cxId,
+            dob: data?.dob,
+            genderAtBirth: data?.genderAtBirth,
+            firstNameInitial: data?.firstNameInitial,
+            lastNameInitial: data?.lastNameInitial,
+          },
+        }),
+      { retryOnTimeout: true }
+    );
     const patients: Patient[] = response.data.map((patient: PatientDTO) =>
       getDomainFromDTO(patient)
     );
@@ -49,14 +61,18 @@ export class PatientLoaderMetriportAPI implements PatientLoader {
 
   async findBySimilarityAcrossAllCxs({ data }: Omit<FindBySimilarity, "cxId">): Promise<Patient[]> {
     try {
-      const response = await axios.get(`${this.apiUrl}/internal/mpi/patient`, {
-        params: {
-          dob: data?.dob,
-          genderAtBirth: data?.genderAtBirth,
-          firstNameInitial: data?.firstNameInitial,
-          lastNameInitial: data?.lastNameInitial,
-        },
-      });
+      const response = await executeWithNetworkRetries(
+        () =>
+          axios.get(`${this.apiUrl}/internal/mpi/patient`, {
+            params: {
+              dob: data?.dob,
+              genderAtBirth: data?.genderAtBirth,
+              firstNameInitial: data?.firstNameInitial,
+              lastNameInitial: data?.lastNameInitial,
+            },
+          }),
+        { retryOnTimeout: true }
+      );
       // call convertToDomainObject(response) here
       const patients: Patient[] = response.data.map((patient: PatientDTO) =>
         getDomainFromDTO(patient)

packages/core/src/external/aws/document-signing/bulk-sign.ts

@@ -75,15 +75,13 @@ export async function searchDocumentsSignUrlsAndSendToApi(
 
     const response = urls.flatMap(url => (url !== undefined ? url : []));
 
-    await executeWithNetworkRetries(() =>
-      ossApiClient.callInternalEndpoint({
-        cxId,
-        patientId,
-        requestId,
-        docs: response,
-        status: "completed",
-      })
-    );
+    await ossApiClient.callInternalEndpoint({
+      cxId,
+      patientId,
+      requestId,
+      docs: response,
+      status: "completed",
+    });
   } catch (error) {
     const msg = "Error getting signed URLs";
     const extra = { ...getNetworkErrorDetails(error), cxId, patientId, requestId };

packages/core/src/external/aws/s3.ts

@@ -235,6 +235,7 @@ export class S3Utils {
 
     return newKey;
   }
+
   async uploadFile({
     bucket,
     key,

packages/core/src/external/carequality/pd/process-inbound-pd.ts

@@ -3,10 +3,11 @@ import {
   InboundPatientDiscoveryResp,
   PatientResource,
 } from "@metriport/ihe-gateway-sdk";
-import { executeWithNetworkRetries } from "@metriport/shared";
 import { Address } from "../../../domain/address";
+import { getStateEnum } from "../../../domain/geographic-locations";
 import { Patient, PatientData } from "../../../domain/patient";
 import { MPI } from "../../../mpi/mpi";
+import { normalizeGender, normalizePatient } from "../../../mpi/normalize-patient";
 import { patientMPIToPartialPatient } from "../../../mpi/shared";
 import {
   constructPDErrorResponse,
@@ -15,11 +16,8 @@ import {
   XDSRegistryError,
 } from "../error";
 import { toIheGatewayPatientResource } from "../ihe-gateway-v2/patient";
-import { validateFHIRAndExtractPatient } from "./validating-pd";
-
-import { getStateEnum } from "../../../domain/geographic-locations";
-import { normalizeGender, normalizePatient } from "../../../mpi/normalize-patient";
 import { METRIPORT_HOME_COMMUNITY_ID } from "../shared";
+import { validateFHIRAndExtractPatient } from "./validating-pd";
 
 function constructMatchResponse(
   payload: InboundPatientDiscoveryReq,
@@ -46,7 +44,7 @@ export async function processInboundPatientDiscovery(
 ): Promise<InboundPatientDiscoveryResp> {
   try {
     const patient = validateFHIRAndExtractPatient(payload);
-    const matchingPatient = await executeWithNetworkRetries(() => mpi.findMatchingPatient(patient));
+    const matchingPatient = await mpi.findMatchingPatient(patient);
     if (!matchingPatient) {
       return constructPDNoMatchResponse(payload);
     }

packages/core/src/external/commonwell/document/document-downloader-local.ts

@@ -53,7 +53,10 @@ export class DocumentDownloaderLocal extends DocumentDownloader {
     const onEnd = () => {
       console.log("Finished downloading document");
     };
-    let downloadResult = await this.downloadFromCommonwellIntoS3(document, fileInfo, onData, onEnd);
+    let downloadResult = await executeWithNetworkRetries(
+      () => this.downloadFromCommonwellIntoS3(document, fileInfo, onData, onEnd),
+      { retryOnTimeout: true, initialDelay: 500, maxAttempts: 5 }
+    );
 
     // Check if the detected file type is in the accepted content types and update it if not
     downloadResult = await this.checkAndUpdateMimeType({
@@ -83,7 +86,7 @@ export class DocumentDownloaderLocal extends DocumentDownloader {
 
   /**
    * Checks if the content type of a downloaded document is accepted. If not accepted, updates the content type
-   * and extension  in S3 and returns the updated download result.
+   * and extension in S3 and returns the updated download result.
    */
   async checkAndUpdateMimeType({
     document,

packages/lambdas/src/cw-doc-contribution.ts

@@ -1,10 +1,10 @@
+import { S3Utils } from "@metriport/core/external/aws/s3";
 import { docContributionFileParam } from "@metriport/core/external/commonwell/document/document-contribution";
-import { errorToString, executeWithRetries } from "@metriport/shared";
+import { errorToString } from "@metriport/shared";
 import * as Sentry from "@sentry/serverless";
 import * as lambda from "aws-lambda";
 import { capture } from "./shared/capture";
 import { getEnvOrFail } from "./shared/env";
-import { S3Utils } from "./shared/s3";
 
 // Keep this as early on the file as possible
 capture.init();
@@ -52,18 +52,11 @@ export const handler = Sentry.AWSLambda.wrapHandler(
       }
 
       console.log(`Key: ${key}`);
-      const url = await executeWithRetries(
-        () =>
-          s3Utils.s3.getSignedUrlPromise("getObject", {
-            Bucket: bucketName,
-            Key: key,
-            Expires: SIGNED_URL_DURATION_SECONDS,
-          }),
-        {
-          maxAttempts: 3,
-          initialDelay: 500,
-        }
-      );
+      const url = await s3Utils.getSignedUrl({
+        bucketName,
+        fileName: key,
+        durationSeconds: SIGNED_URL_DURATION_SECONDS,
+      });
       return sendResponse({
         statusCode: 301,
         headers: {

packages/lambdas/src/document-downloader.ts

@@ -10,7 +10,6 @@ import { DownloadResult } from "@metriport/core/external/commonwell/document/doc
 import { DocumentDownloaderLambdaRequest } from "@metriport/core/external/commonwell/document/document-downloader-lambda";
 import { DocumentDownloaderLocal } from "@metriport/core/external/commonwell/document/document-downloader-local";
 import { getEnvType } from "@metriport/core/util/env-var";
-import { executeWithNetworkRetries } from "@metriport/shared";
 import * as Sentry from "@sentry/serverless";
 import dayjs from "dayjs";
 import duration from "dayjs/plugin/duration";
@@ -73,10 +72,7 @@ export const handler = Sentry.AWSLambda.wrapHandler(
       },
       capture,
     });
-    const result = await executeWithNetworkRetries(
-      () => docDownloader.download({ document, fileInfo }),
-      { retryOnTimeout: true, initialDelay: 500, maxAttempts: 5 }
-    );
+    const result = await docDownloader.download({ document, fileInfo });
 
     console.log(`Done - ${JSON.stringify(result)}`);
     return result;

packages/lambdas/src/sqs-to-converter.ts

@@ -1,3 +1,4 @@
+import { S3Utils } from "@metriport/core/external/aws/s3";
 import {
   executeWithNetworkRetries,
   executeWithRetries,
@@ -13,7 +14,6 @@ import { getEnvOrFail } from "./shared/env";
 import { isAxiosBadGateway, isAxiosTimeout } from "./shared/http";
 import { Log, prefixedLog } from "./shared/log";
 import { apiClient } from "./shared/oss-api";
-import { S3Utils } from "./shared/s3";
 import { SQSUtils } from "./shared/sqs";
 import { cleanUpPayload } from "./sqs-to-converter/cleanup";
 

packages/lambdas/src/sqs-to-fhir.ts

@@ -1,5 +1,6 @@
 import { MedplumClient } from "@medplum/core";
 import { Bundle, Resource } from "@medplum/fhirtypes";
+import { S3Utils } from "@metriport/core/external/aws/s3";
 import { MetriportError } from "@metriport/core/util/error/metriport-error";
 import {
   executeWithNetworkRetries,
@@ -17,7 +18,6 @@ import { getEnvOrFail, isSandbox } from "./shared/env";
 import { isAxiosBadGateway, isAxiosTimeout } from "./shared/http";
 import { Log, prefixedLog } from "./shared/log";
 import { apiClient } from "./shared/oss-api";
-import { S3Utils } from "./shared/s3";
 import { SQSUtils } from "./shared/sqs";
 
 // Keep this as early on the file as possible