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

・schema.rb の差し替え
・関連に対して find_or_initialize_by が使えたのでリファクタ

Author: chicaco

db/schema.rb

@@ -80,10 +80,10 @@
   end
 
   create_table "upcoming_events", force: :cascade do |t|
+    t.integer "dojo_event_service_id", null: false
     t.string "event_id", null: false
     t.string "event_url", null: false
     t.datetime "event_at", null: false
-    t.integer "dojo_event_service_id", default: 1, null: false
     t.string "dojo_name", null: false
     t.string "service_name", null: false
     t.integer "participants", null: false

lib/upcoming_events/tasks/connpass.rb

@@ -13,8 +13,7 @@ def run
             @client.fetch_events(@params.merge(series_id: dojo_event_service.group_id)).each do |e|
               next unless e.dig('series', 'id').to_s == dojo_event_service.group_id
 
-              record = dojo_event_service.upcoming_events.find_by(event_id: e['event_id'])
-              record ||= dojo_event_service.upcoming_events.build(event_id: e['event_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,
                              event_url:    e['event_url'],

lib/upcoming_events/tasks/doorkeeper.rb

@@ -13,8 +13,7 @@ def run
             @client.fetch_events(@params.merge(group_id: dojo_event_service.group_id)).each do |e|
               next unless e['group'].to_s == dojo_event_service.group_id
 
-              record = dojo_event_service.upcoming_events.find_by(event_id: e['id'])
-              record ||= dojo_event_service.upcoming_events.build(event_id: e['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,
                              event_url: e['public_url'],