cqm-models 3.1.0 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a0d67086fe4eae472fe08e0e069c5fc3c9bfbfb9503e1606fd958b4c553368a
-  data.tar.gz: 10ee066a538619d8dd8850bd715f27796cc58621fa00896e30b9e7da872ba064
+  metadata.gz: 7a98ff5b9f4caf2158764ae9ca3370226cfaec4877b22fc45ff16584f49cfb89
+  data.tar.gz: f1d68db5fb968eac4b9488ac85ac195c4b5d9d56c5c8bea969e46eeb8ed78cf1
 SHA512:
-  metadata.gz: cb89b1251f588838c3d46b9993e18fe25d152a0aca3c694660ac3a957fa10f6cf171558da8963b773879abbb807335012573a076b5dec243d7b95555e5a92b83
-  data.tar.gz: 0215d03daaaa2e938e35dd00921885100ec98614df3ff5195003b34aa20c6cc11e720a59cb1d0200ba7cc2d056127913df3aea44776a5f80573185615a48c07d
+  metadata.gz: 2d769481c231d3a3902b5c9d2bd0d4c9f061381d5cba276609362d902fafddab753d9d7959c2c323a90bd56bf4d8cecdb465cbde155c6894cfdcd9239d91e304
+  data.tar.gz: b4af2c8d6bf9cfc71433f48e2b7bb29309bc7c8563511307fedfb096235f8aee7aa53fae01684b4455075136102b7543584c064553d0f4cbb2d4a8764657716b

data/.eslintrc.json

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

data/.github/workflows/ci.yml

@@ -3,6 +3,7 @@ on:
   pull_request:
     branches:
       - master
+      - cqm_models_3_x
 
 jobs:
   build:
@@ -11,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/app/assets/javascripts/basetypes/Any.js

@@ -7,7 +7,7 @@ function Any(key, options) {
 Any.prototype = Object.create(mongoose.SchemaType.prototype);
 
 function RecursiveCast(any) {
-  if (any && any.value && any.unit) {
+  if (any && any.value !== undefined && any.unit) {
     return new cql.Quantity(any.value, any.unit);
   }
 

data/app/models/cqm/individual_result.rb

@@ -35,8 +35,8 @@ module CQM
     field :state, type: String, default: 'queued'
 
     # Relations to other model classes
-    belongs_to :measure
-    belongs_to :patient
+    belongs_to :measure, class_name: 'CQM::Measure', inverse_of: :calculation_result
+    belongs_to :patient, class_name: 'CQM::Patient', inverse_of: :calculation_result
 
     # Convert the stored array into a hash between clause and result
     def clause_results_by_clause

data/app/models/cqm/measure.rb

@@ -73,7 +73,7 @@ module CQM
     # hence the 'inverse_of: nil')
     has_and_belongs_to_many :value_sets, inverse_of: nil
 
-    has_many :calculation_results, class_name: 'CQM::IndividualResult'
+    has_many :calculation_results, class_name: 'CQM::IndividualResult', inverse_of: :measure
 
     def all_stratifications
       population_sets.flat_map(&:stratifications)

data/app/models/cqm/patient.rb

@@ -11,7 +11,7 @@ module CQM
 
     has_and_belongs_to_many :providers, class_name: 'CQM::Provider'
     embeds_one :qdmPatient, class_name: 'QDM::Patient', autobuild: true
-    has_many :calculation_results, class_name: 'CQM::IndividualResult'
+    has_many :calculation_results, class_name: 'CQM::IndividualResult', inverse_of: :patient
 
     # Include '_type' in any JSON output. This is necessary for deserialization.
     def to_json(options = nil)

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       = '3.1.0'
+  spec.version       = '3.1.2'
   spec.authors       = ['aholmes@mitre.org', 'mokeefe@mitre.org', 'lades@mitre.org']
 
   spec.summary       = 'Mongo models that correspond to the QDM specification.'