Merge pull request #748 from samply/measure

Switch to Media Type text/cql-identifier for CQL Expressions
samply · Jun 29, 2022 · e853014 · e853014
2 parents bf7658e + 783f42e
commit e853014
Show file tree

Hide file tree

Showing 48 changed files with 79 additions and 62 deletions.
diff --git a/.github/scripts/evaluate-measure-subject-list.sh b/.github/scripts/evaluate-measure-subject-list.sh
@@ -53,7 +53,7 @@ cat <<END
             ]
           },
           "criteria": {
-            "language": "text/cql",
+            "language": "text/cql-identifier",
             "expression": "InInitialPopulation"
           }
         }

diff --git a/.github/scripts/evaluate-measure.sh b/.github/scripts/evaluate-measure.sh
@@ -53,7 +53,7 @@ cat <<END
             ]
           },
           "criteria": {
-            "language": "text/cql",
+            "language": "text/cql-identifier",
             "expression": "InInitialPopulation"
           }
         }

diff --git a/.github/scripts/evaluate-patient-q1-measure.sh b/.github/scripts/evaluate-patient-q1-measure.sh
@@ -48,7 +48,7 @@ cat <<END
             ]
           },
           "criteria": {
-            "language": "text/cql",
+            "language": "text/cql-identifier",
             "expression": "InInitialPopulation"
           }
         }

diff --git a/docs/cql-queries/api.md b/docs/cql-queries/api.md
@@ -89,7 +89,7 @@ The Measure resource represents the actual definition of the measure, which is e
             ]
           },
           "criteria": {
-            "language": "text/cql",
+            "language": "text/cql-identifier",
             "expression": "InInitialPopulation"
           }
         }

diff --git a/evaluate-measure.sh b/evaluate-measure.sh
@@ -61,7 +61,7 @@ cat <<END
             ]
           },
           "criteria": {
-            "language": "text/cql",
+            "language": "text/cql-identifier",
             "expression": "InInitialPopulation"
           }
         }

diff --git a/...ation-measure-evaluate-measure/src/blaze/fhir/operation/evaluate_measure/measure/util.clj b/...ation-measure-evaluate-measure/src/blaze/fhir/operation/evaluate_measure/measure/util.clj
@@ -14,7 +14,7 @@
         :fhir/issue "required"
         :fhir.issue/expression (population-path-fn))
 
-      (not= "text/cql" language)
+      (not (#{"text/cql" "text/cql-identifier"} language))
       (ba/unsupported
         (format "Unsupported language `%s`." language)
         :fhir/issue "not-supported"

diff --git a/...measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/measure/util_test.clj b/...measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/measure/util_test.clj
@@ -2,8 +2,11 @@
   (:require
     [blaze.anomaly-spec]
     [blaze.fhir.operation.evaluate-measure.measure.util :as u]
+    [blaze.test-util :refer [satisfies-prop]]
     [clojure.spec.test.alpha :as st]
     [clojure.test :as test :refer [deftest testing]]
+    [clojure.test.check.generators :as gen]
+    [clojure.test.check.properties :as prop]
     [cognitect.anomalies :as anom]
     [juxt.iota :refer [given]]))
 
@@ -38,8 +41,22 @@
 
   (testing "missing expression"
     (given (u/expression (constantly "path-184642")
-                         {:language #fhir/code"text/cql"})
+                         {:language #fhir/code"text/cql-identifier"})
       ::anom/category := ::anom/incorrect
       ::anom/message := "Missing expression."
       :fhir/issue := "required"
-      :fhir.issue/expression := "path-184642.criteria")))
+      :fhir.issue/expression := "path-184642.criteria"))
+
+  (testing "works with `text/cql-identifier`"
+    (satisfies-prop 10
+      (prop/for-all [expression gen/string]
+        (= expression (u/expression (constantly "foo")
+                                    {:language #fhir/code"text/cql-identifier"
+                                     :expression expression})))))
+
+  (testing "works with `text/cql`"
+    (satisfies-prop 10
+      (prop/for-all [expression gen/string]
+        (= expression (u/expression (constantly "foo")
+                                    {:language #fhir/code"text/cql"
+                                     :expression expression}))))))
diff --git a/...tion-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/measure_test.clj b/...tion-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/measure_test.clj
@@ -132,7 +132,7 @@
 
 (defn- cql-expression [expr]
   {:fhir/type :fhir/Expression
-   :language #fhir/code"text/cql"
+   :language #fhir/code"text/cql-identifier"
    :expression expr})
 
 

diff --git a/...peration-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q1-data.json b/...peration-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q1-data.json
@@ -62,7 +62,7 @@
                   ]
                 },
                 "criteria": {
-                  "language": "text/cql",
+                  "language": "text/cql-identifier",
                   "expression": "InInitialPopulation"
                 }
               }

diff --git a/...eration-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q10-data.json b/...eration-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q10-data.json
@@ -140,7 +140,7 @@
                   ]
                 },
                 "criteria": {
-                  "language": "text/cql",
+                  "language": "text/cql-identifier",
                   "expression": "InInitialPopulation"
                 }
               }

diff --git a/...eration-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q11-data.json b/...eration-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q11-data.json
@@ -327,7 +327,7 @@
                   ]
                 },
                 "criteria": {
-                  "language": "text/cql",
+                  "language": "text/cql-identifier",
                   "expression": "InInitialPopulation"
                 }
               }

diff --git a/...eration-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q12-data.json b/...eration-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q12-data.json
@@ -327,7 +327,7 @@
                   ]
                 },
                 "criteria": {
-                  "language": "text/cql",
+                  "language": "text/cql-identifier",
                   "expression": "InInitialPopulation"
                 }
               }

diff --git a/...eration-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q13-data.json b/...eration-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q13-data.json
@@ -118,7 +118,7 @@
                   ]
                 },
                 "criteria": {
-                  "language": "text/cql",
+                  "language": "text/cql-identifier",
                   "expression": "InInitialPopulation"
                 }
               }

diff --git a/...eration-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q14-data.json b/...eration-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q14-data.json
@@ -118,7 +118,7 @@
                   ]
                 },
                 "criteria": {
-                  "language": "text/cql",
+                  "language": "text/cql-identifier",
                   "expression": "InInitialPopulation"
                 }
               }

diff --git a/...eration-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q15-data.json b/...eration-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q15-data.json
@@ -62,7 +62,7 @@
                   ]
                 },
                 "criteria": {
-                  "language": "text/cql",
+                  "language": "text/cql-identifier",
                   "expression": "InInitialPopulation"
                 }
               }

diff --git a/...eration-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q16-data.json b/...eration-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q16-data.json
@@ -327,7 +327,7 @@
                   ]
                 },
                 "criteria": {
-                  "language": "text/cql",
+                  "language": "text/cql-identifier",
                   "expression": "InInitialPopulation"
                 }
               }

diff --git a/...eration-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q17-data.json b/...eration-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q17-data.json
@@ -60,7 +60,7 @@
                   ]
                 },
                 "criteria": {
-                  "language": "text/cql",
+                  "language": "text/cql-identifier",
                   "expression": "InInitialPopulation"
                 }
               }

diff --git a/...re-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q18-specimen-bmi-data.json b/...re-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q18-specimen-bmi-data.json
@@ -200,7 +200,7 @@
                   ]
                 },
                 "criteria": {
-                  "language": "text/cql",
+                  "language": "text/cql-identifier",
                   "expression": "InInitialPopulation"
                 }
               }

diff --git a/...uate-measure/test/blaze/fhir/operation/evaluate_measure/q19-stratifier-ageclass-data.json b/...uate-measure/test/blaze/fhir/operation/evaluate_measure/q19-stratifier-ageclass-data.json
@@ -73,7 +73,7 @@
                   ]
                 },
                 "criteria": {
-                  "language": "text/cql",
+                  "language": "text/cql-identifier",
                   "expression": "InInitialPopulation"
                 }
               }
@@ -84,7 +84,7 @@
                   "text": "age-class"
                 },
                 "criteria": {
-                  "language": "text/cql",
+                  "language": "text/cql-identifier",
                   "expression": "AgeClass"
                 }
               }

diff --git a/...peration-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q2-data.json b/...peration-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q2-data.json
@@ -89,7 +89,7 @@
                   ]
                 },
                 "criteria": {
-                  "language": "text/cql",
+                  "language": "text/cql-identifier",
                   "expression": "InInitialPopulation"
                 }
               }

diff --git a/...evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q20-stratifier-city-data.json b/...evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q20-stratifier-city-data.json
@@ -100,7 +100,7 @@
                   ]
                 },
                 "criteria": {
-                  "language": "text/cql",
+                  "language": "text/cql-identifier",
                   "expression": "InInitialPopulation"
                 }
               }
@@ -111,7 +111,7 @@
                   "text": "city"
                 },
                 "criteria": {
-                  "language": "text/cql",
+                  "language": "text/cql-identifier",
                   "expression": "City"
                 }
               }

diff --git a/...re/test/blaze/fhir/operation/evaluate_measure/q21-stratifier-city-of-only-women-data.json b/...re/test/blaze/fhir/operation/evaluate_measure/q21-stratifier-city-of-only-women-data.json
@@ -104,7 +104,7 @@
                   ]
                 },
                 "criteria": {
-                  "language": "text/cql",
+                  "language": "text/cql-identifier",
                   "expression": "InInitialPopulation"
                 }
               }
@@ -115,7 +115,7 @@
                   "text": "city"
                 },
                 "criteria": {
-                  "language": "text/cql",
+                  "language": "text/cql-identifier",
                   "expression": "City"
                 }
               }

diff --git a/.../test/blaze/fhir/operation/evaluate_measure/q22-stratifier-multiple-cities-fail-data.json b/.../test/blaze/fhir/operation/evaluate_measure/q22-stratifier-multiple-cities-fail-data.json
@@ -103,7 +103,7 @@
                   ]
                 },
                 "criteria": {
-                  "language": "text/cql",
+                  "language": "text/cql-identifier",
                   "expression": "InInitialPopulation"
                 }
               }
@@ -114,7 +114,7 @@
                   "text": "city"
                 },
                 "criteria": {
-                  "language": "text/cql",
+                  "language": "text/cql-identifier",
                   "expression": "City"
                 }
               }

diff --git a/...e/test/blaze/fhir/operation/evaluate_measure/q23-stratifier-ageclass-and-gender-data.json b/...e/test/blaze/fhir/operation/evaluate_measure/q23-stratifier-ageclass-and-gender-data.json
@@ -88,7 +88,7 @@
                   ]
                 },
                 "criteria": {
-                  "language": "text/cql",
+                  "language": "text/cql-identifier",
                   "expression": "InInitialPopulation"
                 }
               }
@@ -101,7 +101,7 @@
                       "text": "age-class"
                     },
                     "criteria": {
-                      "language": "text/cql",
+                      "language": "text/cql-identifier",
                       "expression": "AgeClass"
                     }
                   },
@@ -110,7 +110,7 @@
                       "text": "gender"
                     },
                     "criteria": {
-                      "language": "text/cql",
+                      "language": "text/cql-identifier",
                       "expression": "Gender"
                     }
                   }

diff --git a/...eration-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q24-data.json b/...eration-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q24-data.json
@@ -128,7 +128,7 @@
                   ]
                 },
                 "criteria": {
-                  "language": "text/cql",
+                  "language": "text/cql-identifier",
                   "expression": "InInitialPopulation"
                 }
               }

diff --git a/...te-measure/test/blaze/fhir/operation/evaluate_measure/q25-stratifier-collection-data.json b/...te-measure/test/blaze/fhir/operation/evaluate_measure/q25-stratifier-collection-data.json
@@ -134,7 +134,7 @@
                   ]
                 },
                 "criteria": {
-                  "language": "text/cql",
+                  "language": "text/cql-identifier",
                   "expression": "InInitialPopulation"
                 }
               }
@@ -145,7 +145,7 @@
                   "text": "collection"
                 },
                 "criteria": {
-                  "language": "text/cql",
+                  "language": "text/cql-identifier",
                   "expression": "Collection"
                 }
               }

diff --git a/...-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q26-stratifier-bmi-data.json b/...-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q26-stratifier-bmi-data.json
@@ -97,7 +97,7 @@
                   ]
                 },
                 "criteria": {
-                  "language": "text/cql",
+                  "language": "text/cql-identifier",
                   "expression": "InInitialPopulation"
                 }
               }
@@ -108,7 +108,7 @@
                   "text": "bmi"
                 },
                 "criteria": {
-                  "language": "text/cql",
+                  "language": "text/cql-identifier",
                   "expression": "Bmi"
                 }
               }

diff --git a/...easure/test/blaze/fhir/operation/evaluate_measure/q27-stratifier-calculated-bmi-data.json b/...easure/test/blaze/fhir/operation/evaluate_measure/q27-stratifier-calculated-bmi-data.json
@@ -153,7 +153,7 @@
                   ]
                 },
                 "criteria": {
-                  "language": "text/cql",
+                  "language": "text/cql-identifier",
                   "expression": "InInitialPopulation"
                 }
               }
@@ -164,7 +164,7 @@
                   "text": "bmi"
                 },
                 "criteria": {
-                  "language": "text/cql",
+                  "language": "text/cql-identifier",
                   "expression": "Bmi"
                 }
               }

diff --git a/...test/blaze/fhir/operation/evaluate_measure/q28-relationship-procedure-condition-data.json b/...test/blaze/fhir/operation/evaluate_measure/q28-relationship-procedure-condition-data.json
@@ -138,7 +138,7 @@
                   ]
                 },
                 "criteria": {
-                  "language": "text/cql",
+                  "language": "text/cql-identifier",
                   "expression": "InInitialPopulation"
                 }
               }

diff --git a/.../test/blaze/fhir/operation/evaluate_measure/q29-stratifier-sample-material-type-data.json b/.../test/blaze/fhir/operation/evaluate_measure/q29-stratifier-sample-material-type-data.json
@@ -102,7 +102,7 @@
                   ]
                 },
                 "criteria": {
-                  "language": "text/cql",
+                  "language": "text/cql-identifier",
                   "expression": "InInitialPopulation"
                 }
               }
@@ -113,7 +113,7 @@
                   "text": "SampleMaterialTypeCategory"
                 },
                 "criteria": {
-                  "language": "text/cql",
+                  "language": "text/cql-identifier",
                   "expression": "SampleMaterialTypeCategory"
                 }
               }

diff --git a/...peration-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q3-data.json b/...peration-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q3-data.json
@@ -63,7 +63,7 @@
                   ]
                 },
                 "criteria": {
-                  "language": "text/cql",
+                  "language": "text/cql-identifier",
                   "expression": "InInitialPopulation"
                 }
               }