Remove projects before group/user. Remove namespace directory async

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

2 files changed, 10 insertions, 0 deletions

diff --git a/app/services/delete_user_service.rb b/app/services/delete_user_service.rb
index d259b4efca6..ca350eb2a8d 100644
--- a/app/services/delete_user_service.rb
+++ b/app/services/delete_user_service.rb
@@ -4,6 +4,11 @@ class DeleteUserService
       user.errors[:base] << 'You must transfer ownership or delete groups before you can remove user'
       user
     else
+      # TODO: Skip remove repository so Namespace#rm_dir works
+      user.personal_projects.each do |project|
+        ::Projects::DestroyService.new(project, current_user, {}).execute
+      end
+
       user.destroy
     end
   end
diff --git a/app/services/destroy_group_service.rb b/app/services/destroy_group_service.rb
index 9637a1480a8..c1add7b92e8 100644
--- a/app/services/destroy_group_service.rb
+++ b/app/services/destroy_group_service.rb
@@ -6,6 +6,11 @@ class DestroyGroupService
   end
 
   def execute
+    # TODO: Skip remove repository so Namespace#rm_dir works
+    @group.projects.each do |project|
+      ::Projects::DestroyService.new(project, current_user, {}).execute
+    end
+
     @group.destroy
   end
 end