update conditional create/uodate error message (#7221)

* update conditional create/uodate error message

* use actual conditional url in theIfNoneExist

* revert systemRequestDetail mock

* add changelog to conditional create/update error msg

* fix conditional update tests

---------

Co-authored-by: Ivan Baisi <[email protected]>

Author: ibaisi

hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/8_6_0/7215-improve-conditional-create-update-error-msg.yaml

@@ -0,0 +1,5 @@
+---
+type: add
+issue: 7215
+title: "Improve error message on conditional create/update to reference which resource is failing to be persisted.
+  Resource url and type added to supplied resource."

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java

@@ -851,15 +851,18 @@ private void verifyMatchUrlForConditionalCreateOrUpdate(
 				myInMemoryResourceMatcher.match(theIfNoneExist, theResource, theParams, theRequestDetails);
 
 		if (outcome.supported() && !outcome.matched()) {
-			String errorMsg = getConditionalCreateOrUpdateErrorMsg(theCreateOrUpdate);
+			String errorMsg =
+					getConditionalCreateOrUpdateErrorMsg(theCreateOrUpdate, theIfNoneExist, theResource.fhirType());
 			throw new InvalidRequestException(Msg.code(929) + errorMsg);
 		}
 	}
 
-	private String getConditionalCreateOrUpdateErrorMsg(CreateOrUpdateByMatch theCreateOrUpdate) {
+	private String getConditionalCreateOrUpdateErrorMsg(
+			CreateOrUpdateByMatch theCreateOrUpdate, String url, String resourceType) {
 		return String.format(
-				"Failed to process conditional %s. " + "The supplied resource did not satisfy the conditional URL.",
-				theCreateOrUpdate.name().toLowerCase());
+				"Failed to process conditional %s. "
+						+ "The supplied resource %s of type %s did not satisfy the conditional URL.",
+				theCreateOrUpdate.name().toLowerCase(), url, resourceType);
 	}
 
 	@SuppressWarnings("unchecked")

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

@@ -430,7 +430,7 @@ public void testConditionalCreateFailsIfMatchUrlDoesntMatch() {
 			myObservationDao.create(obs, "identifier=A%20B", newSrd());
 			fail();
 		} catch (InvalidRequestException e) {
-			assertEquals(Msg.code(929) + "Failed to process conditional create. The supplied resource did not satisfy the conditional URL.", e.getMessage());
+			assertEquals(Msg.code(929) + "Failed to process conditional create. The supplied resource identifier=A%20B of type Observation did not satisfy the conditional URL.", e.getMessage());
 		}
 	}
 
@@ -455,7 +455,7 @@ public void testConditionalCreateFailsIfMatchUrlDoesntMatch_InTransaction() {
 			mySystemDao.transaction(newSrd(), (Bundle) bb.getBundle());
 			fail();
 		} catch (InvalidRequestException e) {
-			assertEquals(Msg.code(929) + "Failed to process conditional create. The supplied resource did not satisfy the conditional URL.", e.getMessage());
+			assertEquals(Msg.code(929) + "Failed to process conditional create. The supplied resource identifier=A%20B of type Observation did not satisfy the conditional URL.", e.getMessage());
 		}
 	}
 
@@ -466,7 +466,7 @@ public void testConditionalCreateFailsIfMatchUrlCaseIsDifferent() {
 		assertThatThrownBy(() -> myObservationDao.create(obs, "identifier=xxx", newSrd()))
 			.isInstanceOf(InvalidRequestException.class)
 			.hasMessage(Msg.code(929) +
-				"Failed to process conditional create. The supplied resource did not satisfy the conditional URL.");
+				"Failed to process conditional create. The supplied resource identifier=xxx of type Observation did not satisfy the conditional URL.");
 	}
 
 	@Test

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

@@ -206,7 +206,7 @@ public void withPreventInvalidatingConditionalMatchCriteria_true_mustThrow() {
 				InvalidRequestException thrown = assertThrows(InvalidRequestException.class,
 					() -> myPatientDao.update(p2,
 						"Patient?identifier=http://kookaburra.text/id|kookaburra2", mySrd));
-				assertThat(thrown.getMessage()).endsWith("Failed to process conditional create. The supplied resource did not satisfy the conditional URL.");
+				assertThat(thrown.getMessage()).endsWith("Failed to process conditional create. The supplied resource Patient?identifier=http://kookaburra.text/id|kookaburra2 of type Patient did not satisfy the conditional URL.");
 			}
 
 			@Test
@@ -220,7 +220,7 @@ public void withPreventInvalidatingConditionalMatchCriteria_false_mustThrow() {
 				InvalidRequestException thrown = assertThrows(InvalidRequestException.class,
 					() -> myPatientDao.update(p2,
 						"Patient?identifier=http://kookaburra.text/id|kookaburra2", mySrd));
-				assertThat(thrown.getMessage()).endsWith("Failed to process conditional create. The supplied resource did not satisfy the conditional URL.");
+				assertThat(thrown.getMessage()).endsWith("Failed to process conditional create. The supplied resource Patient?identifier=http://kookaburra.text/id|kookaburra2 of type Patient did not satisfy the conditional URL.");
 			}
 
 		}
@@ -251,7 +251,7 @@ public void withPreventInvalidatingConditionalMatchCriteria_true_mustThrow() {
 				InvalidRequestException thrown = assertThrows(InvalidRequestException.class,
 					() -> myPatientDao.update(p2,
 						"Patient?identifier=http://kookaburra.text/id|kookaburra1", mySrd));
-				assertThat(thrown.getMessage()).endsWith("Failed to process conditional update. The supplied resource did not satisfy the conditional URL.");
+				assertThat(thrown.getMessage()).endsWith("Failed to process conditional update. The supplied resource Patient?identifier=http://kookaburra.text/id|kookaburra1 of type Patient did not satisfy the conditional URL.");
 			}
 		}
 	}