cqm-models 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85bf553127da27f99d10b18c86684ddfa57c4f2f7e992ca54d093c6e27888db6
-  data.tar.gz: b899eb5db26a8cf98655d34b82ae8ff2c105c98c6332af7b1e3b37bb18b19a85
+  metadata.gz: 824c04168aff91f769c20c2ebdb0eebc5b5b63f457ca424002e71c833260b6fc
+  data.tar.gz: ec4fad1105bef87c9e4acde4ec0639db03b6b96d77146ebb62a7e1a64068d2df
 SHA512:
-  metadata.gz: aeb672673dbb27b9ecef2d1e1e1b718d84ebd9ad793bfd75a8b733b7c113e45604281865916fe82e5e12fa4034fa1ea6c0598b76e0e615979fc31e3fc822381c
-  data.tar.gz: 8102ced4699a1bdd4ec549ffb7cc8c649a61d1fd0d2f123ab5bed1a1b2aeff0c5194d49e1f6163cb4dcc15c822ec1e913558b84ab63af10c855542180fe0c358
+  metadata.gz: d4c6e1020981220cb7227caef2dc7423d3bc3374e1b9ff5b1a85ffabe226e2fb8428fbe63abce00cbfda68f21ede488fc9d6122d5fd8ccf8a641cd7903d0baa4
+  data.tar.gz: b8cf4f3ede2e516a194f3879ce5a96980782b9227bffdc6d3a3c1a2779945b9d0d7455a9b33c84b59ed3ac89c4756eedfda6a8cb230285e8c620396fd8a0b723

data/.eslintrc.json

@@ -2,8 +2,14 @@
   "extends": "airbnb-base",
   "rules": {
     "max-len": ["error", {"code": 200, "ignoreComments": true}],
+    "no-multiple-empty-lines": "off",
+    "import/extensions": "off",
+    "max-classes-per-file": "off",
+    "operator-linebreak": "off",
+    "no-else-return": "off",
     "no-unused-vars": ["error", { "varsIgnorePattern": "EntitySchema|Identifier|IdentifierSchema|DataElementSchema|ComponentSchema|FacilityLocationSchema|Code|Quantity|Interval|Integer|Array|Float|Time|Number|Date|Mixed|Any" }],
     "camelcase": "off",
+    "arrow-parens": "off",
     "comma-dangle": ["error", {
       "arrays": "always-multiline",
       "objects": "always-multiline",

data/.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby-version: [2.5]
+        ruby-version: [2.6, 2.7]
         mongodb-version: [4.0.18, 4.4]
         node-version: [12.x, 14.x]
 

data/.gitignore

@@ -1,5 +1,6 @@
 /.bundle/
 /.yardoc
+/.nyc_output
 /Gemfile.lock
 /_yardoc/
 /coverage/

data/app/assets/javascripts/QDMPatient.js

@@ -56,6 +56,31 @@ QDMPatientSchema.methods.getByQrdaOid = function getByQrdaOid(qrdaOid) {
   return this.dataElements.filter(element => element.qrdaOid === qrdaOid);
 };
 
+// cql-execution prefers getId() over id() because some data models may have an id property
+QDMPatientSchema.methods.getId = function getId() {
+  return this._id;
+};
+
+/* eslint no-underscore-dangle: 0 */
+QDMPatientSchema.methods._is = function _is(typeSpecifier) {
+  return this._typeHierarchy().some(
+    t => t.type === typeSpecifier.type && t.name === typeSpecifier.name
+  );
+};
+
+/* eslint no-underscore-dangle: 0 */
+QDMPatientSchema.methods._typeHierarchy = function _typeHierarchy() {
+  const ver = this.qdmVersion.replace('.', '_');
+  return [
+    {
+      name: `{urn:healthit-gov:qdm:v${ver}}Patient`,
+      type: 'NamedTypeSpecifier',
+    },
+    { name: '{urn:hl7-org:elm-types:r1}Tuple', type: 'NamedTypeSpecifier' },
+    { name: '{urn:hl7-org:elm-types:r1}Any', type: 'NamedTypeSpecifier' },
+  ];
+};
+
 // Returns an array of elements that exist on this patient. Optionally
 // takes a qdmCategory, which returns all elements of that QDM qdmCategory.
 // Example: patient.getDataElements({qdmCategory: 'encounters'}) will return

data/app/assets/javascripts/basetypes/DataElement.js

@@ -1,6 +1,6 @@
 const mongoose = require('mongoose/browser');
-const Code = require('./Code.js');
 const cql = require('cql-execution');
+const Code = require('./Code.js');
 const Identifier = require('../attributes/Identifier');
 
 const [Schema] = [mongoose.Schema];
@@ -49,6 +49,31 @@ function DataElementSchema(add, options) {
     return null;
   };
 
+  /* eslint no-underscore-dangle: 0 */
+  extended.methods._is = function _is(typeSpecifier) {
+    return this._typeHierarchy().some(
+      t => t.type === typeSpecifier.type && t.name === typeSpecifier.name
+    );
+  };
+
+  /* eslint no-underscore-dangle: 0 */
+  extended.methods._typeHierarchy = function _typeHierarchy() {
+    const typeName = this._type.replace(/QDM::/, '');
+    const prefix = this.negationRationale ? 'Negative' : 'Positive';
+    const ver = this.qdmVersion.replace('.', '_');
+    return [
+      {
+        name: `{urn:healthit-gov:qdm:v${ver}}${prefix}${typeName}`,
+        type: 'NamedTypeSpecifier',
+      },
+      {
+        name: `{urn:healthit-gov:qdm:v${ver}}${typeName}`,
+        type: 'NamedTypeSpecifier',
+      },
+      { name: '{urn:hl7-org:elm-types:r1}Tuple', type: 'NamedTypeSpecifier' },
+      { name: '{urn:hl7-org:elm-types:r1}Any', type: 'NamedTypeSpecifier' },
+    ];
+  };
   return extended;
 }
 

data/app/models/qdm/basetypes/data_element.rb

@@ -65,6 +65,7 @@ module QDM
     def shift_dates(seconds)
       fields.keys.each do |field|
         send(field + '=', (send(field).to_time + seconds.seconds).to_datetime) if send(field).is_a? DateTime
+        send(field + '=', (send(field).to_time + seconds.seconds).to_datetime) if send(field).is_a? Time
         send(field + '=', send(field).shift_dates(seconds)) if (send(field).is_a? Interval) || (send(field).is_a? DataElement)
 
         # Special case for facility locations

data/cqm-models.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'cqm-models'
-  spec.version       = '4.0.0'
+  spec.version       = '4.1.0'
   spec.authors       = ['aholmes@mitre.org', 'mokeefe@mitre.org', 'lades@mitre.org']
 
   spec.summary       = 'Mongo models that correspond to the QDM specification.'