diff --git a/app/models/application_request.rb b/app/models/application_request.rb index b0e0df278ae..415540ac9fd 100644 --- a/app/models/application_request.rb +++ b/app/models/application_request.rb @@ -102,26 +102,16 @@ class ApplicationRequest < ActiveRecord::Base end def self.stats - @stats ||= begin - s = HashWithIndifferentAccess.new({ - all_total: 0, - all_30_days: 0, - all_7_days: 0 - }) + s = HashWithIndifferentAccess.new({}) - self.req_types.each do |key, i| - query = self.where(req_type: i) - s["#{key}_total"] = query.sum(:count) - s["#{key}_30_days"] = query.where("date > ?", 30.days.ago).sum(:count) - s["#{key}_7_days"] = query.where("date > ?", 7.days.ago).sum(:count) - - s[:all_total] += s["#{key}_total"] - s[:all_30_days] += s["#{key}_30_days"] - s[:all_7_days] += s["#{key}_7_days"] - end - - s + self.req_types.each do |key, i| + query = self.where(req_type: i) + s["#{key}_total"] = query.sum(:count) + s["#{key}_30_days"] = query.where("date > ?", 30.days.ago).sum(:count) + s["#{key}_7_days"] = query.where("date > ?", 7.days.ago).sum(:count) end + + s end end