Avoid touch label links that does not belongs to project when moving itfeature/group-level-labels

1 files changed, 42 insertions, 15 deletions

diff --git a/app/services/labels/transfer_service.rb b/app/services/labels/transfer_service.rb
index f91b3724aef..514679ed29d 100644
--- a/app/services/labels/transfer_service.rb
+++ b/app/services/labels/transfer_service.rb
@@ -4,48 +4,75 @@
 #
 module Labels
   class TransferService
-    def initialize(current_user, group, project)
+    def initialize(current_user, old_group, project)
       @current_user = current_user
-      @group = group
+      @old_group = old_group
       @project = project
     end
 
     def execute
-      return unless group.present?
+      return unless old_group.present?
 
       Label.transaction do
-        labels_to_transfer = Label.where(id: label_links.select(:label_id))
-
         labels_to_transfer.find_each do |label|
           new_label_id = find_or_create_label!(label)
 
           next if new_label_id == label.id
 
-          LabelLink.where(label_id: label.id).update_all(label_id: new_label_id)
-          LabelPriority.where(project_id: project.id, label_id: label.id).update_all(label_id: new_label_id)
+          update_label_links(group_labels_applied_to_issues, old_label_id: label.id, new_label_id: new_label_id)
+          update_label_links(group_labels_applied_to_merge_requests, old_label_id: label.id, new_label_id: new_label_id)
+          update_label_priorities(old_label_id: label.id, new_label_id: new_label_id)
         end
       end
     end
 
     private
 
-    attr_reader :current_user, :group, :project
+    attr_reader :current_user, :old_group, :project
+
+    def labels_to_transfer
+      label_ids = []
+      label_ids << group_labels_applied_to_issues.select(:id)
+      label_ids << group_labels_applied_to_merge_requests.select(:id)
 
-    def label_links
-      label_link_ids = []
-      label_link_ids << LabelLink.where(target: project.issues, label: group.labels).select(:id)
-      label_link_ids << LabelLink.where(target: project.merge_requests, label: group.labels).select(:id)
+      union = Gitlab::SQL::Union.new(label_ids)
 
-      union = Gitlab::SQL::Union.new(label_link_ids)
+      Label.where("labels.id IN (#{union.to_sql})").reorder(nil).uniq
+    end
+
+    def group_labels_applied_to_issues
+      Label.joins(:issues).
+        where(
+          issues: { project_id: project.id },
+          labels: { type: 'GroupLabel', group_id: old_group.id }
+        )
+    end
 
-      LabelLink.where("label_links.id IN (#{union.to_sql})")
+    def group_labels_applied_to_merge_requests
+      Label.joins(:merge_requests).
+        where(
+          merge_requests: { target_project_id: project.id },
+          labels: { type: 'GroupLabel', group_id: old_group.id }
+        )
     end
 
     def find_or_create_label!(label)
-      params = label.attributes.slice('title', 'description', 'color')
+      params    = label.attributes.slice('title', 'description', 'color')
       new_label = FindOrCreateService.new(current_user, project, params).execute
 
       new_label.id
     end
+
+    def update_label_links(labels, old_label_id:, new_label_id:)
+      LabelLink.joins(:label).
+        merge(labels).
+        where(label_id: old_label_id).
+        update_all(label_id: new_label_id)
+    end
+
+    def update_label_priorities(old_label_id:, new_label_id:)
+      LabelPriority.where(project_id: project.id, label_id: old_label_id).
+        update_all(label_id: new_label_id)
+    end
   end
 end