From b90cb389a5c640ea9f564694aa4c7a58d8dc45f7 Mon Sep 17 00:00:00 2001 From: nalabjp Date: Mon, 8 Jan 2018 17:42:22 +0900 Subject: [PATCH 1/2] Use distinct and joins instead --- app/controllers/static_pages_controller.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/controllers/static_pages_controller.rb b/app/controllers/static_pages_controller.rb index 542b584e2..ef13fead0 100644 --- a/app/controllers/static_pages_controller.rb +++ b/app/controllers/static_pages_controller.rb @@ -20,8 +20,11 @@ def stats @range = 2012..2017 @range.each do |year| @dojos[year] = - Dojo.where(created_at: Time.zone.local(2012).beginning_of_year..Time.zone.local(year) - .end_of_year).select{|d| d.dojo_event_services.any?}.count + Dojo + .distinct + .joins(:dojo_event_services) + .where(created_at: Time.zone.local(2012).beginning_of_year..Time.zone.local(year).end_of_year) + .count @events[year] = EventHistory.where(evented_at: Time.zone.local(year).beginning_of_year..Time.zone.local(year).end_of_year).count From 71260553cde3218554b132497e9f3ab3dff448db Mon Sep 17 00:00:00 2001 From: nalabjp Date: Mon, 8 Jan 2018 17:44:07 +0900 Subject: [PATCH 2/2] Use Range#first instead --- app/controllers/static_pages_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/static_pages_controller.rb b/app/controllers/static_pages_controller.rb index ef13fead0..e59d786a3 100644 --- a/app/controllers/static_pages_controller.rb +++ b/app/controllers/static_pages_controller.rb @@ -23,7 +23,7 @@ def stats Dojo .distinct .joins(:dojo_event_services) - .where(created_at: Time.zone.local(2012).beginning_of_year..Time.zone.local(year).end_of_year) + .where(created_at: Time.zone.local(@range.first).beginning_of_year..Time.zone.local(year).end_of_year) .count @events[year] = EventHistory.where(evented_at: