From e5f94fbdffa9330027e63bec4ad0f2b6d8123152 Mon Sep 17 00:00:00 2001
From: chubert-sb <85900348+chubert-sb@users.noreply.github.com>
Date: Fri, 6 Sep 2024 16:32:35 -0400
Subject: [PATCH] MAT-7565: use patient id for folder name (#244)

* MAT-7565: use patient id for folder name

* MAT-7565: cleanup
---
 .../madiefhirservice/services/TestCaseBundleService.java   | 7 ++++---
 .../services/TestCaseBundleServiceTest.java                | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/gov/cms/madie/madiefhirservice/services/TestCaseBundleService.java b/src/main/java/gov/cms/madie/madiefhirservice/services/TestCaseBundleService.java
index 0bc5ff6b..f408b9a3 100644
--- a/src/main/java/gov/cms/madie/madiefhirservice/services/TestCaseBundleService.java
+++ b/src/main/java/gov/cms/madie/madiefhirservice/services/TestCaseBundleService.java
@@ -98,7 +98,7 @@ public Map<String, Bundle> getTestCaseExportBundle(
       // but we don't want to modify it permanently
       if (exportDTO.getBundleType() != null) {
         BundleType bundleType = BundleType.valueOf(exportDTO.getBundleType().name());
-        bundle = updateEntry(bundle, bundleType, parser);
+        bundle = updateEntry(bundle, bundleType, parser, testCase.getPatientId().toString());
         String json = parser.encodeResourceToString(bundle);
         testCase.setJson(json);
       }
@@ -120,7 +120,8 @@ public Map<String, Bundle> getTestCaseExportBundle(
     return testCaseBundle;
   }
 
-  public Bundle updateEntry(Bundle bundle, BundleType bundleType, IParser parser) {
+  public Bundle updateEntry(
+      Bundle bundle, BundleType bundleType, IParser parser, String patientId) {
     Bundle bundleCopy = bundle.copy();
     org.hl7.fhir.r4.model.Bundle.BundleType fhirBundleType =
         org.hl7.fhir.r4.model.Bundle.BundleType.valueOf(bundleType.toString().toUpperCase());
@@ -131,8 +132,8 @@ public Bundle updateEntry(Bundle bundle, BundleType bundleType, IParser parser)
     // "Patient/madie-generated-uuid"
     String bundleString = parser.encodeResourceToString(bundleCopy);
     for (Bundle.BundleEntryComponent entry : bundleCopy.getEntry()) {
-      var resourceID = UUID.randomUUID().toString();
       var resourceType = entry.getResource().getResourceType() + "/";
+      var resourceID = resourceType.equals("Patient/") ? patientId : UUID.randomUUID().toString();
       bundleString =
           bundleString.replaceAll(
               resourceType + entry.getResource().getIdPart(), resourceType + resourceID);
diff --git a/src/test/java/gov/cms/madie/madiefhirservice/services/TestCaseBundleServiceTest.java b/src/test/java/gov/cms/madie/madiefhirservice/services/TestCaseBundleServiceTest.java
index da5c08de..5a40d0c8 100644
--- a/src/test/java/gov/cms/madie/madiefhirservice/services/TestCaseBundleServiceTest.java
+++ b/src/test/java/gov/cms/madie/madiefhirservice/services/TestCaseBundleServiceTest.java
@@ -112,7 +112,7 @@ void updateEntryForTransactionBundleType() {
     assertNull(patientEntry.getRequest().getMethod());
 
     var updatedBundle =
-        testCaseBundleService.updateEntry(testBundle, BundleType.TRANSACTION, parser);
+        testCaseBundleService.updateEntry(testBundle, BundleType.TRANSACTION, parser, "123");
 
     Bundle.BundleEntryComponent updatedPatientEntry = updatedBundle.getEntry().get(0);
     Bundle.BundleEntryComponent updatedEncounterEntry = updatedBundle.getEntry().get(1);
@@ -147,7 +147,7 @@ void updateEntryForCollectionBundleType() {
     assertNull(testBundle.getEntry().get(0).getRequest().getMethod());
 
     var updatedBundle =
-        testCaseBundleService.updateEntry(testBundle, BundleType.COLLECTION, parser);
+        testCaseBundleService.updateEntry(testBundle, BundleType.COLLECTION, parser, "123");
 
     Bundle.BundleEntryComponent updatedPatientEntry = updatedBundle.getEntry().get(0);
     Bundle.BundleEntryComponent updatedEncounterEntry = updatedBundle.getEntry().get(1);