EY practitioner find reference requires email

app/controllers/claims_controller.rb

@@ -77,7 +77,7 @@ def persist_claim
   def check_page_is_in_sequence
     unless correct_journey_for_claim_in_progress?
       clear_claim_session
-      return redirect_to new_claim_path
+      return redirect_to new_claim_path(request.query_parameters)
     end
 
     raise ActionController::RoutingError.new("Not Found for #{params[:slug]}") unless page_sequence.in_sequence?(params[:slug])

app/controllers/concerns/form_submittable.rb

@@ -91,7 +91,7 @@ def redirect_to_slug(slug)
       raise NoMethodError, "End of sequence: you must define #{current_slug.underscore}_after_form_save_success" unless next_slug
       raise NoMethodError, "Missing path helper for resource: \"#{path_helper_resource}\"; try overriding it with #path_helper_resource" unless respond_to?(:"#{path_helper_resource}_path")
 
-      redirect_to send(:"#{path_helper_resource}_path", current_journey_routing_name, slug)
+      redirect_to send(:"#{path_helper_resource}_path", current_journey_routing_name, slug, request.query_parameters)
     end
 
     def redirect_to_next_slug

app/forms/current_school_form.rb

@@ -1,5 +1,6 @@
 class CurrentSchoolForm < Form
   attribute :current_school_id
+  attribute :change_school
 
   attr_reader :schools
 

app/forms/journeys/early_years_payment/practitioner/find_reference_form.rb

@@ -3,6 +3,7 @@ module EarlyYearsPayment
     module Practitioner
       class FindReferenceForm < Form
         attribute :reference_number, :string
+        attribute :email, :string
 
         validates :reference_number, presence: {message: i18n_error_message(:presence)}
         validate :validate_permissible_reference_number
@@ -20,6 +21,7 @@ def claim_exists?
           Claim
             .by_policy(Policies::EarlyYearsPayments)
             .where(reference: reference_number)
+            .where(practitioner_email_address: email)
             .exists?
         end
 

app/forms/journeys/teacher_student_loan_reimbursement/claim_school_form.rb

@@ -2,6 +2,7 @@ module Journeys
   module TeacherStudentLoanReimbursement
     class ClaimSchoolForm < Form
       attribute :claim_school_id
+      attribute :change_school
 
       attr_reader :schools
 

app/views/early_years_payment/practitioner/claims/find_reference.html.erb

@@ -5,6 +5,8 @@
     <%= form_with model: @form, url: claim_path(current_journey_routing_name), method: :patch, builder: GOVUKDesignSystemFormBuilder::FormBuilder, html: { novalidate: false } do |f| %>
       <%= f.govuk_error_summary %>
 
+      <%= f.hidden_field :email, value: params[:email] %>
+
       <h1 class="govuk-heading-l">
         <%= @form.t(:question) %>
       <h1>

spec/features/early_years_payment/practitioner/find_reference_spec.rb

@@ -0,0 +1,23 @@
+require "rails_helper"
+
+RSpec.feature "Early years find reference" do
+  let(:claim) do
+    create(
+      :claim,
+      policy: Policies::EarlyYearsPayments,
+      reference: "foo",
+      practitioner_email_address: "[email protected]"
+    )
+  end
+
+  scenario "when different email address" do
+    when_early_years_payment_practitioner_journey_configuration_exists
+
+    visit "/early-years-payment-practitioner/find-reference?skip_landing_page=true&[email protected]"
+    expect(page).to have_content "Track your application"
+    fill_in "Claim reference number", with: claim.reference
+    click_button "Submit"
+
+    expect(page).to have_content "Track your application"
+  end
+end

spec/features/early_years_payment/practitioner/happy_path_spec.rb

@@ -5,14 +5,15 @@
     create(
       :claim,
       policy: Policies::EarlyYearsPayments,
-      reference: "foo"
-     )
+      reference: "foo",
+      practitioner_email_address: "[email protected]"
+    )
   end
 
   scenario "Happy path" do
     when_early_years_payment_practitioner_journey_configuration_exists
 
-    visit "/early-years-payment-practitioner/find-reference?skip_landing_page=true"
+    visit "/early-years-payment-practitioner/find-reference?skip_landing_page=true&[email protected]"
     expect(page).to have_content "Track your application"
     fill_in "Claim reference number", with: claim.reference
     click_button "Submit"

spec/forms/journeys/early_years_payment/practitioner/find_reference_form_spec.rb

@@ -6,10 +6,11 @@
   let(:journey) { Journeys::EarlyYearsPayment::Practitioner }
   let(:journey_session) { create(:early_years_payment_practitioner_session) }
 
-  let(:reference_number){ nil }
+  let(:reference_number) { nil }
+  let(:email) { nil }
 
   let(:params) do
-    ActionController::Parameters.new(claim: {reference_number:})
+    ActionController::Parameters.new(claim: {reference_number:, email:})
   end
 
   describe "validations" do
@@ -21,7 +22,7 @@
     end
 
     context "when random string" do
-      let(:reference_number){ "foo" }
+      let(:reference_number) { "foo" }
 
       it "is not valid" do
         expect(subject).to be_invalid
@@ -30,10 +31,15 @@
     end
 
     context "when non EY claim" do
-      let(:reference_number){ claim.reference }
+      let(:reference_number) { claim.reference }
+      let(:email) { claim.practitioner_email_address }
 
       let(:claim) do
-        create(:claim)
+        create(
+          :claim,
+          reference: "foo",
+          practitioner_email_address: "[email protected]"
+        )
       end
 
       it "is not valid" do
@@ -43,14 +49,16 @@
     end
 
     context "when EY claim" do
-      let(:reference_number){ claim.reference }
+      let(:reference_number) { claim.reference }
+      let(:email) { claim.practitioner_email_address }
 
       let(:claim) do
         create(
           :claim,
           policy: Policies::EarlyYearsPayments,
-          reference: "foo"
-         )
+          reference: "foo",
+          practitioner_email_address: "[email protected]"
+        )
       end
 
       it "is valid" do
@@ -68,7 +76,7 @@
         :claim,
         policy: Policies::EarlyYearsPayments,
         reference: "foo"
-       )
+      )
     end
 
     it "updates reference number in session" do

spec/requests/reminders_spec.rb

@@ -14,7 +14,7 @@
 
       it "redirects to /email-verfication slug" do
         submit_form
-        expect(response).to redirect_to("/additional-payments/reminders/email-verification")
+        expect(response).to redirect_to("/additional-payments/reminders/email-verification?form%5Bemail_address%5D=joe.bloggs%40example.com&form%5Bfull_name%5D=Joe+Bloggs")
       end
     end