Merge pull request #99 from medizininformatik-initiative/release-v2.2.1

Release v2.2.1

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## v2.1.1
+
+### Bugfixes
+
+* Fix Consent Search Param ([#97](https://github.com/medizininformatik-initiative/flare/issues/97))
+
+The full changelog can be found [here](https://github.com/medizininformatik-initiative/flare/milestone/11?closed=1).
+
 ## v2.1.0
 
 ### Enhancements

pom.xml

@@ -13,15 +13,15 @@
 
   <groupId>de.medizininformatik-initiative</groupId>
   <artifactId>flare</artifactId>
-  <version>2.1.0</version>
+  <version>2.2.1</version>
 
   <name>Flare</name>
   <description>Flare</description>
 
   <properties>
     <java.version>17</java.version>
     <testcontainers.version>1.19.1</testcontainers.version>
-    <ontology.version>2.1.24</ontology.version>
+    <ontology.version>2.1.27</ontology.version>
   </properties>
 
   <dependencies>

src/test/java/de/medizininformatikinitiative/flare/service/StructuredQueryServiceIT.java

@@ -77,9 +77,6 @@ class StructuredQueryServiceIT {
     @Autowired
     private StructuredQueryService service;
 
-    @Autowired
-    private StructuredQueryService service_Specimen;
-
     @Autowired
     private StructuredQueryService service_BloodPressure;
 
@@ -155,6 +152,15 @@ void execute_genderTestCase() throws URISyntaxException, IOException {
         assertThat(result).isEqualTo(172);
     }
 
+    @Test
+    void execute_consentTestCase() throws URISyntaxException, IOException {
+        var query = parseSq(Files.readString(resourcePathFlareApplication("testCases").resolve("returningOther").resolve("consent.json")));
+
+        var result = service.execute(query).block();
+
+        assertThat(result).isOne();
+    }
+
     @Test
     void execute_specimenTestCase() throws IOException, URISyntaxException {
         dataStoreClient.post()
@@ -166,7 +172,7 @@ void execute_specimenTestCase() throws IOException, URISyntaxException {
 
         var query = parseSq(slurpStructuredQueryService("referencedCriteria/sq-test-specimen-diag.json"));
 
-        var result = service_Specimen.execute(query).block();
+        var result = service.execute(query).block();
 
         assertThat(result).isOne();
     }
@@ -246,15 +252,6 @@ public MappingContext mappingContext() throws Exception {
             return Util.flareMappingContext(CLOCK_2000);
         }
 
-        @Bean
-        public MappingContext mappingContext_Specimen() throws Exception {
-            var mapper = new ObjectMapper();
-            var mappings = Arrays.stream(mapper.readValue(slurpStructuredQueryService("referencedCriteria/mapping-specimen-test.json"), Mapping[].class))
-                    .collect(Collectors.toMap(Mapping::key, identity()));
-            var conceptTree = mapper.readValue(slurpStructuredQueryService("referencedCriteria/tree-specimen-test.json"), TermCodeNode.class);
-            return MappingContext.of(mappings, conceptTree, CLOCK_2000);
-        }
-
         @Bean
         public MappingContext mappingContext_BloodPressure() throws Exception {
             var mapper = new ObjectMapper();
@@ -274,11 +271,6 @@ public Translator translator(MappingContext mappingContext) {
             return new Translator(mappingContext);
         }
 
-        @Bean
-        public Translator translator_Specimen(MappingContext mappingContext_Specimen) {
-            return new Translator(mappingContext_Specimen);
-        }
-
         @Bean
         public Translator translator_BloodPressure(MappingContext mappingContext_BloodPressure) {
             return new Translator(mappingContext_BloodPressure);
@@ -289,11 +281,6 @@ public StructuredQueryService service(FhirQueryService fhirQueryService, Transla
             return new StructuredQueryService(fhirQueryService, translator);
         }
 
-        @Bean
-        public StructuredQueryService service_Specimen(FhirQueryService fhirQueryService, Translator translator_Specimen) {
-            return new StructuredQueryService(fhirQueryService, translator_Specimen);
-        }
-
         @Bean
         public StructuredQueryService service_BloodPressure(FhirQueryService fhirQueryService, Translator translator_BloodPressure) {
             return new StructuredQueryService(fhirQueryService, translator_BloodPressure);

src/test/resources/de/medizininformatikinitiative/flare/service/referencedCriteria/custom-search-parameters.json

@@ -25,6 +25,25 @@
           "*"
         ]
       }
+    },
+    {
+      "fullUrl": "https://www.medizininformatik-initiative.de/fhir/modul-consent/SearchParameter/mii-sp-consent-provisioncode",
+      "resource": {
+        "resourceType": "SearchParameter",
+        "id": "mii-provision-provision-code",
+        "url": "https://www.medizininformatik-initiative.de/fhir/modul-consent/SearchParameter/mii-sp-consent-provisioncode",
+        "version": "1.0.3",
+        "name": "MII_SP_Consent_ProvisionCode",
+        "status": "active",
+        "date": "2023-03-08",
+        "description": "Suche im Code der Provison",
+        "code": "mii-provision-provision-code",
+        "base": [
+          "Consent"
+        ],
+        "type": "token",
+        "expression": "Consent.provision.provision.code"
+      }
     }
   ]
 }

src/test/resources/de/medizininformatikinitiative/flare/testCases/returningOther/consent.json

@@ -0,0 +1,23 @@
+{
+  "version": "http://to_be_decided.com/draft-1/schema#",
+  "display": "",
+  "inclusionCriteria": [
+    [
+      {
+        "context": {
+          "code": "Einwilligung",
+          "display": "Einwilligung",
+          "system": "fdpg.mii.cds",
+          "version": "1.0.0"
+        },
+        "termCodes": [
+          {
+            "code": "2.16.840.1.113883.3.1937.777.24.5.3.8",
+            "display": "MDAT wissenschaftlich nutzen EU DSGVO NIVEAU",
+            "system": "urn:oid:2.16.840.1.113883.3.1937.777.24.5.3"
+          }
+        ]
+      }
+    ]
+  ]
+}