ahl_scraper 0.2.0 → 0.3.0

data/lib/ahl_scraper/fixed_games/1018774.json

@@ -1438,7 +1438,7 @@
       ],
       "penalties": [
         {
-          "game_penalty_id": 219063,
+          "game_penalty_id": 219032,
           "period": { "id": "1", "shortName": "", "longName": "1st" },
           "time": "11:54",
           "againstTeam": {
@@ -1473,7 +1473,7 @@
           "isBench": false
         },
         {
-          "game_penalty_id": 219076,
+          "game_penalty_id": 219034,
           "period": { "id": "1", "shortName": "", "longName": "1st" },
           "time": "16:43",
           "againstTeam": {
@@ -2057,7 +2057,7 @@
       ],
       "penalties": [
         {
-          "game_penalty_id": 774,
+          "game_penalty_id": 219045,
           "period": { "id": "2", "shortName": "", "longName": "2nd" },
           "time": "17:58",
           "againstTeam": {
@@ -2381,7 +2381,7 @@
       ],
       "penalties": [
         {
-          "game_penalty_id": 1234,
+          "game_penalty_id": 219082,
           "period": { "id": "3", "shortName": "", "longName": "3rd" },
           "time": "4:19",
           "againstTeam": {

data/lib/ahl_scraper/fixed_games/1020527.json

@@ -1768,7 +1768,7 @@
       ],
       "penalties": [
         {
-          "game_penalty_id": null,
+          "game_penalty_id": 237213,
           "period": { "id": "2", "shortName": "", "longName": "2nd" },
           "time": "2:08",
           "againstTeam": {
@@ -1803,7 +1803,7 @@
           "isBench": false
         },
         {
-          "game_penalty_id": null,
+          "game_penalty_id": 237215,
           "period": { "id": "2", "shortName": "", "longName": "2nd" },
           "time": "4:52",
           "againstTeam": {
@@ -1831,7 +1831,7 @@
           "isBench": true
         },
         {
-          "game_penalty_id": null,
+          "game_penalty_id": 237217,
           "period": { "id": "2", "shortName": "", "longName": "2nd" },
           "time": "6:26",
           "againstTeam": {
@@ -1866,7 +1866,7 @@
           "isBench": false
         },
         {
-          "game_penalty_id": null,
+          "game_penalty_id": 237227,
           "period": { "id": "2", "shortName": "", "longName": "2nd" },
           "time": "18:48",
           "againstTeam": {
@@ -2300,7 +2300,7 @@
       ],
       "penalties": [
         {
-          "game_penalty_id": null,
+          "game_penalty_id": 237233,
           "period": { "id": "3", "shortName": "", "longName": "3rd" },
           "time": "4:35",
           "againstTeam": {
@@ -2335,7 +2335,7 @@
           "isBench": false
         },
         {
-          "game_penalty_id": null,
+          "game_penalty_id": 237245,
           "period": { "id": "3", "shortName": "", "longName": "3rd" },
           "time": "13:27",
           "againstTeam": {
@@ -2370,7 +2370,7 @@
           "isBench": false
         },
         {
-          "game_penalty_id": null,
+          "game_penalty_id": 237262,
           "period": { "id": "3", "shortName": "", "longName": "3rd" },
           "time": "16:49",
           "againstTeam": {
@@ -2405,7 +2405,7 @@
           "isBench": false
         },
         {
-          "game_penalty_id": null,
+          "game_penalty_id": 237268,
           "period": { "id": "3", "shortName": "", "longName": "3rd" },
           "time": "16:49",
           "againstTeam": {

data/lib/ahl_scraper/resources/game.rb

@@ -47,8 +47,9 @@ module AhlScraper
     attr_reader(*ATTRIBUTES)
 
     def initialize(game_id, opts = {})
+      raw_data = GameDataFetcher.new(game_id).call
+      super(raw_data, opts)
       @game_id = game_id
-      @raw_data = GameDataFetcher.new(game_id).call
       @raw_event_data = GameEventDataFetcher.new(game_id).call
       @season_type = opts[:season_type] || SeasonTypeFetcher.new(@raw_data[:details][:seasonId]).call
     end
@@ -224,7 +225,7 @@ module AhlScraper
     end
 
     def overtimes
-      @overtimes ||= Array(@raw_data[:periods][3..-1]).map { |o| Games::Overtime.new(o, { regular_season: season_type == :regular }) }
+      @overtimes ||= Array(@raw_data[:periods][3..]).map { |o| Games::Overtime.new(o, { regular_season: season_type == :regular }) }
     end
 
     def overtime?
@@ -353,7 +354,7 @@ module AhlScraper
     end
 
     def set_current_game_time
-      return if /Final/.match?(@raw_data[:details][:status])
+      return if @raw_data[:details][:final] == "1" || @raw_data[:details][:started] == "0"
 
       game_time = @raw_data[:details][:status].match(/\d{1,2}:\d{2}/).to_s
       return if game_time.empty?

data/lib/ahl_scraper/resources/game_list_item.rb

@@ -2,52 +2,52 @@
 
 module AhlScraper
   class GameListItem < Resource
-    def initialize(raw_data)
-      @raw_data = raw_data
+    def initialize(raw_data, opts = {})
+      super(raw_data, opts)
     end
 
     def id
-      @id ||= @raw_data[:row][:game_id].to_i
+      @id ||= @raw_data&.dig(:row, :game_id).to_i
     end
 
     def home_team_city
-      @home_team_city ||= @raw_data[:row][:home_team_city]
+      @home_team_city ||= @raw_data&.dig(:row, :home_team_city)
     end
 
     def home_team_score
-      @home_team_score ||= @raw_data[:row][:home_goal_count].to_i
+      @home_team_score ||= @raw_data&.dig(:row, :home_goal_count).to_i
     end
 
     def home_team_id
-      @home_team_id ||= @raw_data[:prop][:home_team_city][:teamLink].to_i
+      @home_team_id ||= @raw_data&.dig(:prop, :home_team_city, :teamLink).to_i
     end
 
     def away_team_city
-      @away_team_city ||= @raw_data[:row][:visiting_team_city]
+      @away_team_city ||= @raw_data&.dig(:row, :visiting_team_city)
     end
 
     def away_team_score
-      @away_team_score ||= @raw_data[:row][:visiting_goal_count].to_i
+      @away_team_score ||= @raw_data&.dig(:row, :visiting_goal_count).to_i
     end
 
     def away_team_id
-      @away_team_id ||= @raw_data[:prop][:visiting_team_city][:teamLink].to_i
+      @away_team_id ||= @raw_data&.dig(:prop, :visiting_team_city, :teamLink).to_i
     end
 
     def date
-      @date ||= @raw_data[:row][:date_with_day]
+      @date ||= @raw_data&.dig(:row, :date_with_day)
     end
 
     def status
-      @status ||= @raw_data[:row][:game_status]
+      @status ||= @raw_data&.dig(:row, :game_status)&.match(/am|pm/) ? "Not Started" : @raw_data&.dig(:row, :game_status)
     end
 
     def game_report_url
-      @game_report_url ||= @raw_data[:prop][:game_report][:link]
+      @game_report_url ||= @raw_data&.dig(:prop, :game_report, :link)
     end
 
     def game_sheet_url
-      @game_sheet_url ||= @raw_data[:prop][:game_sheet][:link]
+      @game_sheet_url ||= @raw_data&.dig(:prop, :game_sheet, :link)
     end
 
     def game_center_url

data/lib/ahl_scraper/resources/games/info.rb

@@ -64,7 +64,7 @@ module AhlScraper
       end
 
       def status
-        @status ||= @raw_data[:status]
+        @status ||= @raw_data[:started] == "0" ? @raw_data[:status].strip : @raw_data[:status]
       end
 
       def season_id

data/lib/ahl_scraper/resources/games/penalty.rb

@@ -4,7 +4,7 @@ module AhlScraper
   module Games
     class Penalty < Resource
       def id
-        @id ||= @raw_data.dig(:game_penalty_id)&.to_i
+        @id ||= @raw_data[:game_penalty_id]&.to_i
       end
 
       def number
@@ -78,7 +78,7 @@ module AhlScraper
       end
 
       def bench?
-        @raw_data[:isPowerPlay]
+        @raw_data[:isBench]
       end
 
       def invalid?

data/lib/ahl_scraper/resources/games/team.rb

@@ -49,7 +49,7 @@ module AhlScraper
           p1_sog: @opts[:shots].dig(0, home_team? ? :home : :away),
           p2_sog: @opts[:shots].dig(1, home_team? ? :home : :away),
           p3_sog: @opts[:shots].dig(2, home_team? ? :home : :away),
-          ot_sog: @opts[:shots][3..-1]&.map { |ot| ot[home_team? ? :home : :away].to_i },
+          ot_sog: @opts[:shots][3..]&.map { |ot| ot[home_team? ? :home : :away].to_i },
         }
       end
 
@@ -59,7 +59,7 @@ module AhlScraper
           p1_goals: @opts[:goal_totals].dig(0, home_team? ? :home : :away),
           p2_goals: @opts[:goal_totals].dig(1, home_team? ? :home : :away),
           p3_goals: @opts[:goal_totals].dig(2, home_team? ? :home : :away),
-          ot_goals: @opts[:goal_totals][3..-1]&.map { |ot| ot[home_team? ? :home : :away].to_i },
+          ot_goals: @opts[:goal_totals][3..]&.map { |ot| ot[home_team? ? :home : :away].to_i },
         }
       end
 

data/lib/ahl_scraper/resources/goalie_game_list_item.rb

@@ -2,7 +2,8 @@
 
 module AhlScraper
   class GoalieGameListItem < Resource
-    def initialize(raw_data)
+    def initialize(raw_data, opts = {})
+      super(raw_data, opts)
       @raw_data = raw_data
     end
 

data/lib/ahl_scraper/resources/player.rb

@@ -2,8 +2,8 @@
 
 module AhlScraper
   class Player < Resource
-    def initialize(raw_data)
-      @raw_data = raw_data
+    def initialize(raw_data, opts = {})
+      super(raw_data, opts)
     end
 
     def id

data/lib/ahl_scraper/resources/playoff_bracket.rb

@@ -2,20 +2,20 @@
 
 module AhlScraper
   class PlayoffBracket < Resource
-    def initialize(bracket_data)
-      @bracket_data = bracket_data
+    def initialize(raw_data, opts = {})
+      super(raw_data, opts)
     end
 
     def teams
-      @teams ||= @bracket_data[:teams].map { |_team_id, team_data| PlayoffBrackets::Team.new(team_data) }
+      @teams ||= @raw_data[:teams].map { |_team_id, team_data| PlayoffBrackets::Team.new(team_data) }
     end
 
     def rounds
-      @rounds ||= @bracket_data[:rounds].map { |round| PlayoffBrackets::Round.new(round) }
+      @rounds ||= @raw_data[:rounds].map { |round| PlayoffBrackets::Round.new(round, { raw_data: @raw_data }) }
     end
 
     def logo_url
-      @logo_url ||= @bracket_data[:logo]
+      @logo_url ||= @raw_data[:logo]
     end
   end
 end

data/lib/ahl_scraper/resources/playoff_brackets/round.rb

@@ -24,7 +24,7 @@ module AhlScraper
       end
 
       def series
-        @series ||= @raw_data[:matchups].map { |series| Series.new(series) }
+        @series ||= @raw_data[:matchups].map { |series| Series.new(series, { bracket_data: @opts[:bracket_data] }) }
       end
     end
   end

data/lib/ahl_scraper/resources/playoff_brackets/series.rb

@@ -3,6 +3,18 @@
 module AhlScraper
   module PlayoffBrackets
     class Series < Resource
+      OVERRIDE_WINS_NEEDED = {
+        "36" => { "1" => 4 },
+        "39" => { "1" => 4 },
+        "33" => { "1" => 4 },
+        "29" => { "1" => 4 },
+        "15" => { "1" => 4 },
+        "10" => { "1" => 4 },
+        "7" => { "1" => 4 },
+        "69" => { "1" => 4 },
+        "72" => { "1" => 1, "2" => 1, "3" => 2, "4" => 2 },
+      }.freeze
+
       def id
         @id ||= @raw_data[:series_letter]
       end
@@ -20,54 +32,82 @@ module AhlScraper
       end
 
       def active?
-        @active ||= @raw_data[:active] == "1"
+        @active ||= @raw_data[:active] == "1" && team1_wins < wins_needed && team2_wins < wins_needed
       end
 
-      def feeder_series1
-        @feeder_series1 ||= @raw_data[:feeder_series1]
+      def home_feeder_series
+        @home_feeder_series ||= home_team_id == team1 ? @raw_data[:feeder_series1] : @raw_data[:feeder_series2]
       end
 
-      def feeder_series2
-        @feeder_series2 ||= @raw_data[:feeder_series2]
+      def away_feeder_series
+        @away_feeder_series ||= home_team_id == team1 ? @raw_data[:feeder_series2] : @raw_data[:feeder_series1]
       end
 
-      def team1
-        @team1 ||= @raw_data[:team1].to_i
+      def winning_team_id
+        @winning_team_id ||= @raw_data[:winner].empty? ? find_winner : @raw_data[:winner].to_i
       end
 
-      def team2
-        @team2 ||= @raw_data[:team2].to_i
+      def home_team_id
+        @home_team_id ||= first_game[:home_team].to_i
       end
 
-      def team1_wins
-        @team1_wins ||= @raw_data[:team1_wins]
+      def away_team_id
+        @away_team_id ||= first_game[:visiting_team].to_i
       end
 
-      def team2_wins
-        @team2_wins ||= @raw_data[:team2_wins]
+      def home_team_wins
+        @home_team_wins ||= home_team_id == team1 ? team1_wins : team2_wins
       end
 
-      def winning_team
-        @winning_team ||= @raw_data[:winner].empty? ? nil : @raw_data[:winner].to_i
+      def away_team_wins
+        @away_team_wins ||= home_team_id == team1 ? team2_wins : team1_wins
       end
 
       def ties
-        @ties ||= @raw_data[:ties]
-      end
-
-      def home_team_id
-        @home_team_id ||= first_game[:home_team].to_i
+        @ties ||= @raw_data[:ties].to_i
       end
 
       def games
         @games ||= @raw_data[:games].map { |game| Game.new(game) }
       end
 
+      def wins_needed
+        @wins_needed ||= OVERRIDE_WINS_NEEDED.dig(season_id, round.to_s) || (round == 1 ? 3 : 4)
+      end
+
       private
 
       def first_game
         @first_game ||= @raw_data[:games][0]
       end
+
+      def find_winner
+        return team1 if team1_wins == wins_needed
+
+        return team2 if team2_wins == wins_needed
+
+        nil
+      end
+
+      def season_id
+        @opts[:bracket_data]&.dig(:rounds, round - 1, :season_id)
+      end
+
+      def team1
+        @team1 ||= @raw_data[:team1].to_i
+      end
+
+      def team2
+        @team2 ||= @raw_data[:team2].to_i
+      end
+
+      def team1_wins
+        @team1_wins ||= @raw_data[:team1_wins]
+      end
+
+      def team2_wins
+        @team2_wins ||= @raw_data[:team2_wins]
+      end
     end
   end
 end

data/lib/ahl_scraper/resources/roster_player.rb

@@ -5,7 +5,7 @@ module AhlScraper
     attr_reader :team_id, :season_id
 
     def initialize(raw_data, team_id, season_id)
-      @raw_data = raw_data
+      super(raw_data, {})
       @team_id = team_id
       @season_id = season_id
     end

data/lib/ahl_scraper/resources/season.rb

@@ -4,7 +4,8 @@ module AhlScraper
   class Season < Resource
     attr_reader :id, :name, :season_type
 
-    def initialize(raw_data)
+    def initialize(raw_data, opts = {})
+      super(raw_data, opts)
       @id = raw_data[:id].to_i
       @name = raw_data[:name]
       @season_type = set_season_type
@@ -15,13 +16,15 @@ module AhlScraper
       @abbreviation ||=
         case season_type
         when :regular
-          "#{start_year.to_s[-2..-1]}-#{end_year.to_s[-2..-1]}"
+          "#{start_year.to_s[-2..]}-#{end_year.to_s[-2..]}"
         when :playoffs
-          "#{start_year.to_s[-2..-1]}PO"
+          "#{start_year.to_s[-2..]}PO"
         when :all_star_game
-          "#{start_year.to_s[-2..-1]}ASG"
+          "#{start_year.to_s[-2..]}ASG"
         when :exhibition
-          "#{start_year.to_s[-2..-1]}-#{end_year.to_s[-2..-1]}EX"
+          "#{start_year.to_s[-2..]}-#{end_year.to_s[-2..]}EX"
+        when :preseason
+          "#{start_year.to_s[-2..]}PS"
         end
     end
 
@@ -29,8 +32,8 @@ module AhlScraper
       @start_year ||=
         case season_type
         when :regular, :exhibition
-          name[/(.*?)\-/].to_i
-        when :playoffs, :all_star_game
+          name[/(.*?)-/].to_i
+        when :playoffs, :all_star_game, :preseason
           name[/(.*?) /].to_i
         end
     end
@@ -48,7 +51,7 @@ module AhlScraper
         case season_type
         when :regular, :exhibition
           start_year + 1
-        when :playoffs, :all_star_game
+        when :playoffs, :all_star_game, :preseason
           start_year
         end
     end
@@ -73,6 +76,8 @@ module AhlScraper
         :playoffs
       when /Regular/
         :regular
+      when /Preseason/
+        :preseason
       end
     end
 

data/lib/ahl_scraper/resources/season_list_item.rb

@@ -2,8 +2,8 @@
 
 module AhlScraper
   class SeasonListItem < Resource
-    def initialize(raw_data)
-      @raw_data = raw_data
+    def initialize(raw_data, opts = {})
+      super(raw_data, opts)
     end
 
     def id

data/lib/ahl_scraper/resources/seasons/team.rb

@@ -28,8 +28,8 @@ module AhlScraper
         "henderson-silver-knights" => { city: "Henderson", name: "Silver Knights" },
       }.freeze
 
-      def initialize(raw_data, division)
-        @raw_data = raw_data
+      def initialize(raw_data, division, opts = {})
+        super(raw_data, opts)
         @division = division
       end
 
@@ -42,7 +42,8 @@ module AhlScraper
       end
 
       def abbreviation
-        @abbreviation ||= EXCEPTIONS[parameterized_name]&.dig(:abbreviation) || @raw_data.dig(:row, :team_code)&.delete_prefix("y -")&.delete_prefix("x -")&.delete_prefix("xy -")&.strip
+        @abbreviation ||= EXCEPTIONS[parameterized_name]&.dig(:abbreviation) || @raw_data.dig(:row,
+          :team_code)&.delete_prefix("y -")&.delete_prefix("x -")&.delete_prefix("xy -")&.strip
       end
 
       def parameterized_name

data/lib/ahl_scraper/resources/skater_game_list_item.rb

@@ -2,8 +2,8 @@
 
 module AhlScraper
   class SkaterGameListItem < Resource
-    def initialize(raw_data)
-      @raw_data = raw_data
+    def initialize(raw_data, opts = {})
+      super(raw_data, opts)
     end
 
     def game_id

data/lib/ahl_scraper/resources/team_game_list_item.rb

@@ -2,9 +2,8 @@
 
 module AhlScraper
   class TeamGameListItem < Resource
-    def initialize(raw_data, opts)
-      @raw_data = raw_data
-      @opts = opts
+    def initialize(raw_data, opts = {})
+      super(raw_data, opts)
     end
 
     def game_id

data/lib/ahl_scraper/resources/team_list_item.rb

@@ -5,7 +5,7 @@ module AhlScraper
     attr_reader :season_id
 
     def initialize(raw_data, season_id)
-      @raw_data = raw_data
+      super(raw_data, {})
       @season_id = season_id
     end
 

data/lib/ahl_scraper/services/games/create_skaters_service.rb

@@ -3,7 +3,7 @@
 module AhlScraper
   module Games
     class CreateSkatersService
-      def initialize(skater_data, goal_data, penalty_data, shootout_data, penalty_shot_data, opts)
+      def initialize(skater_data, goal_data, penalty_data, shootout_data, penalty_shot_data, opts = {})
         @skater_data = skater_data
         @goal_data = goal_data
         @penalty_data = penalty_data

data/lib/ahl_scraper/services/games/on_ice_statlines_service.rb

@@ -45,7 +45,7 @@ module AhlScraper
         on_scoring_team ? "#{skater_ids.length}v#{opposing_skater_ids.length}" : "#{opposing_skater_ids.length}v#{skater_ids.length}"
       end
 
-      def find_goal_situation(goal, on_scoring_team)
+      def find_goal_situation(goal, on_scoring_team) # rubocop:disable Metrics/CyclomaticComplexity
         return "pp" if (goal[:properties][:isPowerPlay] == "1" && on_scoring_team) || (goal[:properties][:isShortHanded] == "1" && !on_scoring_team)
 
         return "sh" if goal[:properties][:isShortHanded] == "1" && on_scoring_team || (goal[:properties][:isPowerPlay] == "1" && !on_scoring_team)