feat(cq): nits on dr pr

Refs: #1379

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

@@ -58,14 +58,17 @@ export class PatientLoaderMetriportAPI implements PatientLoader {
  lastNameInitial: data?.lastNameInitial,
  },
  });
- // call convertToDomainObject(response) here
+ if (!response.data) {
+ console.log(`No patients found for ${JSON.stringify(data)}`);
+ throw new Error();
+ }
  const patients: Patient[] = response.data.map((patient: PatientDTO) =>
  getDomainFromDTO(patient)
  );
  patients.forEach(validatePatient);
  return patients;
  } catch (error) {
- console.log("Failing on request to internal endpoint", error);
+ console.log(`Failing on request to internal endpoint ${JSON.stringify(error)}`);
  throw error;
  }
  }

packages/core/src/external/aws/lambda-logic/document-uploader.ts

@@ -174,6 +174,8 @@ async function createAndUploadMetadataFile({
  title,
  });
 
- console.log(`Uploading metadata to S3 with key: ${s3MetadataFileName}`);
+ console.log(
+ `Uploading metadata to S3 with key: ${s3MetadataFileName}, cxId: ${cxId}, patientId: ${patientId}`
+ );
  await s3Utils.uploadFile(destinationBucket, s3MetadataFileName, Buffer.from(extrinsicObjectXml));
 }

packages/core/src/external/carequality/dq/create-metadata-xml.ts

@@ -70,6 +70,8 @@ export function createExtrinsicObjectXml({
 
  const objectTypeClassification =
  "urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:Classification";
+ const externalIdentifierClassification =
+ "urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:ExternalIdentifier";
 
  const metadataXml = `<ExtrinsicObject home="${METRIPORT_HOME_COMMUNITY_ID}" id="${documentUUID}" isOpaque="false" mimeType="text/xml" objectType="${ON_DEMAND_OBJECT_TYPE}" status="urn:oasis:names:tc:ebxml-regrep:StatusType:Approved">
 
@@ -179,14 +181,14 @@ export function createExtrinsicObjectXml({
  </Name>
  </Classification>
 
- <ExternalIdentifier id="${uuidv7()}" identificationScheme="${PATIENT_ID_CLASSIFICATION_SCHEME}" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:ExternalIdentifier" registryObject="${documentUUID}" value="${patientId}^^^&amp;${homeCommunityId}&amp;ISO">
+ <ExternalIdentifier id="${uuidv7()}" identificationScheme="${PATIENT_ID_CLASSIFICATION_SCHEME}" objectType=""${externalIdentifierClassification}"}" registryObject="${documentUUID}" value="${patientId}^^^&amp;${homeCommunityId}&amp;ISO">
  <Name>
  <LocalizedString charset="UTF-8" value="XDSDocumentEntry.patientId"/>
  </Name>
  </ExternalIdentifier>
 
  <!-- (IHE) REQUIRED - DocumentEntry.uniqueId - Globally unique identifier assigned to the document by its creator -->
- <ExternalIdentifier id="${uuidv7()}" identificationScheme="${DOCUMENT_ENTRY_CLASSIFICATION_SCHEME}" objectType="urn:oasis:names:tc:ebxml-regrep:ObjectType:RegistryObject:ExternalIdentifier" registryObject="${documentUUID}" value="${createDocumentUniqueId(
+ <ExternalIdentifier id="${uuidv7()}" identificationScheme="${DOCUMENT_ENTRY_CLASSIFICATION_SCHEME}" objectType=""${externalIdentifierClassification}"}" registryObject="${documentUUID}" value="${createDocumentUniqueId(
  documentUniqueId
  )}">
  <Name>

packages/core/src/external/carequality/dq/process-incoming-dq.ts

@@ -3,13 +3,7 @@ import {
  DocumentQueryRespToExternalGW,
 } from "@metriport/ihe-gateway-sdk";
 import { validateDQ } from "./validating-dq";
-import {
- XDSUnknownPatientId,
- XDSUnknownCommunity,
- XDSMissingHomeCommunityId,
- XDSRegistryError,
- constructDQErrorResponse,
-} from "../error";
+import { IHEGatewayError, XDSRegistryError, constructDQErrorResponse } from "../error";
 
 export async function processIncomingRequest(
  payload: DocumentQueryReqFromExternalGW
@@ -28,12 +22,7 @@ export async function processIncomingRequest(
 
  return response;
  } catch (error) {
- if (
- error instanceof XDSUnknownPatientId ||
- error instanceof XDSUnknownCommunity ||
- error instanceof XDSMissingHomeCommunityId ||
- error instanceof XDSRegistryError
- ) {
+ if (error instanceof IHEGatewayError) {
  return constructDQErrorResponse(payload, error);
  } else {
  return constructDQErrorResponse(payload, new XDSRegistryError());

packages/core/src/external/carequality/dr/process-incoming-dr.ts

@@ -2,15 +2,15 @@ import {
  DocumentRetrievalReqFromExternalGW,
  DocumentRetrievalRespToExternalGW,
 } from "@metriport/ihe-gateway-sdk";
-import { validateDR } from "./validating-dr";
+import { validateDRAndRetrievePresignedUrls } from "./validating-dr";
 import { IHEGatewayError, constructDRErrorResponse, XDSRegistryError } from "../error";
 
 export async function processIncomingRequest(
  payload: DocumentRetrievalReqFromExternalGW
 ): Promise<DocumentRetrievalRespToExternalGW> {
  try {
  // validate incoming request + look for patient and get all their documents from s3
- const documents = await validateDR(payload);
+ const documents = await validateDRAndRetrievePresignedUrls(payload);
 
  // construct response
  const response: DocumentRetrievalRespToExternalGW = {

packages/core/src/external/carequality/dr/validating-dr.ts

@@ -12,7 +12,7 @@ import { XDSRegistryError } from "../error";
 const region = Config.getAWSRegion();
 const medicalDocumentsBucketName = Config.getMedicalDocumentsBucketName();
 
-export async function validateDR(
+export async function validateDRAndRetrievePresignedUrls(
  payload: DocumentRetrievalReqFromExternalGW
 ): Promise<DocumentReference[]> {
  validateBasePayload(payload);
@@ -27,21 +27,26 @@ export async function validateDR(
 
 async function retrievePreSignedUrls(documentIds: string[]): Promise<DocumentReference[]> {
  const s3Utils = new S3Utils(region);
- const documentReferences: DocumentReference[] = [];
-
- for (const id of documentIds) {
- const url = await s3Utils.getSignedUrl({
- bucketName: medicalDocumentsBucketName,
- fileName: id,
- });
- const documentReference: DocumentReference = {
- homeCommunityId: METRIPORT_HOME_COMMUNITY_ID,
- repositoryUniqueId: METRIPORT_REPOSITORY_UNIQUE_ID,
- docUniqueId: id,
- urn: url,
- };
- documentReferences.push(documentReference);
- }
+
+ const promises = documentIds.map(id =>
+ s3Utils
+ .getSignedUrl({
+ bucketName: medicalDocumentsBucketName,
+ fileName: id,
+ })
+ .then(url => ({
+ homeCommunityId: METRIPORT_HOME_COMMUNITY_ID,
+ repositoryUniqueId: METRIPORT_REPOSITORY_UNIQUE_ID,
+ docUniqueId: id,
+ urn: url,
+ }))
+ );
+
+ const results = await Promise.allSettled(promises);
+
+ const documentReferences = results
+ .filter(result => result.status === "fulfilled")
+ .map(result => (result as PromiseFulfilledResult<DocumentReference>).value);
 
  return documentReferences;
 }

packages/core/src/external/fhir/patient/index.ts

@@ -10,7 +10,6 @@ import { ContactTypes, Contact } from "../../../domain/contact";
 import { Address } from "../../../domain/address";
 import { GenderAtBirth, Patient, PersonalIdentifier, splitName } from "../../../domain/patient";
 import { getIdFromSubjectId, getIdFromSubjectRef } from "../shared";
-import { uuidv7 } from "../../../util/uuid-v7";
 
 export const genderMapping: { [k in GenderAtBirth]: "female" | "male" } = {
  F: "female",
@@ -20,7 +19,7 @@ export const genderMapping: { [k in GenderAtBirth]: "female" | "male" } = {
 export const toFHIR = (patient: Pick<Patient, "id" | "data">): FHIRPatient => {
  return {
  resourceType: "Patient",
- id: uuidv7(),
+ id: patient.id,
  identifier: patient.data.personalIdentifiers
  ? convertDriversLicenseToIdentifier(patient.data.personalIdentifiers)
  : [],

packages/ihe-gateway-sdk/src/models/document-query/document-query-requests.ts

@@ -30,6 +30,8 @@ export const documentQueryReqToExternalGWSchema = documentQueryDefaultReqSchema.
 export type DocumentQueryReqToExternalGW = z.infer<typeof documentQueryReqToExternalGWSchema>;
 
 // FROM EXTERNAL GATEWAY
-export const documentQueryReqFromExternalGWSchema = documentQueryDefaultReqSchema;
+export const documentQueryReqFromExternalGWSchema = documentQueryDefaultReqSchema.omit({
+ cxId: true,
+});
 
 export type DocumentQueryReqFromExternalGW = z.infer<typeof documentQueryReqFromExternalGWSchema>;

packages/ihe-gateway-sdk/src/models/document-retrieval/document-retrieval-requests.ts

@@ -15,7 +15,9 @@ export type DocumentRetrievalReqToExternalGW = z.infer<
 >;
 
 // FROM EXTERNAL GATEWAY
-export const documentRetrievalReqFromExternalGWSchema = documentRetrievalReqDefaultSchema;
+export const documentRetrievalReqFromExternalGWSchema = documentRetrievalReqDefaultSchema.omit({
+ cxId: true,
+});
 
 export type DocumentRetrievalReqFromExternalGW = z.infer<
  typeof documentRetrievalReqFromExternalGWSchema

packages/ihe-gateway-sdk/src/models/shared.ts

@@ -30,7 +30,7 @@ export const SamlAttributesSchema = z.object({
 
 export const baseRequestSchema = z.object({
  id: z.string(),
- cxId: z.string().optional(),
+ cxId: z.string(),
  timestamp: z.string(),
  samlAttributes: SamlAttributesSchema,
  patientId: z.string().optional(),

packages/utils/src/carequality/mock-ihe-gateway.ts

@@ -6,6 +6,12 @@ import { processIncomingRequest as processIncomingPdRequest } from "@metriport/c
 import { MPIMetriportAPI } from "@metriport/core/mpi/patient-mpi-metriport-api";
 import { getEnvVarOrFail } from "@metriport/core/util/env-var";
 
+/* 
+This is a mock IHE gateway for Carequality interfaces to handle patient discovery (PD),
+document query (DQ), and document retrieval (DR) requests. Use it for testing logic in 
+@metriport/core
+*/
+
 import express, { Application, Request, Response } from "express";
 
 const apiUrl = getEnvVarOrFail("API_URL");

packages/utils/src/fhir-converter/shared.ts

@@ -1,5 +1,5 @@
 import { Bundle, Resource, ResourceType } from "@medplum/fhirtypes";
-import { parseS3FileName } from "@metriport/core/external/aws/s3";
+import { parseS3FileName } from "@metriport/core/domain/utils";
 import { getFileContentsAsync, getFileNames } from "../shared/fs";
 import { uuidv7 } from "../shared/uuid-v7";