Change default filters in users controller
This commit is contained in:
parent
3104990de9
commit
bb77ae7ecc
1 changed files with 12 additions and 16 deletions
|
|
@ -12,9 +12,9 @@ module Api
|
||||||
MAX_SUMMONS = 8
|
MAX_SUMMONS = 8
|
||||||
MAX_WEAPONS = 13
|
MAX_WEAPONS = 13
|
||||||
|
|
||||||
DEFAULT_MIN_CHARACTERS = 3
|
DEFAULT_MIN_CHARACTERS = 0
|
||||||
DEFAULT_MIN_SUMMONS = 2
|
DEFAULT_MIN_SUMMONS = 0
|
||||||
DEFAULT_MIN_WEAPONS = 5
|
DEFAULT_MIN_WEAPONS = 0
|
||||||
|
|
||||||
DEFAULT_MAX_CLEAR_TIME = 5400
|
DEFAULT_MAX_CLEAR_TIME = 5400
|
||||||
|
|
||||||
|
|
@ -53,19 +53,9 @@ module Api
|
||||||
if @user.nil?
|
if @user.nil?
|
||||||
render_not_found_response('user')
|
render_not_found_response('user')
|
||||||
else
|
else
|
||||||
|
|
||||||
conditions = build_conditions
|
conditions = build_conditions
|
||||||
conditions[:user_id] = @user.id
|
conditions[:user_id] = @user.id
|
||||||
|
|
||||||
@parties = Party
|
|
||||||
.where(conditions)
|
|
||||||
.where(name_quality)
|
|
||||||
.where(user_quality)
|
|
||||||
.where(original)
|
|
||||||
.order(created_at: :desc)
|
|
||||||
.paginate(page: request.params[:page], per_page: COLLECTION_PER_PAGE)
|
|
||||||
.each { |party| party.favorited = party.is_favorited(current_user) }
|
|
||||||
|
|
||||||
parties = Party
|
parties = Party
|
||||||
.where(conditions)
|
.where(conditions)
|
||||||
.where(name_quality)
|
.where(name_quality)
|
||||||
|
|
@ -141,11 +131,15 @@ module Api
|
||||||
end
|
end
|
||||||
|
|
||||||
def original
|
def original
|
||||||
"source_party_id IS NULL" unless params['original'].blank? || params['original'] == '0'
|
unless params.key?('original') || params['original'].blank? || params['original'] == '0'
|
||||||
|
"source_party_id IS NULL"
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def user_quality
|
def user_quality
|
||||||
"user_id IS NOT NULL" unless params[:user_quality].nil? || params[:user_quality] == "0"
|
unless params.key?('user_quality') || params[:user_quality].nil? || params[:user_quality] == "0"
|
||||||
|
"user_id IS NOT NULL"
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def name_quality
|
def name_quality
|
||||||
|
|
@ -166,7 +160,9 @@ module Api
|
||||||
|
|
||||||
joined_names = low_quality.map { |name| "'#{name}'" }.join(',')
|
joined_names = low_quality.map { |name| "'#{name}'" }.join(',')
|
||||||
|
|
||||||
"name NOT IN (#{joined_names})" unless params[:name_quality].nil? || params[:name_quality] == "0"
|
unless params.key?('name_quality') || params[:name_quality].nil? || params[:name_quality] == "0"
|
||||||
|
"name NOT IN (#{joined_names})"
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# Specify whitelisted properties that can be modified.
|
# Specify whitelisted properties that can be modified.
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue