1 files changed, 60 insertions, 28 deletions
diff --git a/lib/gitlab/background_migration/update_jira_tracker_data_deployment_type_based_on_url.rb b/lib/gitlab/background_migration/update_jira_tracker_data_deployment_type_based_on_url.rb
index bba1ca26b35..e9a38916999 100644
--- a/lib/gitlab/background_migration/update_jira_tracker_data_deployment_type_based_on_url.rb
+++ b/lib/gitlab/background_migration/update_jira_tracker_data_deployment_type_based_on_url.rb
@@ -1,42 +1,74 @@
 # frozen_string_literal: true
 
 # rubocop: disable Style/Documentation
-class Gitlab::BackgroundMigration::UpdateJiraTrackerDataDeploymentTypeBasedOnUrl
-  # rubocop: disable Gitlab/NamespacedClass
-  class JiraTrackerData < ActiveRecord::Base
-    self.table_name = "jira_tracker_data"
-    self.inheritance_column = :_type_disabled
+module Gitlab
+  module BackgroundMigration
+    class UpdateJiraTrackerDataDeploymentTypeBasedOnUrl < Gitlab::BackgroundMigration::BatchedMigrationJob
+      # rubocop: disable Gitlab/NamespacedClass
+      class JiraTrackerData < ActiveRecord::Base
+        self.table_name = "jira_tracker_data"
+        self.inheritance_column = :_type_disabled
 
-    include ::Integrations::BaseDataFields
-    attr_encrypted :url, encryption_options
-    attr_encrypted :api_url, encryption_options
+        include ::Integrations::BaseDataFields
+        attr_encrypted :url, encryption_options
+        attr_encrypted :api_url, encryption_options
 
-    enum deployment_type: { unknown: 0, server: 1, cloud: 2 }, _prefix: :deployment
-  end
-  # rubocop: enable Gitlab/NamespacedClass
+        enum deployment_type: { unknown: 0, server: 1, cloud: 2 }, _prefix: :deployment
+      end
+      # rubocop: enable Gitlab/NamespacedClass
 
-  # https://rubular.com/r/uwgK7k9KH23efa
-  JIRA_CLOUD_REGEX = %r{^https?://[A-Za-z0-9](?:[A-Za-z0-9\-]{0,61}[A-Za-z0-9])?\.atlassian\.net$}ix.freeze
+      # https://rubular.com/r/uwgK7k9KH23efa
+      JIRA_CLOUD_REGEX = %r{^https?://[A-Za-z0-9](?:[A-Za-z0-9\-]{0,61}[A-Za-z0-9])?\.atlassian\.net$}ix.freeze
 
-  # rubocop: disable CodeReuse/ActiveRecord
-  def perform(start_id, end_id)
-    trackers_data = JiraTrackerData
-      .where(deployment_type: 'unknown')
-      .where(id: start_id..end_id)
+      def perform
+        cloud = []
+        server = []
+        unknown = []
 
-    cloud, server = trackers_data.partition { |tracker_data| tracker_data.url.match?(JIRA_CLOUD_REGEX) }
+        trackers_data.each do |tracker_data|
+          client_url = tracker_data.api_url.presence || tracker_data.url
 
-    cloud_mappings = cloud.each_with_object({}) do |tracker_data, hash|
-      hash[tracker_data] = { deployment_type: 2 }
-    end
+          if client_url.blank?
+            unknown << tracker_data
+          elsif client_url.match?(JIRA_CLOUD_REGEX)
+            cloud << tracker_data
+          else
+            server << tracker_data
+          end
+        end
 
-    server_mapppings = server.each_with_object({}) do |tracker_data, hash|
-      hash[tracker_data] = { deployment_type: 1 }
-    end
+        cloud_mappings = cloud.each_with_object({}) do |tracker_data, hash|
+          hash[tracker_data] = { deployment_type: 2 }
+        end
+
+        server_mappings = server.each_with_object({}) do |tracker_data, hash|
+          hash[tracker_data] = { deployment_type: 1 }
+        end
+
+        unknown_mappings = unknown.each_with_object({}) do |tracker_data, hash|
+          hash[tracker_data] = { deployment_type: 0 }
+        end
 
-    mappings = cloud_mappings.merge(server_mapppings)
+        mappings = cloud_mappings.merge(server_mappings, unknown_mappings)
 
-    ::Gitlab::Database::BulkUpdate.execute(%i[deployment_type], mappings)
+        update_records(mappings)
+      end
+
+      private
+
+      def update_records(mappings)
+        return if mappings.empty?
+
+        ::Gitlab::Database::BulkUpdate.execute(%i[deployment_type], mappings)
+      end
+
+      # rubocop: disable CodeReuse/ActiveRecord
+      def trackers_data
+        @trackers_data ||= JiraTrackerData
+          .where(deployment_type: 'unknown')
+          .where(batch_column => start_id..end_id)
+      end
+      # rubocop: enable CodeReuse/ActiveRecord
+    end
   end
-  # rubocop: enable CodeReuse/ActiveRecord
 end