Add a date_attribute argument to StatsController#cumulative_hash
This commit is contained in:
parent
dbf891b333
commit
06714b5fc3
2 changed files with 27 additions and 8 deletions
|
@ -42,10 +42,10 @@ class StatsController < ApplicationController
|
||||||
h
|
h
|
||||||
end
|
end
|
||||||
|
|
||||||
def cumulative_hash(association)
|
def cumulative_hash(association, date_attribute = :created_at)
|
||||||
sum = 0
|
sum = 0
|
||||||
association
|
association
|
||||||
.group("DATE_TRUNC('month', created_at)")
|
.group("DATE_TRUNC('month', #{date_attribute.to_s})")
|
||||||
.count
|
.count
|
||||||
.to_a
|
.to_a
|
||||||
.sort{ |x, y| x[0] <=> y[0] }
|
.sort{ |x, y| x[0] <=> y[0] }
|
||||||
|
|
|
@ -50,19 +50,38 @@ describe StatsController, type: :controller do
|
||||||
end
|
end
|
||||||
|
|
||||||
describe '#cumulative_hash' do
|
describe '#cumulative_hash' do
|
||||||
|
context "without a date attribute" do
|
||||||
|
before do
|
||||||
|
FactoryGirl.create(:procedure, :created_at => 45.days.ago)
|
||||||
|
FactoryGirl.create(:procedure, :created_at => 15.days.ago)
|
||||||
|
FactoryGirl.create(:procedure, :created_at => 15.days.ago)
|
||||||
|
end
|
||||||
|
|
||||||
|
let (:association) { Procedure.all }
|
||||||
|
|
||||||
|
subject { StatsController.new.send(:cumulative_hash, association) }
|
||||||
|
|
||||||
|
it { expect(subject).to eq({
|
||||||
|
45.days.ago.beginning_of_month => 1,
|
||||||
|
15.days.ago.beginning_of_month => 3
|
||||||
|
}) }
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context "with a date attribute" do
|
||||||
before do
|
before do
|
||||||
FactoryGirl.create(:procedure, :created_at => 45.days.ago)
|
FactoryGirl.create(:procedure, :created_at => 45.days.ago, :updated_at => 20.days.ago)
|
||||||
FactoryGirl.create(:procedure, :created_at => 15.days.ago)
|
FactoryGirl.create(:procedure, :created_at => 15.days.ago, :updated_at => 20.days.ago)
|
||||||
FactoryGirl.create(:procedure, :created_at => 15.days.ago)
|
FactoryGirl.create(:procedure, :created_at => 15.days.ago, :updated_at => 10.days.ago)
|
||||||
end
|
end
|
||||||
|
|
||||||
let (:association) { Procedure.all }
|
let (:association) { Procedure.all }
|
||||||
|
|
||||||
subject { StatsController.new.send(:cumulative_hash, association) }
|
subject { StatsController.new.send(:cumulative_hash, association, :updated_at) }
|
||||||
|
|
||||||
it { expect(subject).to eq({
|
it { expect(subject).to eq({
|
||||||
45.days.ago.beginning_of_month => 1,
|
20.days.ago.beginning_of_month => 2,
|
||||||
15.days.ago.beginning_of_month => 3
|
10.days.ago.beginning_of_month => 3
|
||||||
}) }
|
}) }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue