From e1e6ad612ceccd885d1ac43286915a4113930abb Mon Sep 17 00:00:00 2001
From: PaulDoyle-DEFRA <97455399+PaulDoyle-DEFRA@users.noreply.github.com>
Date: Fri, 10 Feb 2023 12:27:09 +0000
Subject: [PATCH] Use reg_identifier instead of token when redirecting

---
 .../deregistration_confirmation_forms_controller.rb         | 6 +++---
 .../waste_carriers_engine/deregistering_registration.rb     | 2 ++
 .../deregistration_confirmation_forms_spec.rb               | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/controllers/waste_carriers_engine/deregistration_confirmation_forms_controller.rb b/app/controllers/waste_carriers_engine/deregistration_confirmation_forms_controller.rb
index 56a211c7c..f9da4f4fe 100644
--- a/app/controllers/waste_carriers_engine/deregistration_confirmation_forms_controller.rb
+++ b/app/controllers/waste_carriers_engine/deregistration_confirmation_forms_controller.rb
@@ -21,13 +21,13 @@ def create
 
     private
 
-    def find_or_initialize_transient_registration(token)
-      @transient_registration = DeregisteringRegistration.where(token: token).first
+    def find_or_initialize_transient_registration(reg_identifier)
+      @transient_registration = DeregisteringRegistration.where(reg_identifier: reg_identifier).first
       if @transient_registration.present?
         # If a DeregisteringRegistration already exists, reset its workflow state to the beginning
         @transient_registration.update_attributes(workflow_state: "deregistration_confirmation_form")
       else
-        @transient_registration = DeregisteringRegistration.new(token: token)
+        @transient_registration = DeregisteringRegistration.new(reg_identifier: reg_identifier)
       end
     end
 
diff --git a/app/models/waste_carriers_engine/deregistering_registration.rb b/app/models/waste_carriers_engine/deregistering_registration.rb
index ff04e4ef2..0ab5dfc81 100644
--- a/app/models/waste_carriers_engine/deregistering_registration.rb
+++ b/app/models/waste_carriers_engine/deregistering_registration.rb
@@ -11,6 +11,8 @@ class DeregisteringRegistration < TransientRegistration
     field :temp_confirm_deregistration, type: String
 
     def registration
+      Rails.logger.warn "\n>>>>> getting registration, reg_identifier: \"#{reg_identifier}\""
+      Rails.logger.warn ">>>>> called from #{caller}\n"
       @_registration ||= Registration.find_by(reg_identifier: reg_identifier)
     end
 
diff --git a/spec/requests/waste_carriers_engine/deregistration_confirmation_forms_spec.rb b/spec/requests/waste_carriers_engine/deregistration_confirmation_forms_spec.rb
index d1c5fbcc8..50244d888 100644
--- a/spec/requests/waste_carriers_engine/deregistration_confirmation_forms_spec.rb
+++ b/spec/requests/waste_carriers_engine/deregistration_confirmation_forms_spec.rb
@@ -20,7 +20,7 @@ module WasteCarriersEngine
 
       subject(:submit_form) do
         post_form_with_params(:deregistration_confirmation_form,
-                              transient_registration.token,
+                              transient_registration.reg_identifier,
                               { temp_confirm_deregistration: selected_option })
       end