Allow submitting consent for an unscheduled session

When filling in a consent form and recording that the child goes to a
different school to the one we thought, this ensures that the consent
form doesn't show the "deadline passed" end state if the new school
session is unscheduled. This situation could occur if the new school
doesn't have dates yet, but will do in the future, meaning that
submitting consent at this point is worth doing.

This partially reverts 63b0d93 which
introduce this regression in this specific scenario.

Jira-Issue: MAV-2144

Author: thomasleese

app/controllers/parent_interface/consent_forms/base_controller.rb

@@ -102,6 +102,7 @@ def authenticate_consent_form_user!
     end
 
     def check_if_past_deadline!
+      return if @session.unscheduled?
       return if @session.open_for_consent?
 
       redirect_to deadline_passed_parent_interface_consent_forms_path(

app/models/consent_form.rb

@@ -354,7 +354,7 @@ def reason_notes_must_be_provided?
   end
 
   def session
-    # This tries to find the most approriate session for this consent form.
+    # This tries to find the most appropriate session for this consent form.
     # It's used when generating links to patients in a session, or when
     # deciding which dates to show in an email. Under the hood, patients
     # belong to locations, not sessions.
@@ -365,7 +365,10 @@ def session
     # session.
 
     @session ||=
-      begin
+      if location_is_clinic? || education_setting_home? ||
+           education_setting_none?
+        team.generic_clinic_session(academic_year:)
+      else
         session_location = school || location
 
         sessions_to_search =
@@ -375,16 +378,9 @@ def session
             team:
           )
 
-        if (scheduled_session = sessions_to_search.find(&:scheduled?))
-          return scheduled_session
-        end
-
-        if education_setting_home? || education_setting_none?
+        sessions_to_search.find(&:scheduled?) ||
+          sessions_to_search.find(&:unscheduled?) || sessions_to_search.first ||
           team.generic_clinic_session(academic_year:)
-        else
-          sessions_to_search.first ||
-            team.generic_clinic_session(academic_year:)
-        end
       end
   end
 

spec/features/parental_consent_school_session_completed_spec.rb

@@ -3,14 +3,23 @@
 describe "Parental consent" do
   around { |example| travel_to(Date.new(2025, 8, 1)) { example.run } }
 
-  scenario "Move to a completed session" do
-    stub_pds_search_to_return_no_patients
+  before { stub_pds_search_to_return_no_patients }
 
+  scenario "Move to an unscheduled session" do
     given_an_hpv_programme_is_underway
 
     when_i_go_to_the_consent_form
     and_i_fill_in_my_childs_name_and_birthday
-    and_i_try_to_give_consent
+    and_i_try_to_give_consent_for_the_unscheduled_school
+    then_i_see_that_consent_is_open
+  end
+
+  scenario "Move to a completed session" do
+    given_an_hpv_programme_is_underway
+
+    when_i_go_to_the_consent_form
+    and_i_fill_in_my_childs_name_and_birthday
+    and_i_try_to_give_consent_for_the_completed_school
     then_i_see_that_consent_is_closed
   end
 
@@ -20,10 +29,12 @@ def given_an_hpv_programme_is_underway
 
     @subteam = create(:subteam, team: @team)
 
-    @scheduled_school =
+    @unscheduled_school =
       create(:school, :secondary, name: "School 1", subteam: @subteam)
-    @completed_school =
+    @scheduled_school =
       create(:school, :secondary, name: "School 2", subteam: @subteam)
+    @completed_school =
+      create(:school, :secondary, name: "School 3", subteam: @subteam)
 
     @scheduled_session =
       create(
@@ -34,6 +45,15 @@ def given_an_hpv_programme_is_underway
         location: @scheduled_school
       )
 
+    @unscheduled_session =
+      create(
+        :session,
+        :unscheduled,
+        team: @team,
+        programmes: [@programme],
+        location: @unscheduled_school
+      )
+
     @completed_session =
       create(
         :session,
@@ -69,14 +89,27 @@ def and_i_fill_in_my_childs_name_and_birthday
     click_on "Continue"
   end
 
-  def and_i_try_to_give_consent
+  def and_i_try_to_give_consent_for_the_unscheduled_school
+    choose "No, they go to a different school"
+    click_on "Continue"
+
+    select @unscheduled_school.name
+    click_on "Continue"
+  end
+
+  def and_i_try_to_give_consent_for_the_completed_school
     choose "No, they go to a different school"
     click_on "Continue"
 
     select @completed_school.name
     click_on "Continue"
   end
 
+  def then_i_see_that_consent_is_open
+    expect(page).to have_content("About you")
+    expect(page).to have_button("Continue")
+  end
+
   def then_i_see_that_consent_is_closed
     expect(page).to have_content("The deadline for responding has passed")
     expect(page).to have_content(

spec/models/consent_form_spec.rb

@@ -624,17 +624,10 @@
       context "with an unscheduled and scheduled school session" do
         before do
           create(:session, :unscheduled, location: school, team:, programmes:)
-        end
-
-        let!(:scheduled_school_session) do
           create(:session, :scheduled, location: school, team:, programmes:)
         end
 
-        # This intentionally returns the school session because the clinic session
-        # might not be scheduled with dates yet (which is usually the case early
-        # on at the beginning of the year), and without a session the user sees
-        # a page saying the deadline has passed.
-        it { should eq(scheduled_school_session) }
+        it { should eq(generic_clinic_session) }
       end
     end