Refactor group search out of global search

app/services/search/global_service.rb

@@ -9,38 +9,32 @@ module Search
     end
 
     def execute
-      group = Group.find_by(id: params[:group_id]) if params[:group_id].present?
-      projects = ProjectsFinder.new(current_user: current_user).execute
-
-      if group
-        projects = projects.inside_path(group.full_path)
-      end
-
       if current_application_settings.elasticsearch_search?
-        projects_spec =
-          if group
-            projects.pluck(:id)
-          else
-            if current_user && current_user.admin_or_auditor?
-              :any
-            elsif current_user
-              current_user.authorized_projects.pluck(:id)
-            else
-              []
-            end
-          end
-
-        Gitlab::Elastic::SearchResults.new(
-          current_user,
-          params[:search],
-          projects_spec,
-          !group # Ignore public projects outside of the group if provided
-        )
+        Gitlab::Elastic::SearchResults.new(current_user, params[:search], elastic_projects, elastic_global)
       else
         Gitlab::SearchResults.new(current_user, projects, params[:search])
       end
     end
 
+    def projects
+      @projects ||= ProjectsFinder.new(current_user: current_user).execute
+    end
+
+    def elastic_projects
+      @elastic_projects ||=
+        if current_user.try(:admin_or_auditor?)
+          :any
+        elsif current_user
+          current_user.authorized_projects.pluck(:id)
+        else
+          []
+        end
+    end
+
+    def elastic_global
+      true
+    end
+
     def scope
       @scope ||= begin
         allowed_scopes = %w[issues merge_requests milestones]

app/services/search/group_service.rb

+module Search
+  class GroupService < Search::GlobalService
+    attr_accessor :group
+
+    def initialize(user, group, params)
+      super(user, params)
+
+      @group = group
+    end
+
+    def projects
+      return Project.none unless group
+      return @projects if defined? @projects
+
+      @projects = super.inside_path(group.full_path)
+    end
+
+    def elastic_projects
+      @elastic_projects ||= projects.pluck(:id)
+    end
+
+    def elastic_global
+      false
+    end
+  end
+end

app/services/search_service.rb

@@ -54,6 +54,8 @@ class SearchService
         Search::ProjectService.new(project, current_user, params)
       elsif show_snippets?
         Search::SnippetService.new(current_user, params)
+      elsif group
+        Search::GroupService.new(current_user, group, params)
       else
         Search::GlobalService.new(current_user, params)
       end

spec/services/search/global_service_spec.rb

@@ -40,27 +40,6 @@ describe Search::GlobalService, services: true do
 
         expect(results.objects('projects')).to match_array [found_project]
       end
-
-      context 'nested group' do
-        let!(:nested_group) { create(:group, :nested) }
-        let!(:project) { create(:empty_project, namespace: nested_group) }
-
-        before do
-          project.add_master(user)
-        end
-
-        it 'returns result from nested group' do
-          results = Search::GlobalService.new(user, search: project.path).execute
-
-          expect(results.objects('projects')).to match_array [project]
-        end
-
-        it 'returns result from descendants when search inside group' do
-          results = Search::GlobalService.new(user, search: project.path, group_id: nested_group.parent).execute
-
-          expect(results.objects('projects')).to match_array [project]
-        end
-      end
     end
   end
 end

spec/services/search/group_service_spec.rb

+require 'spec_helper'
+
+describe Search::GroupService, services: true do
+  shared_examples_for 'group search' do
+    context 'finding projects by name' do
+      let(:user) { create(:user) }
+      let(:term) { "Project Name" }
+      let(:nested_group) { create(:group, :nested) }
+
+      # These projects shouldn't be found
+      let!(:outside_project) { create(:empty_project, :public, name: "Outside #{term}") }
+      let!(:private_project) { create(:empty_project, :private, namespace: nested_group, name: "Private #{term}" )}
+      let!(:other_project)   { create(:empty_project, :public, namespace: nested_group, name: term.reverse) }
+
+      # These projects should be found
+      let!(:project1) { create(:empty_project, :internal, namespace: nested_group, name: "Inner #{term} 1") }
+      let!(:project2) { create(:empty_project, :internal, namespace: nested_group, name: "Inner #{term} 2") }
+      let!(:project3) { create(:empty_project, :internal, namespace: nested_group.parent, name: "Outer #{term}") }
+
+      let(:results) { Search::GroupService.new(user, search_group, search: term).execute }
+      subject { results.objects('projects') }
+
+      context 'in parent group' do
+        let(:search_group) { nested_group.parent }
+
+        it { is_expected.to match_array([project1, project2, project3]) }
+      end
+
+      context 'in subgroup' do
+        let(:search_group) { nested_group }
+
+        it { is_expected.to match_array([project1, project2]) }
+      end
+    end
+  end
+
+  describe 'basic search' do
+    include_examples 'group search'
+  end
+
+  describe 'elasticsearch' do
+    before(:each) do
+      stub_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
+      Gitlab::Elastic::Helper.create_empty_index
+
+      # Ensure these are present when the index is refreshed
+      _ = [
+        outside_project, private_project, other_project,
+        project1, project2, project3,
+      ]
+
+      Gitlab::Elastic::Helper.refresh_index
+    end
+
+    after(:each) do
+      Gitlab::Elastic::Helper.delete_index
+    end
+
+    include_examples 'group search'
+  end
+end