Skip to content

has_one -> has_many between Dojo and DojoEventService #182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 6, 2017
Merged

has_one -> has_many between Dojo and DojoEventService #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e86a09a
`has_one` -> `has_many` between Dojo and DojoEventService
nalabjp Nov 3, 2017
467a615
Use UTC time for request params
nalabjp Nov 3, 2017
fe08d35
Fix to use PDT time for request params
nalabjp Nov 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/models/dojo.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ class Dojo < ApplicationRecord
NUM_OF_JAPAN_DOJOS = Dojo.count.to_s

belongs_to :prefecture
has_one :dojo_event_service, dependent: :destroy
has_many :event_histories, dependent: :destroy
has_many :dojo_event_services, dependent: :destroy
has_many :event_histories, dependent: :destroy

serialize :tags
default_scope -> { order(order: :asc) }
Expand Down
72 changes: 39 additions & 33 deletions lib/statistics/aggregation.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ module Statistics
class Aggregation
class << self
def run(date:)
cnps_dojos = Dojo.joins(:dojo_event_service).where(dojo_event_services: { name: :connpass }).to_a
drkp_dojos = Dojo.joins(:dojo_event_service).where(dojo_event_services: { name: :doorkeeper }).to_a
fsbk_dojos = Dojo.joins(:dojo_event_service).where(dojo_event_services: { name: :facebook }).to_a
cnps_dojos = Dojo.joins(:dojo_event_services).where(dojo_event_services: { name: :connpass }).to_a
drkp_dojos = Dojo.joins(:dojo_event_services).where(dojo_event_services: { name: :doorkeeper }).to_a
fsbk_dojos = Dojo.joins(:dojo_event_services).where(dojo_event_services: { name: :facebook }).to_a

Connpass.run(cnps_dojos, date)
Doorkeeper.run(drkp_dojos, date)
Expand All @@ -21,17 +21,19 @@ def run(dojos, date)
}

dojos.each do |dojo|
cnps.fetch_events(params.merge(series_id: dojo.dojo_event_service.group_id)).each do |e|
next unless e.dig('series', 'id').to_s == dojo.dojo_event_service.group_id
dojo.dojo_event_services.each do |dojo_event_service|
cnps.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

EventHistory.create!(dojo_id: dojo.id,
dojo_name: dojo.name,
service_name: dojo.dojo_event_service.name,
service_group_id: dojo.dojo_event_service.group_id,
event_id: e['event_id'],
event_url: e['event_url'],
participants: e['accepted'],
evented_at: Time.zone.parse(e['started_at']))
EventHistory.create!(dojo_id: dojo.id,
dojo_name: dojo.name,
service_name: dojo_event_service.name,
service_group_id: dojo_event_service.group_id,
event_id: e['event_id'],
event_url: e['event_url'],
participants: e['accepted'],
evented_at: Time.zone.parse(e['started_at']))
end
end
end
end
Expand All @@ -48,17 +50,19 @@ def run(dojos, date)
}

dojos.each do |dojo|
drkp.fetch_events(params.merge(group_id: dojo.dojo_event_service.group_id)).each do |e|
next unless e['group'].to_s == dojo.dojo_event_service.group_id
dojo.dojo_event_services.each do |dojo_event_service|
drkp.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

EventHistory.create!(dojo_id: dojo.id,
dojo_name: dojo.name,
service_name: dojo.dojo_event_service.name,
service_group_id: dojo.dojo_event_service.group_id,
event_id: e['id'],
event_url: e['public_url'],
participants: e['participants'],
evented_at: Time.zone.parse(e['starts_at']))
EventHistory.create!(dojo_id: dojo.id,
dojo_name: dojo.name,
service_name: dojo_event_service.name,
service_group_id: dojo_event_service.group_id,
event_id: e['id'],
event_url: e['public_url'],
participants: e['participants'],
evented_at: Time.zone.parse(e['starts_at']))
end
end
end
end
Expand All @@ -75,17 +79,19 @@ def run(dojos, date)
}

dojos.each do |dojo|
fsbk.fetch_events(params.merge(group_id: dojo.dojo_event_service.group_id)).each do |e|
next unless e.dig('owner', 'id') == dojo.dojo_event_service.group_id
dojo.dojo_event_services.each do |dojo_event_service|
fsbk.fetch_events(params.merge(group_id: dojo_event_service.group_id)).each do |e|
next unless e.dig('owner', 'id') == dojo_event_service.group_id

EventHistory.create!(dojo_id: dojo.id,
dojo_name: dojo.name,
service_name: dojo.dojo_event_service.name,
service_group_id: dojo.dojo_event_service.group_id,
event_id: e['id'],
event_url: "https://www.facebook.com/events/#{e['id']}",
participants: e['attending_count'],
evented_at: Time.zone.parse(e['start_time']))
EventHistory.create!(dojo_id: dojo.id,
dojo_name: dojo.name,
service_name: dojo_event_service.name,
service_group_id: dojo_event_service.group_id,
event_id: e['id'],
event_url: "https://www.facebook.com/events/#{e['id']}",
participants: e['attending_count'],
evented_at: Time.zone.parse(e['start_time']))
end
end
end
end
Expand Down
12 changes: 8 additions & 4 deletions lib/statistics/client.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,14 @@ def initialize
def fetch_events(group_id:, since_at: nil, until_at: nil)
params = {
fields: %i(attending_count start_time owner),
limit: 100,
since: since_at,
until: until_at
}.compact
limit: 100
}.tap do |h|
# @note FacebookのGraph APIはPDTがタイムゾーンとなっており、
# JST<->PDTのオフセット8時間を追加した時刻をパラメータとする必要がある
# @see https://github.com/coderdojo-japan/coderdojo.jp/pull/182#discussion_r148935458
h[:since] = since_at.since(8.hours).to_i if since_at
h[:until] = until_at.since(8.hours).to_i if until_at
end

events = []

Expand Down
20 changes: 8 additions & 12 deletions lib/tasks/dojo_event_services.rake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,19 @@ namespace :dojo_event_services do
next
end

insert = false
unless dojo.dojo_event_service
dojo.build_dojo_event_service
insert = true
end

dojo.dojo_event_service.assign_attributes(des.except('dojo_id'))
if dojo.dojo_event_service.changed?
changes = dojo.dojo_event_service.changes
dojo.dojo_event_service.save!
(insert ? result[:inserted] : result[:updated]) << [des['dojo_id'], changes]
dojo_event_service = dojo.dojo_event_services.find_or_initialize_by(des)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

find_or_initialize_by 👍

if dojo_event_service.changed?
changes = dojo_event_service.changes
new_record = dojo_event_service.new_record?
dojo_event_service.save!
(new_record ? result[:inserted] : result[:updated]) << ["#{des['dojo_id']}:#{dojo_event_service.id}", changes]
else
result[:kept] << [des['dojo_id']]
result[:kept] << ["#{des['dojo_id']}:#{dojo_event_service.id}"]
end
end

# Dump result
result[:skipped] = result[:skipped].uniq {|s| s.first }
result.except!(:kept, :skipped) unless ENV.key?('DEBUG')
sorted = result.sort_by {|_, v| v.length }.reverse.to_h
puts
Expand Down