bonnie_bundler 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '09fad5431a725716e82f1102598fa03d7e88b389'
-  data.tar.gz: 01d459f365bd058999fa42c231d33a223f5a56a3
+  metadata.gz: ee582288be3cfd05d88916295b4cddd2002350c0
+  data.tar.gz: 052e03dc984ea038e5469c45f60bc44307befc3c
 SHA512:
-  metadata.gz: e6095973b1224e9b3c8b3419a01dc6b61e4bb44a9727a86ffb8d5c26183a7c7e1605a97ccf42448aad6aa584327d9db168e1d14f6ee8e0cb28c65d95580f4768
-  data.tar.gz: 4b77d0640c3279926db64a9b7873e004e8074636c21b0773fa26c6fc3672b21def3138c8984037b03414fecc2071130f8c56284fb5a0a8f9676168296735025c
+  metadata.gz: b228407edd054902045f684c4ed9e1faa96c34a2d68f15f532a4035fa0dbffe33e0398e19e3f6493252aa0db8ffa5a5223408232ee62f916cf4459c2e57bd9ee
+  data.tar.gz: c2885dbe838270ee02367978e472fbef37b570ffbdfe7b5d3da5d164ed3e364012b362f68e6465dadac53a4411d53bccbcff37fd756b61d7c7bbd685835b63c7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bonnie_bundler (2.0.2)
+    bonnie_bundler (2.0.3)
       diffy (~> 3.0.0)
       health-data-standards (~> 4.0)
       hqmf2js (~> 1.4)
@@ -84,7 +84,7 @@ GEM
     globalid (0.4.1)
       activesupport (>= 4.2.0)
     hashdiff (0.3.6)
-    health-data-standards (4.0.1)
+    health-data-standards (4.0.2)
       activesupport (~> 4.2.0)
       builder (~> 3.1)
       erubis (~> 2.7.0)
@@ -93,7 +93,7 @@ GEM
       memoist (~> 0.9.1)
       mongoid (~> 5.0.0)
       mongoid-tree (~> 2.0.0)
-      nokogiri (~> 1.8.1)
+      nokogiri (~> 1.8.2)
       protected_attributes (~> 1.0.5)
       rest-client (~> 1.8.0)
       rubyzip (~> 1.2.1)
@@ -146,7 +146,7 @@ GEM
       mongoid (>= 4.0, < 6.0)
     multi_json (1.12.2)
     netrc (0.11.0)
-    nokogiri (1.8.1)
+    nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
     origin (2.3.1)
     protected_attributes (1.0.9)

data/bonnie-bundler.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.email = "pophealth-talk@googlegroups.com"
   s.homepage = "http://github.com/projecttacoma/bonnie_bundler"
   s.authors = ["The MITRE Corporation"]
-  s.version = '2.0.2'
+  s.version = '2.0.3'
   s.license = 'Apache-2.0'
 
   s.add_dependency 'health-data-standards', '~> 4.0'

data/lib/measures/loading/cql_loader.rb

@@ -129,31 +129,22 @@ module Measures
           raise VSACException.new "Error Loading Value Sets from VSAC: #{e.message}"
         end
       else
-        # if VSAC credentials aren't provided, find the value sets in the database
-        elm_value_sets.each do |elm_value_set|
-          version = elm_value_set[:version] || "N/A" # 'N/A' is what is stored in the DB for value sets without versions
-          query_params = {user_id: user.id, oid: elm_value_set[:oid]}
-
-          if (elm_value_set[:profile])
-            query_params[:profile] = elm_value_set[:profile]
-          else
-            query_params[:version] = version
-          end
-
-          value_set = HealthDataStandards::SVS::ValueSet.where(query_params).first()
-          if value_set
-            value_set_models << value_set
-          elsif version == "N/A"
-            # if the version is "N/A" and a value set doesn't exist with that version, just grab the existing value set
-            value_set = HealthDataStandards::SVS::ValueSet.where({user_id: user.id, oid: elm_value_set[:oid]}).first()
+        # No vsac credentials were provided grab the valueset and valueset versions from the 'value_set_oid_version_object' on the existing measure
+        db_measure = CqlMeasure.by_user(user).where(hqmf_set_id: measure_id).first
+        unless db_measure.nil?
+          measure_value_set_version_map = db_measure.value_set_oid_version_objects
+          measure_value_set_version_map.each do |value_set|
+            query_params = {user_id: user.id, oid: value_set['oid'], version: value_set['version']}
+            value_set = HealthDataStandards::SVS::ValueSet.where(query_params).first()
             if value_set
               value_set_models << value_set
+            else
+              raise MeasureLoadingException.new "Value Set not found in database: #{query_params}"
             end
           end
         end
       end
 
-
       # Get code systems and codes for all value sets in the elm.
       all_codes_and_code_names = HQMF2JS::Generator::CodesToJson.from_value_sets(value_set_models)
       # Replace code system oids with friendly names
@@ -167,7 +158,10 @@ module Measures
       # Add our new fake oids to measure value sets.
       all_value_set_oids = value_set_models.collect{|vs| vs.oid}
       single_code_references.each do |single_code|
-        all_value_set_oids << single_code[:guid]
+        # Only add unique Direct Reference Codes
+        unless all_value_set_oids.include?(single_code[:guid])
+          all_value_set_oids << single_code[:guid]
+        end
       end
 
       # Add a list of value set oids and their versions
@@ -192,8 +186,12 @@ module Measures
         value_set_oid_version_objects << {:oid => vs.oid, :version => vs.version}
       end
       single_code_references.each do |single_code|
-        value_set_oid_version_objects << {:oid => single_code[:guid], :version => ""}
+        # Only add unique Direct Reference Codes to the object
+        unless value_set_oid_version_objects.include?({:oid => single_code[:guid], :version => ""})
+          value_set_oid_version_objects << {:oid => single_code[:guid], :version => ""}
+        end
       end
+      # Return a list of unique objects only
       value_set_oid_version_objects
     end
 

data/test/unit/cql_loader_test.rb

@@ -51,4 +51,38 @@ class CQLLoaderTest < ActiveSupport::TestCase
       assert_equal measures[0]['data_criteria']['prefix_5195_3_LaboratoryTestPerformed_70C9F083_14BD_4331_99D7_201F8589059D']['code_list_id'], measures[1]['data_criteria']['prefix_5195_3_LaboratoryTestPerformed_70C9F083_14BD_4331_99D7_201F8589059D']['code_list_id']
     end
   end
+
+  test 'Re-loading a measure with no VSAC credentials' do
+    direct_reference_mat_export = File.new File.join('test', 'fixtures', 'CMS158_v5_4_Artifacts_Update.zip')
+    VCR.use_cassette('valid_vsac_response_158_update') do
+      dump_db
+      user = User.new
+      user.save
+
+      measure_details = { 'episode_of_care'=> false }
+      Measures::CqlLoader.load(direct_reference_mat_export, user, measure_details, ENV['VSAC_USERNAME'], ENV['VSAC_PASSWORD']).save
+      assert_equal 1, CqlMeasure.all.count
+      measure = CqlMeasure.all.first
+      before_value_sets = measure.value_set_oids
+      before_value_set_version_object = measure.value_set_oid_version_objects
+      before_data_criteria = measure.data_criteria
+      before_source_data_criteria = measure.source_data_criteria
+
+      # Re-load the Measure without VSAC Credentials
+      Measures::CqlLoader.load(direct_reference_mat_export, user, measure_details, nil, nil).save
+      assert_equal 2, CqlMeasure.all.count
+      measures = CqlMeasure.all
+
+      # Assert the value sets were loaded properly when no VSAC credentials are provided for both instances of the measure
+      assert Digest::MD5.hexdigest(before_value_sets.to_json) == Digest::MD5.hexdigest(measures[0].value_set_oids.to_json)
+      assert Digest::MD5.hexdigest(before_value_set_version_object.to_json) == Digest::MD5.hexdigest(measures[0].value_set_oid_version_objects.to_json)
+      assert Digest::MD5.hexdigest(before_data_criteria.to_json) == Digest::MD5.hexdigest(measures[0].data_criteria.to_json)
+      assert Digest::MD5.hexdigest(before_source_data_criteria.to_json) == Digest::MD5.hexdigest(measures[0].source_data_criteria.to_json)
+
+      assert Digest::MD5.hexdigest(before_value_sets.to_json) == Digest::MD5.hexdigest(measures[1].value_set_oids.to_json)
+      assert Digest::MD5.hexdigest(before_value_set_version_object.to_json) == Digest::MD5.hexdigest(measures[1].value_set_oid_version_objects.to_json)
+      assert Digest::MD5.hexdigest(before_data_criteria.to_json) == Digest::MD5.hexdigest(measures[1].data_criteria.to_json)
+      assert Digest::MD5.hexdigest(before_source_data_criteria.to_json) == Digest::MD5.hexdigest(measures[1].source_data_criteria.to_json)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bonnie_bundler
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - The MITRE Corporation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-17 00:00:00.000000000 Z
+date: 2018-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: health-data-standards
@@ -256,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: A Gem for creating and managing bonnie bundles