dinislage/redmine_rate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactored Rate#for to only get one record. #1920

Browse Source
This commit is contained in:
Eric Davis
2009-01-16 16:08:13 -08:00
parent 6a211c3e5e
commit 69d922a029
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/rate.rb
View File

@@ -26,7 +26,7 @@ class Rate < ActiveRecord::Base
# API to find the Rate for a +user+ on a +project+ at a +date+
def self.for(user, project = nil, date = Date.today.to_s)
rates = Rate.find(:all,
rate = Rate.find(:first,
:conditions => ["user_id IN (?) AND project_id IN (?) AND date_in_effect <= ?",
user.id,
project.id,
@@ -34,7 +34,7 @@ class Rate < ActiveRecord::Base
],
:order => 'date_in_effect DESC')
return nil if rates.empty?
return rates[0].amount
return nil if rate.nil?
return rate.amount
end
end

12
spec/models/rate_spec.rb
View File

@@ -157,34 +157,30 @@ describe Rate, 'for' do
describe 'with a user, project, and date' do
it 'should find all the rates for a user on the project before the date' do
rate1 = mock_model(Rate, :amount => 50.50)
rate2 = mock_model(Rate, :amount => 100.25)
rates = [rate1, rate2]
Rate.should_receive(:find).with(:all, {
Rate.should_receive(:find).with(:first, {
:conditions => ["user_id IN (?) AND project_id IN (?) AND date_in_effect <= ?",
@user.id,
@project.id,
@date
],
:order => 'date_in_effect DESC'
}).and_return(rates)
}).and_return(rate1)
Rate.for(@user, @project, @date)
end
it 'should return the value of the most recent rate found' do
rate1 = mock_model(Rate, :amount => 50.50)
rate2 = mock_model(Rate, :amount => 100.25)
rates = [rate1, rate2]
Rate.should_receive(:find).with(:all, {
Rate.should_receive(:find).with(:first, {
:conditions => ["user_id IN (?) AND project_id IN (?) AND date_in_effect <= ?",
@user.id,
@project.id,
@date
],
:order => 'date_in_effect DESC'
}).and_return(rates)
}).and_return(rate1)
Rate.for(@user, @project, @date).should eql(rate1.amount)
end