diff --git a/.github/integration-test/docker-compose.yml b/.github/integration-test/docker-compose.yml
index 132e95e8..cbc71b71 100644
--- 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:
@@ -110,8 +110,8 @@ services:
- "feasibility-auth-db:/var/lib/postgresql/data"
auth:
- image: keycloak/keycloak:21.1
- command: ["start", "--import-realm"]
+ image: quay.io/keycloak/keycloak:25.0
+ command: ["start-dev", "--import-realm"]
restart: unless-stopped
environment:
KC_DB: "postgres"
diff --git a/.github/scripts/post-test-query.sh b/.github/scripts/post-test-query.sh
index 2754d9fc..cd766432 100755
--- a/.github/scripts/post-test-query.sh
+++ b/.github/scripts/post-test-query.sh
@@ -14,37 +14,81 @@ 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": [
+ "version": "http://to_be_decided.com/draft-1/schema#",
+ "display": "",
+ "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"
+ "termCodes":
+ [
+ {
+ "code": "119373006",
+ "system": "http://snomed.info/sct",
+ "version": "http://snomed.info/sct/900000000000207008/version/20220930",
+ "display": "Amniotic fluid specimen"
+ }
+ ],
+ "attributeFilters":
+ [
+ {
+ "criteria":
+ [
+ {
+ "termCodes":
+ [
+ {
+ "code": "F40.01",
+ "system": "http://fhir.de/CodeSystem/bfarm/icd-10-gm",
+ "version": "2023",
+ "display": "Mit Panikstörung"
+ }
+ ],
+ "context":
+ {
+ "code": "Diagnose",
+ "system": "fdpg.mii.cds",
+ "version": "1.0.0",
+ "display": "Diagnose"
+ }
+ }
+ ],
+ "type": "reference",
+ "attributeCode":
+ {
+ "code": "festgestellteDiagnose",
+ "display": "Festgestellte Diagnose",
+ "system": "http://hl7.org/fhir/StructureDefinition"
+ }
+ },
+ {
+ "selectedConcepts":
+ [
+ {
+ "code": "C69",
+ "display": "Auge und Augenanhangsgebilde",
+ "system": "http://hl7.org/fhir/sid/icd-o-3"
+ }
+ ],
+ "type": "concept",
+ "attributeCode":
+ {
+ "code": "icd-o-3",
+ "display": "icd-o-3",
+ "system": "http://hl7.org/fhir/StructureDefinition"
+ }
+ }
+ ],
+ "context":
+ {
+ "code": "Specimen",
+ "system": "fdpg.mii.cds",
+ "version": "1.0.0",
+ "display": "Bioprobe"
+ }
}
- ],
- "type": "concept"
- }
- }
+ ]
]
- ]
}
')
diff --git a/.github/scripts/wait-for-url.sh b/.github/scripts/wait-for-url.sh
index 2179de67..7803dd19 100755
--- a/.github/scripts/wait-for-url.sh
+++ b/.github/scripts/wait-for-url.sh
@@ -9,7 +9,7 @@ eclipsed() {
}
# wait at maximum 240 seconds
-while [[ ($(eclipsed) -lt 240) && ("$(curl -s -o /dev/null -w '%{response_code}' "$URL")" != "200") ]]; do
+while [[ ($(eclipsed) -lt 240) && ("$(curl -L -s -o /dev/null -w '%{response_code}' "$URL")" != "200") ]]; do
sleep 2
done
diff --git a/pom.xml b/pom.xml
index 4ceb3368..e0b6e51c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
17
4.10.0
4.10.0
- v2.1.27
+ v2.2.0-RC
@@ -224,7 +224,7 @@
de.medizininformatik-initiative
sq2cql
- 0.2.16
+ 0.3.0-rc.1
diff --git a/src/test/java/de/numcodex/feasibility_gui_backend/query/broker/direct/DirectBrokerClientCqlIT.java b/src/test/java/de/numcodex/feasibility_gui_backend/query/broker/direct/DirectBrokerClientCqlIT.java
index 140c2853..7ed1906f 100644
--- a/src/test/java/de/numcodex/feasibility_gui_backend/query/broker/direct/DirectBrokerClientCqlIT.java
+++ b/src/test/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/src/test/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFFhirWebClientProviderTest.java b/src/test/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFFhirWebClientProviderTest.java
index f4b400ee..6fab8b1d 100644
--- a/src/test/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFFhirWebClientProviderTest.java
+++ b/src/test/java/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);