Merge branch 'extract-sidekiq-job-tracking' into 'master'

Extract sidekiq job tracking

See merge request gitlab-org/gitlab!28730

app/models/concerns/import_state/sidekiq_job_tracker.rb

+# frozen_string_literal: true
+
+module ImportState
+  module SidekiqJobTracker
+    extend ActiveSupport::Concern
+
+    included do
+      # Refreshes the expiration time of the associated import job ID.
+      #
+      # This method can be used by asynchronous importers to refresh the status,
+      # preventing the StuckImportJobsWorker from marking the import as failed.
+      def refresh_jid_expiration
+        return unless jid
+
+        Gitlab::SidekiqStatus.set(jid, StuckImportJobsWorker::IMPORT_JOBS_EXPIRATION)
+      end
+
+      def self.jid_by(project_id:, status:)
+        select(:jid).with_status(status).find_by(project_id: project_id)
+      end
+    end
+  end
+end

app/models/jira_import_state.rb

@@ -2,6 +2,7 @@
 
 class JiraImportState < ApplicationRecord
   include AfterCommitQueue
+  include ImportState::SidekiqJobTracker
 
   self.table_name = 'jira_imports'
 
@@ -66,14 +67,4 @@ class JiraImportState < ApplicationRecord
   def in_progress?
     scheduled? || started?
   end
-
-  def refresh_jid_expiration
-    return unless jid
-
-    Gitlab::SidekiqStatus.set(jid, StuckImportJobsWorker::IMPORT_JOBS_EXPIRATION)
-  end
-
-  def self.jid_by(project_id:, status:)
-    select(:jid).with_status(status).find_by(project_id: project_id)
-  end
 end

app/models/project_import_state.rb

@@ -2,6 +2,7 @@
 
 class ProjectImportState < ApplicationRecord
   include AfterCommitQueue
+  include ImportState::SidekiqJobTracker
 
   self.table_name = "project_mirror_data"
 
@@ -88,20 +89,6 @@ class ProjectImportState < ApplicationRecord
     # import? does SQL work so only run it if it looks like there's an import running
     status == 'started' && project.import?
   end
-
-  # Refreshes the expiration time of the associated import job ID.
-  #
-  # This method can be used by asynchronous importers to refresh the status,
-  # preventing the StuckImportJobsWorker from marking the import as failed.
-  def refresh_jid_expiration
-    return unless jid
-
-    Gitlab::SidekiqStatus.set(jid, StuckImportJobsWorker::IMPORT_JOBS_EXPIRATION)
-  end
-
-  def self.jid_by(project_id:, status:)
-    select(:jid).with_status(status).find_by(project_id: project_id)
-  end
 end
 
 ProjectImportState.prepend_if_ee('EE::ProjectImportState')