Skip to content

Commit d392c68

Browse files
committed
Change the column type of dojo_event_services.name to integer from string
1 parent 9adb714 commit d392c68

File tree

5 files changed

+16
-6
lines changed

5 files changed

+16
-6
lines changed

app/models/dojo_event_service.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
class DojoEventService < ApplicationRecord
22
belongs_to :dojo
3+
enum name: %i( connpass doorkeeper )
34
end
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
class ChangeColumnTypeDojoEventServices < ActiveRecord::Migration[5.0]
2+
def up
3+
change_column :dojo_event_services, :name, :integer, null: false
4+
end
5+
6+
def down
7+
change_column :dojo_event_services, :name, :string, null: false
8+
end
9+
end

db/schema.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
#
1111
# It's strongly recommended that you check this file into your version control system.
1212

13-
ActiveRecord::Schema.define(version: 20170820085052) do
13+
ActiveRecord::Schema.define(version: 20170820090605) do
1414

1515
create_table "dojo_event_services", force: :cascade do |t|
1616
t.integer "dojo_id", null: false
17-
t.string "name", null: false
17+
t.integer "name", null: false
1818
t.string "url"
1919
t.integer "group_id", null: false
2020
t.datetime "created_at", null: false

lib/statistics/aggregation.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ module Statistics
22
class Aggregation
33
class << self
44
def run(date:)
5-
cnps_dojos = Dojo.joins(:dojo_event_service).where(dojo_event_services: { name: 'connpass' }).to_a
6-
drkp_dojos = Dojo.joins(:dojo_event_service).where(dojo_event_services: { name: 'doorkeeper' }).to_a
5+
cnps_dojos = Dojo.joins(:dojo_event_service).where(dojo_event_services: { name: :connpass }).to_a
6+
drkp_dojos = Dojo.joins(:dojo_event_service).where(dojo_event_services: { name: :doorkeeper }).to_a
77

88
Connpass.run(cnps_dojos, date)
99
Doorkeeper.run(drkp_dojos, date)

spec/lib/statistics/aggregation_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
before do
2121
d1 = Dojo.create(name: 'Dojo1', email: 'info@dojo1.com', description: 'CoderDojo1', tags: %w(CoderDojo1), url: 'https://dojo1.com')
2222
d2 = Dojo.create(name: 'Dojo2', email: 'info@dojo2.com', description: 'CoderDojo2', tags: %w(CoderDojo2), url: 'https://dojo2.com')
23-
DojoEventService.create(dojo_id: d1.id, name: 'connpass', group_id: 9876)
24-
DojoEventService.create(dojo_id: d2.id, name: 'doorkeeper', group_id: 5555)
23+
DojoEventService.create(dojo_id: d1.id, name: :connpass, group_id: 9876)
24+
DojoEventService.create(dojo_id: d2.id, name: :doorkeeper, group_id: 5555)
2525
end
2626

2727
subject { Statistics::Aggregation.run(date: Time.current) }

0 commit comments

Comments
 (0)