Inline PATIENT_ID And Format Code

Author: trobanga

clinical-domain-agent/src/main/java/care/smith/fts/cda/impl/DeidentifhirStep.java

@@ -8,9 +8,9 @@
 import care.smith.fts.api.DateShiftPreserve;
 import care.smith.fts.api.TransportBundle;
 import care.smith.fts.api.cda.Deidentificator;
-import care.smith.fts.cda.services.deidentifhir.PatientCompartmentService;
 import care.smith.fts.cda.services.deidentifhir.DeidentifhirUtils;
 import care.smith.fts.cda.services.deidentifhir.IdatScraper;
+import care.smith.fts.cda.services.deidentifhir.PatientCompartmentService;
 import care.smith.fts.util.error.TransferProcessException;
 import care.smith.fts.util.tca.*;
 import io.micrometer.core.instrument.MeterRegistry;

clinical-domain-agent/src/main/java/care/smith/fts/cda/services/deidentifhir/IdatScraper.java

@@ -90,7 +90,8 @@ private Map<String, Boolean> precomputeCompartmentMembership(Bundle bundle) {
     for (var entry : bundle.getEntry()) {
       Resource r = entry.getResource();
       String key = r.fhirType() + ":" + r.getIdPart();
-      boolean inCompartment = patientCompartmentService.isInPatientCompartment(r, patientResourceId);
+      boolean inCompartment =
+          patientCompartmentService.isInPatientCompartment(r, patientResourceId);
       membership.put(key, inCompartment);
     }
 

clinical-domain-agent/src/test/java/care/smith/fts/cda/impl/DeidentifhirStepIT.java

@@ -20,8 +20,8 @@
 import care.smith.fts.api.ConsentedPatientBundle;
 import care.smith.fts.api.TransportBundle;
 import care.smith.fts.cda.ClinicalDomainAgent;
-import care.smith.fts.cda.services.deidentifhir.PatientCompartmentService;
 import care.smith.fts.cda.services.deidentifhir.DeidentifhirUtils;
+import care.smith.fts.cda.services.deidentifhir.PatientCompartmentService;
 import care.smith.fts.test.connection_scenario.AbstractConnectionScenarioIT;
 import care.smith.fts.util.WebClientFactory;
 import care.smith.fts.util.tca.TcaDomains;

clinical-domain-agent/src/test/java/care/smith/fts/cda/services/deidentifhir/IdatScraperTest.java

@@ -13,13 +13,12 @@
 import org.junit.jupiter.api.Test;
 
 class IdatScraperTest {
-  private static final String PATIENT_ID = "id1";
   private IdatScraper scraper;
   private PatientCompartmentService patientCompartmentService;
 
   @BeforeEach
   void setUp() {
-    ConsentedPatient patient = new ConsentedPatient(PATIENT_ID, "identifierSystem1");
+    ConsentedPatient patient = new ConsentedPatient("id1", "identifierSystem1");
     var config = parseResources(IdatScraperTest.class, "IDScraper.profile");
 
     // Patient resource is in compartment (IS the patient)
@@ -30,12 +29,12 @@ void setUp() {
             "Organization", List.of());
     patientCompartmentService = new PatientCompartmentService(compartmentParams);
 
-    scraper = new IdatScraper(config, patient, patientCompartmentService, PATIENT_ID, false);
+    scraper = new IdatScraper(config, patient, patientCompartmentService, "id1", false);
   }
 
   @Test
   void gatherIDs() throws IOException {
-    var bundle = generateOnePatient(PATIENT_ID, "2023", "identifierSystem1", "identifier1");
+    var bundle = generateOnePatient("id1", "2023", "identifierSystem1", "identifier1");
     assertThat(scraper.gatherIDs(bundle))
         .containsExactlyInAnyOrder(
             "id1.identifier.identifierSystem1:identifier1", "id1.Patient:id1");