Remove unused mothod in BulkUpdateService

Remove needless changelog file
Refactor specs to remove unnecessary assigment

app/services/issuable/bulk_update_service.rb

@@ -15,7 +15,7 @@ module Issuable
       update_class = type.classify.pluralize.constantize::UpdateService
 
       ids = params.delete(:issuable_ids).split(",")
-      items = find_issuables(model_class, ids, parent)
+      items = find_issuables(parent, model_class, ids)
 
       permitted_attrs(type).each do |key|
         params.delete(key) unless params[key].present?
@@ -49,27 +49,14 @@ module Issuable
       end
     end
 
-    def valid_parent?(type, issuing_parent, parent)
-      return true unless parent.class.name == 'Group'
-
-      issuing_parents =
-        if type == "issue" || type == "merge_request"
-          issuing_parent&.group&.self_and_descendants
-        else
-          issuing_parent&.self_and_descendants
-        end
-
-      issuing_parents.include?(parent)
-    end
-
-    # rubocop: disable CodeReuse/ActiveRecord
-    def find_issuables(model_class, ids, parent)
+    def find_issuables(parent, model_class, ids)
       if parent.is_a?(Project)
-        model_class.where(id: ids).where(project_id: parent)
+        model_class.id_in(ids).of_projects(parent)
       elsif parent.is_a?(Group)
-        model_class.where(id: ids).where(project_id: parent.all_projects)
+        model_class.id_in(ids).of_projects(parent.all_projects)
       end
     end
-    # rubocop: enable CodeReuse/ActiveRecord
   end
 end
+
+Issuable::BulkUpdateService.prepend_if_ee('EE::Issuable::BulkUpdateService')

changelogs/unreleased/12687-follow-up-from-allow-bulk-update-for-group-issues-milestones.yml

----
-title: When bulk editing group issuables, verify that they belong to the correct group.
-merge_request:
-author:
-type: fixed

ee/app/services/ee/issuable/bulk_update_service.rb

@@ -7,18 +7,12 @@ module EE
 
       private
 
-      # rubocop: disable CodeReuse/ActiveRecord
       override :find_issuables
-      def find_issuables(model_class, ids, parent)
-        if model_class.method_defined?("group") && parent.is_a?(Group)
-          model_class.where(id: ids).where(group_id: parent.self_and_descendants)
-        else
-          super
-        end
+      def find_issuables(parent, model_class, ids)
+        return model_class.for_ids(ids).in_selected_groups(parent.self_and_descendants) if model_class == ::Epic
+
+        super
       end
-      # rubocop: enable CodeReuse/ActiveRecord
     end
   end
 end
-
-Issuable::BulkUpdateService.prepend_if_ee('EE::Issuable::BulkUpdateService')

ee/spec/services/ee/issuable/bulk_update_service_spec.rb

@@ -33,10 +33,8 @@ describe Issuable::BulkUpdateService do
 
       context 'when epics are enabled' do
         it 'updates epic labels' do
-          result = subject
-
-          expect(result[:success]).to be_truthy
-          expect(result[:count]).to eq(issuables.count)
+          expect(subject[:success]).to be_truthy
+          expect(subject[:count]).to eq(issuables.count)
 
           issuables.each do |issuable|
             expect(issuable.reload.labels).to eq([label2, label3])
@@ -57,18 +55,17 @@ describe Issuable::BulkUpdateService do
       end
 
       context 'when issuable_ids contain external epics' do
-        it 'updates epics that belong to the parent group or descendants' do
-          epic3 = create(:epic, labels: [label1])
-          epic4 = create(:epic, group: create(:group, parent: group), labels: [label1])
-          params = { issuable_ids: [epic1.id, epic3.id, epic4.id], add_label_ids: [label3.id] }
-          result = described_class.new(group, user, params).execute('epic')
+        let(:epic3) { create(:epic, group: create(:group, parent: group), labels: [label1]) }
+        let(:outer_epic) { create(:epic, labels: [label1]) }
+        let(:params) { { issuable_ids: [epic1.id, epic3.id, outer_epic.id], add_label_ids: [label3.id] } }
 
-          expect(result[:success]).to be_truthy
-          expect(result[:count]).to eq(2)
+        it 'updates epics that belong to the parent group or descendants' do
+          expect(subject[:success]).to be_truthy
+          expect(subject[:count]).to eq(2)
 
           expect(epic1.reload.labels).to eq([label1, label3])
-          expect(epic3.reload.labels).to eq([label1])
-          expect(epic4.reload.labels).to eq([label1, label3])
+          expect(epic3.reload.labels).to eq([label1, label3])
+          expect(outer_epic.reload.labels).to eq([label1])
         end
       end
     end

spec/services/issuable/bulk_update_service_spec.rb

@@ -338,8 +338,8 @@ describe Issuable::BulkUpdateService do
       end
     end
 
-    describe 'updating issuables from external project' do
-      it 'updates issuables that belong to the parent project' do
+    describe 'updating issues from external project' do
+      it 'updates only issues that belong to the parent project' do
         issue1 = create(:issue, project: project)
         issue2 = create(:issue, project: create(:project))
         result = bulk_update([issue1, issue2], assignee_ids: [user.id])
@@ -395,8 +395,8 @@ describe Issuable::BulkUpdateService do
       it_behaves_like 'updating labels'
     end
 
-    describe 'updating issuables from external group' do
-      it 'updates issuables that belong to the parent group or descendants' do
+    describe 'with issues from external group' do
+      it 'updates issues that belong to the parent group or descendants' do
         issue1 = create(:issue, project: create(:project, group: group))
         issue2 = create(:issue, project: create(:project, group: create(:group)))
         issue3 = create(:issue, project: create(:project, group: create(:group, parent: group)))