diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2016-06-29 10:53:59 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-06-29 10:53:59 +0000 |
| commit | d33991f8cc343cef704d04fd7b97c69887f3299b (patch) | |
| tree | c89ab8603436945ecc62b45f2dd3dd3b51423cd8 | |
| parent | 1023289605f075cef86833ab5c1b0e87d967f69e (diff) | |
| parent | e21c7d37c8cd21be1489f6dd445d5efa24e94456 (diff) | |
| download | gitlab-ce-d33991f8cc343cef704d04fd7b97c69887f3299b.tar.gz | |
Merge branch 'make-max-member-access-faster' into 'master'
Reduce overhead and optimize ProjectTeam#max_member_access performance
See merge request !4973
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/models/member.rb | 1 | ||||
| -rw-r--r-- | app/models/project_team.rb | 14 |
3 files changed, 4 insertions, 12 deletions
diff --git a/CHANGELOG b/CHANGELOG index 80f404423c7..ae0785c37f8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -26,6 +26,7 @@ v 8.9.3 (unreleased) - Fix encrypted data backwards compatibility after upgrading attr_encrypted gem - Update mobile button icons to be more inline with typical UI paradigms - Fixes missing avatar on system notes. !4954 + - Improve performance of obtaining the maximum access of a user in a project v 8.9.2 - Fix visibility of snippets when searching. diff --git a/app/models/member.rb b/app/models/member.rb index c74a16367db..57161397e2b 100644 --- a/app/models/member.rb +++ b/app/models/member.rb @@ -32,6 +32,7 @@ class Member < ActiveRecord::Base scope :request, -> { where.not(requested_at: nil) } scope :non_request, -> { where(requested_at: nil) } scope :non_pending, -> { non_request.non_invite } + scope :has_access, -> { where('access_level > 0') } scope :guests, -> { where(access_level: GUEST) } scope :reporters, -> { where(access_level: REPORTER) } diff --git a/app/models/project_team.rb b/app/models/project_team.rb index 73e736820af..0865b979ce0 100644 --- a/app/models/project_team.rb +++ b/app/models/project_team.rb @@ -137,20 +137,10 @@ class ProjectTeam def max_member_access(user_id) access = [] - project.members.non_request.each do |member| - if member.user_id == user_id - access << member.access_field if member.access_field - break - end - end + access += project.members.non_request.where(user_id: user_id).has_access.pluck(:access_level) if group - group.members.non_request.each do |member| - if member.user_id == user_id - access << member.access_field if member.access_field - break - end - end + access += group.members.non_request.where(user_id: user_id).has_access.pluck(:access_level) end if project.invited_groups.any? && project.allowed_to_share_with_group? |