1 files changed, 16 insertions, 9 deletions
diff --git a/app/services/todo_service.rb b/app/services/todo_service.rb
index dea116c8546..e473a6dc594 100644
--- a/app/services/todo_service.rb
+++ b/app/services/todo_service.rb
@@ -47,7 +47,7 @@ class TodoService
 
     yield target
 
-    todo_users.each(&:update_todos_count_cache)
+    Users::UpdateTodoCountCacheService.new(todo_users).execute if todo_users.present?
   end
 
   # When we reassign an assignable object (issuable, alert) we should:
@@ -177,7 +177,7 @@ class TodoService
   def resolve_todos_for_target(target, current_user)
     attributes = attributes_for_target(target)
 
-    resolve_todos(pending_todos(current_user, attributes), current_user)
+    resolve_todos(pending_todos([current_user], attributes), current_user)
   end
 
   def resolve_todos(todos, current_user, resolution: :done, resolved_by_action: :system_done)
@@ -220,16 +220,23 @@ class TodoService
   private
 
   def create_todos(users, attributes)
-    Array(users).map do |user|
-      next if pending_todos(user, attributes).exists? && Feature.disabled?(:multiple_todos, user)
+    users = Array(users)
 
+    return if users.empty?
+
+    users_with_pending_todos = pending_todos(users, attributes).pluck_user_id
+    users.reject! { |user| users_with_pending_todos.include?(user.id) && Feature.disabled?(:multiple_todos, user) }
+
+    todos = users.map do |user|
       issue_type = attributes.delete(:issue_type)
       track_todo_creation(user, issue_type)
 
-      todo = Todo.create(attributes.merge(user_id: user.id))
-      user.update_todos_count_cache
-      todo
+      Todo.create(attributes.merge(user_id: user.id))
     end
+
+    Users::UpdateTodoCountCacheService.new(users).execute
+
+    todos
   end
 
   def new_issuable(issuable, author)
@@ -353,8 +360,8 @@ class TodoService
     end
   end
 
-  def pending_todos(user, criteria = {})
-    PendingTodosFinder.new(user, criteria).execute
+  def pending_todos(users, criteria = {})
+    PendingTodosFinder.new(users, criteria).execute
   end
 
   def track_todo_creation(user, issue_type)