From fbbb985a03d0b51e28a3df5a3c3f21a81540405f Mon Sep 17 00:00:00 2001
From: Maxim Rydkin <maks.rydkin@gmail.com>
Date: Wed, 23 Aug 2017 22:33:56 +0300
Subject: extract finder and add first test

---
 app/controllers/autocomplete_controller.rb | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/autocomplete_controller.rb b/app/controllers/autocomplete_controller.rb
index dfc8bd0ba81..8e945f90f76 100644
--- a/app/controllers/autocomplete_controller.rb
+++ b/app/controllers/autocomplete_controller.rb
@@ -6,28 +6,7 @@ class AutocompleteController < ApplicationController
   before_action :find_users, only: [:users]
 
   def users
-    @users ||= User.none
-    @users = @users.active
-    @users = @users.reorder(:name)
-    @users = @users.search(params[:search]) if params[:search].present?
-    @users = @users.where.not(id: params[:skip_users]) if params[:skip_users].present?
-    @users = @users.page(params[:page]).per(params[:per_page])
-
-    if params[:todo_filter].present? && current_user
-      @users = @users.todo_authors(current_user.id, params[:todo_state_filter])
-    end
-
-    if params[:search].blank?
-      # Include current user if available to filter by "Me"
-      if params[:current_user].present? && current_user
-        @users = [current_user, *@users].uniq
-      end
-
-      if params[:author_id].present? && current_user
-        author = User.find_by_id(params[:author_id])
-        @users = [author, *@users].uniq if author
-      end
-    end
+    @users = YetAnotherUsersFinder.new(params: params, current_user: current_user, users: @users).execute
 
     render json: @users, only: [:name, :username, :id], methods: [:avatar_url]
   end
-- 
cgit v1.2.1


From 20ff87a261ac0ea06268d2cb7223f104baf2ed35 Mon Sep 17 00:00:00 2001
From: Maxim Rydkin <maks.rydkin@gmail.com>
Date: Tue, 5 Sep 2017 21:59:40 +0300
Subject: rename yet_another_users_finder into autocomplete_users_finder

---
 app/controllers/autocomplete_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/controllers')

diff --git a/app/controllers/autocomplete_controller.rb b/app/controllers/autocomplete_controller.rb
index 8e945f90f76..d907777e936 100644
--- a/app/controllers/autocomplete_controller.rb
+++ b/app/controllers/autocomplete_controller.rb
@@ -6,7 +6,7 @@ class AutocompleteController < ApplicationController
   before_action :find_users, only: [:users]
 
   def users
-    @users = YetAnotherUsersFinder.new(params: params, current_user: current_user, users: @users).execute
+    @users = AutocompleteUsersFinder.new(params: params, current_user: current_user, users: @users).execute
 
     render json: @users, only: [:name, :username, :id], methods: [:avatar_url]
   end
-- 
cgit v1.2.1


From fa276e30292349173e98f7fe0f9a94c82345dc7a Mon Sep 17 00:00:00 2001
From: Maxim Rydkin <maks.rydkin@gmail.com>
Date: Fri, 8 Sep 2017 12:00:31 +0300
Subject: move `find_users` method into finder and add `load_group` method

---
 app/controllers/autocomplete_controller.rb | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/autocomplete_controller.rb b/app/controllers/autocomplete_controller.rb
index d907777e936..10e8e54f402 100644
--- a/app/controllers/autocomplete_controller.rb
+++ b/app/controllers/autocomplete_controller.rb
@@ -3,10 +3,10 @@ class AutocompleteController < ApplicationController
 
   skip_before_action :authenticate_user!, only: [:users, :award_emojis]
   before_action :load_project, only: [:users]
-  before_action :find_users, only: [:users]
+  before_action :load_group, only: [:users]
 
   def users
-    @users = AutocompleteUsersFinder.new(params: params, current_user: current_user, users: @users).execute
+    @users = AutocompleteUsersFinder.new(params: params, current_user: current_user, project: @project, group: @group).execute
 
     render json: @users, only: [:name, :username, :id], methods: [:avatar_url]
   end
@@ -39,26 +39,14 @@ class AutocompleteController < ApplicationController
 
   private
 
-  def find_users
-    @users =
-      if @project
-        user_ids = @project.team.users.pluck(:id)
-
-        if params[:author_id].present?
-          user_ids << params[:author_id]
-        end
-
-        User.where(id: user_ids)
-      elsif params[:group_id].present?
+  def load_group
+    @group ||= begin
+      if @project.blank? && params[:group_id].present?
         group = Group.find(params[:group_id])
         return render_404 unless can?(current_user, :read_group, group)
-
-        group.users
-      elsif current_user
-        User.all
-      else
-        User.none
+        group
       end
+    end
   end
 
   def load_project
-- 
cgit v1.2.1