Skip to content

Commit 740ca73

Browse files
committed
Remove records of the target period before executing the aggregation
1 parent ab9736d commit 740ca73

File tree

2 files changed

+19
-16
lines changed

2 files changed

+19
-16
lines changed

lib/statistics/aggregation.rb

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ def run(dojos, date)
2222
cnps.fetch_events(params.merge(series_id: dojo.dojo_event_service.group_id)).each do |e|
2323
next unless e.dig('series', 'id') == dojo.dojo_event_service.group_id
2424

25-
EventHistory.find_or_create_by!(dojo_id: dojo.id,
26-
dojo_name: dojo.name,
27-
service_name: dojo.dojo_event_service.name,
28-
service_group_id: dojo.dojo_event_service.group_id,
29-
event_id: e['event_id'],
30-
event_url: e['event_url'],
31-
participants: e['accepted'],
32-
evented_at: Time.zone.parse(e['started_at']))
25+
EventHistory.create!(dojo_id: dojo.id,
26+
dojo_name: dojo.name,
27+
service_name: dojo.dojo_event_service.name,
28+
service_group_id: dojo.dojo_event_service.group_id,
29+
event_id: e['event_id'],
30+
event_url: e['event_url'],
31+
participants: e['accepted'],
32+
evented_at: Time.zone.parse(e['started_at']))
3333
end
3434
end
3535
end
@@ -49,14 +49,14 @@ def run(dojos, date)
4949
drkp.fetch_events(params.merge(group_id: dojo.dojo_event_service.group_id)).each do |e|
5050
next unless e['group'] == dojo.dojo_event_service.group_id
5151

52-
EventHistory.find_or_create_by!(dojo_id: dojo.id,
53-
dojo_name: dojo.name,
54-
service_name: dojo.dojo_event_service.name,
55-
service_group_id: dojo.dojo_event_service.group_id,
56-
event_id: e['id'],
57-
event_url: e['public_url'],
58-
participants: e['participants'],
59-
evented_at: Time.zone.parse(e['starts_at']))
52+
EventHistory.create!(dojo_id: dojo.id,
53+
dojo_name: dojo.name,
54+
service_name: dojo.dojo_event_service.name,
55+
service_group_id: dojo.dojo_event_service.group_id,
56+
event_id: e['id'],
57+
event_url: e['public_url'],
58+
participants: e['participants'],
59+
evented_at: Time.zone.parse(e['starts_at']))
6060
end
6161
end
6262
end

lib/tasks/statistics.rake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ namespace :statistics do
1515

1616
raise ArgumentError, "Invalid format: #{args[:yyyymm]}" if date.nil?
1717

18+
19+
EventHistory.where(evented_at: date.beginning_of_month..date.end_of_month).delete_all
20+
1821
Statistics::Aggregation.run(date: date)
1922
end
2023

0 commit comments

Comments
 (0)