diff options
author | Stan Hu <stanhu@gmail.com> | 2018-01-26 22:16:56 -0800 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2018-01-30 21:46:09 -0800 |
commit | 46a6edc7314ce8acab5d8ce04799bd3557bc26bc (patch) | |
tree | 9b2d004d22a09ca51b4420feb87ca16d372da703 /lib/api/members.rb | |
parent | 120c79020ddd3097ae64149c75864353276aaa5f (diff) | |
download | gitlab-ce-46a6edc7314ce8acab5d8ce04799bd3557bc26bc.tar.gz |
Remove N+1 queries with /projects/:project_id/{access_requests,members} API endpointssh-fix-project-members-api-perf
We can simplify the code quite a bit and improve performance by using
grape-entity merge fields:
https://github.com/ruby-grape/grape-entity/tree/v0.6.0#merge-fields
Relates to #42030
Diffstat (limited to 'lib/api/members.rb')
-rw-r--r-- | lib/api/members.rb | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/api/members.rb b/lib/api/members.rb index 130c6d6da71..bc1de37284a 100644 --- a/lib/api/members.rb +++ b/lib/api/members.rb @@ -21,10 +21,11 @@ module API get ":id/members" do source = find_source(source_type, params[:id]) - users = source.users - users = users.merge(User.search(params[:query])) if params[:query].present? + members = source.members.where.not(user_id: nil).includes(:user) + members = members.joins(:user).merge(User.search(params[:query])) if params[:query].present? + members = paginate(members) - present paginate(users), with: Entities::Member, source: source + present members, with: Entities::Member end desc 'Gets a member of a group or project.' do @@ -39,7 +40,7 @@ module API members = source.members member = members.find_by!(user_id: params[:user_id]) - present member.user, with: Entities::Member, member: member + present member, with: Entities::Member end desc 'Adds a member to a group or project.' do @@ -62,7 +63,7 @@ module API if !member not_allowed! # This currently can only be reached in EE elsif member.persisted? && member.valid? - present member.user, with: Entities::Member, member: member + present member, with: Entities::Member else render_validation_error!(member) end @@ -83,7 +84,7 @@ module API member = source.members.find_by!(user_id: params.delete(:user_id)) if member.update_attributes(declared_params(include_missing: false)) - present member.user, with: Entities::Member, member: member + present member, with: Entities::Member else render_validation_error!(member) end |