RELEASE 1801 1827

packages/api/src/external/fhir/document/get-documents.ts

@@ -1,65 +1,11 @@
 import { DocumentReference } from "@medplum/fhirtypes";
-import { chunk } from "lodash";
-import { capture } from "../../../shared/notifications";
-import { makeFhirApi } from "../api/api-factory";
-import {
- isoDateToFHIRDateQueryFrom,
- isoDateToFHIRDateQueryTo,
-} from "@metriport/core/external/fhir/shared/index";
+import { getDocuments } from "@metriport/core/external/fhir/document/get-documents";
 
-export async function getDocumentsFromFHIR({
- cxId,
- patientId,
- from,
- to,
- documentIds,
-}: {
- cxId: string;
- patientId?: string | string[];
- from?: string;
- to?: string;
- documentIds?: string[];
-}): Promise<DocumentReference[]> {
- try {
- const api = makeFhirApi(cxId);
- const docs: DocumentReference[] = [];
- const chunksDocIds = documentIds && documentIds.length > 0 ? chunk(documentIds, 150) : [[]];
-
- for (const docIds of chunksDocIds) {
- const filtersAsStr = getFilters({ patientId, documentIds: docIds, from, to });
- for await (const page of api.searchResourcePages("DocumentReference", filtersAsStr)) {
- docs.push(...page);
- }
- }
- return docs;
- } catch (error) {
- const msg = `Error getting documents from FHIR server`;
- console.log(`${msg} - patientId: ${patientId}, error: ${error}`);
- capture.message(msg, { extra: { patientId, error }, level: "error" });
- throw error;
- }
-}
-
-export function getFilters({
- patientId: patientIdParam,
- documentIds = [],
- from,
- to,
-}: {
- patientId?: string | string[];
- documentIds?: string[];
- from?: string;
- to?: string;
-} = {}) {
- const filters = new URLSearchParams();
- const patientIds = Array.isArray(patientIdParam) ? patientIdParam : [patientIdParam];
- const patientIdsFiltered = patientIds.flatMap(id =>
- id && id.trim().length > 0 ? id.trim() : []
- );
- patientIdsFiltered.length && filters.append("patient", patientIdsFiltered.join(","));
- documentIds.length && filters.append(`_id`, documentIds.join(","));
- from && filters.append("date", isoDateToFHIRDateQueryFrom(from));
- to && filters.append("date", isoDateToFHIRDateQueryTo(to));
- const filtersAsStr = filters.toString();
- return filtersAsStr;
+/**
+ * @deprecated Use `getDocuments()` from `@metriport/core/external/fhir/document/get-documents` instead.
+ */
+export async function getDocumentsFromFHIR(
+ ...params: Parameters<typeof getDocuments>
+): Promise<DocumentReference[]> {
+ return getDocuments(...params);
 }

packages/api/src/routes/medical/document.ts

@@ -1,6 +1,7 @@
 import { UploadDocumentResult } from "@metriport/api-sdk";
 import { createDocumentFilePath } from "@metriport/core/domain/document/filename";
 import { S3Utils } from "@metriport/core/external/aws/s3";
+import { searchDocuments } from "@metriport/core/external/opensearch/search-documents";
 import { uuidv7 } from "@metriport/core/util/uuid-v7";
 import { stringToBoolean } from "@metriport/shared";
 import { Request, Response } from "express";
@@ -18,14 +19,13 @@ import {
  docRefCheck,
 } from "../../external/fhir/document/draft-update-document-reference";
 import { upsertDocumentToFHIRServer } from "../../external/fhir/document/save-document-reference";
-import { searchDocuments } from "../../external/fhir/document/search-documents";
 import { Config } from "../../shared/config";
+import { requestLogger } from "../helpers/request-logger";
 import { sanitize } from "../helpers/string";
 import { optionalDateSchema } from "../schemas/date";
 import { asyncHandler, getCxIdOrFail, getFrom, getFromQueryOrFail } from "../util";
 import { toDTO } from "./dtos/documentDTO";
 import { docConversionTypeSchema, docFileNameSchema } from "./schemas/documents";
-import { requestLogger } from "../helpers/request-logger";
 import { cxRequestMetadataSchema } from "./schemas/request-metadata";
 
 const router = Router();

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

@@ -1,14 +1,14 @@
-import { S3Utils } from "../s3";
-import { DocumentReference } from "@medplum/fhirtypes";
-import { searchDocuments } from "../../opensearch/search-documents";
 import axios from "axios";
-import { capture } from "../../../util/notifications";
 import dayjs from "dayjs";
 import duration from "dayjs/plugin/duration";
+import { capture } from "../../../util/notifications";
+import { searchDocuments } from "../../opensearch/search-documents";
+import { S3Utils } from "../s3";
 import { DocumentBulkSignerLambdaResponse } from "./document-bulk-signer-response";
-const ossApi = axios.create();
+
 dayjs.extend(duration);
 
+const ossApi = axios.create();
 const SIGNED_URL_DURATION_SECONDS = dayjs.duration({ minutes: 3 }).asSeconds();
 
 export type DocumentBulkSignerLambdaRequest = {
@@ -17,7 +17,7 @@ export type DocumentBulkSignerLambdaRequest = {
  requestId: string;
 };
 
-export async function getSignedUrls(
+export async function searchDocumentsSignUrlsAndSendToApi(
  cxId: string,
  patientId: string,
  requestId: string,
@@ -27,12 +27,12 @@ export async function getSignedUrls(
 ) {
  const s3Utils = new S3Utils(region);
 
- const documents: DocumentReference[] = await searchDocuments({ cxId, patientId });
+ const documents = await searchDocuments({ cxId, patientId });
  const ossApiClient = apiClientBulkDownloadWebhook(apiURL);
 
  try {
  const urls = await Promise.all(
- documents.map(async doc => {
+ documents.flatMap(async doc => {
  const attachment = (doc?.content ?? [])
  .map(content => content?.attachment)
  .find(attachment => attachment?.title !== undefined);
@@ -62,7 +62,7 @@ export async function getSignedUrls(
  })
  );
 
- const response = urls.filter(url => url !== undefined) as DocumentBulkSignerLambdaResponse[];
+ const response = urls.flatMap(url => (url !== undefined ? url : []));
 
  await ossApiClient.callInternalEndpoint({
  cxId: cxId,
@@ -72,8 +72,9 @@ export async function getSignedUrls(
  status: "completed",
  });
  } catch (error) {
- capture.error(error, {
- extra: { patientId, context: `bulkUrlSigningLambda.getSignedUrls`, error },
+ const msg = "Error getting signed URLs";
+ capture.error(msg, {
+ extra: { patientId, context: `getSignedUrls`, error },
  });
  await ossApiClient.callInternalEndpoint({
  cxId: cxId,

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

@@ -1,4 +1,4 @@
-import { getSignedUrls } from "./bulk-sign";
+import { searchDocumentsSignUrlsAndSendToApi } from "./bulk-sign";
 import { DocumentBulkSigner, DocumentBulkSignerRequest } from "./document-bulk-signer";
 
 export class DocumentBulkSignerLocal extends DocumentBulkSigner {
@@ -7,6 +7,13 @@ export class DocumentBulkSignerLocal extends DocumentBulkSigner {
  }
 
  async sign({ patientId, cxId, requestId }: DocumentBulkSignerRequest): Promise<void> {
- await getSignedUrls(cxId, patientId, requestId, this.bucketName, this.region, this.apiURL);
+ await searchDocumentsSignUrlsAndSendToApi(
+ cxId,
+ patientId,
+ requestId,
+ this.bucketName,
+ this.region,
+ this.apiURL
+ );
  }
 }

packages/api/src/external/fhir/document/__tests__/get-documents.test.ts → packages/core/src/external/fhir/document/__tests__/get-documents.test.ts

@@ -1,8 +1,8 @@
 import { faker } from "@faker-js/faker";
+import { ISO_DATE } from "@metriport/shared/common/date";
 import dayjs from "dayjs";
+import { trim } from "lodash";
 import { v4 as uuidv4 } from "uuid";
-import { makePatient } from "../../../../domain/medical/__tests__/patient";
-import { ISO_DATE } from "../../../../shared/date";
 import { getFilters } from "../get-documents";
 
 beforeEach(() => {
@@ -17,9 +17,23 @@ describe("getDocuments", () => {
  });
 
  it("returns patientId when only patientId is set", async () => {
- const patient = makePatient();
- const res = getFilters({ patientId: patient.id });
- expect(res).toEqual("patient=" + patient.id);
+ const patientId = faker.string.uuid();
+ const res = getFilters({ patientId });
+ expect(res).toEqual("patient=" + patientId);
+ });
+
+ it("returns list of patientId when gets patientId as array", async () => {
+ const patientIds = [faker.string.uuid(), faker.string.uuid(), faker.string.uuid()];
+ const encodedPatientIds = encodeURIComponent(patientIds.join(","));
+ const res = getFilters({ patientId: patientIds });
+ expect(res).toEqual("patient=" + encodedPatientIds);
+ });
+
+ it("trims patientIds", async () => {
+ const patientIds = [faker.string.uuid() + " ", " " + faker.string.uuid()];
+ const encodedPatientIds = encodeURIComponent(patientIds.map(trim).join(","));
+ const res = getFilters({ patientId: patientIds });
+ expect(res).toEqual("patient=" + encodedPatientIds);
  });
 
  it("returns `from` when only `from` is set", async () => {
@@ -41,20 +55,20 @@ describe("getDocuments", () => {
  });
 
  it("groups patientId and documentIds when both are set", async () => {
- const patient = makePatient();
+ const patientId = faker.string.uuid();
  const documentIds = [uuidv4(), uuidv4()];
- const res = getFilters({ patientId: patient.id, documentIds });
+ const res = getFilters({ patientId: patientId, documentIds });
  expect(res).toEqual(
- "patient=" + patient.id + "&_id=" + documentIds.join(encodeURIComponent(","))
+ "patient=" + patientId + "&_id=" + documentIds.join(encodeURIComponent(","))
  );
  });
 
  it("groups patientId and dates when those are set", async () => {
- const patient = makePatient();
+ const patientId = faker.string.uuid();
  const from = dayjs(faker.date.past()).format(ISO_DATE);
  const to = dayjs(faker.date.past()).format(ISO_DATE);
- const res = getFilters({ patientId: patient.id, from, to });
- expect(res).toEqual("patient=" + patient.id + "&date=ge" + from + "&date=le" + to);
+ const res = getFilters({ patientId, from, to });
+ expect(res).toEqual("patient=" + patientId + "&date=ge" + from + "&date=le" + to);
  });
 
  it("groups documentIds and dates when those are set", async () => {
@@ -68,14 +82,14 @@ describe("getDocuments", () => {
  });
 
  it("groups all when all are set", async () => {
- const patient = makePatient();
+ const patientId = faker.string.uuid();
  const documentIds = [uuidv4(), uuidv4()];
  const from = dayjs(faker.date.past()).format(ISO_DATE);
  const to = dayjs(faker.date.past()).format(ISO_DATE);
- const res = getFilters({ patientId: patient.id, documentIds, from, to });
+ const res = getFilters({ patientId: patientId, documentIds, from, to });
  expect(res).toEqual(
  "patient=" +
- patient.id +
+ patientId +
  "&_id=" +
  documentIds.join(encodeURIComponent(",")) +
  "&date=ge" +

packages/core/src/external/fhir/document/document-reference.ts

@@ -1,5 +1,12 @@
 import { DocumentReference, Resource } from "@medplum/fhirtypes";
 
+export type DocumentReferenceWithId = Omit<DocumentReference, "id"> &
+ Required<Pick<DocumentReference, "id">>;
+
+export function hasId(docRef: DocumentReference): docRef is DocumentReferenceWithId {
+ return !!docRef.id;
+}
+
 export function isDocumentReference(
  resource?: Resource | undefined
 ): resource is DocumentReference {