1 files changed, 21 insertions, 17 deletions

diff --git a/lib/gitlab/ci/tags/bulk_insert.rb b/lib/gitlab/ci/tags/bulk_insert.rb
index 29f3731a9b4..2e56e47f5b8 100644
--- a/lib/gitlab/ci/tags/bulk_insert.rb
+++ b/lib/gitlab/ci/tags/bulk_insert.rb
@@ -9,40 +9,44 @@ module Gitlab
         TAGGINGS_BATCH_SIZE = 1000
         TAGS_BATCH_SIZE = 500
 
-        def initialize(statuses)
-          @statuses = statuses
+        def self.bulk_insert_tags!(taggables)
+          Gitlab::Ci::Tags::BulkInsert.new(taggables).insert!
+        end
+
+        def initialize(taggables)
+          @taggables = taggables
         end
 
         def insert!
-          return false if tag_list_by_status.empty?
+          return false if tag_list_by_taggable.empty?
 
           persist_build_tags!
         end
 
         private
 
-        attr_reader :statuses
+        attr_reader :taggables
 
-        def tag_list_by_status
-          strong_memoize(:tag_list_by_status) do
-            statuses.each.with_object({}) do |status, acc|
-              tag_list = status.tag_list
+        def tag_list_by_taggable
+          strong_memoize(:tag_list_by_taggable) do
+            taggables.each.with_object({}) do |taggable, acc|
+              tag_list = taggable.tag_list
               next unless tag_list
 
-              acc[status] = tag_list
+              acc[taggable] = tag_list
             end
           end
         end
 
         def persist_build_tags!
-          all_tags = tag_list_by_status.values.flatten.uniq.reject(&:blank?)
+          all_tags = tag_list_by_taggable.values.flatten.uniq.reject(&:blank?)
           tag_records_by_name = create_tags(all_tags).index_by(&:name)
           taggings = build_taggings_attributes(tag_records_by_name)
 
           return false if taggings.empty?
 
           taggings.each_slice(TAGGINGS_BATCH_SIZE) do |taggings_slice|
-            ActsAsTaggableOn::Tagging.insert_all!(taggings)
+            ActsAsTaggableOn::Tagging.insert_all!(taggings_slice)
           end
 
           true
@@ -65,24 +69,24 @@ module Gitlab
         # rubocop: enable CodeReuse/ActiveRecord
 
         def build_taggings_attributes(tag_records_by_name)
-          taggings = statuses.flat_map do |status|
-            tag_list = tag_list_by_status[status]
+          taggings = taggables.flat_map do |taggable|
+            tag_list = tag_list_by_taggable[taggable]
             next unless tag_list
 
             tags = tag_records_by_name.values_at(*tag_list)
-            taggings_for(tags, status)
+            taggings_for(tags, taggable)
           end
 
           taggings.compact!
           taggings
         end
 
-        def taggings_for(tags, status)
+        def taggings_for(tags, taggable)
           tags.map do |tag|
             {
               tag_id: tag.id,
-              taggable_type: CommitStatus.name,
-              taggable_id: status.id,
+              taggable_type: taggable.class.base_class.name,
+              taggable_id: taggable.id,
               created_at: Time.current,
               context: 'tags'
             }