Only run on open issues

-Add changelog file
-Add new negative flow specs
- Add translation
- Rename system note argument
- Add new update_sentry_issue permission

app/policies/project_policy.rb

@@ -222,6 +222,7 @@ class ProjectPolicy < BasePolicy
     enable :read_deployment
     enable :read_merge_request
     enable :read_sentry_issue
+    enable :update_sentry_issue
     enable :read_prometheus
   end
 

app/services/error_tracking/base_service.rb

@@ -62,5 +62,9 @@ module ErrorTracking
     def can_read?
       can?(current_user, :read_sentry_issue, project)
     end
+
+    def can_update?
+      can?(current_user, :update_sentry_issue, project)
+    end
   end
 end

app/services/error_tracking/issue_update_service.rb

@@ -21,10 +21,19 @@ module ErrorTracking
 
     def update_related_issue
       issue = related_issue
-      return unless issue && resolving?
+      return unless issue
+
+      @closed_issue = close_and_create_note(issue)
+    end
+
+    def close_and_create_note(issue)
+      return unless resolving? && issue.opened?
 
       processed_issue = close_issue(issue)
+      return unless processed_issue.reset.closed?
+
       create_system_note(processed_issue)
+      processed_issue
     end
 
     def close_issue(issue)
@@ -34,8 +43,6 @@ module ErrorTracking
     end
 
     def create_system_note(issue)
-      return unless issue.reset.closed?
-
       SystemNoteService.close_after_error_tracking_resolve(issue, project, current_user)
     end
 
@@ -55,7 +62,15 @@ module ErrorTracking
     end
 
     def parse_response(response)
-      { updated: response[:updated].present? }
+      {
+        updated: response[:updated].present?,
+        closed_issue_iid: @closed_issue&.iid
+      }
+    end
+
+    def check_permissions
+      return error('Error Tracking is not enabled') unless enabled?
+      return error('Access denied', :unauthorized) unless can_update?
     end
   end
 end

app/services/system_note_service.rb

@@ -99,10 +99,10 @@ module SystemNoteService
     ::SystemNotes::TimeTrackingService.new(noteable: noteable, project: project, author: author).change_time_spent
   end
 
-  def close_after_error_tracking_resolve(noteable, project, author)
-    body = 'automatically closed this as a result of resolving the corresponding Sentry error.'
+  def close_after_error_tracking_resolve(issue, project, author)
+    body = _('resolved the corresponding error and closed the issue.')
 
-    create_note(NoteSummary.new(noteable, project, author, body, action: 'closed'))
+    create_note(NoteSummary.new(issue, project, author, body, action: 'closed'))
   end
 
   def change_status(noteable, project, author, status, source = nil)

changelogs/unreleased/39825-close-issue-after-error-resolve.yml

+---
+title: Close Issue when resolving corresponding Sentry error
+merge_request: 22744
+author:
+type: added

locale/gitlab.pot

@@ -22788,6 +22788,9 @@ msgstr[1] ""
 msgid "reset it."
 msgstr ""
 
+msgid "resolved the corresponding error and closed the issue."
+msgstr ""
+
 msgid "score"
 msgstr ""
 

spec/controllers/projects/error_tracking_controller_spec.rb

@@ -301,7 +301,7 @@ describe Projects::ErrorTrackingController do
       context 'update result is successful' do
         before do
           expect(issue_update_service).to receive(:execute)
-            .and_return(status: :success, updated: true)
+            .and_return(status: :success, updated: true, closed_issue_iid: 1234)
 
           update_issue
         end

spec/fixtures/api/schemas/error_tracking/update_issue.json

@@ -6,9 +6,15 @@
   "properties" : {
     "result": {
       "type": "object",
+      "required" : [
+        "status",
+        "updated",
+        "closed_issue_iid"
+      ],
       "properties": {
         "status": { "type": "string" },
-        "updated": { "type": "boolean" }
+        "updated": { "type": "boolean" },
+        "closed_issue_iid": { "type": ["integer", "null"] }
       }
     }
   },

spec/services/error_tracking/issue_update_service_spec.rb

@@ -9,6 +9,17 @@ describe ErrorTracking::IssueUpdateService do
 
   subject { described_class.new(project, user, arguments) }
 
+  shared_examples 'does not perform close issue flow' do
+    it 'does not call the close issue service' do
+      expect(issue_close_service)
+        .not_to receive(:execute)
+    end
+
+    it 'does not create system note' do
+      expect(SystemNoteService).not_to receive(:close_after_error_tracking_resolve)
+    end
+  end
+
   describe '#execute' do
     context 'with authorized user' do
       context 'when update_issue returns success' do
@@ -20,7 +31,7 @@ describe ErrorTracking::IssueUpdateService do
         end
 
         it 'returns the response' do
-          expect(result).to eq(update_issue_response.merge(status: :success))
+          expect(result).to eq(update_issue_response.merge(status: :success, closed_issue_iid: nil))
         end
 
         it 'updates any related issue' do
@@ -40,6 +51,10 @@ describe ErrorTracking::IssueUpdateService do
             allow_any_instance_of(SentryIssuesFinder)
               .to receive(:find_by_identifier)
               .and_return(sentry_issue)
+
+            allow(Issues::CloseService)
+              .to receive(:new)
+              .and_return(issue_close_service)
           end
 
           after do
@@ -47,12 +62,7 @@ describe ErrorTracking::IssueUpdateService do
           end
 
           it 'closes the issue' do
-            close_service = spy(:close_service)
-            expect(Issues::CloseService)
-              .to receive(:new)
-              .and_return(close_service)
-
-            expect(close_service)
+            expect(issue_close_service)
               .to receive(:execute)
               .with(issue, system_note: false)
               .and_return(issue)
@@ -61,6 +71,29 @@ describe ErrorTracking::IssueUpdateService do
           it 'creates a system note' do
             expect(SystemNoteService).to receive(:close_after_error_tracking_resolve)
           end
+
+          it 'returns a response with closed issue' do
+            closed_issue = create(:issue, :closed, project: project)
+
+            expect(issue_close_service)
+              .to receive(:execute)
+              .with(issue, system_note: false)
+              .and_return(closed_issue)
+
+            expect(result).to eq(status: :success, updated: true, closed_issue_iid: closed_issue.iid)
+          end
+
+          context 'issue is already closed' do
+            let(:issue) { create(:issue, :closed, project: project) }
+
+            include_examples 'does not perform close issue flow'
+          end
+
+          context 'status is not resolving' do
+            let(:arguments) { { issue_id: sentry_issue.sentry_issue_identifier, status: 'ignored' } }
+
+            include_examples 'does not perform close issue flow'
+          end
         end
       end