fix reference prefetch caching (#6822)

* failing test

* failing test

* fix and changelog

* update changelog based on review suggestion

Co-authored-by: volodymyr-korzh <[email protected]>

* review change

---------

Co-authored-by: jdar <[email protected]>
Co-authored-by: volodymyr-korzh <[email protected]>

Author: 3 people

hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/8_2_0/6821-fix-failed-to-resolve-placeholder-refs-in-transaction-bundle.yaml

@@ -0,0 +1,6 @@
+---
+type: fix
+issue: 6821
+jira: SMILE-10029
+title: "Previously, when submitting a transaction bundle with a placeholder ID referencing another resource within the same bundle, the 
+reference would sometimes fail to resolve, resulting in a 400 Bad Request error. This has now been fixed."

hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirSystemDaoR4Test.java

@@ -1,6 +1,10 @@
 package ca.uhn.fhir.jpa.dao.r4;
 
 import static ca.uhn.fhir.test.utilities.UuidUtils.HASH_UUID_PATTERN;
+
+import org.hl7.fhir.r4.model.MessageHeader;
+import org.hl7.fhir.r4.model.RequestGroup;
+
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -5173,4 +5177,23 @@ public void testTransactionWithDuplicateConditionalCreateAndDelete() {
 		assertEquals(status204, resp.getEntry().get(1).getResponse().getStatus());
 	}
 
+	@Test
+	public void testTransaction_withPlaceholderIdReferences_referencesResolveSuccessfully() {
+		Patient p = new Patient();
+		p.setActive(true);
+		p.setId("A123");
+		myPatientDao.update(p, mySrd);
+
+		String bundleString = ClasspathUtil.loadResource("/transaction-bundles/transaction-bundle.json");
+		Bundle input = myFhirContext.newJsonParser().parseResource(Bundle.class, bundleString);
+
+		Bundle resp = mySystemDao.transaction(null, input);
+		assertThat(resp.getEntry()).hasSize(2);
+		resp.getEntry().stream().map(bundleEntry -> bundleEntry.getResponse().getStatus()).forEach(statusMessage -> assertThat(statusMessage).isEqualTo("201 Created"));
+		List<String> createdResources = resp.getEntry().stream().map(b->b.getResponse().getLocation()).toList();
+		assertThat(createdResources)
+			.hasSize(2)
+			.allMatch(resourceLocation -> resourceLocation.contains("MessageHeader") || resourceLocation.contains("RequestGroup"));
+	}
+
 }

hapi-fhir-jpaserver-test-r4/src/test/resources/transaction-bundles/transaction-bundle.json

@@ -0,0 +1,44 @@
+{
+	"resourceType": "Bundle",
+	"type": "transaction",
+	"entry": [
+		{
+			"fullUrl": "urn:uuid:a6017be3-a75c-40d2-bf31-42037df175a7",
+			"resource": {
+				"resourceType": "RequestGroup"
+			},
+			"request": {
+				"method": "POST",
+				"url": "RequestGroup"
+			}
+		},
+		{
+			"fullUrl": "urn:uuid:aa3ed9c6-21f0-4904-b101-08f7efd638b7",
+			"resource": {
+				"resourceType": "MessageHeader",
+				"meta": {
+					"extension": [
+						{
+							"url": "http://hapifhir.io/fhir/StructureDefinition/auto-version-references-at-path",
+							"valueString": "focus"
+						}
+					]
+				},
+				"focus": [
+					{
+						"reference": "urn:uuid:a6017be3-a75c-40d2-bf31-42037df175a7",
+						"type": "RequestGroup"
+					},
+					{
+						"reference": "Patient/A123",
+						"type": "Patient"
+					}
+				]
+			},
+			"request": {
+				"method": "POST",
+				"url": "MessageHeader"
+			}
+		}
+	]
+}

hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/BaseTransactionProcessor.java

@@ -1851,7 +1851,10 @@ private void resolveReferencesThenSaveAndIndexResource(
 					} else {
 						// we will add the looked up info to the transaction
 						// for later
-						theTransactionDetails.addResolvedResourceId(id, resourceVersionMap.getResourcePersistentId(id));
+						if (resourceVersionMap.containsKey(id)) {
+							theTransactionDetails.addResolvedResourceId(
+									id, resourceVersionMap.getResourcePersistentId(id));
+						}
 					}
 				}