From 61af451f45c003d08df1e708c18f65d2a11b8e0c Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Mon, 30 Oct 2023 15:16:39 +0000 Subject: [PATCH] feat: don't add old_id to new scheme for consistency --- app/services/merge/merge_organisations_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/merge/merge_organisations_service.rb b/app/services/merge/merge_organisations_service.rb index d8996f225..25883eca2 100644 --- a/app/services/merge/merge_organisations_service.rb +++ b/app/services/merge/merge_organisations_service.rb @@ -68,7 +68,7 @@ private merging_organisation.owned_schemes.each do |scheme| next if scheme.deactivated? - new_scheme = Scheme.create!(scheme.attributes.except("id", "owning_organisation_id").merge(owning_organisation: @absorbing_organisation)) + new_scheme = Scheme.create!(scheme.attributes.except("id", "owning_organisation_id", "old_id").merge(owning_organisation: @absorbing_organisation)) scheme.locations.each do |location| new_scheme.locations << Location.new(location.attributes.except("id", "scheme_id", "old_id")) unless location.deactivated? end