filter to remove workaround induced false positive validation error

Author: hhund

dsf-fhir/dsf-fhir-server/src/test/java/dev/dsf/fhir/integration/BundleIntegrationTest.java

@@ -5,6 +5,9 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -358,7 +361,11 @@ private Bundle createFailingTestBundle(BundleType type, IdType resourceToDelete)
 	@Test
 	public void createBundleInBundle() throws Exception
 	{
-		Bundle b = new Bundle().setType(BundleType.BATCHRESPONSE);
+		StructureDefinition sd = readTestBundleProfile();
+		getWebserviceClient().create(sd);
+
+		Bundle b = new Bundle().setType(BundleType.BATCH);
+		b.getMeta().addProfile(sd.getUrl() + "|" + sd.getVersion());
 		b.addEntry()
 				.setResource(new Bundle().setType(BundleType.SEARCHSET)
 						.addLink(new BundleLinkComponent().setRelation("self").setUrl("Medication")).setTotal(0))
@@ -370,4 +377,13 @@ public void createBundleInBundle() throws Exception
 		assertNotNull(created.getIdElement());
 		assertNotNull(created.getIdElement().getIdPart());
 	}
+
+	private StructureDefinition readTestBundleProfile() throws IOException
+	{
+		try (InputStream in = Files
+				.newInputStream(Paths.get("src/test/resources/integration/bundle/test-bundle-profile.xml")))
+		{
+			return fhirContext.newXmlParser().parseResource(StructureDefinition.class, in);
+		}
+	}
 }

dsf-fhir/dsf-fhir-server/src/test/resources/integration/bundle/test-bundle-profile.xml

@@ -0,0 +1,39 @@
+
+<StructureDefinition xmlns="http://hl7.org/fhir">
+	<meta>
+		<tag>
+			<system value="http://dsf.dev/fhir/CodeSystem/read-access-tag" />
+			<code value="ALL" />
+		</tag>
+	</meta>
+	<url value="http://dev.dsf/fhir/Bundle/test-bundle" />
+	<name value="SearchBundleReport" />
+	<fhirVersion value="4.0.1" />
+	<version value="2.0.0" />
+	<status value="active" />
+	<date value="2025-03-31" />
+	<experimental value="false" />
+	<abstract value="false" />
+	<kind value="resource" />
+	<type value="Bundle" />
+	<baseDefinition value="http://hl7.org/fhir/StructureDefinition/Bundle" />
+	<derivation value="constraint" />
+	<differential>
+		<element id="Bundle.type">
+			<path value="Bundle.type" />
+			<fixedCode value="batch" />
+		</element>
+		<element id="Bundle.entry">
+			<path value="Bundle.entry" />
+			<min value="1" />
+		</element>
+		<element id="Bundle.entry.request">
+			<path value="Bundle.entry.request" />
+			<min value="1" />
+		</element>
+		<element id="Bundle.entry.request.method">
+			<path value="Bundle.entry.request.method" />
+			<fixedCode value="GET" />
+		</element>
+	</differential>
+</StructureDefinition>

dsf-fhir/dsf-fhir-validation/src/main/java/dev/dsf/fhir/validation/ResourceInResourceValidator.java

@@ -2,13 +2,15 @@
 
 import java.util.List;
 import java.util.Objects;
+import java.util.function.Predicate;
 import java.util.stream.Stream;
 
 import org.hl7.fhir.r4.model.Bundle;
 import org.hl7.fhir.r4.model.Bundle.BundleEntryComponent;
 import org.hl7.fhir.r4.model.Resource;
 
 import ca.uhn.fhir.context.FhirContext;
+import ca.uhn.fhir.validation.ResultSeverityEnum;
 import ca.uhn.fhir.validation.SingleValidationMessage;
 import ca.uhn.fhir.validation.ValidationResult;
 
@@ -46,6 +48,17 @@ private ValidationResult validateBundle(Bundle bundle)
 				.flatMap(List::stream);
 
 		return new ValidationResult(fhirContext,
-				Stream.concat(bundleResult.getMessages().stream(), entryResults).toList());
+				Stream.concat(
+						bundleResult.getMessages().stream().filter(filterBundleEntryMinimumIfEntriesPresent(entries)),
+						entryResults).toList());
+	}
+
+	private Predicate<SingleValidationMessage> filterBundleEntryMinimumIfEntriesPresent(
+			List<BundleEntryComponent> entries)
+	{
+		return message -> !(!entries.isEmpty() && ResultSeverityEnum.ERROR.equals(message.getSeverity())
+				&& "Bundle".equals(message.getLocationString()) && message.getMessage() != null
+				&& message.getMessage().startsWith("Bundle.entry: minimum required = 1, but only found 0")
+				&& "Validation_VAL_Profile_Minimum".equals(message.getMessageId()));
 	}
 }