diff options
author | Stan Hu <stanhu@gmail.com> | 2018-01-27 09:16:56 +0300 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2018-01-31 08:46:09 +0300 |
commit | 46a6edc7314ce8acab5d8ce04799bd3557bc26bc (patch) | |
tree | 9b2d004d22a09ca51b4420feb87ca16d372da703 /lib/api/entities.rb | |
parent | 120c79020ddd3097ae64149c75864353276aaa5f (diff) |
Remove N+1 queries with /projects/:project_id/{access_requests,members} API endpoints
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/entities.rb')
-rw-r--r-- | lib/api/entities.rb | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index cb222697f32..e13463ec66b 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -205,22 +205,15 @@ module API expose :build_artifacts_size, as: :job_artifacts_size end - class Member < UserBasic - expose :access_level do |user, options| - member = options[:member] || options[:source].members.find_by(user_id: user.id) - member.access_level - end - expose :expires_at do |user, options| - member = options[:member] || options[:source].members.find_by(user_id: user.id) - member.expires_at - end + class Member < Grape::Entity + expose :user, merge: true, using: UserBasic + expose :access_level + expose :expires_at end - class AccessRequester < UserBasic - expose :requested_at do |user, options| - access_requester = options[:access_requester] || options[:source].requesters.find_by(user_id: user.id) - access_requester.requested_at - end + class AccessRequester < Grape::Entity + expose :user, merge: true, using: UserBasic + expose :requested_at end class Group < Grape::Entity |