Check if alert resolved before adding note

- Remove SystemNoteService addition
- Small tidy ups

app/services/issues/close_service.rb

@@ -33,7 +33,7 @@ module Issues
 
         notification_service.async.close_issue(issue, current_user, closed_via: closed_via) if notifications
         todo_service.close_issue(issue, current_user)
-        resolve_alert(issue, system_note)
+        resolve_alert(issue)
         execute_hooks(issue, 'close')
         invalidate_cache_counts(issue, users: issue.assignees)
         issue.update_project_counter_caches
@@ -59,11 +59,12 @@ module Issues
       SystemNoteService.change_status(issue, issue.project, current_user, issue.state, current_commit)
     end
 
-    def resolve_alert(issue, system_note)
+    def resolve_alert(issue)
       return unless alert = issue.alert_management_alert
+      return if alert.resolved?
 
       if alert.resolve
-        SystemNoteService.closed_alert_issue(alert, issue, current_user) if system_note
+        SystemNotes::AlertManagementService.new(noteable: alert, project: alert.project, author: current_user).closed_alert_issue(issue)
       else
         Gitlab::AppLogger.warn(
           message: 'Cannot resolve an associated Alert Management alert',

app/services/system_note_service.rb

@@ -300,10 +300,6 @@ module SystemNoteService
     ::SystemNotes::AlertManagementService.new(noteable: alert, project: alert.project, author: author).new_alert_issue(issue)
   end
 
-  def closed_alert_issue(alert, issue, author)
-    ::SystemNotes::AlertManagementService.new(noteable: alert, project: alert.project, author: author).closed_alert_issue(issue)
-  end
-
   private
 
   def merge_requests_service(noteable, project, author)

app/services/system_notes/alert_management_service.rb

@@ -20,7 +20,6 @@ module SystemNotes
 
     # Called when an issue is created based on an AlertManagement::Alert
     #
-    # alert - AlertManagement::Alert object.
     # issue - Issue object.
     #
     # Example Note text:
@@ -34,9 +33,8 @@ module SystemNotes
       create_note(NoteSummary.new(noteable, project, author, body, action: 'alert_issue_added'))
     end
 
-    # Called when an AlertManagement::Alert is resolved due to the associated alert being closed
+    # Called when an AlertManagement::Alert is resolved due to the associated issue being closed
     #
-    # alert - AlertManagement::Alert object.
     # issue - Issue object.
     #
     # Example Note text:

spec/services/issues/close_service_spec.rb

@@ -257,7 +257,9 @@ RSpec.describe Issues::CloseService do
           let!(:alert) { create(:alert_management_alert, issue: issue, project: project) }
 
           it 'resolves an alert and sends a system note' do
-            expect(SystemNoteService).to receive(:closed_alert_issue).with(alert, issue, instance_of(User))
+            expect_next_instance_of(SystemNotes::AlertManagementService) do |notes_service|
+              expect(notes_service).to receive(:closed_alert_issue).with(issue)
+            end
 
             close_issue
 

spec/services/system_note_service_spec.rb

@@ -705,16 +705,4 @@ RSpec.describe SystemNoteService do
       described_class.new_alert_issue(alert, alert.issue, author)
     end
   end
-
-  describe '.closed_alert_issue' do
-    let(:alert) { build(:alert_management_alert, :with_issue) }
-
-    it 'calls AlertManagementService' do
-      expect_next_instance_of(SystemNotes::AlertManagementService) do |service|
-        expect(service).to receive(:closed_alert_issue).with(alert.issue)
-      end
-
-      described_class.closed_alert_issue(alert, alert.issue, author)
-    end
-  end
 end