Merge branch 'sh-add-deletion-events-in-transaction' into 'master'

During a project destroy, log the audit and Geo events within the transaction

See merge request gitlab-org/gitlab-ee!6059

ee/app/services/ee/projects/destroy_service.rb

@@ -12,13 +12,19 @@ module EE
         # and clean up where we can.
         if project&.destroyed?
           mirror_cleanup(project)
-          log_geo_event(project)
-          log_audit_event(project)
         end
 
         succeeded
       end
 
+      override :log_destroy_event
+      def log_destroy_event
+        super
+
+        log_geo_event(project)
+        log_audit_event(project)
+      end
+
       def mirror_cleanup(project)
         return unless project.mirror?
 

ee/changelogs/unreleased/sh-add-deletion-events-in-transaction.yml

+---
+title: Log audit and Geo events within a project destroy transaction
+merge_request: 6059
+author:
+type: fixed

ee/spec/services/projects/destroy_service_spec.rb

@@ -36,11 +36,13 @@ describe Projects::DestroyService do
     it 'logs an event to the Geo event log' do
       # Run Sidekiq immediately to check that renamed repository will be removed
       Sidekiq::Testing.inline! do
+        expect(subject).to receive(:log_destroy_event).and_call_original
         expect { subject.execute }.to change(Geo::RepositoryDeletedEvent, :count).by(1)
       end
     end
 
     it 'does not log event to the Geo log if project deletion fails' do
+      expect(subject).to receive(:log_destroy_event).and_call_original
       expect_any_instance_of(Project)
         .to receive(:destroy!).and_raise(StandardError.new('Other error message'))
 
@@ -80,6 +82,7 @@ describe Projects::DestroyService do
     end
 
     it 'logs an audit event' do
+      expect(subject).to receive(:log_destroy_event).and_call_original
       expect { subject.execute }.to change(AuditEvent, :count)
     end
   end