aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGareth Rees <gareth@mysociety.org>2014-10-27 20:28:06 +0000
committerGareth Rees <gareth@mysociety.org>2014-10-29 13:01:44 +0000
commit22a39c69230e1ebda0a4126554e3308dfbc1210b (patch)
tree88059dfadf960ef39e4d5ac238cd8cd7d31fc113
parentc0e2e36a9ac1d3d939d57676e4d878a98cd2ad45 (diff)
Use where syntax for TrackThing.find_existing
Faster (0.2ms vs 9.3ms) Shorter line length Non-deprecated syntax
-rw-r--r--app/models/track_thing.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/app/models/track_thing.rb b/app/models/track_thing.rb
index 8991242ea..ac00b2719 100644
--- a/app/models/track_thing.rb
+++ b/app/models/track_thing.rb
@@ -45,10 +45,13 @@ class TrackThing < ActiveRecord::Base
validates_inclusion_of :track_type, :in => TRACK_TYPES
validates_inclusion_of :track_medium, :in => TRACK_MEDIUMS
- # When constructing a new track, use this to avoid duplicates / double posting
+ # When constructing a new track, use this to avoid duplicates / double
+ # posting
def self.find_existing(tracking_user, track)
return nil if tracking_user.nil?
- TrackThing.find(:first, :conditions => [ 'tracking_user_id = ? and track_query = ? and track_type = ?', tracking_user.id, track.track_query, track.track_type ] )
+ where(:tracking_user_id => tracking_user.id,
+ :track_query => track.track_query,
+ :track_type => track.track_type).first
end
def self.track_type_description(track_type)