Improvements to DQ and DR PRs #1528

jonahkaye · 2024-01-26T20:54:01Z

Refs: #1379

Description

fixing leftover nits on ihe stack 3/4 - DQ Response #1362 (review)
fixing leftover nits on ihe stack 4/4 - DR Response #1405

TODO

Confirm metadata file working on s3 uploads: https://metriport.slack.com/archives/C04T5Q9JHFX/p1706719046285299
DR Internal Server Error if no metadata file

Testing

Local
- tested with local mock-ihe-gateway
staging
branch to staging

Release Plan

Merge this

Refs: #1379

jonahkaye · 2024-01-28T01:37:29Z

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

- this._s3.upload(
- {
+ try {
+ const data = await this._s3


modified to use await/async

jonahkaye · 2024-01-28T01:37:55Z

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

+ exists: true,
+ size: head.ContentLength,
+ contentType: head.ContentType,
+ eTag: head.ETag,


removed unnessecary conditionals

jonahkaye · 2024-01-28T01:38:24Z

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

- return `${cxId}/${patientId}/${cxId}_${patientId}_${fileName}`;
-};
-
-export const parseS3FileName = (


moved these files to metriport business logic files instead of s3.ts

jonahkaye · 2024-01-28T01:39:05Z

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

- const stringSize = size ? size.toString() : "";
- const hash = eTag ? eTag : "";
+ const stringSize = size.toString();
+ const hash = eTag;


removed unnessecary conditionals

jonahkaye · 2024-01-28T01:41:58Z

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

 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)}`);


no multiline errors

jonahkaye · 2024-01-28T01:42:15Z

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) {


response.data is of type any so checking if undefined to prevent runtime errors

jonahkaye · 2024-01-28T01:45:39Z

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

@@ -166,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}`


more descriptive logging

jonahkaye · 2024-01-28T01:51:34Z

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

+ HEALTHCARE_FACILITY_TYPE_CODE_CLASSIFICATION_SCHEME,
+ TYPE_CODE_CLASSIFICATION_SCHEME,
+ PATIENT_ID_CLASSIFICATION_SCHEME,
+ DOCUMENT_ENTRY_CLASSIFICATION_SCHEME,


removing all hardcoding

jonahkaye · 2024-01-28T01:54:02Z

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

- error instanceof XDSMissingHomeCommunityId ||
- error instanceof XDSRegistryError
- ) {
+ if (error instanceof IHEGatewayError) {


simplification since XDSUnknownPatientId etc are all instances of IHEGatewayError

jonahkaye · 2024-01-28T01:55:17Z

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

- patientId: string,
- bucketName: string
- ): Promise<string[] | undefined> {
- const Prefix = `${cxId}/${patientId}/uploads/`;


removing metriport business logic from retrieveDocumentsContentFromS3

jonahkaye · 2024-01-28T01:57:38Z

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

 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);


more descriptive function name

jonahkaye · 2024-01-28T01:58:17Z

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

- documentReferences.push(documentReference);
- }
+
+ const promises = documentIds.map(id =>


batch for efficiency

jonahkaye · 2024-01-28T01:58:56Z

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

@@ -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,


the culprit 😭

jonahkaye · 2024-01-28T01:59:48Z

packages/lambdas/src/patient-discovery.ts

@@ -17,6 +17,7 @@ export const handler = Sentry.AWSLambda.wrapHandler(async (event: APIGatewayProx
 id: payload.id,
 timestamp: payload.timestamp,
 samlAttributes: payload.samlAttributes,
+ patientResource: payload.patientResource,


schema validation for all required fields

jonahkaye · 2024-01-28T02:00:38Z

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(),


reverting this back to mandatory and modifying the incoming request types to omit cxId

jonahkaye · 2024-01-28T02:01:33Z

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,


omit cxId in this schema since incoming requests don't have cxId

jonahkaye · 2024-01-28T02:06:12Z

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 


script explainer

jonahkaye · 2024-01-28T02:06:38Z

packages/utils/src/document/document-upload-post-process.ts

@@ -9,6 +9,10 @@ const destinationBucket = getEnvVarOrFail("DESTINATION_BUCKET");
 const region = getEnvVarOrFail("AWS_REGION");
 const apiUrl = getEnvVarOrFail("API_URL");

+/**
+This script takes a document from a source bucket and uploads it to a destination bucket, and generates a metadata xml file for the document
+*/


script explainer string

Refs: #1379

feat(cq): fixing nits on dq pr

fdb3373

Refs: #1379

jonahkaye self-assigned this Jan 26, 2024

jonahkaye added 2 commits January 27, 2024 19:12

feat(cq): nits on dr pr

ca03831

Refs: #1379

feat(cq): tested changes local

f7038d3

Refs: #1379

jonahkaye commented Jan 28, 2024

View reviewed changes

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

this._s3.upload(

{

try {

const data = await this._s3

Copy link

Member Author

jonahkaye Jan 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

modified to use await/async

jonahkaye commented Jan 28, 2024

View reviewed changes

jonahkaye marked this pull request as ready for review January 28, 2024 02:17

jonahkaye requested review from Goncharo, leite08, Orta21 and RamilGaripov as code owners January 28, 2024 02:17

feat(cq): better naming a function and better log

c305351

Refs: #1379

jonahkaye changed the title ~~feat(cq): fixing nits on dq pr~~ Improvements to DQ and DR PRs Jan 30, 2024

jonahkaye marked this pull request as draft January 31, 2024 17:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Improvements to DQ and DR PRs #1528

Improvements to DQ and DR PRs #1528

jonahkaye commented Jan 26, 2024 •

edited

jonahkaye Jan 28, 2024

jonahkaye Jan 28, 2024

jonahkaye Jan 28, 2024

jonahkaye Jan 28, 2024

jonahkaye Jan 28, 2024

jonahkaye Jan 28, 2024

jonahkaye Jan 28, 2024

jonahkaye Jan 28, 2024

jonahkaye Jan 28, 2024

jonahkaye Jan 28, 2024

jonahkaye Jan 28, 2024

jonahkaye Jan 28, 2024

jonahkaye Jan 28, 2024

jonahkaye Jan 28, 2024

jonahkaye Jan 28, 2024

jonahkaye Jan 28, 2024

jonahkaye Jan 28, 2024

jonahkaye Jan 28, 2024

Improvements to DQ and DR PRs #1528

Are you sure you want to change the base?

Improvements to DQ and DR PRs #1528

Conversation

jonahkaye commented Jan 26, 2024 • edited

Description

TODO

Testing

Release Plan

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jonahkaye commented Jan 26, 2024 •

edited