Fix Bundle URL

Author: Lucas0T

src/main/java/de/medizininformatikinitiative/torch/model/management/ResourceBundle.java

@@ -269,7 +269,7 @@ private Bundle.BundleEntryComponent createBundleEntry(Resource resource) {
         Bundle.BundleEntryComponent entryComponent = new Bundle.BundleEntryComponent();
         entryComponent.setResource(resource);
         Bundle.BundleEntryRequestComponent request = new Bundle.BundleEntryRequestComponent();
-        request.setUrl(resource.getId());
+        request.setUrl(resource.getResourceType() + "/" + resource.getId());
         request.setMethod(PUT);
         entryComponent.setRequest(request);
         return entryComponent;

src/test/java/de/medizininformatikinitiative/torch/CdsExecutionIT.java

@@ -1,6 +1,7 @@
 package de.medizininformatikinitiative.torch;
 
 import de.medizininformatikinitiative.torch.assertions.BundleAssert;
+import org.hl7.fhir.r4.model.Bundle;
 import org.hl7.fhir.r4.model.ResourceType;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
@@ -12,6 +13,7 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.List;
 
 import static de.medizininformatikinitiative.torch.TestUtils.nodeFromValueString;
 import static de.medizininformatikinitiative.torch.assertions.Assertions.assertThat;
@@ -37,7 +39,7 @@ static void setUp() throws IOException {
 
         torchClient = environment.torchClient();
         fileServerClient = environment.fileServerClient();
-        var blazeClient = environment.blazeClient();
+        FhirClient blazeClient = environment.blazeClient();
 
         logger.info("Uploading test data...");
         var bundle = Files.readString(Path.of("target/kds-testdata-2024.0.1/resources/Bundle-mii-exa-test-data-bundle.json"));
@@ -57,8 +59,8 @@ public void testExamples() throws IOException {
         var statusResponse = torchClient.pollStatus(statusUrl).block();
         assertThat(statusResponse).isNotNull();
 
-        var coreBundles = statusResponse.coreBundleUrl().stream().flatMap(fileServerClient::fetchBundles).toList();
-        var patientBundles = statusResponse.patientBundleUrls().stream().flatMap(fileServerClient::fetchBundles).toList();
+        List<Bundle> coreBundles = statusResponse.coreBundleUrl().stream().flatMap(fileServerClient::fetchBundles).toList();
+        List<Bundle> patientBundles = statusResponse.patientBundleUrls().stream().flatMap(fileServerClient::fetchBundles).toList();
 
         assertThat(coreBundles, BundleAssert.class).singleElement().containsNEntries(0);
         assertThat(patientBundles).hasSize(3);
@@ -110,10 +112,13 @@ public void testExamples() throws IOException {
                         .extractElementsAt("code.coding.code")
                         .containsExactly(nodeFromValueString("C16.9")));
 
-        // test that IDs are properly formatted
         assertThat(patientBundles).allSatisfy(bundle ->
                 assertThat(bundle).extractResourcesByType(ResourceType.Condition).allSatisfy(
                         r -> assertThat(r).extractChildrenStringsAt("subject.reference").satisfiesExactly(id -> assertThat(id).startsWith("Patient/"))
                 ));
+
+        assertThat(patientBundles).allSatisfy(bundle ->
+                assertThat(bundle).allRequestsMatchResourceIdentity());
+
     }
 }

src/test/java/de/medizininformatikinitiative/torch/SpecificExecutionIT.java

@@ -59,6 +59,9 @@ static void uploadTestData(String testName) throws IOException {
 
     public void executeStandardTests(List<Bundle> patientBundles) {
 
+        assertThat(patientBundles).allSatisfy(bundle ->
+                assertThat(bundle).allRequestsMatchResourceIdentity());
+
         // test if referenced IDs match the actual patient's IDs
         assertThat(patientBundles).allSatisfy(bundle -> Assertions.assertThat(bundle).extractOnlyPatient().satisfies(patient ->
                 Assertions.assertThat(bundle).extractResourcesByType(ResourceType.Condition).allSatisfy(condition ->

src/test/java/de/medizininformatikinitiative/torch/assertions/BundleAssert.java

@@ -55,6 +55,17 @@ public ListAssert<String> extractBatchBundleUrls() {
         return new ListAssert<>(fhirPathEngine.evaluate(actual, "Bundle.entry.request.url", UriType.class).stream().map(UriType::getValueAsString).toList());
     }
 
+    public BundleAssert allRequestsMatchResourceIdentity() {
+        boolean allMatch = actual.getEntry().stream().allMatch(entry ->
+                entry.getRequest().getUrl().equals(entry.getResource().getId())
+        );
+        if (!allMatch) {
+            failWithMessage("Expected bundle to resource ids to match request urls");
+        }
+
+        return myself;
+    }
+
     /**
      * Extracts the only patient of the bundle.
      * <p>