hey look, some tests

.rspec

@@ -0,0 +1 @@
+--require spec_helper

.rubocop.yml

@@ -7,9 +7,6 @@ AllCops:
     - 'node_modules/*'
     - 'vendor/**/*'
     - lib/tasks/*
-    - spec/**/*
-    - test/**/*
-    - test/*
     - features/**/*
     - db/**/*
     - bin/**/*
@@ -20,6 +17,10 @@ AllCops:
     - old/**/*
     - scrapers/*
 
+Metrics/BlockLength:
+  Exclude:
+    - spec/**/*
+
 Style/FrozenStringLiteralComment:
   Enabled: False
 Style/Documentation:

Gemfile

@@ -28,5 +28,6 @@ group :development, :test do
   gem 'better_errors', '~> 2.9'
   gem 'binding_of_caller', '~> 1.0'
   gem 'pry-rails', '~> 0.3'
+  gem 'rspec-rails'
   gem 'rubocop', '~> 1.36'
 end

Gemfile.lock

@@ -94,6 +94,7 @@ GEM
       rake (> 10, < 14)
       ruby-statistics (>= 2.1)
       thor (>= 0.19, < 2)
+    diff-lcs (1.5.0)
     erubi (1.11.0)
     et-orbi (1.2.7)
       tzinfo
@@ -217,6 +218,23 @@ GEM
       connection_pool
     regexp_parser (2.6.0)
     rexml (3.2.5)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-rails (6.0.1)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
+      railties (>= 6.1)
+      rspec-core (~> 3.11)
+      rspec-expectations (~> 3.11)
+      rspec-mocks (~> 3.11)
+      rspec-support (~> 3.11)
+    rspec-support (3.12.0)
     rubocop (1.36.0)
       json (~> 2.3)
       parallel (~> 1.10)
@@ -266,6 +284,7 @@ DEPENDENCIES
   rack-cors (~> 1.1)
   rails (~> 7.0)
   redis (~> 5.0)
+  rspec-rails
   rubocop (~> 1.36)
   stackprof (~> 0.2)
 

app/models/event.rb

@@ -3,4 +3,29 @@
 class Event < ActiveRecord::Base
   belongs_to :match
   belongs_to :team
+
+  def data_hash
+    return @data_hash if @data_hash
+    return {} unless event_json && JSON.parse(event_json).is_a?(Hash)
+
+    @data_hash ||= JSON.parse(event_json)
+  end
+
+  def event_team_id
+    @team&.id || data_hash['IdTeam']
+  end
+
+  def event_player_id
+    data_hash['IdPlayer']
+  end
+
+  def event_time
+    data_hash['Minute']
+  end
+
+  def event_id
+    return data_hash['IdEvent'] if data_hash['IdEvent'].present?
+
+    "#{event_team_id}_#{event_match_id}_#{event_time}"
+  end
 end

app/models/json_match.rb

@@ -4,6 +4,8 @@
 #    IsUpdateable -- can determine if currently live?
 
 class JsonMatch
+  attr_reader :info
+
   # identifiers, date_info, location_info, general_info
   # home_team_info, away_team_info, score_info, current_time_info
   # home_team, away_team
@@ -28,10 +30,6 @@ def method_missing(method, *_args)
     end
   end
 
-  def respond_to_missing?(method, include_private)
-    method.to_s.start_with?(:match) || super
-  end
-
   def identifiers
     { fifa_id: match_id_match, season_id: match_id_season,
       stage_id: match_id_stage, group_id: match_id_group,
@@ -142,16 +140,14 @@ def home_team_info
     { tactics: home_team['Tactics'],
       starting_eleven: starters,
       substitutes: substitutes,
-      coaches: coach_names,
-      bookings: home_team['Bookings'] }
+      coaches: coach_names }
   end
 
   def away_team_info
     { tactics: away_team['Tactics'],
       starting_eleven: starters(away: true),
       substitutes: substitutes(away: true),
-      coaches: coach_names(away: true),
-      bookings: away_team['Bookings'] }
+      coaches: coach_names(away: true) }
   end
 
   def coach_names(home: true, away: false)
@@ -173,9 +169,7 @@ def substitutes(home: true, away: false)
     subs = subs.select { |p| p['Status'] == 2 }
     PlayersFormatter.players_from_array(subs)
   end
-end
 
-class JsonMatch
   class PlayersFormatter
     class << self
       def players_from_array(players_array)

db/migrate/20221114232107_add_event_json_to_event.rb

@@ -0,0 +1,5 @@
+class AddEventJsonToEvent < ActiveRecord::Migration[7.0]
+  def change
+    add_column :events, :event_json, :text
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2022_10_08_195245) do
+ActiveRecord::Schema[7.0].define(version: 2022_11_14_232107) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
   enable_extension "plpgsql"
@@ -25,6 +25,7 @@
     t.datetime "updated_at", precision: nil, null: false
     t.string "fifa_id"
     t.integer "team_id"
+    t.text "event_json"
     t.index ["team_id"], name: "index_events_on_team_id"
   end
 

spec/models/json_match_spec.rb

@@ -0,0 +1,45 @@
+require 'rails_helper'
+
+RSpec.describe JsonMatch, :type => :model do
+  let(:json_file) { File.read(Rails.root.join('spec/support/api_match_response.json').to_s) }
+  let(:group) { Group.create(letter: 'T') }
+  let!(:home_team) { Team.create(country: 'HTA', alternate_name: 'Home Test', group: group) }
+  let!(:away_team) { Team.create(country: 'ATS', alternate_name: 'Away Test', group: group) }
+  let!(:match) do
+    Match.create(fifa_id: '400180541', home_team: home_team, away_team: away_team,
+                 fifa_competition_id: '520', latest_json: JSON.parse(json_file).to_json)
+  end
+  let(:json_match) { JsonMatch.new(match.reload.latest_json) }
+
+  before(:each) do
+    expect(json_match.info).to be_a(Hash)
+  end
+
+  it 'should return basic info about the match' do
+    expected_info = { :fifa_id => '400180541', :season_id => '282653', :stage_id => '282667', :group_id => '284947',
+                      :competition_id => '520', :stage_name => 'Final Round' }
+    expect(json_match.identifiers.sort).to match_array(expected_info.sort)
+  end
+
+  it 'should return info about the location of the match' do
+    expected_gen_info = { :attendance => '31000', :weather => {}, :officials => [] }
+    expected_loc_info = { :venue => 'Estadio Olimpico Metropolitano', :location => 'San Pedro Sula' }
+
+    expect(json_match.general_info.sort).to match_array(expected_gen_info.sort)
+    expect(json_match.location_info.sort).to match_array(expected_loc_info.sort)
+  end
+
+  it 'should return info about each team' do
+    expect(json_match.home_team_info.keys).to match_array(%i[tactics starting_eleven substitutes coaches])
+    expect(json_match.away_team_info.keys).to match_array(%i[tactics starting_eleven substitutes coaches])
+  end
+
+  it 'should have time info' do
+    date_info = { :date => '2021-09-09T02:30:00Z', :local_date => '2021-09-08T20:30:00Z' }
+    time_info = { :current_time => "0'", :first_half_time => nil, :first_half_extra_time => 3, :second_half_time => nil,
+                  :second_half_extra_time => 4 }
+
+    expect(json_match.date_info.sort).to match_array(date_info.sort)
+    expect(json_match.current_time_info.sort).to match_array(time_info.sort)
+  end
+end

spec/rails_helper.rb

@@ -0,0 +1,63 @@
+# This file is copied to spec/ when you run 'rails generate rspec:install'
+require 'spec_helper'
+ENV['RAILS_ENV'] ||= 'test'
+require_relative '../config/environment'
+# Prevent database truncation if the environment is production
+abort("The Rails environment is running in production mode!") if Rails.env.production?
+require 'rspec/rails'
+# Add additional requires below this line. Rails is not loaded until this point!
+
+# Requires supporting ruby files with custom matchers and macros, etc, in
+# spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are
+# run as spec files by default. This means that files in spec/support that end
+# in _spec.rb will both be required and run as specs, causing the specs to be
+# run twice. It is recommended that you do not name files matching this glob to
+# end with _spec.rb. You can configure this pattern with the --pattern
+# option on the command line or in ~/.rspec, .rspec or `.rspec-local`.
+#
+# The following line is provided for convenience purposes. It has the downside
+# of increasing the boot-up time by auto-requiring all files in the support
+# directory. Alternatively, in the individual `*_spec.rb` files, manually
+# require only the support files necessary.
+#
+# Dir[Rails.root.join('spec', 'support', '**', '*.rb')].sort.each { |f| require f }
+
+# Checks for pending migrations and applies them before tests are run.
+# If you are not using ActiveRecord, you can remove these lines.
+begin
+  ActiveRecord::Migration.maintain_test_schema!
+rescue ActiveRecord::PendingMigrationError => e
+  abort e.to_s.strip
+end
+RSpec.configure do |config|
+  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
+  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+
+  # If you're not using ActiveRecord, or you'd prefer not to run each of your
+  # examples within a transaction, remove the following line or assign false
+  # instead of true.
+  config.use_transactional_fixtures = true
+
+  # You can uncomment this line to turn off ActiveRecord support entirely.
+  # config.use_active_record = false
+
+  # RSpec Rails can automatically mix in different behaviours to your tests
+  # based on their file location, for example enabling you to call `get` and
+  # `post` in specs under `spec/controllers`.
+  #
+  # You can disable this behaviour by removing the line below, and instead
+  # explicitly tag your specs with their type, e.g.:
+  #
+  #     RSpec.describe UsersController, type: :controller do
+  #       # ...
+  #     end
+  #
+  # The different available types are documented in the features, such as in
+  # https://relishapp.com/rspec/rspec-rails/docs
+  config.infer_spec_type_from_file_location!
+
+  # Filter lines from Rails gems in backtraces.
+  config.filter_rails_from_backtrace!
+  # arbitrary gems may also be filtered via:
+  # config.filter_gems_from_backtrace("gem name")
+end

spec/spec_helper.rb

@@ -0,0 +1,94 @@
+# This file was generated by the `rails generate rspec:install` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause
+# this file to always be loaded, without a need to explicitly require it in any
+# files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need
+# it.
+#
+# See https://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    #     be_bigger_than(2).and_smaller_than(4).description
+    #     # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #     # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
+
+  # This option will default to `:apply_to_host_groups` in RSpec 4 (and will
+  # have no way to turn it off -- the option exists only for backwards
+  # compatibility in RSpec 3). It causes shared context metadata to be
+  # inherited by the metadata hash of host groups and examples, rather than
+  # triggering implicit auto-inclusion in groups with matching metadata.
+  config.shared_context_metadata_behavior = :apply_to_host_groups
+
+# The settings below are suggested to provide a good initial experience
+# with RSpec, but feel free to customize to your heart's content.
+=begin
+  # This allows you to limit a spec run to individual examples or groups
+  # you care about by tagging them with `:focus` metadata. When nothing
+  # is tagged with `:focus`, all examples get run. RSpec also provides
+  # aliases for `it`, `describe`, and `context` that include `:focus`
+  # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
+  config.filter_run_when_matching :focus
+
+  # Allows RSpec to persist some state between runs in order to support
+  # the `--only-failures` and `--next-failure` CLI options. We recommend
+  # you configure your source control system to ignore this file.
+  config.example_status_persistence_file_path = "spec/examples.txt"
+
+  # Limits the available syntax to the non-monkey patched syntax that is
+  # recommended. For more details, see:
+  # https://relishapp.com/rspec/rspec-core/docs/configuration/zero-monkey-patching-mode
+  config.disable_monkey_patching!
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = "doc"
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
+=end
+end