Merge branch 'osw-move-related-issues-method-to-ee' into 'master'

Move Issue#related_issues method to EE scope

Closes #7906

See merge request gitlab-org/gitlab-ee!7836

app/models/issue.rb

@@ -177,23 +177,6 @@ class Issue < ActiveRecord::Base
     "#{project.to_reference(from, full: full)}#{reference}"
   end
 
-  def related_issues(current_user, preload: nil)
-    related_issues = Issue
-                       .select(['issues.*', 'issue_links.id AS issue_link_id'])
-                       .joins("INNER JOIN issue_links ON
-                                 (issue_links.source_id = issues.id AND issue_links.target_id = #{id})
-                                 OR
-                                 (issue_links.target_id = issues.id AND issue_links.source_id = #{id})")
-                       .preload(preload)
-                       .reorder('issue_link_id')
-
-    cross_project_filter = -> (issues) { issues.where(project: project) }
-    Ability.issues_readable_by_user(
-      related_issues, current_user,
-      filters: { read_cross_project: cross_project_filter }
-    )
-  end
-
   def suggested_branch_name
     return to_branch_name unless project.repository.branch_exists?(to_branch_name)
 

ee/app/models/ee/issue.rb

@@ -70,6 +70,22 @@ module EE
       project&.feature_available?(:issue_weights)
     end
 
+    def related_issues(current_user, preload: nil)
+      related_issues = ::Issue
+                           .select(['issues.*', 'issue_links.id AS issue_link_id'])
+                           .joins("INNER JOIN issue_links ON
+                                 (issue_links.source_id = issues.id AND issue_links.target_id = #{id})
+                                 OR
+                                 (issue_links.target_id = issues.id AND issue_links.source_id = #{id})")
+                           .preload(preload)
+                           .reorder('issue_link_id')
+
+      cross_project_filter = -> (issues) { issues.where(project: project) }
+      Ability.issues_readable_by_user(related_issues,
+                                      current_user,
+                                      filters: { read_cross_project: cross_project_filter })
+    end
+
     class_methods do
       # override
       def sort_by_attribute(method, excluded_labels: [])

ee/spec/models/issue_spec.rb

@@ -27,6 +27,43 @@ describe Issue do
     end
   end
 
+  describe '#related_issues' do
+    let(:user) { create(:user) }
+    let(:authorized_project) { create(:project) }
+    let(:authorized_project2) { create(:project) }
+    let(:unauthorized_project) { create(:project) }
+
+    let(:authorized_issue_a) { create(:issue, project: authorized_project) }
+    let(:authorized_issue_b) { create(:issue, project: authorized_project) }
+    let(:authorized_issue_c) { create(:issue, project: authorized_project2) }
+
+    let(:unauthorized_issue) { create(:issue, project: unauthorized_project) }
+
+    let!(:issue_link_a) { create(:issue_link, source: authorized_issue_a, target: authorized_issue_b) }
+    let!(:issue_link_b) { create(:issue_link, source: authorized_issue_a, target: unauthorized_issue) }
+    let!(:issue_link_c) { create(:issue_link, source: authorized_issue_a, target: authorized_issue_c) }
+
+    before do
+      authorized_project.add_developer(user)
+      authorized_project2.add_developer(user)
+    end
+
+    it 'returns only authorized related issues for given user' do
+      expect(authorized_issue_a.related_issues(user))
+          .to contain_exactly(authorized_issue_b, authorized_issue_c)
+    end
+
+    describe 'when a user cannot read cross project' do
+      it 'only returns issues within the same project' do
+        expect(Ability).to receive(:allowed?).with(user, :read_cross_project)
+                               .and_return(false)
+
+        expect(authorized_issue_a.related_issues(user))
+            .to contain_exactly(authorized_issue_b)
+      end
+    end
+  end
+
   describe '#allows_multiple_assignees?' do
     it 'does not allow multiple assignees without license' do
       stub_licensed_features(multiple_issue_assignees: false)

spec/models/issue_spec.rb

@@ -268,43 +268,6 @@ describe Issue do
     end
   end
 
-  describe '#related_issues' do
-    let(:user) { create(:user) }
-    let(:authorized_project) { create(:project) }
-    let(:authorized_project2) { create(:project) }
-    let(:unauthorized_project) { create(:project) }
-
-    let(:authorized_issue_a) { create(:issue, project: authorized_project) }
-    let(:authorized_issue_b) { create(:issue, project: authorized_project) }
-    let(:authorized_issue_c) { create(:issue, project: authorized_project2) }
-
-    let(:unauthorized_issue) { create(:issue, project: unauthorized_project) }
-
-    let!(:issue_link_a) { create(:issue_link, source: authorized_issue_a, target: authorized_issue_b) }
-    let!(:issue_link_b) { create(:issue_link, source: authorized_issue_a, target: unauthorized_issue) }
-    let!(:issue_link_c) { create(:issue_link, source: authorized_issue_a, target: authorized_issue_c) }
-
-    before do
-      authorized_project.add_developer(user)
-      authorized_project2.add_developer(user)
-    end
-
-    it 'returns only authorized related issues for given user' do
-      expect(authorized_issue_a.related_issues(user))
-        .to contain_exactly(authorized_issue_b, authorized_issue_c)
-    end
-
-    describe 'when a user cannot read cross project' do
-      it 'only returns issues within the same project' do
-        expect(Ability).to receive(:allowed?).with(user, :read_cross_project)
-                             .and_return(false)
-
-        expect(authorized_issue_a.related_issues(user))
-          .to contain_exactly(authorized_issue_b)
-      end
-    end
-  end
-
   describe '#suggested_branch_name' do
     let(:repository) { double }