Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Handle nil and blank cases in Account finders (#3500)

Browse source
This commit is contained in:
Matt Jankowski 2017-06-01 08:20:36 -04:00 • committed by GitHub
parent dbccdcc1b1
commit d1e08bd38c
2 changed files with 23 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/models/concerns/account_finder_concern.rb
View file

@ -37,21 +37,25 @@ module AccountFinderConcern
def scoped_accounts
Account.unscoped.tap do |scope|
scope.merge! with_usernames
scope.merge! matching_username
scope.merge! matching_domain
end
end
def with_usernames
Account.where.not(username: [nil, ''])
end
def matching_username
raise(ActiveRecord::RecordNotFound) if username.blank?
Account.where(Account.arel_table[:username].lower.eq username.downcase)
Account.where(Account.arel_table[:username].lower.eq username.to_s.downcase)
end
def matching_domain
if domain.nil?
Account.where(domain: nil)
else
Account.where(Account.arel_table[:domain].lower.eq domain.downcase)
Account.where(Account.arel_table[:domain].lower.eq domain.to_s.downcase)
end
end
end