From 5e8ca392d24180ef7e0ae2fa316c4a2ae1796dc2 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Fri, 24 Mar 2017 16:45:55 +1300 Subject: [PATCH] Moved Member.interest near top of file --- app/models/member.rb | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/app/models/member.rb b/app/models/member.rb index 55cd0c48c..4b82b5a30 100644 --- a/app/models/member.rb +++ b/app/models/member.rb @@ -36,6 +36,14 @@ class Member < ActiveRecord::Base scope :recently_joined, -> { reorder("confirmed_at desc") } scope :wants_newsletter, -> { where(newsletter: true) } + scope :interesting, -> { + confirmed + .located + .recently_signed_in + .has_plantings + } + scope :has_plantings, -> { joins(:plantings).where("plantings.id IS NOT NULL") } + has_many :follows, class_name: "Follow", foreign_key: "follower_id" has_many :followed, through: :follows @@ -183,16 +191,6 @@ class Member < ActiveRecord::Base sets end - scope :interesting, -> { - confirmed - .located - .recently_signed_in - .has_plantings - } - - scope :has_plantings, -> { - joins(:plantings).where("plantings.id IS NOT NULL") - } def self.login_name_or_email(login) where(["lower(login_name) = :value OR lower(email) = :value", { value: login.downcase }])