#395 dojo_event_services:upsert の修正(レビュー指摘事項反映+処理見直し) + RSpec 修正

Author: chicaco

lib/tasks/dojo_event_services.rake

@@ -2,6 +2,7 @@ namespace :dojo_event_services do
   desc '現在のyamlファイルを元にデータベースを更新します'
   task upsert: :environment do
     result = { inserted: [], updated: [], deleted: [], kept: [], skipped: [] }
+    reserved_ids = []
 
     list = YAML.load_file(Rails.root.join('db','dojo_event_services.yaml'))
     list.each do |des|
@@ -19,13 +20,6 @@ namespace :dojo_event_services do
       # 比較対象は URL を除く dojo_id, name, group_id
       url = des.delete('url')
       dojo_event_service = dojo.dojo_event_services.find_or_initialize_by(des)
-      overlapped = dojo.dojo_event_services.where(des).where.not(id: dojo_event_service.id)
-      if overlapped.present?
-        overlapped.each do |d|
-          result[:deleted] << ["#{d.dojo_id}:#{d.id}"]
-        end
-        overlapped.destroy_all
-      end
       dojo_event_service.url = url
       if dojo_event_service.changed?
         changes = dojo_event_service.changes
@@ -35,6 +29,12 @@ namespace :dojo_event_services do
       else
         result[:kept] << ["#{des['dojo_id']}:#{dojo_event_service.id}"]
       end
+      reserved_ids << dojo_event_service.id
+    end
+
+    DojoEventService.where.not(id: reserved_ids).find_each do |d|
+      result[:deleted] << ["#{d.dojo_id}:#{d.id}"]
+      d.destroy
     end
 
     # Dump result

spec/lib/tasks/dojo_event_services_spec.rb

@@ -20,7 +20,6 @@
       @dojo_3 = create(:dojo, name: 'dojo_3', email: 'mail_3@test', tags: %w(Scratch ラズベリーパイ Webサイト), description: '月1回開催', prefecture_id: 13)
 
       create(:dojo_event_service, dojo_id: @dojo_1.id, name: :doorkeeper, group_id: '10001', url: 'https://coder-dojo-11.doorkeeper.jp/')
-      create(:dojo_event_service, dojo_id: @dojo_1.id, name: :doorkeeper, group_id: '10002', url: 'https://coder-dojo-12.doorkeeper.jp/abc')
       create(:dojo_event_service, dojo_id: @dojo_1.id, name: :doorkeeper, group_id: '10002', url: 'https://coder-dojo-12.doorkeeper.jp/')
       create(:dojo_event_service, dojo_id: @dojo_2.id, name: :connpass,   group_id: '20001', url: 'https://coder-dojo-21.connpass.jp/')
     end
@@ -29,43 +28,52 @@
 
     it '単純追加' do
       allow(YAML).to receive(:load_file).and_return([
-        { 'dojo_id' => @dojo_3.id, "name" => 'facebook', 'group_id' => '30001', 'url' => 'https://coder-dojo-31.facebook.com/' }
+        { 'dojo_id' => @dojo_1.id, "name" => 'doorkeeper', 'group_id' => '10001', 'url' => 'https://coder-dojo-11.doorkeeper.jp/' },
+        { 'dojo_id' => @dojo_1.id, "name" => 'doorkeeper', 'group_id' => '10002', 'url' => 'https://coder-dojo-12.doorkeeper.jp/' },
+        { 'dojo_id' => @dojo_2.id, "name" => 'connpass',   'group_id' => '20001', 'url' => 'https://coder-dojo-21.connpass.jp/' },
+        { 'dojo_id' => @dojo_3.id, "name" => 'facebook',   'group_id' => '30001', 'url' => 'https://coder-dojo-31.facebook.com/' }
       ])
 
       # before
-      expect(DojoEventService.count).to eq(4)
+      expect(DojoEventService.count).to eq(3)
 
       # exec
       expect(@rake[task].invoke).to be_truthy
 
       # after
-      expect(DojoEventService.count).to eq(5)
+      expect(DojoEventService.count).to eq(4)
       new_records = DojoEventService.where(dojo_id: @dojo_3.id, name: :facebook, group_id: '30001')
       expect(new_records.count).to eq(1)
       expect(new_records.first.url).to eq('https://coder-dojo-31.facebook.com/')
     end
 
     it '単純更新' do
       allow(YAML).to receive(:load_file).and_return([
-        { 'dojo_id' => @dojo_2.id, "name" => 'connpass', 'group_id' => '20001', 'url' => 'https://coder-dojo-21.connpass.jp/zzz' }
+        { 'dojo_id' => @dojo_1.id, "name" => 'doorkeeper', 'group_id' => '10001', 'url' => 'https://coder-dojo-11.doorkeeper.jp/' },
+        { 'dojo_id' => @dojo_1.id, "name" => 'doorkeeper', 'group_id' => '10002', 'url' => 'https://coder-dojo-12.doorkeeper.jp/' },
+        { 'dojo_id' => @dojo_2.id, "name" => 'connpass',   'group_id' => '20001', 'url' => 'https://coder-dojo-21.connpass.jp/zzz' }
       ])
 
       # before
-      expect(DojoEventService.count).to eq(4)
+      expect(DojoEventService.count).to eq(3)
 
       # exec
       expect(@rake[task].invoke).to be_truthy
 
       # after
-      expect(DojoEventService.count).to eq(4)
+      expect(DojoEventService.count).to eq(3)
       mod_records = DojoEventService.where(dojo_id: @dojo_2.id, name: :connpass, group_id: '20001')
       expect(mod_records.count).to eq(1)
       expect(mod_records.first.url).to eq('https://coder-dojo-21.connpass.jp/zzz')
     end
 
     it '余剰データ削除 & 更新' do
+      create(:dojo_event_service, dojo_id: @dojo_1.id, name: :doorkeeper, group_id: '10002', url: 'https://coder-dojo-12.doorkeeper.jp/abc')
+
       allow(YAML).to receive(:load_file).and_return([
-        { 'dojo_id' => @dojo_1.id, "name" => 'doorkeeper', 'group_id' => '10002', 'url' => 'https://coder-dojo-12.doorkeeper.jp/12345' }
+        { 'dojo_id' => @dojo_1.id, "name" => 'doorkeeper', 'group_id' => '10001', 'url' => 'https://coder-dojo-11.doorkeeper.jp/' },
+        { 'dojo_id' => @dojo_1.id, "name" => 'doorkeeper', 'group_id' => '10002', 'url' => 'https://coder-dojo-12.doorkeeper.jp/12345' },
+        { 'dojo_id' => @dojo_2.id, "name" => 'connpass',   'group_id' => '20001', 'url' => 'https://coder-dojo-21.connpass.jp/' }
       ])
 
       # before