lx_data_validation 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02c93750ed26cb06f116a642b68edc23fc709043
-  data.tar.gz: bd936e31f2744b45648ee733378d502c8cbed2cc
+  metadata.gz: be0f66a6383f14c36a771d432383dbdb21af171e
+  data.tar.gz: 2823beb8c72fa58b1f3a9f656cf42419923741f4
 SHA512:
-  metadata.gz: 7a03048a35904537093fda7db90d00af6287d3a8f05fba9d7d9cca0e2ce7a076853bb04f2d709d1d273d60847c01f06e639e8b2d6db70c4e1f8b3cc143d800d0
-  data.tar.gz: b5b07349608f919c5288fc90b557c1ddc7803ddc9e037ce777be768b99a9a9e99f1c94efe1b5b3c2e98a67e8472c00be8b04a118055059d15bb4327b6a38716a
+  metadata.gz: 99fdfd839dafb5ed3ccfa07c99fabb996ab953bed2141942467d0cd3e2233457cf2c069a236911cb57aa6042bc80476938280fa32a85b156c313db51016605f6
+  data.tar.gz: d3fc812ca9464161a839ddafebb22c10f959749e17adb6b7eabd06e9e2935c1b6a206d52dce7c749594f4fa0c8fc2e9ec0e8435d538da9be62ccd9426bb8fac3

data/lib/data_validation/comparison/comparison_base.rb

@@ -37,37 +37,71 @@ module DataValidation
         end
 
         web_data.each_with_index do |item, index|
-          team = api_data['results']['results']['teams'][index]
+          teams = api_data['results']['results']['teams']
+          team = teams[index]
 
-          i = 0
-          field_array.each do |filed_name|
+          error_log = []
 
-            if filed_name.is_a? String
-              team_value = team[filed_name]
-            elsif filed_name.is_a? Array
-              team_value = team[filed_name[0]][filed_name[1]]
-            else
-              i += 1
-              next
-            end
+          error_info, rank_value = check_item(item, team, false)
+          error_log << error_info
 
-            if item.length < field_array.length && empty_field && empty_field == filed_name ## when the field is empty in the table
-              logger.error "team #{item[0]}'s #{filed_name} is not empty: #{team_value}" unless (team_value == 0 || team_value.nil?)
-              next
+          if error_info.size > 0 && rank_value
+            possible_teams = teams.select { |team| team[rank_field] == rank_value }
+            possible_teams.each do |team|
+              error, value = check_item(item, team, true)
+              error_log << error
             end
+          end
 
+          error_log.min_by { |log| log.length }.each { |item| logger.error item }
+        end
+      end
 
-            unless (team_value.is_a?(String) && team_value.include?(item[i].strip)) ||
-              (team_value.is_a?(Float) && team_value == item[i].to_f) ||
-              (team_value.is_a?(Integer) && team_value == item[i].to_i)
+      def check_item(item, team, re_check)
+        error_info = []
+        i = 0
+        rank_value = nil # the value used to rank
 
-              logger.error "team #{item[0]}'s #{filed_name}: #{item[i]} -- #{team_value}"
-            end
+        field_array.each do |field_name|
+
+          if re_check && field_name == related_rank_field
+            i += 1
+            next
+          end
 
+          if field_name.is_a? String
+            team_value = team[field_name]
+          elsif field_name.is_a? Array
+            team_value = team[field_name[0]][field_name[1]]
+          else
             i += 1
+            next
+          end
+
+          if item.length < field_array.length && empty_field && empty_field == field_name ## when the field is empty in the table
+            error_info << "team #{item[0]}'s #{field_name} is not empty: #{team_value}" unless (team_value == 0 || team_value.nil?)
+            next
+          end
+
+
+          if compare_values(item[i], team_value)
+
+            if field_name == rank_field
+              rank_value = team_value
+            end
+          else
+            error_info << "team #{item[0]}'s #{field_name}: #{item[i]} -- #{team_value}"
           end
 
+          i += 1
         end
+        [error_info, rank_value]
+      end
+
+      def compare_values(page_item, team_value)
+        (team_value.is_a?(String) && team_value.include?(page_item.strip)) ||
+          (team_value.is_a?(Float) && compare_floats(team_value, page_item)) ||
+          (team_value.is_a?(Integer) && team_value == page_item.to_i)
       end
 
       def compare_conf_standings(api_data, data_access)
@@ -95,7 +129,7 @@ module DataValidation
 
               record.each_with_index do |item, index|
                 if index == 0 && item.to_i != team_data['rank']
-                elsif index == 1 && item.to_f != team_data['powerRating']
+                elsif index == 1 && !compare_floats(team_data['powerRating'], item)
                   logger.error "team #{i} powerRating in #{full_conf}: #{item.to_f} -- #{team_data['powerRating']}"
                 elsif index == 2 && item.to_i != team_data['conference']['wins']
                   logger.error "team #{i} conference wins in #{full_conf}: #{item.to_i} -- #{team_data['conference']['wins']}"
@@ -103,7 +137,7 @@ module DataValidation
                   logger.error "team #{i} conference losses in #{full_conf}: #{item.to_i} -- #{team_data['conference']['losses']}"
                 elsif index == 4 && item.to_i != team_data['conference']['ties']
                   logger.error "team #{i} conference ties in #{full_conf}: #{item.to_i} -- #{team_data['conference']['ties']}"
-                elsif index == 5 && item.to_f != team_data['winLossConf']
+                elsif index == 5 && !compare_floats(team_data['winLossConf'], item)
                   logger.error "team #{i} winLossConf in #{full_conf}: #{item.to_f} -- #{team_data['winLossConf']}"
                 elsif index == 6 && item.to_i != team_data['total']['wins']
                   logger.error "team #{i} total wins in #{full_conf}: #{item.to_i} -- #{team_data['total']['wins']}"
@@ -111,7 +145,7 @@ module DataValidation
                   logger.error "team #{i} total losses in #{full_conf}: #{item.to_i} -- #{team_data['total']['losses']}"
                 elsif index == 8 && item.to_i != team_data['total']['ties']
                   logger.error "team #{i} total ties in #{full_conf}: #{item.to_i} -- #{team_data['total']['ties']}"
-                elsif index == 9 && item.to_f != team_data['winLossTotal']
+                elsif index == 9 && !compare_floats(team_data['winLossTotal'], item)
                   logger.error "team #{i} winLossTotal in #{full_conf}: #{item.to_f} -- #{team_data['winLossTotal']}"
                 end
               end
@@ -135,6 +169,14 @@ module DataValidation
 
       end
 
+      def rank_field
+
+      end
+
+      def related_rank_field
+
+      end
+
       def determine_request_body_and_logger_name
         @category = if web_url.match /bingrl/
                       'GIRLS'
@@ -157,6 +199,15 @@ module DataValidation
         %Q|{"category":"#{category}","season":#{season},"divisionId":#{division_id},"currPage":1,"pageSize":1000}|
       end
 
+      def compare_floats(team_value, page_item)
+        f = page_item.to_f
+        (team_value - f).round(decimal_places_num) <= 0.01
+      end
+
+      def decimal_places_num
+        2
+      end
+
       private
 
       def logger

data/lib/data_validation/comparison/comparison_factory.rb

@@ -39,7 +39,7 @@ module DataValidation
           return RankingTableMwPollComparison.new url
         elsif url.match /update\d\d\/bin\S+\/trend\d+.php/ # Trend page for collage division
           return RankingTableMwTrendComparison.new url
-        elsif url.match /update\d\d\/bin\S+\/tsi\d+.php/ # Trend page for collage division
+        elsif url.match /update\d\d\/bin\S+\/tsi\d+.php/ # Tournament Selection Index page for collage division
           return RankingTableMwTsiComparison.new url
         elsif url.match /\.com\/(mll|nll)/ # Pro ranking page
           return RankingTableProPrComparison.new url

data/lib/data_validation/comparison/div_ranking_pr_comparison.rb

@@ -52,7 +52,7 @@ module DataValidation
 
 
             unless (team_value.is_a?(String) && team_value.include?(item[i])) ||
-              (team_value.is_a?(Float) && team_value == item[i].to_f) ||
+              (team_value.is_a?(Float) && compare_floats(team_value, item[i])) ||
               (team_value.is_a?(Integer) && team_value == item[i].to_i)
 
               logger.error "team #{item[0]}'s #{filed_name}: #{item[i]} -- #{team_value}"

data/lib/data_validation/comparison/div_ranking_wl_comparison.rb

@@ -12,6 +12,14 @@ module DataValidation
         ['rank', 'teamName', 'rank', 'winLossTotal', 'rankDivision', 'winLossDivision', 'rankDate', 'winLossDate', 'rankRoad', 'winLossRoad', %w|record wins|, %w|record losses|, %w|record ties|]
       end
 
+      def rank_field
+        'winLossTotal'
+      end
+
+      def related_rank_field
+        'rank'
+      end
+
      end
   end
 end

data/lib/data_validation/comparison/ranking_table_hs_crr_comparison.rb

@@ -8,6 +8,10 @@ module DataValidation
         ['rank', 'teamName', 'state', 'totalWins', 'totalLosses', 'totalTies', 'ccr', 'pollPoint', 'powerRating']
       end
 
+      def rank_field
+        'ccr'
+      end
+
     end
   end
 end

data/lib/data_validation/comparison/ranking_table_hs_poll_comparison.rb

@@ -8,6 +8,10 @@ module DataValidation
         ['rank', 'teamName', 'state', 'totalWins', 'totalLosses', 'totalTies', 'pollPoint', 'pollFirst']
       end
 
+      def rank_field
+        'pollFirst'
+      end
+
     end
   end
 end

data/lib/data_validation/comparison/ranking_table_hs_qwf_comparison.rb

@@ -8,6 +8,14 @@ module DataValidation
         ['rank', 'teamName', 'region', 'gameScheduled', 'qwf', 'totalWins', 'totalLosses', 'totalTies']
       end
 
+      def rank_field
+        'qwf'
+      end
+
+      def related_rank_field
+        'rank'
+      end
+
       def determine_request_body_and_logger_name
         @category = if web_url.match /bingrl/
                       'GIRLS'

data/lib/data_validation/comparison/ranking_table_hs_rating_comparison.rb

@@ -12,6 +12,10 @@ module DataValidation
         'pollRank'
       end
 
+      def rank_field
+        'powerRating'
+      end
+
       def determine_request_body_and_logger_name
         @category = if web_url.match /bingrl/
                       'GIRLS'
@@ -27,7 +31,7 @@ module DataValidation
 
         @logger_name = "log/#{season}/#{category.downcase}/natlrating_#{season}_#{category}.log"
 
-        %Q|{"category":"#{category}","season":#{season}, "type": "PR", "currPage":1,"pageSize":1000}|
+        %Q|{"category":"#{category}","season":#{season}, "type": "PR", "currPage":1,"pageSize":5000}|
       end
 
     end

data/lib/data_validation/comparison/ranking_table_hs_rpi_comparison.rb

@@ -8,6 +8,14 @@ module DataValidation
         ['rank', 'teamName', 'region', 'gameScheduled', 'rpi', 'totalWins', 'totalLosses', 'totalTies']
       end
 
+      def rank_field
+        'rpi'
+      end
+
+      def related_rank_field
+        'rank'
+      end
+
     end
   end
 end

data/lib/data_validation/comparison/ranking_table_hs_sos_comparison.rb

@@ -8,6 +8,14 @@ module DataValidation
         ['rank', 'teamName', 'region', 'gameScheduled', 'sos', 'totalWins', 'totalLosses', 'totalTies']
       end
 
+      def rank_field
+        'sos'
+      end
+
+      def related_rank_field
+        'rank'
+      end
+
     end
   end
 end

data/lib/data_validation/comparison/ranking_table_mw_poll_comparison.rb

@@ -16,6 +16,10 @@ module DataValidation
         'pollFirst'
       end
 
+      def rank_field
+        'pollPoint'
+      end
+
     end
   end
 end

data/lib/data_validation/comparison/ranking_table_mw_qw_comparison.rb

@@ -12,6 +12,13 @@ module DataValidation
         ['rank', 'teamName', 'qwPrRank', 'qualityWinsPr', nil, 'qualityWinsPoll', 'qwRpiRank', 'qualityWinsRpi', %w|record wins|, %w|record losses|, %w|record ties|]
       end
 
+      def rank_field
+        'qualityWinsPr'
+      end
+
+      def related_rank_field
+        'qwPrRank'
+      end
     end
   end
 end

data/lib/data_validation/comparison/ranking_table_mw_rpi_comparison.rb

@@ -16,6 +16,14 @@ module DataValidation
          %w|recordHome wins|, %w|recordHome losses|, %w|recordHome ties|]
       end
 
+      def rank_field
+        'rpi'
+      end
+
+      def decimal_places_num
+        4
+      end
+
     end
   end
 end

data/lib/data_validation/comparison/ranking_table_mw_sos_comparison.rb

@@ -12,6 +12,10 @@ module DataValidation
         ['rank', 'teamName', 'totalGames', nil,  'sosAverage', 'sosWeightedRank', 'sosWeighted', 'sosRpiRank', 'sosRpi', %w|record wins|, %w|record losses|, %w|record ties|]
       end
 
+      def rank_field
+        'sosAverage'
+      end
+
     end
   end
 end

data/lib/data_validation/comparison/ranking_table_mw_tsi_comparison.rb

@@ -16,6 +16,10 @@ module DataValidation
         'pollRank'
       end
 
+      def rank_field
+        'tsi'
+      end
+
     end
   end
 end

data/lib/data_validation/version.rb

@@ -1,3 +1,3 @@
 module DataValidation
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/lib/data_validation.rb

@@ -23,6 +23,7 @@ module DataValidation
     def compare_with_season(season = '17')
       compare_with_url(web_request_host + '/mll')
       compare_with_url(web_request_host + '/nll')
+      compare_national(season)
       %w|men women boys girls|.each { |category| compare_with_season_and_category season, category }
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lx_data_validation
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Roger Tong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-17 00:00:00.000000000 Z
+date: 2017-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri