cqm-validators 3.1.3 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d1b58c405d0b4f5749dd5a97f3e8bf6d9d751276b322f7f616ec143273c546a
-  data.tar.gz: 6c569d85fa41bdf80c2ebb2844035a0d3eca2e58d8c065f28dab833370049e34
+  metadata.gz: 29df45cf99b9918238f8546e963c56c83abe86cbff28f5fb82f5d6ffdc8d8521
+  data.tar.gz: 873a72b950d5e2a98bbffc90748270ae114ef036c8a5b294639cb8ed215326c0
 SHA512:
-  metadata.gz: 1fac7b2669ce06bcf10402fe2e966740eb6f82e5dadd1245e251e49a7d1fcc3f3d0dc6966d235f073279ad844864b30c965101bf630fe1a88560f8b11edcf1bb
-  data.tar.gz: c641e6e185bc0cf57efc448b280441193ce0a3c0143e5d041271a1484a6b1cf6a84d19862cce4e5ec7b1767960bd41bb19b8e2d86d5a4b508bbbfad07e7c5fb4
+  metadata.gz: 3386b218f4d06ffac761dfcb4707cabefc6766d7bceaad1eb16edfab038a0ef6b9f0cdb631e98338bd54c55cda9abca9dbf5f1a7879b170fc5fd5db6a3d6e79d
+  data.tar.gz: 428af9d72635fce454ee01d55c706d7c1b6fdf52a48c782eba7cde889dcbd448c1df79646f9933ed786cf642afbab586030d196f233f8689da698b696157ca89

data/.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby-version: [2.6, 2.7.2]
+        ruby-version: [2.6, 2.5]
         mongodb-version: [4.0.18, 4.4]
 
     steps:
@@ -33,4 +33,4 @@ jobs:
         bundle exec overcommit --sign
         bundle exec overcommit --run
     - name: Run tests
-      run: bundle exec rake test
+      run: bundle exec rake test

data/.rubocop.yml

@@ -58,6 +58,10 @@ Metrics/PerceivedComplexity:
   Max: 10
   Exclude:
     - 'lib/reported_result_extractor.rb'
+Metrics/ParameterLists:
+  Max: 5
+  Exclude:
+    - 'lib/reported_result_extractor.rb'
 Naming/MethodParameterName:
   Enabled: false
 Style/DateTime:

data/lib/cqm_validators/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CqmValidators
-  VERSION = '3.1.3'
+  VERSION = '4.0.2'
 end

data/lib/reported_result_extractor.rb

@@ -20,7 +20,10 @@ module CqmValidators
       end
 
       nodes.each do |n|
-        results = get_measure_components(n, measure.population_sets.where(population_set_id: poulation_set_id).first, stratification_id)
+        popset_index = measure.population_sets.map(&:population_set_id).find_index do |pop_set|
+          pop_set == poulation_set_id
+        end
+        results = get_measure_components(n, measure.population_sets.where(population_set_id: poulation_set_id).first, stratification_id, popset_index)
         break if !results.nil? || (!results.nil? && !results.empty?)
       end
       return nil if results.nil?
@@ -35,14 +38,14 @@ module CqmValidators
       doc.xpath(xpath_measures)
     end
 
-    def get_measure_components(n, population_set, stratification_id)
+    def get_measure_components(n, population_set, stratification_id, popset_index)
       # observations are a hash of population/value. For example {"DENOM"=>108.0, "NUMER"=>2}
       results = { supplemental_data: {}, observations: {} }
       stratification = stratification_id ? population_set.stratifications.where(stratification_id: stratification_id).first.hqmf_id : nil
       ALL_POPULATION_CODES.each do |pop_code|
         next unless population_set.populations[pop_code]
 
-        get_observed_values(results, n, pop_code, population_set, stratification)
+        get_observed_values(results, n, pop_code, population_set, stratification, popset_index)
         val, sup, pr = extract_component_value(n, pop_code, population_set.populations[pop_code]['hqmf_id'], stratification)
         unless val.nil?
           results[pop_code] = val
@@ -53,14 +56,14 @@ module CqmValidators
       results
     end
 
-    def get_observed_values(results, n, pop_code, population_set, stratification)
+    def get_observed_values(results, n, pop_code, population_set, stratification, popset_index)
       statement_name = population_set.populations[pop_code]['statement_name']
       # look to see if there is an observation that corresponds to the specific statement_name
-      statement_observation = population_set.observations.select { |obs| obs.observation_parameter.statement_name == statement_name }
+      statement_observation = population_set.observations.select { |obs| obs.observation_parameter.statement_name == statement_name }[popset_index]
       # return unless an observation is found
-      unless statement_observation.empty?
+      unless statement_observation.nil?
         hqmf_id = population_set.populations[pop_code]['hqmf_id']
-        results[:observations][pop_code] = extract_cv_value(n, statement_observation.first.hqmf_id, hqmf_id, pop_code, stratification)
+        results[:observations][pop_code] = extract_cv_value(n, statement_observation.hqmf_id, hqmf_id, pop_code, stratification)
       end
     end