cqm-models 0.7.2 → 0.7.3

data/app/assets/javascripts/SubstanceOrder.js

@@ -4,6 +4,7 @@ const Code = require('./basetypes/Code');
 const Interval = require('./basetypes/Interval');
 const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
+const Any = require('./basetypes/Any');
 
 const [Number, String] = [
   mongoose.Schema.Types.Number,

data/app/assets/javascripts/SubstanceRecommended.js

@@ -4,6 +4,7 @@ const Code = require('./basetypes/Code');
 const Interval = require('./basetypes/Interval');
 const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
+const Any = require('./basetypes/Any');
 
 const [Number, String] = [
   mongoose.Schema.Types.Number,

data/app/assets/javascripts/Symptom.js

@@ -4,6 +4,7 @@ const Code = require('./basetypes/Code');
 const Interval = require('./basetypes/Interval');
 const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
+const Any = require('./basetypes/Any');
 
 const [Number, String] = [
   mongoose.Schema.Types.Number,

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

@@ -0,0 +1,50 @@
+const mongoose = require('mongoose');
+const cql = require('cql-execution');
+
+function Any(key, options) {
+  mongoose.SchemaType.call(this, key, options, 'Any');
+}
+Any.prototype = Object.create(mongoose.SchemaType.prototype);
+
+function RecursiveCast(any) {
+  if (any && any.value && any.unit) {
+    return new cql.Quantity(any);
+  }
+  if (any && any.low) {
+    const casted = new cql.Interval(any.low, any.high, any.lowClosed, any.highClosed);
+
+    // Cast Low and High values to Quantities if it is a quantity
+    if (casted.low && casted.low.unit && casted.low.value) {
+      casted.low = new cql.Quantity(casted.low);
+      if (casted.high && casted.high.unit && casted.high.value) {
+        casted.high = new cql.Quantity(casted.high);
+      }
+      return casted;
+    }
+
+    // Cast to DateTime if it is a string representing a DateTime
+    if (casted.low && Date.parse(casted.low)) {
+      casted.low = cql.DateTime.fromDate(new Date(casted.low), 0);
+    }
+    if (casted.high && Date.parse(casted.high)) {
+      casted.high = cql.DateTime.fromDate(new Date(casted.high), 0);
+    }
+    return casted;
+  }
+  if (Array.isArray(any)) {
+    const casted = [];
+    any.forEach((val) => {
+      casted.push(RecursiveCast(val));
+    });
+    return casted;
+  }
+  if (Date.parse(any)) {
+    return cql.DateTime.fromDate(new Date(any), 0);
+  }
+  return any;
+}
+
+Any.prototype.cast = any => RecursiveCast(any);
+
+mongoose.Schema.Types.Any = Any;
+module.exports = Any;

data/app/models/qdm/tacoma/measure.rb

@@ -63,6 +63,8 @@ module QDM
     field :populations, type: Array
     field :populations_cql_map, type: Hash
     field :observations, type: Array
+    # TODO: Depending on how we restructure the Measure/Population object, may be deleted in the future
+    field :population_ids, type: Hash
 
     field :value_set_oids, type: Array, default: []
     field :value_set_oid_version_objects, type: Array, default: []

data/cqm-models.gemspec

@@ -4,11 +4,11 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'cqm-models'
-  spec.version       = '0.7.2'
+  spec.version       = '0.7.3'
   spec.authors       = ['aholmes@mitre.org', 'mokeefe@mitre.org', 'lades@mitre.org']
 
   spec.summary       = 'Mongo models that correspond to the QDM specification.'
-  spec.description   = 'This library contains auto generated Mongoid (Ruby) and Mongoose (JavaScript) models that correspond to the QDM (Quality Data Model) specification.'
+  spec.description   = 'This library contains auto generated Mongo (Mongoid) models that correspond to the QDM (Quality Data Model) specification.'
   spec.homepage      = 'https://github.com/projecttacoma/cqm-models'
   spec.license       = 'Apache-2.0'