Release v0.23.4

.github/workflows/build.yml

@@ -234,7 +234,7 @@ jobs:
 
     - name: Upload Trivy Scan Results to GitHub Security Tab
       if: ${{ (github.repository_owner == 'samply') || (vars.IMAGE_SCAN_UPLOAD == 'true') }}
-      uses: github/codeql-action/upload-sarif@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # v3
+      uses: github/codeql-action/upload-sarif@e5f05b81d5b6ff8cfa111c80c22c5fd02a384118 # v3
       with:
         sarif_file: trivy-results.sarif
 

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## v0.23.4
+
+### Bugfixes
+
+* Fix Error while Evaluating Measure with Population Basis Boolean ([#1397](https://github.com/samply/blaze/issues/1397))
+
+The full changelog can be found [here](https://github.com/samply/blaze/milestone/83?closed=1).
+
 ## v0.23.3
 
 ### Bugfixes

Dockerfile

@@ -8,7 +8,7 @@ RUN apt-get update && apt-get upgrade -y && \
     rm -rf /var/lib/apt/lists/
 
 RUN mkdir -p /app/data && chown 1001:1001 /app/data
-COPY target/blaze-0.23.3-standalone.jar /app/
+COPY target/blaze-0.23.4-standalone.jar /app/
 
 WORKDIR /app
 USER 1001
@@ -19,4 +19,4 @@ ENV INDEX_DB_DIR="/app/data/index"
 ENV TRANSACTION_DB_DIR="/app/data/transaction"
 ENV RESOURCE_DB_DIR="/app/data/resource"
 
-CMD ["java", "-jar",  "blaze-0.23.3-standalone.jar"]
+CMD ["java", "-jar",  "blaze-0.23.4-standalone.jar"]

README.md

@@ -15,7 +15,7 @@ The goal of this project is to provide a FHIR® Store with an internal CQL Evalu
 
 Blaze passes all [Touchstone FHIR 4.0.1 Basic Tests][12] and almost all [CQL Tests][3]. Please refer to the [Conformance](docs/conformance.md) section and report any issues you encounter during evaluation.
 
-Latest release: [v0.23.3][5]
+Latest release: [v0.23.4][5]
 
 ## Quick Start
 
@@ -74,7 +74,7 @@ Unless required by applicable law or agreed to in writing, software distributed
 
 [3]: <https://cql.hl7.org/tests.html>
 [4]: <https://alexanderkiel.gitbook.io/blaze/deployment>
-[5]: <https://github.com/samply/blaze/releases/tag/v0.23.3>
+[5]: <https://github.com/samply/blaze/releases/tag/v0.23.4>
 [6]: <https://www.yourkit.com/java/profiler/>
 [7]: <https://www.yourkit.com/.net/profiler/>
 [8]: <https://www.yourkit.com/youmonitor/>

build.clj

@@ -2,7 +2,7 @@
   (:require [clojure.tools.build.api :as b]))
 
 (def lib 'samply/blaze)
-(def version "0.23.3")
+(def version "0.23.4")
 (def class-dir "target/classes")
 (def basis (b/create-basis {:project "deps.edn"}))
 (def uber-file (format "target/%s-%s-standalone.jar" (name lib) version))

deps.edn

@@ -53,7 +53,7 @@
   {:mvn/version "1.3.7"}
 
   org.slf4j/slf4j-nop
-  {:mvn/version "2.0.10"}}
+  {:mvn/version "2.0.11"}}
 
  :aliases
  {:build

docs/.vitepress/config.ts

@@ -27,7 +27,7 @@ export default defineConfig({
         nav: [
             {text: 'Home', link: '/'},
             {
-                text: "v0.23.3",
+                text: "v0.23.4",
                 items: [
                     {
                         text: 'Changelog',

docs/deployment/docker-deployment.md

@@ -27,7 +27,7 @@ Blaze should log something like this:
 2023-06-09T08:30:30.126Z b45689460ff3 main INFO [blaze.core:67] - JVM version: 17.0.7
 2023-06-09T08:30:30.126Z b45689460ff3 main INFO [blaze.core:68] - Maximum available memory: 1738 MiB
 2023-06-09T08:30:30.126Z b45689460ff3 main INFO [blaze.core:69] - Number of available processors: 2
-2023-06-09T08:30:30.126Z b45689460ff3 main INFO [blaze.core:70] - Successfully started 🔥 Blaze version 0.23.3 in 9.0 seconds
+2023-06-09T08:30:30.126Z b45689460ff3 main INFO [blaze.core:70] - Successfully started 🔥 Blaze version 0.23.4 in 9.0 seconds
 ```
 
 In order to test connectivity, query the health endpoint:
@@ -47,7 +47,7 @@ that should return:
 ```json
 {
   "name": "Blaze",
-  "version": "0.23.3"
+  "version": "0.23.4"
 }
 ```
 

docs/deployment/manual-deployment.md

@@ -2,12 +2,12 @@
 
 The installation works under Windows, Linux and macOS. The only dependency is an installed OpenJDK 11 or 17 with 17 recommended. Blaze is tested with [Eclipse Temurin][1].
 
-Blaze runs on the JVM and comes as single JAR file. Download the most recent version [here](https://github.com/samply/blaze/releases/tag/v0.23.3). Look for `blaze-0.23.3-standalone.jar`.
+Blaze runs on the JVM and comes as single JAR file. Download the most recent version [here](https://github.com/samply/blaze/releases/tag/v0.23.4). Look for `blaze-0.23.4-standalone.jar`.
 
 After the download, you can start blaze with the following command (Linux, macOS):
 
 ```sh
-java -jar blaze-0.23.3-standalone.jar
+java -jar blaze-0.23.4-standalone.jar
 ```
 
 Blaze will run with an in-memory, volatile database for testing and demo purposes.
@@ -17,14 +17,14 @@ Blaze can be run with durable storage by setting the environment variables `STOR
 Under Linux/macOS:
 
 ```sh
-STORAGE=standalone java -jar blaze-0.23.3-standalone.jar
+STORAGE=standalone java -jar blaze-0.23.4-standalone.jar
 ```
 
 Under Windows, you need to set the Environment variables in the PowerShell before starting Blaze:
 
 ```powershell
 $Env:STORAGE="standalone"
-java -jar blaze-0.23.3-standalone.jar
+java -jar blaze-0.23.4-standalone.jar
 ```
 
 This will create three directories called `index`, `transaction` and `resource` inside the current working directory, one for each database part used.
@@ -42,7 +42,7 @@ The output should look like this:
 2021-06-27T11:02:37.834Z ee086ef908c1 main INFO [blaze.core:64] - JVM version: 16.0.2
 2021-06-27T11:02:37.834Z ee086ef908c1 main INFO [blaze.core:65] - Maximum available memory: 1738 MiB
 2021-06-27T11:02:37.835Z ee086ef908c1 main INFO [blaze.core:66] - Number of available processors: 8
-2021-06-27T11:02:37.836Z ee086ef908c1 main INFO [blaze.core:67] - Successfully started Blaze version 0.23.3 in 8.2 seconds
+2021-06-27T11:02:37.836Z ee086ef908c1 main INFO [blaze.core:67] - Successfully started Blaze version 0.23.4 in 8.2 seconds
 ```
 
 In order to test connectivity, query the health endpoint:
@@ -62,7 +62,7 @@ that should return:
 ```json
 {
   "name": "Blaze",
-  "version": "0.23.3"
+  "version": "0.23.4"
 }
 ```
 

modules/frontend/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "blaze-frontend",
-	"version": "0.23.3",
+	"version": "0.23.4",
 	"private": true,
 	"scripts": {
 		"dev": "vite dev",

modules/operation-measure-evaluate-measure/src/blaze/fhir/operation/evaluate_measure/cql.clj

@@ -207,8 +207,8 @@
    * context :parameters        - an optional map of parameters
    * context :return-handles?   - whether subject-handles or a simple count
                                   should be returned
-   * context :population-basis  - the population basis of either :boolean or a
-                                  type like `Encounter`
+   * context :population-basis  - an optional population basis of a type like
+                                  `Encounter`
    * name                       - the name of the expression
    * subject-type               - the type of subjects like `Patient`
 

modules/operation-measure-evaluate-measure/src/blaze/fhir/operation/evaluate_measure/measure.clj

@@ -170,7 +170,8 @@
    (fn [{:keys [url value]}]
      (when (= "http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-populationBasis" url)
        (let [basis (type/value value)]
-         (cond-> basis (= "boolean" basis) keyword))))
+         (when-not (= "boolean" basis)
+           basis))))
    extension))
 
 (defn- evaluate-group

modules/operation-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/measure_test.clj

@@ -263,6 +263,10 @@
                      :library [#fhir/canonical"0"]
                      :group
                      [{:fhir/type :fhir.Measure/group
+                       :extension
+                       [#fhir/Extension
+                         {:url "http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-populationBasis"
+                          :value #fhir/code"boolean"}]
                        :population
                        [{:fhir/type :fhir.Measure.group/population
                          :code (population-concept "initial-population")
@@ -659,6 +663,8 @@
 
   (testing-query "q51-specimen-condition-reference-2" 1)
 
+  (testing-query "q53-population-basis-boolean" 2)
+
   (let [result (evaluate "q1" "subject-list")]
     (testing "MeasureReport is valid"
       (is (s/valid? :blaze/resource (:resource result))))
@@ -851,4 +857,4 @@
 
 (comment
   (log/set-level! :debug)
-  (evaluate "q52-sort-with-missing-values"))
+  (evaluate "q53-population-basis-boolean"))

modules/operation-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q53-population-basis-boolean.cql

@@ -0,0 +1,8 @@
+library "q53-population-basis-boolean"
+using FHIR version '4.0.0'
+include FHIRHelpers version '4.0.0'
+
+context Patient
+
+define InInitialPopulation:
+  Patient.gender = 'male'