diff options
Diffstat (limited to 'app/services/labels')
-rw-r--r-- | app/services/labels/promote_service.rb | 62 |
1 files changed, 27 insertions, 35 deletions
diff --git a/app/services/labels/promote_service.rb b/app/services/labels/promote_service.rb index 9ed10f6a11b..fdf2cf13f92 100644 --- a/app/services/labels/promote_service.rb +++ b/app/services/labels/promote_service.rb @@ -10,81 +10,79 @@ module Labels label.is_a?(ProjectLabel) Label.transaction do - new_label = clone_label_to_group_label(label) + # use the existing group label if it exists + group_label = find_or_create_group_label(label) - label_ids_for_merge(new_label).find_in_batches(batch_size: BATCH_SIZE) do |batched_ids| - update_old_label_relations(new_label, batched_ids) + label_ids_for_merge(group_label).find_in_batches(batch_size: BATCH_SIZE) do |batched_ids| + update_old_label_relations(group_label, batched_ids) destroy_project_labels(batched_ids) end - # We skipped validations during creation. Let's run them now, after deleting conflicting labels - raise ActiveRecord::RecordInvalid.new(new_label) unless new_label.valid? - - new_label + group_label end end # rubocop: enable CodeReuse/ActiveRecord private - def update_old_label_relations(new_label, old_label_ids) - update_issuables(new_label, old_label_ids) - update_resource_label_events(new_label, old_label_ids) - update_issue_board_lists(new_label, old_label_ids) - update_priorities(new_label, old_label_ids) - subscribe_users(new_label, old_label_ids) + def update_old_label_relations(group_label, old_label_ids) + update_issuables(group_label, old_label_ids) + update_resource_label_events(group_label, old_label_ids) + update_issue_board_lists(group_label, old_label_ids) + update_priorities(group_label, old_label_ids) + subscribe_users(group_label, old_label_ids) end # rubocop: disable CodeReuse/ActiveRecord - def subscribe_users(new_label, label_ids) + def subscribe_users(group_label, label_ids) # users can be subscribed to multiple labels that will be merged into the group one # we want to keep only one subscription / user ids_to_update = Subscription.where(subscribable_id: label_ids, subscribable_type: 'Label') .group(:user_id) .pluck('MAX(id)') - Subscription.where(id: ids_to_update).update_all(subscribable_id: new_label.id) + Subscription.where(id: ids_to_update).update_all(subscribable_id: group_label.id) end # rubocop: enable CodeReuse/ActiveRecord # rubocop: disable CodeReuse/ActiveRecord - def label_ids_for_merge(new_label) + def label_ids_for_merge(group_label) LabelsFinder - .new(current_user, title: new_label.title, group_id: project.group.id) + .new(current_user, title: group_label.title, group_id: project.group.id) .execute(skip_authorization: true) - .where.not(id: new_label) + .where.not(id: group_label) .select(:id) # Can't use pluck() to avoid object-creation because of the batching end # rubocop: enable CodeReuse/ActiveRecord # rubocop: disable CodeReuse/ActiveRecord - def update_issuables(new_label, label_ids) + def update_issuables(group_label, label_ids) LabelLink .where(label: label_ids) - .update_all(label_id: new_label.id) + .update_all(label_id: group_label.id) end # rubocop: enable CodeReuse/ActiveRecord # rubocop: disable CodeReuse/ActiveRecord - def update_resource_label_events(new_label, label_ids) + def update_resource_label_events(group_label, label_ids) ResourceLabelEvent .where(label: label_ids) - .update_all(label_id: new_label.id) + .update_all(label_id: group_label.id) end # rubocop: enable CodeReuse/ActiveRecord # rubocop: disable CodeReuse/ActiveRecord - def update_issue_board_lists(new_label, label_ids) + def update_issue_board_lists(group_label, label_ids) List .where(label: label_ids) - .update_all(label_id: new_label.id) + .update_all(label_id: group_label.id) end # rubocop: enable CodeReuse/ActiveRecord # rubocop: disable CodeReuse/ActiveRecord - def update_priorities(new_label, label_ids) + def update_priorities(group_label, label_ids) LabelPriority .where(label: label_ids) - .update_all(label_id: new_label.id) + .update_all(label_id: group_label.id) end # rubocop: enable CodeReuse/ActiveRecord @@ -92,18 +90,12 @@ module Labels def destroy_project_labels(label_ids) Label.where(id: label_ids).destroy_all # rubocop: disable Cop/DestroyAll end - # rubocop: enable CodeReuse/ActiveRecord - def clone_label_to_group_label(label) + def find_or_create_group_label(label) params = label.attributes.slice('title', 'description', 'color') - # Since the title of the new label has to be the same as the previous labels - # and we're merging old labels in batches we'll skip validation to omit 2-step - # merge process and do it in one batch - # We'll be forcing validation at the end of the transaction to ensure everything - # was merged correctly - new_label = GroupLabel.new(params.merge(group: project.group)) - new_label.save(validate: false) + new_label = GroupLabel.create_with(params).find_or_initialize_by(group_id: project.group.id, title: label.title) + new_label.save! unless new_label.persisted? new_label end end |