diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-09-09 15:16:26 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-09-12 10:34:03 +0200 |
| commit | 3a58dd2d8ffd0baf7a6a8f342d703cbdc34400bb (patch) | |
| tree | 895b4aec21e9543f29021da987c6285463722062 | |
| parent | 874ad681cd98616e560fb633e7c3867361faf46c (diff) | |
| download | gitlab-ce-rc-api-use-search-globalservice-in-projects-search-api.tar.gz | |
Use Search::GlobalService.new in the `GET /projects/search/:query` endpointrc-api-use-search-globalservice-in-projects-search-api
Also streamline the sorting part while we're at it.
That being done, there's currently a duplication between
`GET /projects/search/:query` and `GET /projects?search=:search`
so we might want to keep only the latter for 9.0...
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | lib/api/projects.rb | 15 |
2 files changed, 4 insertions, 13 deletions
diff --git a/CHANGELOG b/CHANGELOG index 5b2655bcb95..9d0cde95ebf 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -14,6 +14,7 @@ v 8.12.0 (unreleased) - Add font color contrast to external label in admin area (ClemMakesApps) - Change logo animation to CSS (ClemMakesApps) - Instructions for enabling Git packfile bitmaps !6104 + - Use Search::GlobalService.new in the `GET /projects/search/:query` endpoint - Fix pagination on user snippets page - Escape search term before passing it to Regexp.new !6241 (winniehell) - Fix pinned sidebar behavior in smaller viewports !6169 @@ -111,7 +112,6 @@ v 8.12.0 (unreleased) - Use default clone protocol on "check out, review, and merge locally" help page URL - API for Ci Lint !5953 (Katarzyna Kobierska Urszula Budziszewska) - Allow bulk update merge requests from merge requests index page - - Project search API is now agnostic to casing v 8.11.6 (unreleased) diff --git a/lib/api/projects.rb b/lib/api/projects.rb index b76be145a14..644d836ed0b 100644 --- a/lib/api/projects.rb +++ b/lib/api/projects.rb @@ -428,18 +428,9 @@ module API # Example Request: # GET /projects/search/:query get "/search/:query" do - ids = current_user.authorized_projects.map(&:id) - visibility_levels = [ Gitlab::VisibilityLevel::INTERNAL, Gitlab::VisibilityLevel::PUBLIC ] - projects = Project.where("(id in (?) OR visibility_level in (?)) AND (LOWER(name) LIKE LOWER((?)))", ids, visibility_levels, "%#{params[:query]}%") - sort = params[:sort] == 'desc' ? 'desc' : 'asc' - - projects = case params["order_by"] - when 'id' then projects.order("id #{sort}") - when 'name' then projects.order("name #{sort}") - when 'created_at' then projects.order("created_at #{sort}") - when 'last_activity_at' then projects.order("last_activity_at #{sort}") - else projects - end + search_service = Search::GlobalService.new(current_user, search: params[:query]).execute + projects = search_service.objects('projects', params[:page]) + projects = projects.reorder(project_order_by => project_sort) present paginate(projects), with: Entities::Project end |