Merge branch 'nd/fix-group-transfer' into 'master'

Fix group transfer not transfering groups

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104722



Merged-by: Tetiana Chupryna <tchupryna@gitlab.com>
Approved-by: Tyler Amos <tamos@gitlab.com>
Approved-by: Tetiana Chupryna <tchupryna@gitlab.com>
Co-authored-by: Nicolas Dular <ndular@gitlab.com>

ee/app/services/ee/groups/transfer_service.rb

@@ -10,9 +10,9 @@ module TransferService
       # `child_epics_from_different_hierarchies` feature flag is removed:
       # https://gitlab.com/gitlab-org/gitlab/-/issues/382719
       def update_group_attributes
-        return super if cross_group_epics_enabled?
+        ::Epic.nullify_lost_group_parents(group.self_and_descendants, lost_groups) unless cross_group_epics_enabled?
 
-        ::Epic.nullify_lost_group_parents(group.self_and_descendants, lost_groups)
+        super
       end
 
       private

ee/spec/services/groups/transfer_service_spec.rb

@@ -15,6 +15,26 @@
     new_group&.add_owner(user)
   end
 
+  describe '#execute' do
+    it 'transfers a group successfully' do
+      transfer_service.execute(new_group)
+
+      expect(group.parent).to eq(new_group)
+    end
+
+    context 'when child_epics_from_different_hierarchies feature flag is disabled' do
+      before do
+        stub_feature_flags(child_epics_from_different_hierarchies: false)
+      end
+
+      it 'transfers a group successfully' do
+        transfer_service.execute(new_group)
+
+        expect(group.parent).to eq(new_group)
+      end
+    end
+  end
+
   describe 'elasticsearch indexing', :aggregate_failures do
     before do
       stub_ee_application_setting(elasticsearch_indexing: true)
@@ -88,6 +108,18 @@
 
         expect(group.parent).to eq(new_group)
       end
+
+      context 'when child_epics_from_different_hierarchies feature flag is disabled' do
+        before do
+          stub_feature_flags(child_epics_from_different_hierarchies: false)
+        end
+
+        it 'transfers a group successfully' do
+          transfer_service.execute(new_group)
+
+          expect(group.parent).to eq(new_group)
+        end
+      end
     end
 
     context 'when epics feature is enabled' do