Merge branch '49796-project-deletion-may-not-log-audit-events-during-group-deletion' into 'master'

Resolve "Project deletion may not log audit events during group deletion"

Closes #49796

See merge request gitlab-org/gitlab-ce!21162

app/services/groups/destroy_service.rb

@@ -2,6 +2,8 @@
 
 module Groups
   class DestroyService < Groups::BaseService
+    DestroyError = Class.new(StandardError)
+
     def async_execute
       job_id = GroupDestroyWorker.perform_async(group.id, current_user.id)
       Rails.logger.info("User #{current_user.id} scheduled a deletion of group ID #{group.id} with job ID #{job_id}")
@@ -12,9 +14,8 @@ module Groups
 
       group.projects.each do |project|
         # Execute the destruction of the models immediately to ensure atomic cleanup.
-        # Skip repository removal because we remove directory with namespace
+        success = ::Projects::DestroyService.new(project, current_user).execute
-        # that contain all these repositories
+        raise DestroyError, "Project #{project.id} can't be deleted" unless success
-        ::Projects::DestroyService.new(project, current_user, skip_repo: project.legacy_storage?).execute
       end
 
       group.children.each do |group|

changelogs/unreleased/49796-project-deletion-may-not-log-audit-events-during-group-deletion.yml

@@ -0,0 +1,5 @@
+---
+title: 'Fix: Project deletion may not log audit events during group deletion'
+merge_request: 21162
+author:
+type: fixed

spec/services/groups/destroy_service_spec.rb

@@ -135,6 +135,17 @@ describe Groups::DestroyService do
     it_behaves_like 'group destruction', false
   end
 
+  context 'repository removal status is taken into account' do
+    it 'raises exception' do
+      expect_next_instance_of(::Projects::DestroyService) do |destroy_service|
+        expect(destroy_service).to receive(:execute).and_return(false)
+      end
+
+      expect { destroy_group(group, user, false) }
+        .to raise_error(Groups::DestroyService::DestroyError, "Project #{project.id} can't be deleted" )
+    end
+  end
+
   describe 'repository removal' do
     before do
       destroy_group(group, user, false)