Extract any-branch-allows-collaboration logic into dedicated method

1 files changed, 20 insertions, 19 deletions

diff --git a/app/models/project.rb b/app/models/project.rb
index cd558752080..930f6c9911f 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1928,9 +1928,19 @@ class Project < ActiveRecord::Base
                                 .where('project_authorizations.project_id = merge_requests.target_project_id')
                                 .limit(1)
                                 .select(1)
-    source_of_merge_requests.opened
-      .where(allow_collaboration: true)
-      .where('EXISTS (?)', developer_access_exists)
+    merge_requests_allowing_collaboration.where('EXISTS (?)', developer_access_exists)
+  end
+
+  def any_branch_allows_collaboration?(user)
+    return false unless user
+    return false if empty_repo?
+
+    # Issue for N+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/49322
+    Gitlab::GitalyClient.allow_n_plus_1_calls do
+      merge_requests_allowing_collaboration.any? do |merge_request|
+        merge_request.can_be_merged_by?(user)
+      end
+    end
   end
 
   def branch_allows_collaboration?(user, branch_name)
@@ -2018,6 +2028,10 @@ class Project < ActiveRecord::Base
 
   private
 
+  def merge_requests_allowing_collaboration
+    source_of_merge_requests.opened.where(allow_collaboration: true)
+  end
+
   def create_new_pool_repository
     pool = begin
              create_pool_repository!(shard: Shard.by_name(repository_storage), source_project: self)
@@ -2143,24 +2157,11 @@ class Project < ActiveRecord::Base
   end
 
   def fetch_branch_allows_collaboration?(user, branch_name)
-    check_access = -> do
+    Gitlab::SafeRequestStore.fetch("project-#{id}:branch-#{branch_name}:user-#{user.id}:branch_allows_collaboration") do
       next false if empty_repo?
 
-      merge_requests = source_of_merge_requests.opened
-                         .where(allow_collaboration: true)
-
-      # Issue for N+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/49322
-      Gitlab::GitalyClient.allow_n_plus_1_calls do
-        if branch_name
-          merge_requests.find_by(source_branch: branch_name)&.can_be_merged_by?(user)
-        else
-          merge_requests.any? { |merge_request| merge_request.can_be_merged_by?(user) }
-        end
-      end
-    end
-
-    Gitlab::SafeRequestStore.fetch("project-#{id}:branch-#{branch_name}:user-#{user.id}:branch_allows_collaboration") do
-      check_access.call
+      merge_request = merge_requests_allowing_collaboration.find_by(source_branch: branch_name)
+      merge_request&.can_be_merged_by?(user)
     end
   end