Merge pull request #40 from jembi/hotfix

Hotfix
jembi · Apr 10, 2024 · 70b34ed · 70b34ed
2 parents d9aecb5 + 10d560c
commit 70b34ed
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mpi-mediator",
-  "version": "v2.1.0",
+  "version": "v2.1.1",
   "description": "An OpenHIM mediator to handle all interactions with an MPI component",
   "main": "index.ts",
   "scripts": {

diff --git a/src/utils/kafkaFhir.ts b/src/utils/kafkaFhir.ts
@@ -76,14 +76,15 @@ export const sendToFhirAndKafka = async (
     // Restore full patient resources to the bundle for sending to Kafka
     Object.keys(newPatientRef).forEach((fullUrl) => {
       const patientData = newPatientRef[fullUrl];
+      const url = `Patient/${patientData.mpiResponsePatient?.id}`;
 
       if (patientData.restoredPatient && bundle.entry) {
         const patientEntry: BundleEntry = {
-          fullUrl: fullUrl,
+          fullUrl,
           resource: patientData.restoredPatient,
           request: {
             method: 'PUT',
-            url: `Patient/${patientData.mpiResponsePatient?.id}`,
+            url
           },
         };
 
@@ -101,6 +102,13 @@ export const sendToFhirAndKafka = async (
           );
           bundle.entry.push(patientEntry);
         }
+
+        // Replace the old patient reference in the resources
+        const oldId = fullUrl.split('/').pop();
+
+        if (oldId) {
+          bundle = JSON.parse(JSON.stringify(bundle).replace(RegExp(`Patient/${oldId}`, 'g'), url));
+        }
       }
     });