Merge branch 'backport-cyclomatic_complexity-fix' into 'master'

Fix Rubocop CyclomaticComplexity offense

See merge request !10941

1 files changed, 26 insertions, 18 deletions

diff --git a/app/policies/project_policy.rb b/app/policies/project_policy.rb
index f8594e29547..5baac9ebe4b 100644
--- a/app/policies/project_policy.rb
+++ b/app/policies/project_policy.rb
@@ -2,20 +2,13 @@ class ProjectPolicy < BasePolicy
   def rules
     team_access!(user)
 
-    owner = project.owner == user ||
-      (project.group && project.group.has_owner?(user))
-
-    owner_access! if user.admin? || owner
-    team_member_owner_access! if owner
+    owner_access! if user.admin? || owner?
+    team_member_owner_access! if owner?
 
     if project.public? || (project.internal? && !user.external?)
       guest_access!
       public_access!
-
-      if project.request_access_enabled &&
-          !(owner || user.admin? || project.team.member?(user) || project_group_member?(user))
-        can! :request_access
-      end
+      can! :request_access if access_requestable?
     end
 
     archived_access! if project.archived?
@@ -27,6 +20,13 @@ class ProjectPolicy < BasePolicy
     @subject
   end
 
+  def owner?
+    return @owner if defined?(@owner)
+
+    @owner = project.owner == user ||
+      (project.group && project.group.has_owner?(user))
+  end
+
   def guest_access!
     can! :read_project
     can! :read_board
@@ -226,14 +226,6 @@ class ProjectPolicy < BasePolicy
     disabled_features!
   end
 
-  def project_group_member?(user)
-    project.group &&
-      (
-        project.group.members_with_parents.exists?(user_id: user.id) ||
-        project.group.requesters.exists?(user_id: user.id)
-      )
-  end
-
   def block_issues_abilities
     unless project.feature_available?(:issues, user)
       cannot! :read_issue if project.default_issues_tracker?
@@ -254,6 +246,22 @@ class ProjectPolicy < BasePolicy
 
   private
 
+  def project_group_member?(user)
+    project.group &&
+      (
+        project.group.members_with_parents.exists?(user_id: user.id) ||
+        project.group.requesters.exists?(user_id: user.id)
+      )
+  end
+
+  def access_requestable?
+    project.request_access_enabled &&
+      !owner? &&
+      !user.admin? &&
+      !project.team.member?(user) &&
+      !project_group_member?(user)
+  end
+
   # A base set of abilities for read-only users, which
   # is then augmented as necessary for anonymous and other
   # read-only users.