Feature/ruby 2973 unsubscribe (#1527)

https://eaflood.atlassian.net/browse/RUBY-2973
DEFRA · Apr 17, 2024 · 5dfe597 · 5dfe597
1 parent 6e6f034
commit 5dfe597
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/Gemfile b/Gemfile
@@ -77,7 +77,7 @@ group :test do
 
   gem "faker", "~> 3.2.0"
 
-  gem "govuk_design_system_formbuilder", "~> 4.1.1"
+  gem "govuk_design_system_formbuilder", "~> 5.3"
 
   gem "rails-controller-testing", "~> 1.0.5"
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -209,7 +209,7 @@ GEM
       rake (>= 10.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    govuk_design_system_formbuilder (4.1.1)
+    govuk_design_system_formbuilder (5.3.2)
       actionview (>= 6.1)
       activemodel (>= 6.1)
       activesupport (>= 6.1)
@@ -245,7 +245,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2023.1003)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.5)
+    mini_portile2 (2.8.6)
     minitest (5.22.3)
     mongo (2.19.3)
       bson (>= 4.14.1, < 5.0.0)
@@ -476,7 +476,7 @@ DEPENDENCIES
   factory_bot_rails (~> 6.2.0)
   faker (~> 3.2.0)
   github_changelog_generator (~> 1.16.4)
-  govuk_design_system_formbuilder (~> 4.1.1)
+  govuk_design_system_formbuilder (~> 5.3)
   matrix (~> 0.4.2)
   mongo_session_store
   pry-byebug (~> 3.10.1)

diff --git a/app/models/concerns/waste_carriers_engine/can_copy_data_from_registration.rb b/app/models/concerns/waste_carriers_engine/can_copy_data_from_registration.rb
@@ -16,10 +16,12 @@ def copy_data_from_registration
     end
 
     def copy_attributes_from_registration
+      # Omit addresses and key_people from embedded_documents as these will/won't be
+      # copied separately depending on options passed by the class using this concern
       attributes = SafeCopyAttributesService.run(
         source_instance: registration,
         target_class: self.class,
-        embedded_documents: %w[addresses metaData key_people],
+        embedded_documents: %w[metaData],
         attributes_to_exclude: options[:ignorable_attributes]
       )
       assign_attributes(strip_whitespace(attributes))