Skip to content
Snippets Groups Projects
Commit ec349dc1 authored by Yorick Peterse's avatar Yorick Peterse Committed by Robert Speicher
Browse files

Refactor Gitlab::ProjectSearchResults

Previously this class would be given a project ID which was then used to
retrieve the corresponding Project object. However, in all cases the
Project object was already known as it was used to grab the ID to pass
to ProjectSearchResults. By just passing a Project instead we remove the
need for an extra query as well as the need for some other complexity
in this class.
parent 42fde69d
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -7,7 +7,7 @@ module Search
end
 
def execute
Gitlab::ProjectSearchResults.new(project.id,
Gitlab::ProjectSearchResults.new(project,
params[:search],
params[:repository_ref])
end
Loading
Loading
Loading
Loading
@@ -2,8 +2,8 @@ module Gitlab
class ProjectSearchResults < SearchResults
attr_reader :project, :repository_ref
 
def initialize(project_id, query, repository_ref = nil)
@project = Project.find(project_id)
def initialize(project, query, repository_ref = nil)
@project = project
@repository_ref = if repository_ref.present?
repository_ref
else
Loading
Loading
@@ -73,7 +73,7 @@ module Gitlab
end
 
def notes
Note.where(project_id: limit_project_ids).user.search(query).order('updated_at DESC')
project.notes.user.search(query).order('updated_at DESC')
end
 
def commits
Loading
Loading
@@ -83,9 +83,5 @@ module Gitlab
project.repository.find_commits_by_message(query).compact
end
end
def limit_project_ids
[project.id]
end
end
end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment