fix merge issues

cqframework · Sep 17, 2024 · 758811a · 758811a
1 parent 5b1495b
commit 758811a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/cqf-fhir-utility/src/main/java/org/opencds/cqf/fhir/utility/PackageHelper.java b/cqf-fhir-utility/src/main/java/org/opencds/cqf/fhir/utility/PackageHelper.java
@@ -52,7 +52,7 @@ public static IBaseBackboneElement createEntry(IBaseResource resource, boolean i
 
     public static IBaseBackboneElement deleteEntry(IBaseResource resource) {
         final var fhirVersion = resource.getStructureFhirVersionEnum();
-        final var entry = BundleHelper.newEntryWithResource(resource.getStructureFhirVersionEnum(), resource);
+        final var entry = BundleHelper.newEntryWithResource(resource);
         var requestUrl = resource.fhirType() + "/" + resource.getIdElement().getIdPart();
 
         final var request = BundleHelper.newRequest(fhirVersion, "DELETE", requestUrl);

diff --git a/...utility/src/main/java/org/opencds/cqf/fhir/utility/repository/InMemoryFhirRepository.java b/...utility/src/main/java/org/opencds/cqf/fhir/utility/repository/InMemoryFhirRepository.java
@@ -118,6 +118,7 @@ public <T extends IBaseResource, I extends IIdType> MethodOutcome delete(
         var resources = resourceMap.computeIfAbsent(id.getResourceType(), r -> new HashMap<>());
         var keyId = id.toUnqualifiedVersionless();
         if (resources.containsKey(keyId)) {
+            outcome.setResource(resources.get(keyId));
             resources.remove(keyId);
         } else {
             throw new ResourceNotFoundException("Resource not found with id " + id);
@@ -237,7 +238,7 @@ public static <B extends IBaseBundle> B transactionStub(B transaction, Repositor
                     var res = repository.delete(
                             resourceClass,
                             BundleHelper.getEntryRequestId(version, e).get().withResourceType(resourceType));
-                    BundleHelper.addEntry(returnBundle, BundleHelper.newEntryWithResource(version, res.getResource()));
+                    BundleHelper.addEntry(returnBundle, BundleHelper.newEntryWithResource(res.getResource()));
                 } else {
                     throw new ResourceNotFoundException("Trying to delete an entry without id");
                 }