Revert "Extract IssuesFinder.not_restricted_by_confidentiality to Issue model"

This reverts commit 6d9acc49b29b9a735148198a15654728f7f2ba91.

app/finders/issues_finder.rb

@@ -23,7 +23,7 @@ class IssuesFinder < IssuableFinder
   private
 
   def init_collection
-    Issue.not_restricted_by_confidentiality(current_user)
+    IssuesFinder.not_restricted_by_confidentiality(current_user)
   end
 
   def by_assignee(items)
@@ -38,6 +38,21 @@ class IssuesFinder < IssuableFinder
     end
   end
 
+  def self.not_restricted_by_confidentiality(user)
+    return Issue.where('issues.confidential IS NOT TRUE') if user.blank?
+
+    return Issue.all if user.admin_or_auditor?
+
+    Issue.where('
+      issues.confidential IS NOT TRUE
+      OR (issues.confidential = TRUE
+        AND (issues.author_id = :user_id
+          OR EXISTS (SELECT TRUE FROM issue_assignees WHERE user_id = :user_id AND issue_id = issues.id)
+          OR issues.project_id IN(:project_ids)))',
+      user_id: user.id,
+      project_ids: user.authorized_projects(Gitlab::Access::REPORTER).select(:id))
+  end
+
   def item_project_ids(items)
     items&.reorder(nil)&.select(:project_id)
   end

app/models/issue.rb

@@ -99,21 +99,6 @@ class Issue < ActiveRecord::Base
     '#'
   end
 
-  def self.not_restricted_by_confidentiality(user)
-    return where('issues.confidential IS NOT TRUE') if user.blank?
-
-    return all if user.admin_or_auditor?
-
-    where('
-      issues.confidential IS NOT TRUE
-      OR (issues.confidential = TRUE
-        AND (issues.author_id = :user_id
-          OR EXISTS (SELECT TRUE FROM issue_assignees WHERE user_id = :user_id AND issue_id = issues.id)
-          OR issues.project_id IN(:project_ids)))',
-                user_id: user.id,
-                project_ids: user.authorized_projects(Gitlab::Access::REPORTER).select(:id))
-  end
-
   # Pattern used to extract `#123` issue references from text
   #
   # This pattern supports cross-project references.

spec/finders/issues_finder_spec.rb

@@ -302,4 +302,33 @@ describe IssuesFinder do
       end
     end
   end
+
+  describe '.not_restricted_by_confidentiality' do
+    let(:authorized_user) { create(:user) }
+    let(:admin_user) { create(:admin) }
+    let(:auditor_user) { create(:user, :auditor) }
+    let(:project) { create(:empty_project, namespace: authorized_user.namespace) }
+    let!(:public_issue) { create(:issue, project: project) }
+    let!(:confidential_issue) { create(:issue, project: project, confidential: true) }
+
+    it 'returns non confidential issues for nil user' do
+      expect(described_class.send(:not_restricted_by_confidentiality, nil)).to include(public_issue)
+    end
+
+    it 'returns non confidential issues for user not authorized for the issues projects' do
+      expect(described_class.send(:not_restricted_by_confidentiality, user)).to include(public_issue)
+    end
+
+    it 'returns all issues for user authorized for the issues projects' do
+      expect(described_class.send(:not_restricted_by_confidentiality, authorized_user)).to include(public_issue, confidential_issue)
+    end
+
+    it 'returns all issues for an admin user' do
+      expect(described_class.send(:not_restricted_by_confidentiality, admin_user)).to include(public_issue, confidential_issue)
+    end
+
+    it 'returns all issues for an auditor user' do
+      expect(described_class.send(:not_restricted_by_confidentiality, auditor_user)).to include(public_issue, confidential_issue)
+    end
+  end
 end

spec/models/issue_spec.rb

@@ -38,36 +38,6 @@ describe Issue, models: true do
     end
   end
 
-  describe '.not_restricted_by_confidentiality' do
-    let(:user) { create(:user) }
-    let(:authorized_user) { create(:user) }
-    let(:admin_user) { create(:admin) }
-    let(:auditor_user) { create(:user, :auditor) }
-    let(:project) { create(:empty_project, namespace: authorized_user.namespace) }
-    let!(:public_issue) { create(:issue, project: project) }
-    let!(:confidential_issue) { create(:issue, project: project, confidential: true) }
-
-    it 'returns non confidential issues for nil user' do
-      expect(described_class.not_restricted_by_confidentiality(nil)).to include(public_issue)
-    end
-
-    it 'returns non confidential issues for user not authorized for the issues projects' do
-      expect(described_class.not_restricted_by_confidentiality(user)).to include(public_issue)
-    end
-
-    it 'returns all issues for user authorized for the issues projects' do
-      expect(described_class.not_restricted_by_confidentiality(authorized_user)).to include(public_issue, confidential_issue)
-    end
-
-    it 'returns all issues for an admin user' do
-      expect(described_class.not_restricted_by_confidentiality(admin_user)).to include(public_issue, confidential_issue)
-    end
-
-    it 'returns all issues for an auditor user' do
-      expect(described_class.not_restricted_by_confidentiality(auditor_user)).to include(public_issue, confidential_issue)
-    end
-  end
-
   describe '#card_attributes' do
     it 'includes the author name' do
       allow(subject).to receive(:author).and_return(double(name: 'Robert'))