Adding filter and Game Precision

Author: IMhide

app/providers/smash_gg/get_tournaments_by_country.rb

@@ -8,7 +8,7 @@ class SmashGg::GetTournamentsByCountry
   TournamentsQuery = GraphClient.parse <<-'GRAPHQL'
     query($cCode: String!, $perPage: Int!) {
       tournaments(query: {  perPage: $perPage,
-                            filter: { countryCode: $cCode, upcoming: true },
+                            filter: { countryCode: $cCode, upcoming: true, videogameIds: [1, 1386] },
                             sortBy: "startAt" })
       {
         nodes {
@@ -24,7 +24,6 @@ class SmashGg::GetTournamentsByCountry
                 venueName
                 events {
                   videogame {
-                    id
                     name
             }  
           }
@@ -39,7 +38,7 @@ def self.call(country: "FR", page_size: 25)
   end
 
   def self.videogames(hash)
-    hash['events'].map{|e| e.dig('name')}.uniq
+    hash['events'].map{|e| e.dig('videogame', 'name')}.uniq
   end
 
   def self.format(results)
@@ -53,6 +52,7 @@ def self.format(results)
       new_hash[:address] = new_hash.delete('venueAddress')
       new_hash[:google_place_id] = new_hash.delete('mapsPlaceId')
       new_hash[:games] = videogames(hash)
+      new_hash.delete('events')
       new_hash.with_indifferent_access
     end 
   end

app/services/tournaments/check_new_tournaments.rb

@@ -5,7 +5,7 @@ class Tournaments::CheckNewTournaments < ::BaseService
 
   def compute(input)
     remote_ids = Tournament.all.pluck(:remote_id)
-    input[:remote_tournaments] = SmashGg::GetTournamentsByCountry.()
+    input[:remote_tournaments] = SmashGg::GetTournamentsByCountry.(page_size: 50)
 
     input[:remote_tournaments].delete_if {|t| remote_ids.include?(t[:remote_id].to_s)}
   end
@@ -17,7 +17,7 @@ def persist(input)
   def notify(input)
     input[:remote_tournaments].each do |tournament|
       notify_discord(tournament)
-      notify_twitter(tournament)
+      notify_twitter(tournament) if Rails.env.production?
       sleep 0.5
     end
   end
@@ -27,7 +27,7 @@ def notify(input)
   def notify_discord(tournament)
     start_at = I18n.l(tournament[:start_at], format: :long)
     ClientDiscord.execute do |builder|
-      builder.content = 'Un nouveau tournoi just appeared'
+      builder.content = "Un nouveau tournoi just appeared sur #{tournament[:games].join(' et ')}"
       builder.add_embed do |embed|
         embed.title = tournament[:name]
         embed.description = "#{tournament[:city]}\nLien: https://smash.gg/#{tournament[:slug]}\n Le: #{start_at}"
@@ -38,7 +38,7 @@ def notify_discord(tournament)
 
   def notify_twitter(tournament)
     start_at = I18n.l(tournament[:start_at], format: :long)
-    tweet = "Un nouveau tournoi à #{tournament[:city]}\n#{tournament[:name]}\nDebute le #{start_at}\nhttps://smash.gg/#{tournament[:slug]}\nLieu: #{tournament[:venue_name]} #{tournament[:address]}"
+    tweet = "Un nouveau tournoi à #{tournament[:city]} sur #{tournament[:games].join(' et ')}\n#{tournament[:name]}\nDebute le #{start_at}\nhttps://smash.gg/#{tournament[:slug]}\nLieu: #{tournament[:venue_name]} #{tournament[:address]}"
     TwitterClient.update(tweet[0, 280])
   end
 end

db/migrate/20190318223805_add_games_to_tounaments.rb

@@ -0,0 +1,6 @@
+class AddGamesToTounaments < ActiveRecord::Migration[5.2]
+  def change
+    add_column :tournaments, :games, :string, array: true
+    add_index :tournaments, :games, using: :gin
+  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.define(version: 2019_03_13_191339) do
+ActiveRecord::Schema.define(version: 2019_03_18_223805) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -54,6 +54,8 @@
     t.datetime "end_at"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.string "games", array: true
+    t.index ["games"], name: "index_tournaments_on_games", using: :gin
   end
 
 end