Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Search account domain in lowercase (#13016)

Browse source 
* Search account domain in lowercase

* fix rubocop error

* fix spec/models/account_spec.rb
This commit is contained in:
abcang 2020-02-01 23:42:24 +09:00 • committed by GitHub
parent 37dc12dd53
commit 61a7390b66
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 55 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/validators/unique_username_validator.rb
View file

@ -7,8 +7,9 @@ class UniqueUsernameValidator < ActiveModel::Validator
return if account.username.nil?
normalized_username = account.username.downcase
normalized_domain = account.domain&.downcase
scope = Account.where(domain: nil).where('lower(username) = ?', normalized_username)
scope = Account.where(Account.arel_table[:username].lower.eq normalized_username).where(Account.arel_table[:domain].lower.eq normalized_domain)
scope = scope.where.not(id: account.id) if account.persisted?
account.errors.add(:username, :taken) if scope.exists?