Improve query relationship tests (#354)

* Improve query relationship tests

- Update simple model to add relationships from Conditions to Encounters
- Update simple model to add Medication record type
- Update tests to use relationship clauses that use real relationships
- Update tests to test relationships with empty secondary sources

* npm audit fix

Author: cmoesel

package-lock.json

@@ -24,6 +24,17 @@
     <ns4:typeInfo xsi:type="ns4:ClassInfo" name="Condition" baseType="Simple.Record" retrievable="true" primaryCodePath="code">
         <ns4:element name="code" elementType="System.Code"/>
         <ns4:element name="status" elementType="System.Code"/>
+        <ns4:element name="encounterId" elementType="System.String"/>
+        <ns4:element name="period">
+            <ns4:elementTypeSpecifier xsi:type="ns4:IntervalTypeSpecifier">
+                <ns4:pointTypeSpecifier xsi:type="ns4:NamedTypeSpecifier" modelName="System" name="DateTime"/>
+            </ns4:elementTypeSpecifier>
+        </ns4:element>
+    </ns4:typeInfo>
+    <ns4:typeInfo xsi:type="ns4:ClassInfo" name="Medication" baseType="Simple.Record" retrievable="true" primaryCodePath="code">
+        <ns4:element name="code" elementType="System.Code"/>
+        <ns4:element name="status" elementType="System.Code"/>
+        <ns4:element name="encounterId" elementType="System.String"/>
         <ns4:element name="period">
             <ns4:elementTypeSpecifier xsi:type="ns4:IntervalTypeSpecifier">
                 <ns4:pointTypeSpecifier xsi:type="ns4:NamedTypeSpecifier" modelName="System" name="DateTime"/>

src/simple-modelinfo.xml

@@ -30,16 +30,22 @@ define multiSourceWithArrays:
 
 // @Test: QueryRelationship
 define withQuery:  [Encounter] E
-with [Condition] C such that C.id = 'http://cqframework.org/3/2'
+with [Condition] C such that C.encounterId = E.id
 
 define withQuery2:  [Encounter] E
-with [Condition] C such that C.id = 'http://cqframework.org/3'
+with [Condition] C such that C.encounterId = E.id and exists(C.status)
+
+define withQueryEmptySecondarySource:  [Encounter] E
+with [Medication] M such that M.encounterId = E.id
 
 define withOutQuery:  [Encounter] E
-without [Condition] C such that C.id = 'http://cqframework.org/3/'
+without [Condition] C such that C.encounterId = E.id and exists(C.status)
 
 define withOutQuery2:  [Encounter] E
-without [Condition] C such that C.id = 'http://cqframework.org/3/2'
+without [Condition] C such that C.encounterId = E.id
+
+define withOutQueryEmptySecondarySource:  [Encounter] E
+without [Medication] M such that M.encounterId = E.id
 
 // @Test: QueryLet
 define query:  [Encounter] E