use ResourceType enum for path check, remove constants indirection

medizininformatik-initiative · Jul 5, 2024 · 4f143c1 · 4f143c1
1 parent 5d28823
commit 4f143c1
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 19 deletions.
diff --git a/src/main/java/de/medizininformatik_initiative/process/report/service/CheckSearchBundle.java b/src/main/java/de/medizininformatik_initiative/process/report/service/CheckSearchBundle.java
@@ -8,8 +8,8 @@
 import java.util.stream.Stream;
 
 import org.camunda.bpm.engine.delegate.DelegateExecution;
+import org.hl7.fhir.exceptions.FHIRException;
 import org.hl7.fhir.r4.model.Bundle;
-import org.hl7.fhir.r4.model.IdType;
 import org.hl7.fhir.r4.model.ResourceType;
 import org.hl7.fhir.r4.model.Task;
 import org.slf4j.Logger;
@@ -19,6 +19,7 @@
 import org.springframework.web.util.UriComponentsBuilder;
 
 import de.medizininformatik_initiative.process.report.ConstantsReport;
+
 import dev.dsf.bpe.v1.ProcessPluginApi;
 import dev.dsf.bpe.v1.activity.AbstractServiceDelegate;
 import dev.dsf.bpe.v1.variables.Target;
@@ -39,12 +40,11 @@ public class CheckSearchBundle extends AbstractServiceDelegate
 
 	private static final List<String> DATE_SEARCH_PARAMS = List.of("date", "recorded-date", "onset-date", "effective",
 			"effective-time", "authored", "collected", "issued", "period", "location-period", "occurrence");
-	private static final List<String> TOKEN_SEARCH_PARAMS = List.of("code", "ingredient-code", TYPE_SEARCH_PARAM);
-	private static final List<String> OTHER_SEARCH_PARAMS = List.of("_profile", SUMMARY_SEARCH_PARAM);
+	private static final List<String> TOKEN_SEARCH_PARAMS = List.of("code", "ingredient-code", "type");
+	private static final List<String> OTHER_SEARCH_PARAMS = List.of("_profile", "_summary");
 
-	private static final List<String> VALID_SEARCH_PARAMS = Stream
-			.of(DATE_SEARCH_PARAMS.stream(), TOKEN_SEARCH_PARAMS.stream(), OTHER_SEARCH_PARAMS.stream()).flatMap(s -> s)
-			.toList();
+	private static final List<String> VALID_SEARCH_PARAMS = Stream.of(DATE_SEARCH_PARAMS.stream(),
+			TOKEN_SEARCH_PARAMS.stream(), OTHER_SEARCH_PARAMS.stream()).flatMap(s -> s).toList();
 
 	public CheckSearchBundle(ProcessPluginApi api)
 	{
@@ -79,8 +79,7 @@ protected void doExecute(DelegateExecution execution, Variables variables)
 					target.getOrganizationIdentifierValue(), task.getId(), exception.getMessage());
 			throw new RuntimeException(
 					"Error while checking search Bundle from HRP '" + target.getOrganizationIdentifierValue()
-							+ "' in Task with id '" + task.getId() + "' - " + exception.getMessage(),
-					exception);
+							+ "' in Task with id '" + task.getId() + "' - " + exception.getMessage(), exception);
 		}
 	}
 
@@ -115,23 +114,29 @@ private void testRequestUrls(List<Bundle.BundleEntryComponent> searches)
 		List<UriComponents> uriComponents = requests.stream()
 				.map(r -> UriComponentsBuilder.fromUriString(r.getUrl()).build()).toList();
 
-		testContainsNoPathIds(uriComponents);
+		testContainsOnlyResourcePath(uriComponents);
 		testContainsValidSummaryCount(uriComponents);
 		testContainsValidSearchParams(uriComponents);
 		testContainsValidDateSearchParams(uriComponents);
 		testContainsValidTokenSearchParams(uriComponents);
 	}
 
-	private void testContainsNoPathIds(List<UriComponents> uriComponents)
+	private void testContainsOnlyResourcePath(List<UriComponents> uriComponents)
 	{
-		// Resource type is only present in IdType if URI path contains a resource id
-		List<IdType> pathsWithId = uriComponents.stream().map(UriComponents::getPath).filter(Objects::nonNull)
-				.map(IdType::new).filter(i -> i.getResourceType() != null).toList();
+		uriComponents.stream().filter(u -> !CAPABILITY_STATEMENT_PATH.equals(u.getPath())).forEach(this::testPath);
+	}
 
-		if (!pathsWithId.isEmpty())
+	private void testPath(UriComponents uriComponents)
+	{
+		try
 		{
-			throw new RuntimeException("Search Bundle contains request url with resource id - ["
-					+ pathsWithId.stream().map(IdType::getValue).collect(Collectors.joining(",")) + "]");
+			// Converting to ResourceType enum without exception shows that path contains only resource without id
+			ResourceType.fromCode(uriComponents.getPath());
+		}
+		catch (FHIRException exception)
+		{
+			throw new RuntimeException(
+					"Search Bundle contains request url with resource id - [" + uriComponents.getPath() + "]");
 		}
 	}
 
@@ -193,9 +198,9 @@ private void testSearchParamDateValues(MultiValueMap<String, String> queryParams
 				.filter(e -> !e.getValue().startsWith(DATE_EQUALITY_FILTER)).toList();
 
 		if (erroneousDateFilters.size() > 0)
-			throw new RuntimeException(
-					"Search Bundle contains date search params not starting with 'eq' - [" + erroneousDateFilters
-							.stream().map(e -> e.getKey() + ":" + e.getValue()).collect(Collectors.joining(",")) + "]");
+			throw new RuntimeException("Search Bundle contains date search params not starting with 'eq' - ["
+					+ erroneousDateFilters.stream().map(e -> e.getKey() + ":" + e.getValue())
+					.collect(Collectors.joining(",")) + "]");
 
 		List<Map.Entry<String, String>> erroneousDateValues = dateParams.stream()
 				.filter(e -> !YEAR_ONLY.matcher(e.getValue().replace(DATE_EQUALITY_FILTER, "")).matches()).toList();

diff --git a/...java/de/medizininformatik_initiative/process/report/bpe/CheckSearchBundleServiceTest.java b/...java/de/medizininformatik_initiative/process/report/bpe/CheckSearchBundleServiceTest.java
@@ -102,6 +102,12 @@ public void testInvalidResourceId()
 		testInvalid("/fhir/Bundle/search-bundle-invalid-resource-id.xml", "request url with resource id");
 	}
 
+	@Test
+	public void testInvalidResourceIdDouble()
+	{
+		testInvalid("/fhir/Bundle/search-bundle-invalid-resource-id-double.xml", "request url with resource id");
+	}
+
 	@Test
 	public void testInvalidNoSummary()
 	{

diff --git a/src/test/resources/fhir/Bundle/search-bundle-invalid-resource-id-double.xml b/src/test/resources/fhir/Bundle/search-bundle-invalid-resource-id-double.xml
@@ -0,0 +1,28 @@
+<Bundle xmlns="http://hl7.org/fhir">
+	<meta>
+		<versionId value="1"/>
+		<lastUpdated value="2022-11-16T10:00:00.000+01:00"/>
+		<profile value="http://medizininformatik-initiative.de/fhir/Bundle/search-bundle-report|1.0"/>
+		<tag>
+			<system value="http://dsf.dev/fhir/CodeSystem/read-access-tag" />
+			<code value="ALL" />
+		</tag>
+	</meta>
+	<type value="batch"/>
+	<identifier>
+		<system value="http://medizininformatik-initiative.de/fhir/CodeSystem/report" />
+		<value value="search-bundle" />
+	</identifier>
+	<entry>
+		<request>
+			<method value="GET"/>
+			<url value="Consent/Consent?_profile=http://fhir.de/ConsentManagement/StructureDefinition/Consent&amp;_summary=count"/>
+		</request>
+	</entry>
+	<entry>
+		<request>
+			<method value="GET"/>
+			<url value="Condition?_profile=https://www.medizininformatik-initiative.de/fhir/core/modul-diagnose/StructureDefinition/Diagnose&amp;_summary=count"/>
+		</request>
+	</entry>
+</Bundle>