Add :below Modifier To Profile Search

Lucas0T · Lucas0T · commit c23432284ec8 · 2025-07-07T13:39:59.000Z
diff --git a/src/main/java/de/medizininformatikinitiative/torch/consent/ConsentFetcher.java b/src/main/java/de/medizininformatikinitiative/torch/consent/ConsentFetcher.java
@@ -54,7 +54,7 @@ public ConsentFetcher(DataStore dataStore, ConsentCodeMapper mapper, FhirContext
     }
 
     private static Query getConsentQuery(PatientBatch batch) {
-        return Query.of("Consent", batch.compartmentSearchParam("Consent").appendParam("_profile", stringValue(CDS_CONSENT_PROFILE_URL)));
+        return Query.of("Consent", batch.compartmentSearchParam("Consent").appendParam("_profile:below", stringValue(CDS_CONSENT_PROFILE_URL)));
     }
 
     /**
diff --git a/src/main/java/de/medizininformatikinitiative/torch/consent/ConsentHandler.java b/src/main/java/de/medizininformatikinitiative/torch/consent/ConsentHandler.java
@@ -48,7 +48,7 @@ public ConsentHandler(DataStore dataStore, ConsentFetcher consentFetcher) {
     }
 
     private static Query getEncounterQuery(PatientBatch batch) {
-        return Query.of("Encounter", batch.compartmentSearchParam("Encounter").appendParam("_profile", stringValue(CDS_ENCOUNTER_PROFILE_URL)));
+        return Query.of("Encounter", batch.compartmentSearchParam("Encounter").appendParam("_profile:below", stringValue(CDS_ENCOUNTER_PROFILE_URL)));
     }
 
     private static Mono<Map<String, Collection<Encounter>>> groupEncounterByPatient(Flux<Encounter> encounters) {
diff --git a/src/main/java/de/medizininformatikinitiative/torch/model/crtdl/annotated/AnnotatedAttributeGroup.java b/src/main/java/de/medizininformatikinitiative/torch/model/crtdl/annotated/AnnotatedAttributeGroup.java
@@ -76,10 +76,10 @@ private List<QueryParams> queryParams(DseMappingTreeBase mappingTreeBase) {
 
         if (codeParams.isEmpty()) {
             // Add a single QueryParams with the date filter (if available) and profile parameter
-            return List.of(dateParams.appendParam("_profile", stringValue(groupReference)));
+            return List.of(dateParams.appendParam("_profile:below", stringValue(groupReference)));
         } else {
             return codeParams.stream()
-                    .map(p -> p.appendParams(dateParams).appendParam("_profile", stringValue(groupReference)))
+                    .map(p -> p.appendParams(dateParams).appendParam("_profile:below", stringValue(groupReference)))
                     .toList();
         }
     }
diff --git a/src/test/java/de/medizininformatikinitiative/torch/model/crtdl/annotated/AnnotatedAttributeGroupTest.java b/src/test/java/de/medizininformatikinitiative/torch/model/crtdl/annotated/AnnotatedAttributeGroupTest.java
@@ -15,7 +15,9 @@
 import java.util.List;
 import java.util.stream.Stream;
 
-import static de.medizininformatikinitiative.torch.model.fhir.QueryParams.*;
+import static de.medizininformatikinitiative.torch.model.fhir.QueryParams.codeValue;
+import static de.medizininformatikinitiative.torch.model.fhir.QueryParams.dateValue;
+import static de.medizininformatikinitiative.torch.model.fhir.QueryParams.stringValue;
 import static de.medizininformatikinitiative.torch.model.sq.Comparator.GREATER_EQUAL;
 import static de.medizininformatikinitiative.torch.model.sq.Comparator.LESS_EQUAL;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -43,7 +45,7 @@ void oneCode() {
             var result = attributeGroup.queries(mappingTreeBase, "Observation");
 
             assertThat(result).containsExactly(
-                    new Query("Observation", QueryParams.of("code", codeValue(CODE1)).appendParam("_profile", stringValue("groupRef")))
+                    new Query("Observation", QueryParams.of("code", codeValue(CODE1)).appendParam("_profile:below", stringValue("groupRef")))
             );
         }
 
@@ -57,8 +59,8 @@ void twoCodes() {
             var result = attributeGroup.queries(mappingTreeBase, "Observation");
 
             assertThat(result).containsExactly(
-                    new Query("Observation", QueryParams.of("code", codeValue(CODE1)).appendParam("_profile", stringValue("groupRef"))),
-                    new Query("Observation", QueryParams.of("code", codeValue(CODE2)).appendParam("_profile", stringValue("groupRef")))
+                    new Query("Observation", QueryParams.of("code", codeValue(CODE1)).appendParam("_profile:below", stringValue("groupRef"))),
+                    new Query("Observation", QueryParams.of("code", codeValue(CODE2)).appendParam("_profile:below", stringValue("groupRef")))
             );
         }
 
@@ -70,7 +72,7 @@ void dateFilter() {
             var result = attributeGroup.queries(mappingTreeBase, "Observation");
 
             assertThat(result).containsExactly(
-                    new Query("Observation", QueryParams.of("date", dateValue(GREATER_EQUAL, DATE_START)).appendParam("date", dateValue(LESS_EQUAL, DATE_END)).appendParam("_profile", stringValue("groupRef")))
+                    new Query("Observation", QueryParams.of("date", dateValue(GREATER_EQUAL, DATE_START)).appendParam("date", dateValue(LESS_EQUAL, DATE_END)).appendParam("_profile:below", stringValue("groupRef")))
             );
         }
 
@@ -87,4 +89,4 @@ void filtersIgnoredForPatient() {
         }
     }
 
-}
+}
diff --git a/src/test/resources/BlazeBundle.json b/src/test/resources/BlazeBundle.json
@@ -368,7 +368,7 @@
         "id": "VHF00006-E-1-A-1",
         "meta": {
           "profile": [
-            "https://www.medizininformatik-initiative.de/fhir/core/modul-fall/StructureDefinition/KontaktGesundheitseinrichtung"
+            "https://www.medizininformatik-initiative.de/fhir/core/modul-fall/StructureDefinition/KontaktGesundheitseinrichtung|2024"
           ]
         },
         "status": "finished",
@@ -590,7 +590,7 @@
         "id": "1",
         "meta": {
           "profile": [
-            "https://www.medizininformatik-initiative.de/fhir/core/modul-person/StructureDefinition/Patient"
+            "https://www.medizininformatik-initiative.de/fhir/core/modul-person/StructureDefinition/Patient|123"
           ]
         },
         "identifier": [
@@ -677,7 +677,7 @@
         "id": "b84c9b34-d374-4d76-ae61-544ecb84265f",
         "meta": {
           "profile": [
-            "https://www.medizininformatik-initiative.de/fhir/core/modul-labor/StructureDefinition/ObservationLab"
+            "https://www.medizininformatik-initiative.de/fhir/core/modul-labor/StructureDefinition/ObservationLab|2025"
           ]
         },
         "status": "final",
@@ -1243,8 +1243,8 @@
           "versionId": "6",
           "lastUpdated": "2024-09-27T09:01:54.858Z",
           "profile": [
-            "http://fhir.de/ConsentManagement/StructureDefinition/Consent",
-            "https://www.medizininformatik-initiative.de/fhir/modul-consent/StructureDefinition/mii-pr-consent-einwilligung"
+            "http://fhir.de/ConsentManagement/StructureDefinition/Consent|2023",
+            "https://www.medizininformatik-initiative.de/fhir/modul-consent/StructureDefinition/mii-pr-consent-einwilligung|2025"
           ]
         },
         "resourceType": "Consent",

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public ConsentFetcher(DataStore dataStore, ConsentCodeMapper mapper, FhirContext`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`private static Query getConsentQuery(PatientBatch batch) {`
`57`		`- return Query.of("Consent", batch.compartmentSearchParam("Consent").appendParam("_profile", stringValue(CDS_CONSENT_PROFILE_URL)));`
	`57`	`+ return Query.of("Consent", batch.compartmentSearchParam("Consent").appendParam("_profile:below", stringValue(CDS_CONSENT_PROFILE_URL)));`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public ConsentHandler(DataStore dataStore, ConsentFetcher consentFetcher) {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`private static Query getEncounterQuery(PatientBatch batch) {`
`51`		`- return Query.of("Encounter", batch.compartmentSearchParam("Encounter").appendParam("_profile", stringValue(CDS_ENCOUNTER_PROFILE_URL)));`
	`51`	`+ return Query.of("Encounter", batch.compartmentSearchParam("Encounter").appendParam("_profile:below", stringValue(CDS_ENCOUNTER_PROFILE_URL)));`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`private static Mono<Map<String, Collection<Encounter>>> groupEncounterByPatient(Flux<Encounter> encounters) {`
Original file line number	Diff line number	Diff line change
`@@ -76,10 +76,10 @@ private List<QueryParams> queryParams(DseMappingTreeBase mappingTreeBase) {`
`76`	`76`
`77`	`77`	`if (codeParams.isEmpty()) {`
`78`	`78`	`// Add a single QueryParams with the date filter (if available) and profile parameter`
`79`		`- return List.of(dateParams.appendParam("_profile", stringValue(groupReference)));`
	`79`	`+ return List.of(dateParams.appendParam("_profile:below", stringValue(groupReference)));`
`80`	`80`	`} else {`
`81`	`81`	`return codeParams.stream()`
`82`		`- .map(p -> p.appendParams(dateParams).appendParam("_profile", stringValue(groupReference)))`
	`82`	`+ .map(p -> p.appendParams(dateParams).appendParam("_profile:below", stringValue(groupReference)))`
`83`	`83`	`.toList();`
`84`	`84`	`}`
`85`	`85`	`}`