Merge pull request #36 from jembi/TB-400-summary-endpoint-forward-params

Forwarding non _mdm query Parameters to Hapi FHIR
jembi · Apr 15, 2024 · 375665d · 375665d
2 parents 70b34ed + 03c3238
commit 375665d
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 11 deletions.
diff --git a/src/middlewares/mpi-mdm-summary.ts b/src/middlewares/mpi-mdm-summary.ts
@@ -4,14 +4,14 @@ import { fetchMpiPatientLinks } from '../utils/mpi';
 import { buildOpenhimResponseObject } from '../utils/utils';
 import { fetchAllPatientSummariesByRefs } from '../routes/handlers/fetchPatientSummaries';
 
-const fetchAllLinkedPatientSummary = async (patientId: string) => {
+const fetchAllLinkedPatientSummary = async (patientId: string, params: object) => {
   try {
     const patientRef = `Patient/${patientId}`;
     const patientRefs: string[] = [];
 
     await fetchMpiPatientLinks(patientRef, patientRefs);
 
-    const bundle = await fetchAllPatientSummariesByRefs(patientRefs);
+    const bundle = await fetchAllPatientSummariesByRefs(patientRefs, params);
 
     logger.debug(`Fetched all patient summaries from the MPI: ${bundle}`);
 
@@ -40,7 +40,9 @@ export const mpiMdmSummaryMiddleware: RequestHandler = async (req, res, next) =>
     return next();
   }
 
-  const { status, body } = await fetchAllLinkedPatientSummary(req.params.patientId);
+  delete req.query._mdm;
+
+  const { status, body } = await fetchAllLinkedPatientSummary(req.params.patientId, req.query);
 
   res.set('Content-Type', 'application/json+openhim');
   res.status(status).send(body);

diff --git a/src/routes/handlers/fetchPatientSummaries.ts b/src/routes/handlers/fetchPatientSummaries.ts
@@ -16,10 +16,20 @@ const {
 } = getConfig();
 
 export const fetchAllPatientSummariesByRefs = async (
-  patientRefs: string[]
+  patientRefs: string[],
+  queryParams?: object
 ): Promise<Bundle> => {
   const patientExternalRefs = patientRefs.map((ref) => {
-    const path = `/fhir/${ref}/$summary`;
+    const params = Object.entries(queryParams ?? {});
+    let combinedParams = null;
+
+    if (params.length > 0) {
+      combinedParams = params
+        .map(([key, value]) => `${key}=${encodeURIComponent(value)}`)
+        .join('&');
+    }
+
+    const path = `/fhir/${ref}/$summary${combinedParams ? `?${combinedParams}` : ''}`;
 
     return getData(protocol, host, port, path, {
       'Content-Type': 'application/fhir+json',
@@ -43,10 +53,11 @@ export const fetchAllPatientSummariesByRefs = async (
 };
 
 export const fetchPatientSummaryByRef = async (
-  ref: string
+  ref: string,
+  queryParams: object
 ): Promise<MpiMediatorResponseObject> => {
   try {
-    const bundle = await fetchAllPatientSummariesByRefs([ref]);
+    const bundle = await fetchAllPatientSummariesByRefs([ref], queryParams);
     const responseBody = buildOpenhimResponseObject('Successful', 200, bundle);
 
     logger.info(`Successfully fetched patient summary with id ${ref}`);

diff --git a/src/routes/index.ts b/src/routes/index.ts
@@ -76,7 +76,10 @@ routes.get(
   '/fhir/Patient/:patientId/\\$summary',
   mpiMdmSummaryMiddleware,
   asyncHandler(async (req, res) => {
-    const { status, body } = await fetchPatientSummaryByRef(`Patient/${req.params.patientId}`);
+    const { status, body } = await fetchPatientSummaryByRef(
+      `Patient/${req.params.patientId}`,
+      req.query
+    );
 
     res.set('Content-Type', 'application/json+openhim');
     res.status(status).send(body);

diff --git a/tests/unit/fetchPatientSummaries.ts b/tests/unit/fetchPatientSummaries.ts
@@ -211,14 +211,13 @@ describe('FetchPatientSummaries handler', (): void => {
   describe('fetchPatientSummariesByRefs', async () => {
     it('should return an empty bundle', async () => {
       nock(fhirDatastoreUrl).get(`/fhir/${emptyPatientRef1}/$summary`).reply(200, {});
-
-      const result = await fetchPatientSummaryByRef(emptyPatientRef1);
+      const result = await fetchPatientSummaryByRef(emptyPatientRef1, {});
       expect(JSON.parse(result.body.response.body)).to.deep.equal(emptyBundle);
     });
     it('should return a bundle with 2 entries for 1 given patient', async () => {
       nock(fhirDatastoreUrl).get(`/fhir/${patientRef3}/$summary`).reply(200, patientSummary3);
 
-      const result = await fetchPatientSummaryByRef(patientRef3);
+      const result = await fetchPatientSummaryByRef(patientRef3, {});
       expect(JSON.parse(result.body.response.body)).to.deep.equal(combinedBundle2);
     });
   });