レビュー指摘事項対応(3)

・UpcomingEvent から dojo_name カラムを削除
・UpcomingEvent に service_name + event_id でユニーク制約を追加

Author: chicaco

app/models/upcoming_event.rb

@@ -1,7 +1,6 @@
 class UpcomingEvent < ApplicationRecord
   belongs_to :dojo_event_service
 
-  validates :dojo_name,    presence: true
   validates :service_name, presence: true, uniqueness: { scope: :event_id  }
   validates :event_id,     presence: true
   validates :event_url,    presence: true

db/migrate/20190526151359_mod_columns_to_upcoming_event.rb

@@ -2,13 +2,15 @@ class ModColumnsToUpcomingEvent < ActiveRecord::Migration[5.1]
   def up
     remove_index :upcoming_events, :event_at
 
-    add_column :upcoming_events, :dojo_name, :string, null: false
     add_column :upcoming_events, :service_name, :string, null: false
     add_column :upcoming_events, :participants, :integer, null: false
+
+    add_index :upcoming_events, [:service_name, :event_id], :unique => true
   end
 
   def down
-    remove_column :upcoming_events, :dojo_name, :string, null: false
+    remove_index :upcoming_events, [:service_name, :event_id]
+
     remove_column :upcoming_events, :service_name, :string, null: false
     remove_column :upcoming_events, :participants, :integer, null: false
 

db/schema.rb

@@ -84,10 +84,10 @@
     t.string "event_id", null: false
     t.string "event_url", null: false
     t.datetime "event_at", null: false
-    t.string "dojo_name", null: false
     t.string "service_name", null: false
     t.integer "participants", null: false
     t.index ["dojo_event_service_id"], name: "index_upcoming_events_on_dojo_event_service_id"
+    t.index ["service_name", "event_id"], name: "index_upcoming_events_on_service_name_and_event_id", unique: true
   end
 
   add_foreign_key "dojo_event_services", "dojos"

lib/upcoming_events/tasks/connpass.rb

@@ -14,8 +14,7 @@ def run
               next unless e.dig('series', 'id').to_s == dojo_event_service.group_id
 
               record = dojo_event_service.upcoming_events.find_or_initialize_by(event_id: e['event_id'])
-              record.update!(dojo_name:    dojo.name,
-                             service_name: dojo_event_service.name,
+              record.update!(service_name: dojo_event_service.name,
                              event_url:    e['event_url'],
                              event_at:     Time.zone.parse(e['started_at']),
                              participants: e['accepted'])

lib/upcoming_events/tasks/doorkeeper.rb

@@ -14,8 +14,7 @@ def run
               next unless e['group'].to_s == dojo_event_service.group_id
 
               record = dojo_event_service.upcoming_events.find_or_initialize_by(event_id: e['id'])
-              record.update!(dojo_name: dojo.name,
-                             service_name: dojo_event_service.name,
+              record.update!(service_name: dojo_event_service.name,
                              event_url: e['public_url'],
                              participants: e['participants'],
                              event_at: Time.zone.parse(e['starts_at']))

spec/factories/upcoming_events.rb

@@ -2,7 +2,6 @@
 
 FactoryBot.define do
   factory :upcoming_event do
-    dojo_name    { 'Dojo Name' }
     service_name { :connpass }
     event_id     { '1234' }
     event_url    { 'http:/www.aaa.com/events/1224' }