summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAhmad Sherif <me@ahmadsherif.com>2016-08-17 21:54:31 +0200
committerAhmad Sherif <me@ahmadsherif.com>2016-08-17 21:54:34 +0200
commit1418a935469dec096ef466adf186d2a5602a5e39 (patch)
treed70929e2590b6e8a5b2a44e23f87c7bccd77028b
parent6e0d82049c2545ca6cf23bd5c19739a4f42e7664 (diff)
downloadgitlab-ce-fix/simplify-todo-destroy-queries.tar.gz
Rename TodoService#mark_todos_as_done_by_id{,s}fix/simplify-todo-destroy-queries
-rw-r--r--app/controllers/dashboard/todos_controller.rb2
-rw-r--r--app/services/todo_service.rb4
-rw-r--r--spec/services/todo_service_spec.rb4
3 files changed, 5 insertions, 5 deletions
diff --git a/app/controllers/dashboard/todos_controller.rb b/app/controllers/dashboard/todos_controller.rb
index 32f5c09eac1..c8390af3b36 100644
--- a/app/controllers/dashboard/todos_controller.rb
+++ b/app/controllers/dashboard/todos_controller.rb
@@ -6,7 +6,7 @@ class Dashboard::TodosController < Dashboard::ApplicationController
end
def destroy
- TodoService.new.mark_todos_as_done_by_id([params[:id]], current_user)
+ TodoService.new.mark_todos_as_done_by_ids([params[:id]], current_user)
respond_to do |format|
format.html { redirect_to dashboard_todos_path, notice: 'Todo was successfully marked as done.' }
diff --git a/app/services/todo_service.rb b/app/services/todo_service.rb
index 5a2f7946082..daf4339cb48 100644
--- a/app/services/todo_service.rb
+++ b/app/services/todo_service.rb
@@ -142,10 +142,10 @@ class TodoService
# When user marks some todos as done
def mark_todos_as_done(todos, current_user)
- mark_todos_as_done_by_id(todos.select(&:id), current_user)
+ mark_todos_as_done_by_ids(todos.select(&:id), current_user)
end
- def mark_todos_as_done_by_id(ids, current_user)
+ def mark_todos_as_done_by_ids(ids, current_user)
todos = current_user.todos.where(id: ids)
marked_todos = todos.update_all(state: :done)
diff --git a/spec/services/todo_service_spec.rb b/spec/services/todo_service_spec.rb
index 9db05cce732..a2a1d5e6d30 100644
--- a/spec/services/todo_service_spec.rb
+++ b/spec/services/todo_service_spec.rb
@@ -225,8 +225,8 @@ describe TodoService, services: true do
end
end
- describe '#mark_todos_as_done_by_id' do
- it_behaves_like 'marking todos as done', :mark_todos_as_done_by_id do
+ describe '#mark_todos_as_done_by_ids' do
+ it_behaves_like 'marking todos as done', :mark_todos_as_done_by_ids do
let(:collection) { [first_todo, second_todo].map(&:id) }
end
end