Merge pull request #4736 from nhsuk/fix-consent-form-session

Fix consent form session

Author: thomasleese

app/components/app_consent_confirmation_component.rb

@@ -37,7 +37,7 @@ def full_name
   end
 
   def panel_text
-    location = (@consent_form.session.school? ? " at school" : "")
+    location = (@consent_form.education_setting_school? ? " at school" : "")
 
     if response_given?
       if @consent_form.health_answers_require_triage?

app/models/consent_form.rb

@@ -375,9 +375,16 @@ def session
             team:
           )
 
-        sessions_to_search.find { !it.completed? } ||
-          sessions_to_search.first ||
+        if (scheduled_session = sessions_to_search.find(&:scheduled?))
+          return scheduled_session
+        end
+
+        if education_setting_home? || education_setting_none?
           team.generic_clinic_session(academic_year:)
+        else
+          sessions_to_search.first ||
+            team.generic_clinic_session(academic_year:)
+        end
       end
   end
 

app/models/session.rb

@@ -227,6 +227,8 @@ def completed?
     Date.current > dates.max
   end
 
+  def scheduled? = !unscheduled? && !completed?
+
   def started?
     return false if dates.empty?
     Date.current > dates.min

spec/factories/consent_forms.rb

@@ -122,6 +122,12 @@
       health_answers { [] }
     end
 
+    trait :education_setting_home do
+      education_setting { "home" }
+      school { nil }
+      school_confirmed { false }
+    end
+
     after(:create) do |consent_form, evaluator|
       vaccine_methods = evaluator.response == "given" ? %w[injection] : []
 

spec/features/parental_consent_home_educated_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-describe "Parental consent school" do
-  scenario "Child attends a different school" do
+describe "Parental consent" do
+  scenario "Child is home-schooled" do
     given_an_hpv_programme_is_underway
     when_i_go_to_the_consent_form
     when_i_fill_in_my_childs_name_and_birthday
@@ -12,7 +12,7 @@
     when_i_click_continue
     then_i_see_an_error
 
-    when_i_choose_a_school
+    when_i_choose_home_schooled
     then_i_see_the_parent_step
 
     and_i_give_consent
@@ -22,7 +22,13 @@
 
   def given_an_hpv_programme_is_underway
     @programme = create(:programme, :hpv)
-    @team = create(:team, :with_one_nurse, programmes: [@programme])
+    @team =
+      create(
+        :team,
+        :with_one_nurse,
+        :with_generic_clinic,
+        programmes: [@programme]
+      )
     location = create(:school, team: @team, name: "Pilot School")
     @session =
       create(
@@ -72,7 +78,7 @@ def then_i_see_an_error
     expect(page).to have_heading "There is a problem"
   end
 
-  def when_i_choose_a_school
+  def when_i_choose_home_schooled
     select "Home-schooled"
     click_on "Continue"
   end

spec/models/consent_form_spec.rb

@@ -548,6 +548,131 @@
     end
   end
 
+  describe "#session" do
+    subject { consent_form.session }
+
+    let(:programmes) { [create(:programme, :hpv)] }
+    let(:team) { create(:team, programmes:) }
+
+    let!(:school) { create(:school, team:) }
+    let!(:generic_clinic) { create(:generic_clinic, team:) }
+
+    let!(:generic_clinic_session) do
+      create(:session, location: generic_clinic, team:, programmes:)
+    end
+
+    context "with a consent form from a school" do
+      let(:consent_form) do
+        create(
+          :consent_form,
+          team:,
+          programmes:,
+          location: school,
+          academic_year: AcademicYear.current
+        )
+      end
+
+      context "with no school session" do
+        it { should eq(generic_clinic_session) }
+      end
+
+      context "with an unscheduled school session" do
+        let!(:school_session) do
+          create(:session, :unscheduled, location: school, team:, programmes:)
+        end
+
+        it { should eq(school_session) }
+      end
+
+      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
+
+        it { should eq(scheduled_school_session) }
+      end
+    end
+
+    context "with a consent form from a school to the clinic" do
+      let(:consent_form) do
+        create(
+          :consent_form,
+          :education_setting_home,
+          team:,
+          programmes:,
+          location: school,
+          academic_year: AcademicYear.current
+        )
+      end
+
+      context "with no school session" do
+        it { should eq(generic_clinic_session) }
+      end
+
+      context "with an unscheduled school session" do
+        before do
+          create(:session, :unscheduled, location: school, team:, programmes:)
+        end
+
+        it { should eq(generic_clinic_session) }
+      end
+
+      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) }
+      end
+    end
+
+    context "with a consent form from a clinic" do
+      let(:consent_form) do
+        create(
+          :consent_form,
+          :education_setting_home,
+          team:,
+          programmes:,
+          location: generic_clinic,
+          academic_year: AcademicYear.current
+        )
+      end
+
+      context "with no school session" do
+        it { should eq(generic_clinic_session) }
+      end
+
+      context "with an unscheduled school session" do
+        before do
+          create(:session, :unscheduled, location: school, team:, programmes:)
+        end
+
+        it { should eq(generic_clinic_session) }
+      end
+
+      context "with an unscheduled and scheduled school session" do
+        before do
+          create(:session, :unscheduled, location: school, team:, programmes:)
+          create(:session, :scheduled, location: school, team:, programmes:)
+        end
+
+        it { should eq(generic_clinic_session) }
+      end
+    end
+  end
+
   describe "scope unmatched" do
     let(:programme) { create(:programme) }
     let(:session) { create(:session, programmes: [programme]) }

spec/models/session_spec.rb

@@ -31,6 +31,23 @@
 #
 
 describe Session do
+  describe "associations" do
+    describe "#programmes" do
+      subject(:programmes) { session.reload.programmes }
+
+      let(:hpv_programme) { create(:programme, :hpv) }
+      let(:menacwy_programme) { create(:programme, :menacwy) }
+
+      let(:session) do
+        create(:session, programmes: [menacwy_programme, hpv_programme])
+      end
+
+      it "is ordered by name" do
+        expect(programmes).to eq([hpv_programme, menacwy_programme])
+      end
+    end
+  end
+
   describe "scopes" do
     let(:programmes) { [create(:programme)] }
 
@@ -170,23 +187,6 @@
     end
   end
 
-  describe "associations" do
-    describe "#programmes" do
-      subject(:programmes) { session.reload.programmes }
-
-      let(:hpv_programme) { create(:programme, :hpv) }
-      let(:menacwy_programme) { create(:programme, :menacwy) }
-
-      let(:session) do
-        create(:session, programmes: [menacwy_programme, hpv_programme])
-      end
-
-      it "is ordered by name" do
-        expect(programmes).to eq([hpv_programme, menacwy_programme])
-      end
-    end
-  end
-
   describe "#today?" do
     subject(:today?) { session.today? }
 
@@ -210,7 +210,7 @@
   end
 
   describe "#unscheduled?" do
-    subject(:unscheduled?) { session.reload.unscheduled? }
+    subject { session.reload.unscheduled? }
 
     let(:session) { create(:session, date: nil) }
 
@@ -223,6 +223,20 @@
     end
   end
 
+  describe "#scheduled?" do
+    subject { session.reload.scheduled? }
+
+    let(:session) { create(:session, date: nil) }
+
+    it { should be(false) }
+
+    context "with a date" do
+      before { create(:session_date, session:) }
+
+      it { should be(true) }
+    end
+  end
+
   describe "#supports_delegation?" do
     subject { session.supports_delegation? }