cqm-validators 4.0.1 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3072faa685de768a4a80ed90fae5da72b0ae2ee1b1d86bea76a9f90fc5a198c6
-  data.tar.gz: c90de36ea0e134ba07345cc58842682e98c2494ace3f04aeeb65e9aa1511b57b
+  metadata.gz: aba5de67708f22d92bb0f20c31d7173bfc0e8382bd8e536ac571d8fde83116d2
+  data.tar.gz: 339ba96bb7af5bf2b6b9e2ddb8ff448bc1a0456443273083de3fd014fe0d3f13
 SHA512:
-  metadata.gz: 5358b31884f39aea4f44a48c9a4aee3f548f89646bcfc29d64e124e2992ef0a152aa58d4bca08d0bf0e38682347f89bb6c591077443e565a5c4d01494ef14abc
-  data.tar.gz: c6aee722e6e323d37a8ef25ed2df495fd3b0eb399b194d30134ded1bd7f591f0692a6b73cb52413151559a314e7f29b33d0c62a6707ee69d68065d39c417639b
+  metadata.gz: 187eb234fd776e9935809d756ee9fcf3f258d30bf6cfbe07d4f0a4cd7bf5fad3ef18ce00a0b1e06b02f70b825b14794322b25c7f1a6f0d3c7fc75a8d49c9ac42
+  data.tar.gz: a276379056beb2530eafaea43df030a0fbaff0a52384ab2c4c7d609c91d9a06e08283dff40a51fc8140d97888033abd4e34a27c5533f65348c31a952ed934652

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 = '4.0.1'
+  VERSION = '4.0.3'
 end

data/lib/performance_rate_validator.rb

@@ -17,6 +17,8 @@ module CqmValidators
       measure_ids = document.xpath(measure_selector).map(&:value).map(&:upcase)
       measure_ids.each do |measure_id|
         measure = CQM::Measure.where(hqmf_id: measure_id).first
+        next unless measure
+
         measure.population_sets.each do |population_set|
           reported_result, = extract_results_by_ids(measure, population_set.population_set_id, document)
           # only check performace rate when there is one

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