granblue.team/hensei-api
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix favorites page by fixing how query is built (#125)

Browse source
This commit is contained in:
Justin Edmund 2023-08-21 20:42:54 -07:00 committed by GitHub
parent d2c5455120
commit af960d7a93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app/controllers/api/v1/parties_controller.rb
View file

@ -90,7 +90,7 @@ module Api
conditions = build_filters conditions = build_filters
conditions[:favorites] = { user_id: current_user.id } conditions[:favorites] = { user_id: current_user.id }
query = build_query(conditions) query = build_query(conditions, true)
query = apply_includes(query, params[:includes]) if params[:includes].present? query = apply_includes(query, params[:includes]) if params[:includes].present?
query = apply_excludes(query, params[:excludes]) if params[:excludes].present? query = apply_excludes(query, params[:excludes]) if params[:excludes].present?
@ -152,14 +152,18 @@ module Api
value.to_i unless value.blank? || value.to_i == -1 value.to_i unless value.blank? || value.to_i == -1
end end
def build_query(conditions) def build_query(conditions, favorites = false)
Party.distinct query = Party.distinct
.joins(weapons: [:object], summons: [:object], characters: [:object]) .joins(weapons: [:object], summons: [:object], characters: [:object])
.group('parties.id') .group('parties.id')
.where(conditions) .where(conditions)
.where(name_quality) .where(name_quality)
.where(user_quality) .where(user_quality)
.where(original) .where(original)
query = query.joins(:favorites) if favorites
query
end end
def includes(id) def includes(id)