use new reminders controller + remove old version

DFE-Digital · Nov 19, 2024 · 0b24f49 · 0b24f49
1 parent 1aa044e
commit 0b24f49
Show file tree

Hide file tree

Showing 27 changed files with 121 additions and 635 deletions.
diff --git a/app/controllers/journeys/additional_payments_for_teaching/reminders_controller.rb b/app/controllers/journeys/additional_payments_for_teaching/reminders_controller.rb
diff --git a/app/controllers/journeys/additional_payments_for_teaching/reminders_form_callbacks.rb b/app/controllers/journeys/additional_payments_for_teaching/reminders_form_callbacks.rb
diff --git a/app/controllers/reminders_controller.rb b/app/controllers/reminders_controller.rb
@@ -4,7 +4,11 @@ class RemindersController < BasePublicController
   def show
     @form = form_from_slug
 
-    render view_file
+    if @form.set_reminder_from_claim
+      redirect_to independent_reminder_path(journey: journey::ROUTING_NAME, slug: "confirmation")
+    else
+      render view_file
+    end
   end
 
   def update
@@ -70,7 +74,8 @@ def form_from_slug
     form_class_from_slug.new(
       journey_session:,
       journey:,
-      params:
+      params:,
+      session:
     )
   end
 end
diff --git a/app/forms/journeys/additional_payments_for_teaching/reminders/email_verification_form.rb b/app/forms/journeys/additional_payments_for_teaching/reminders/email_verification_form.rb
diff --git a/app/forms/journeys/additional_payments_for_teaching/reminders/personal_details_form.rb b/app/forms/journeys/additional_payments_for_teaching/reminders/personal_details_form.rb
diff --git a/app/forms/reminders/confirmation_form.rb b/app/forms/reminders/confirmation_form.rb
@@ -1,18 +1,44 @@
 module Reminders
   class ConfirmationForm < Form
     def reminder
-      @reminder ||= Reminder.find_by(
-        full_name: journey_session.answers.reminder_full_name,
-        email_address: journey_session.answers.reminder_email_address,
-        email_verified: true,
-        itt_academic_year: next_academic_year.to_s
-      )
+      @reminder ||= if submitted_claim
+        Reminder.find_by(
+          full_name: submitted_claim.full_name,
+          email_address: submitted_claim.email_address,
+          email_verified: true,
+          itt_subject: itt_subject_for_submitted_claim,
+          itt_academic_year: next_academic_year.to_s
+        )
+      else
+        Reminder.find_by(
+          full_name: journey_session.answers.reminder_full_name,
+          email_address: journey_session.answers.reminder_email_address,
+          email_verified: true,
+          itt_subject:,
+          itt_academic_year: next_academic_year.to_s
+        )
+      end
+    end
+
+    def set_reminder_from_claim
     end
 
     private
 
+    def itt_subject
+      journey_session.answers.eligible_itt_subject
+    end
+
+    def itt_subject_for_submitted_claim
+      submitted_claim.eligible_itt_subject
+    end
+
+    def submitted_claim
+      Claim.find_by(id: session["submitted_claim_id"])
+    end
+
     def next_academic_year
-      AcademicYear.next
+      journey.configuration.current_academic_year + 1
     end
   end
 end