Fix Bundle PUT URL Not Set To Relative URL

Author: Lucas0T

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

@@ -257,9 +257,7 @@ public Bundle toFhirBundle() {
         bundle.setId(UUID.randomUUID().toString());
 
         cache.values().forEach(resource -> {
-                    if (resource.isPresent()) {
-                        bundle.addEntry(createBundleEntry(resource.get()));
-                    }
+                    resource.ifPresent(value -> bundle.addEntry(createBundleEntry(value)));
                 }
         );
         return bundle;
@@ -269,7 +267,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.getResourceType() + "/" + resource.getId());
+        request.setUrl(ResourceUtils.getRelativeURL(resource));
         request.setMethod(PUT);
         entryComponent.setRequest(request);
         return entryComponent;

src/test/java/de/medizininformatikinitiative/torch/management/ResourceBundleTest.java

@@ -34,7 +34,7 @@ class ResourceBundleTest {
 
     @BeforeEach
     void setUp() {
-        patient1.setId("patient1");
+        patient1.setId("http://blaze.com/fhir/Patient/patient1");
         patient2.setId("patient2");
         patient3.setId("patient3");
         Set<String> attributeGroups1 = Set.of("group1", "group2");
@@ -52,7 +52,7 @@ void toFhirBundleTest() {
         cache.put(wrapper1);
 
         var fhirBundle = cache.toFhirBundle();
-
+        assertThat(fhirBundle.getEntry().getFirst().getRequest().getUrl()).isEqualTo("Patient/patient1");
         assertThat(fhirBundle)
                 .containsNEntries(1)
                 .extractResources()