1 files changed, 29 insertions, 5 deletions
diff --git a/app/services/issuable/destroy_service.rb b/app/services/issuable/destroy_service.rb
index 4c64655a622..d5aa84d8d6c 100644
--- a/app/services/issuable/destroy_service.rb
+++ b/app/services/issuable/destroy_service.rb
@@ -3,12 +3,36 @@
 module Issuable
   class DestroyService < IssuableBaseService
     def execute(issuable)
-      TodoService.new.destroy_target(issuable) do |issuable|
-        if issuable.destroy
-          issuable.update_project_counter_caches
-          issuable.assignees.each(&:invalidate_cache_counts)
-        end
+      if issuable.destroy
+        after_destroy(issuable)
+      end
+    end
+
+    private
+
+    def after_destroy(issuable)
+      delete_todos(issuable)
+      issuable.update_project_counter_caches
+      issuable.assignees.each(&:invalidate_cache_counts)
+    end
+
+    def group_for(issuable)
+      issuable.resource_parent.group
+    end
+
+    def delete_todos(issuable)
+      actor = group_for(issuable)
+
+      if Feature.enabled?(:destroy_issuable_todos_async, actor, default_enabled: :yaml)
+        TodosDestroyer::DestroyedIssuableWorker
+          .perform_async(issuable.id, issuable.class.name)
+      else
+        TodosDestroyer::DestroyedIssuableWorker
+          .new
+          .perform(issuable.id, issuable.class.name)
       end
     end
   end
 end
+
+Issuable::DestroyService.prepend_if_ee('EE::Issuable::DestroyService')