jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Model#search: factor out post_tags_match.

Browse Source
This commit is contained in:
evazion
2019-08-29 16:44:19 -05:00
parent c3ad7f6112
commit 6fc4b63fa8
9 changed files with 27 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/models/upload.rb
View File

@@ -174,14 +174,11 @@ class Upload < ApplicationRecord
where(:status => "pending")
end
def post_tags_match(query)
where(post_id: PostQueryBuilder.new(query).build.reorder(""))
end
def search(params)
q = super
q = q.search_user_attribute(:uploader, params)
q = q.search_post_id_attribute(params)
if params[:source].present?
q = q.where(source: params[:source])
@@ -199,20 +196,12 @@ class Upload < ApplicationRecord
q = q.attribute_matches(:rating, params[:parent_id])
end
if params[:post_id].present?
q = q.attribute_matches(:post_id, params[:post_id])
end
if params[:has_post].to_s.truthy?
q = q.where.not(post_id: nil)
elsif params[:has_post].to_s.falsy?
q = q.where(post_id: nil)
end
if params[:post_tags_match].present?
q = q.post_tags_match(params[:post_tags_match])
end
if params[:status].present?
q = q.where("uploads.status LIKE ? ESCAPE E'\\\\'", params[:status].to_escaped_for_sql_like)
end