Track import job id by import state model

We are adding another import state tracking model for
Jira importer and we need to be able to track job id
of the importer. Refactoring this module so that it can
be reused with different project level import state
trackers by making use of the import state model instead
of the project.

app/workers/gitlab/jira_import/stage/start_import_worker.rb

@@ -16,7 +16,7 @@ module Gitlab
 
           return unless start_import
 
-          Gitlab::Import::SetAsyncJid.set_jid(project)
+          Gitlab::Import::SetAsyncJid.set_jid(project.import_state)
 
           Gitlab::JiraImport::Stage::ImportLabelsWorker.perform_async(project.id)
         end

lib/gitlab/github_import/parallel_importer.rb

@@ -31,7 +31,7 @@ module Gitlab
       end
 
       def execute
-        Gitlab::Import::SetAsyncJid.set_jid(project)
+        Gitlab::Import::SetAsyncJid.set_jid(project.import_state)
 
         Stage::ImportRepositoryWorker
           .perform_async(project.id)

lib/gitlab/import/set_async_jid.rb

@@ -10,17 +10,18 @@
 module Gitlab
   module Import
     module SetAsyncJid
-      def self.set_jid(project)
-        jid = generate_jid(project)
+      def self.set_jid(import_state)
+        jid = generate_jid(import_state)
 
         Gitlab::SidekiqStatus
           .set(jid, StuckImportJobsWorker::IMPORT_JOBS_EXPIRATION)
 
-        project.import_state.update_column(:jid, jid)
+        import_state.update_column(:jid, jid)
       end
 
-      def self.generate_jid(project)
-        "async-import/#{project.id}"
+      def self.generate_jid(import_state)
+        importer_name = import_state.class.name.underscore.dasherize
+        "async-import/#{importer_name}/#{import_state.project_id}"
       end
     end
   end

lib/gitlab/phabricator_import/importer.rb

@@ -18,7 +18,7 @@ module Gitlab
       end
 
       def execute
-        Gitlab::Import::SetAsyncJid.set_jid(project)
+        Gitlab::Import::SetAsyncJid.set_jid(project.import_state)
         schedule_first_tasks_page
 
         true

spec/lib/gitlab/github_import/parallel_importer_spec.rb

@@ -27,7 +27,7 @@ describe Gitlab::GithubImport::ParallelImporter do
     end
 
     it 'sets the JID in Redis' do
-      expect(Gitlab::Import::SetAsyncJid).to receive(:set_jid).with(project).and_call_original
+      expect(Gitlab::Import::SetAsyncJid).to receive(:set_jid).with(project.import_state).and_call_original
 
       importer.execute
     end

spec/lib/gitlab/import/set_async_jid_spec.rb

@@ -8,16 +8,16 @@ describe Gitlab::Import::SetAsyncJid do
     it 'sets the JID in Redis' do
       expect(Gitlab::SidekiqStatus)
         .to receive(:set)
-              .with("async-import/#{project.id}", StuckImportJobsWorker::IMPORT_JOBS_EXPIRATION)
+              .with("async-import/project-import-state/#{project.id}", StuckImportJobsWorker::IMPORT_JOBS_EXPIRATION)
               .and_call_original
 
-      described_class.set_jid(project)
+      described_class.set_jid(project.import_state)
     end
 
     it 'updates the import JID of the project' do
-      described_class.set_jid(project)
+      described_class.set_jid(project.import_state)
 
-      expect(project.import_state.reload.jid).to eq("async-import/#{project.id}")
+      expect(project.import_state.reload.jid).to eq("async-import/project-import-state/#{project.id}")
     end
   end
 end