Refactor invariant + Xpath for section entry population

AuDigitalHealth · Jul 15, 2022 · 27b1c43 · 27b1c43
1 parent adcfe5d
commit 27b1c43
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 18 deletions.
diff --git a/resources/dh-composition-acts-1.xml b/resources/dh-composition-acts-1.xml
@@ -79,8 +79,9 @@
       <constraint>
         <key value="inv-dh-acts-01"/>
         <severity value="error"/>
-        <human value="A section shall at least have an entry or an empty reason, but not both"/>
-        <expression value="entry.exists() xor emptyReason.exists()"/>
+        <human value="A section shall at least have an entry or an empty reason"/>
+        <expression value="entry.exists() or emptyReason.exists()"/>
+        <xpath value="exists(f:emptyReason) or exists(f:entry)"/>
         <source
           value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-composition-acts-1"/>
       </constraint>

diff --git a/resources/dh-composition-cocs-1.xml b/resources/dh-composition-cocs-1.xml
@@ -56,8 +56,9 @@
       <constraint>
         <key value="inv-dh-cocs-01"/>
         <severity value="error"/>
-        <human value="A section shall at least have an entry or an empty reason, but not both"/>
-        <expression value="entry.exists() xor emptyReason.exists()"/>
+        <human value="A section shall at least have an entry or an empty reason"/>
+        <expression value="entry.exists() or emptyReason.exists()"/>
+        <xpath value="exists(f:emptyReason) or exists(f:entry)"/>
         <source
           value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-composition-cocs-1"/>
       </constraint>

diff --git a/resources/dh-composition-ds-1.xml b/resources/dh-composition-ds-1.xml
@@ -79,8 +79,9 @@
       <constraint>
         <key value="inv-dh-ds-01"/>
         <severity value="error"/>
-        <human value="A section shall at least have an entry or an empty reason, but not both"/>
-        <expression value="entry.exists() xor emptyReason.exists()"/>
+        <human value="A section shall at least have an entry or an empty reason"/>
+        <expression value="entry.exists() or emptyReason.exists()"/>
+        <xpath value="exists(f:emptyReason) or exists(f:entry)"/>
         <source
           value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-composition-ds-1"/>
       </constraint>
@@ -197,7 +198,7 @@
         <human
           value="If a list is provided, no other entry shall be present"/>
         <expression
-          value="entry.resolve().where($this is List).exists() implies entry.resolve().where($this is List).count() &lt; 2"/>
+          value="entry.resolve().where($this is List).exists() implies entry.count() &lt; 2"/>
         <source
           value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-composition-ds-1"/>
       </constraint>
@@ -248,7 +249,7 @@
         <human
           value="If a list is provided, no other entry shall be present"/>
         <expression
-          value="entry.resolve().where($this is List).exists() implies (entry.resolve().where($this is List).count() &lt; 2"/>
+          value="entry.resolve().where($this is List).exists() implies (entry.count() &lt; 2"/>
         <source
           value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-composition-ds-1"/>
       </constraint>

diff --git a/resources/dh-composition-es-1.xml b/resources/dh-composition-es-1.xml
@@ -106,8 +106,9 @@
       <constraint>
         <key value="inv-dh-es-01"/>
         <severity value="error"/>
-        <human value="A section shall at least have an entry or an empty reason, but not both"/>
-        <expression value="entry.exists() xor emptyReason.exists()"/>
+        <human value="A section shall at least have an entry or an empty reason"/>
+        <expression value="entry.exists() or emptyReason.exists()"/>
+        <xpath value="exists(f:emptyReason) or exists(f:entry)"/>
         <source
           value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-composition-es-1"/>
       </constraint>

diff --git a/resources/dh-composition-pdl-1.xml b/resources/dh-composition-pdl-1.xml
@@ -58,8 +58,9 @@
       <constraint>
         <key value="inv-dh-pdl-01"/>
         <severity value="error"/>
-        <human value="A section shall at least have an entry or an empty reason, but not both"/>
-        <expression value="entry.exists() xor emptyReason.exists()"/>
+        <human value="A section shall at least have an entry or an empty reason"/>
+        <expression value="entry.exists() or emptyReason.exists()"/>
+        <xpath value="exists(f:emptyReason) or exists(f:entry)"/>
         <source
           value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-composition-pdl-1"/>
       </constraint>

diff --git a/resources/dh-composition-phs-1.xml b/resources/dh-composition-phs-1.xml
@@ -87,8 +87,9 @@
       <constraint>
         <key value="inv-dh-phs-01"/>
         <severity value="error"/>
-        <human value="A section shall at least have an entry or an empty reason, but not both"/>
-        <expression value="entry.exists() xor emptyReason.exists()"/>
+        <human value="A section shall at least have an entry or an empty reason"/>
+        <expression value="entry.exists() or emptyReason.exists()"/>
+        <xpath value="exists(f:emptyReason) or exists(f:entry)"/>
         <source
           value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-composition-phs-1"/>
       </constraint>

diff --git a/resources/dh-composition-shs-1.xml b/resources/dh-composition-shs-1.xml
@@ -103,8 +103,9 @@
       <constraint>
         <key value="inv-dh-shs-01"/>
         <severity value="error"/>
-        <human value="A section shall at least have an entry or an empty reason, but not both"/>
-        <expression value="entry.exists() xor emptyReason.exists()"/>
+        <human value="A section shall at least have an entry or an empty reason"/>
+        <expression value="entry.exists() or emptyReason.exists()"/>
+        <xpath value="exists(f:emptyReason) or exists(f:entry)"/>
         <source value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-composition-shs-1"/>
       </constraint>
       <constraint>

diff --git a/resources/dh-composition-sml-1.xml b/resources/dh-composition-sml-1.xml
@@ -77,8 +77,9 @@
       <constraint>
         <key value="inv-dh-sml-01"/>
         <severity value="error"/>
-        <human value="A section shall at least have an entry or an empty reason, but not both"/>
-        <expression value="entry.exists() xor emptyReason.exists()"/>
+        <human value="A section shall at least have an entry or an empty reason"/>
+        <expression value="entry.exists() or emptyReason.exists()"/>
+        <xpath value="exists(f:emptyReason) or exists(f:entry)"/>
         <source
           value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-composition-sml-1"/>
       </constraint>