Merge branch 'make-import-issues-csv-worker-idempotent' into 'master'

Make ImportIssuesCsvWorker idempotent

See merge request gitlab-org/gitlab!47808

app/workers/all_queues.yml

@@ -1609,7 +1609,7 @@
   :urgency: :low
   :resource_boundary: :cpu
   :weight: 2
-  :idempotent:
+  :idempotent: true
   :tags: []
 - :name: invalid_gpg_signature_update
   :feature_category: :source_code_management

app/workers/import_issues_csv_worker.rb

@@ -3,6 +3,7 @@
 class ImportIssuesCsvWorker # rubocop:disable Scalability/IdempotentWorker
   include ApplicationWorker
 
+  idempotent!
   feature_category :issue_tracking
   worker_resource_boundary :cpu
   weight 2
@@ -12,13 +13,15 @@ class ImportIssuesCsvWorker # rubocop:disable Scalability/IdempotentWorker
   end
 
   def perform(current_user_id, project_id, upload_id)
-    @user = User.find(current_user_id)
-    @project = Project.find(project_id)
-    @upload = Upload.find(upload_id)
+    user = User.find(current_user_id)
+    project = Project.find(project_id)
+    upload = Upload.find(upload_id)
 
-    importer = Issues::ImportCsvService.new(@user, @project, @upload.retrieve_uploader)
+    importer = Issues::ImportCsvService.new(user, project, upload.retrieve_uploader)
     importer.execute
 
-    @upload.destroy
+    upload.destroy
+  rescue ActiveRecord::RecordNotFound
+    # Resources have been removed, job should not be retried
   end
 end

changelogs/unreleased/make-import-issues-csv-worker-idempotent.yml

+---
+title: Make ImportIssuesCsvWorker idempotent
+merge_request: 47808
+author:
+type: changed

spec/workers/import_issues_csv_worker_spec.rb

@@ -3,9 +3,9 @@
 require 'spec_helper'
 
 RSpec.describe ImportIssuesCsvWorker do
-  let(:project) { create(:project) }
-  let(:user) { create(:user) }
-  let(:upload) { create(:upload) }
+  let_it_be(:project) { create(:project) }
+  let_it_be(:user) { create(:user) }
+  let(:upload) { create(:upload, :with_file) }
 
   let(:worker) { described_class.new }
 
@@ -19,5 +19,9 @@ RSpec.describe ImportIssuesCsvWorker do
 
       expect { upload.reload }.to raise_error ActiveRecord::RecordNotFound
     end
+
+    it_behaves_like 'an idempotent worker' do
+      let(:job_args) { [user.id, project.id, upload.id] }
+    end
   end
 end