Merge pull request #298 from medizininformatik-initiative/release/v5.…

…0.0-alpha.3 Release v5.0.0 alpha.3
medizininformatik-initiative · Jun 14, 2024 · b2b07b1 · b2b07b1
2 parents 2bf5b31 + 77a16d1
commit b2b07b1
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 42 deletions.
diff --git a/.github/integration-test/docker-compose.yml b/.github/integration-test/docker-compose.yml
@@ -79,7 +79,7 @@ services:
       POSTGRES_DB: "codex_ui"
 
   blaze:
-    image: "samply/blaze:0.22"
+    image: "samply/blaze:0.27"
     environment:
       BASE_URL: "http://blaze:8080"
       JAVA_TOOL_OPTIONS: "-Xmx1g"
@@ -90,7 +90,7 @@ services:
       - "blaze-data:/app/data"
 
   flare:
-    image: ghcr.io/medizininformatik-initiative/flare:2.1.1
+    image: ghcr.io/medizininformatik-initiative/flare:2.2.0
     ports:
       - "8092:8080"
     environment:

diff --git a/.github/scripts/post-test-query.sh b/.github/scripts/post-test-query.sh
@@ -14,38 +14,38 @@ response=$(curl -s -i \
   --header "Authorization: Bearer $access_token" \
   --header 'Content-Type: application/json' \
   --data '{
-            "version": "http://to_be_decided.com/draft-1/schema#",
-            "inclusionCriteria": [
-              [
-                {
-                  "attributeFilters": [],
-                  "termCodes": [
-                    {
-                      "code": "263495000",
-                      "display": "Geschlecht",
-                      "system": "http://snomed.info/sct"
-                    }
-                  ],
-                  "context": {
-                    "code": "Patient",
-                    "display": "Patient",
-                    "system": "fdpg.mii.cds",
-                    "version": "1.0.0"
-                  },
-                  "valueFilter": {
-                    "selectedConcepts": [
-                      {
-                        "code": "male",
-                        "display": "Male",
-                        "system": "http://hl7.org/fhir/administrative-gender"
-                      }
-                    ],
-                    "type": "concept"
-                  }
-                }
-              ]
-            ]
+    "version": "http://to_be_decided.com/draft-1/schema#",
+    "inclusionCriteria": [
+      [
+        {
+          "attributeFilters": [],
+          "termCodes": [
+            {
+              "code": "263495000",
+              "display": "Geschlecht",
+              "system": "http://snomed.info/sct"
+            }
+          ],
+          "context": {
+            "code": "Patient",
+            "display": "Patient",
+            "system": "fdpg.mii.cds",
+            "version": "1.0.0"
+          },
+          "valueFilter": {
+            "selectedConcepts": [
+              {
+                "code": "male",
+                "display": "Male",
+                "system": "http://hl7.org/fhir/administrative-gender"
+              }
+            ],
+            "type": "concept"
           }
+        }
+      ]
+    ]
+  }
 ')
 
 result_location=$(echo "$response" | grep -i location | awk '{print $2}')

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
+## [5.0.0-alpha.3] - 2024-06-14
+
+### Changed
+- Updated sq2cql to version v0.3.0-rc.1 ([#294](https://github.com/medizininformatik-initiative/feasibility-backend/issues/294))
+- Updated ontology to version v2.2.0-RC2 ([#293](https://github.com/medizininformatik-initiative/feasibility-backend/issues/293))
+### Fixed
+- OPS codes with lowercase letters are now correctly found ([#292](https://github.com/medizininformatik-initiative/feasibility-backend/issues/292))
+### Security
+- Updated spring boot to 3.3.0 ([#290](https://github.com/medizininformatik-initiative/feasibility-backend/issues/290))
+
 ## [5.0.0-alpha.2] - 2024-04-30
 
 ### Fixed

diff --git a/pom.xml b/pom.xml
@@ -5,13 +5,13 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.2.5</version>
+    <version>3.3.0</version>
     <relativePath /> <!-- lookup parent from repository -->
   </parent>
 
   <groupId>de.medizininformatik-initiative</groupId>
   <artifactId>FeasibilityGuiBackend</artifactId>
-  <version>5.0.0-alpha.2</version>
+  <version>5.0.0-alpha.3</version>
 
   <name>FeasibilityGuiBackend</name>
   <description>Backend of the Feasibility GUI</description>
@@ -26,7 +26,7 @@
     <java.version>17</java.version>
     <mockwebserver.version>4.10.0</mockwebserver.version>
     <okhttp3.version>4.10.0</okhttp3.version>
-    <ontology-tag>v2.1.27</ontology-tag>
+    <ontology-tag>v2.2.0-RC2</ontology-tag>
   </properties>
 
   <dependencies>
@@ -110,7 +110,7 @@
 
     <dependency>
       <groupId>org.flywaydb</groupId>
-      <artifactId>flyway-core</artifactId>
+      <artifactId>flyway-database-postgresql</artifactId>
     </dependency>
 
     <dependency>
@@ -224,7 +224,7 @@
     <dependency>
       <groupId>de.medizininformatik-initiative</groupId>
       <artifactId>sq2cql</artifactId>
-      <version>0.2.16</version>
+      <version>0.3.0-rc.1</version>
     </dependency>
 
     <dependency>

diff --git a/src/main/java/de/numcodex/feasibility_gui_backend/terminology/TerminologyService.java b/src/main/java/de/numcodex/feasibility_gui_backend/terminology/TerminologyService.java
@@ -195,8 +195,8 @@ private boolean matchesQuery(String query, TerminologyEntry terminologyEntry) {
     return terminologyEntry.getDisplay().toLowerCase().startsWith(query.toLowerCase()) ||
         Arrays.stream(terminologyEntry.getDisplay().toLowerCase().split(" "))
             .anyMatch(var -> var.startsWith(query.toLowerCase())) ||
-        (terminologyEntry.getTermCodes().stream().anyMatch(termCode -> termCode.code()
-            .startsWith(query)));
+        (terminologyEntry.getTermCodes().stream().anyMatch(termCode -> termCode.code().toLowerCase()
+            .startsWith(query.toLowerCase())));
   }
 
   public List<String> getIntersection(String criteriaSetUrl, List<String> contextTermCodeHashList) {

diff --git a/...java/de/numcodex/feasibility_gui_backend/query/broker/direct/DirectBrokerClientCqlIT.java b/...java/de/numcodex/feasibility_gui_backend/query/broker/direct/DirectBrokerClientCqlIT.java
@@ -42,7 +42,7 @@ class DirectBrokerClientCqlIT {
     private static final Long TEST_BACKEND_QUERY_ID = 1L;
 
     private final GenericContainer<?> blaze = new GenericContainer<>(
-        DockerImageName.parse("samply/blaze:0.25"))
+        DockerImageName.parse("samply/blaze:0.27"))
         .withImagePullPolicy(PullPolicy.alwaysPull())
         .withExposedPorts(8080)
         .waitingFor(Wait.forHttp("/health").forStatusCodeMatching(c -> c >= 200 && c <= 500))

diff --git a/...va/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFFhirWebClientProviderTest.java b/...va/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFFhirWebClientProviderTest.java
@@ -19,7 +19,7 @@
 public class DSFFhirWebClientProviderTest {
 
     @Container
-    private GenericContainer<?> blaze = new GenericContainer<>("samply/blaze:0.25")
+    private GenericContainer<?> blaze = new GenericContainer<>("samply/blaze:0.27")
             .withExposedPorts(8080)
             .withNetwork(Network.newNetwork())
             .withReuse(true);