Commit 47cc1fea authored by Rémy Coutable's avatar Rémy Coutable

Merge branch '28812-refactor-search-controller-show' into 'master'

Refactor SearchController#show

Closes #28812

See merge request !9655
parents 53b21c1e b0ab0e4e
...@@ -6,45 +6,19 @@ class SearchController < ApplicationController ...@@ -6,45 +6,19 @@ class SearchController < ApplicationController
layout 'search' layout 'search'
def show def show
if params[:project_id].present? search_service = SearchService.new(current_user, params)
@project = Project.find_by(id: params[:project_id])
@project = nil unless can?(current_user, :download_code, @project)
end
if params[:group_id].present? @project = search_service.project
@group = Group.find_by(id: params[:group_id]) @group = search_service.group
@group = nil unless can?(current_user, :read_group, @group)
end
return if params[:search].blank? return if params[:search].blank?
@search_term = params[:search] @search_term = params[:search]
@scope = params[:scope] @scope = search_service.scope
@show_snippets = params[:snippets].eql? 'true' @show_snippets = search_service.show_snippets?
@search_results = search_service.search_results
@search_results = @search_objects = search_service.search_objects
if @project
unless %w(blobs notes issues merge_requests milestones wiki_blobs
commits).include?(@scope)
@scope = 'blobs'
end
Search::ProjectService.new(@project, current_user, params).execute
elsif @show_snippets
unless %w(snippet_blobs snippet_titles).include?(@scope)
@scope = 'snippet_blobs'
end
Search::SnippetService.new(current_user, params).execute
else
unless %w(projects issues merge_requests milestones).include?(@scope)
@scope = 'projects'
end
Search::GlobalService.new(current_user, params).execute
end
@search_objects = @search_results.objects(@scope, params[:page])
check_single_commit_result check_single_commit_result
end end
......
...@@ -16,5 +16,9 @@ module Search ...@@ -16,5 +16,9 @@ module Search
Gitlab::SearchResults.new(current_user, projects, params[:search]) Gitlab::SearchResults.new(current_user, projects, params[:search])
end end
def scope
@scope ||= %w[issues merge_requests milestones].delete(params[:scope]) { 'projects' }
end
end end
end end
...@@ -12,5 +12,9 @@ module Search ...@@ -12,5 +12,9 @@ module Search
params[:search], params[:search],
params[:repository_ref]) params[:repository_ref])
end end
def scope
@scope ||= %w[notes issues merge_requests milestones wiki_blobs commits].delete(params[:scope]) { 'blobs' }
end
end end
end end
...@@ -11,5 +11,9 @@ module Search ...@@ -11,5 +11,9 @@ module Search
Gitlab::SnippetSearchResults.new(snippets, params[:search]) Gitlab::SnippetSearchResults.new(snippets, params[:search])
end end
def scope
@scope ||= %w[snippet_titles].delete(params[:scope]) { 'snippet_blobs' }
end
end end
end end
class SearchService
include Gitlab::Allowable
def initialize(current_user, params = {})
@current_user = current_user
@params = params.dup
end
def project
return @project if defined?(@project)
@project =
if params[:project_id].present?
the_project = Project.find_by(id: params[:project_id])
can?(current_user, :download_code, the_project) ? the_project : nil
else
nil
end
end
def group
return @group if defined?(@group)
@group =
if params[:group_id].present?
the_group = Group.find_by(id: params[:group_id])
can?(current_user, :read_group, the_group) ? the_group : nil
else
nil
end
end
def show_snippets?
return @show_snippets if defined?(@show_snippets)
@show_snippets = params[:snippets] == 'true'
end
delegate :scope, to: :search_service
def search_results
@search_results ||= search_service.execute
end
def search_objects
@search_objects ||= search_results.objects(scope, params[:page])
end
private
def search_service
@search_service ||=
if project
Search::ProjectService.new(project, current_user, params)
elsif show_snippets?
Search::SnippetService.new(current_user, params)
else
Search::GlobalService.new(current_user, params)
end
end
attr_reader :current_user, :params
end
require 'spec_helper'
describe Search::GlobalService, services: true do
let(:user) { create(:user) }
let(:internal_user) { create(:user) }
let!(:found_project) { create(:empty_project, :private, name: 'searchable_project') }
let!(:unfound_project) { create(:empty_project, :private, name: 'unfound_project') }
let!(:internal_project) { create(:empty_project, :internal, name: 'searchable_internal_project') }
let!(:public_project) { create(:empty_project, :public, name: 'searchable_public_project') }
before do
found_project.add_master(user)
end
describe '#execute' do
context 'unauthenticated' do
it 'returns public projects only' do
results = Search::GlobalService.new(nil, search: "searchable").execute
expect(results.objects('projects')).to match_array [public_project]
end
end
context 'authenticated' do
it 'returns public, internal and private projects' do
results = Search::GlobalService.new(user, search: "searchable").execute
expect(results.objects('projects')).to match_array [public_project, found_project, internal_project]
end
it 'returns only public & internal projects' do
results = Search::GlobalService.new(internal_user, search: "searchable").execute
expect(results.objects('projects')).to match_array [internal_project, public_project]
end
it 'namespace name is searchable' do
results = Search::GlobalService.new(user, search: found_project.namespace.path).execute
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
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment