Merge pull request #5109 from nhsuk/fix-mmr-delay-before-first-dose

Improves the MMR triage delay experience for patients who haven't received their first dose yet

Author: jhenderson

app/components/app_triage_form_component.rb

@@ -19,11 +19,7 @@ def initialize(form, url:, method: :post, heading: true, continue: false)
   def builder = GOVUKDesignSystemFormBuilder::FormBuilder
 
   def hint_text
-    if programme.mmr? &&
-         !patient.vaccination_status(
-           programme:,
-           academic_year: session.academic_year
-         ).vaccinated?
+    if programme.mmr? && patient_eligible_for_additional_dose?
       "2nd dose is not due until #{form.next_mmr_dose_date.to_fs(:long)}"
     else
       "For example, #{hint_date.to_fs(:long)} "
@@ -54,4 +50,14 @@ def fieldset_options
       { legend: { text: }, hint: { text: hint } }
     end
   end
+
+  def patient_eligible_for_additional_dose?
+    next_dose =
+      patient.vaccination_status(
+        programme: programme,
+        academic_year: session.academic_year
+      ).dose_sequence
+
+    next_dose == programme.maximum_dose_sequence
+  end
 end

app/forms/triage_form.rb

@@ -239,7 +239,8 @@ def validate_delay_vaccination_until_date
       )
     end
 
-    if programme.mmr? && (delay_vaccination_until < next_mmr_dose_date)
+    if programme.mmr? && patient_eligible_for_additional_dose? &&
+         (delay_vaccination_until < next_mmr_dose_date)
       errors.add(
         :delay_vaccination_until,
         "The vaccination cannot take place before #{next_mmr_dose_date.to_fs(:long)}"
@@ -255,4 +256,14 @@ def associate_triage_with_vaccination_record(next_dose_delay_triage)
       vaccination_record.update!(next_dose_delay_triage:)
     end
   end
+
+  def patient_eligible_for_additional_dose?
+    next_dose =
+      patient.vaccination_status(
+        programme: programme,
+        academic_year: session.academic_year
+      ).dose_sequence
+
+    next_dose == programme.maximum_dose_sequence
+  end
 end

spec/components/app_triage_form_component_spec.rb

@@ -118,4 +118,28 @@
       expect(rendered).not_to have_text("The parent has consented to")
     end
   end
+
+  context "hint text for delayed triage when programme is MMR" do
+    context "when the patient has not received any dose" do
+      let(:programme) { create(:programme, :mmr) }
+
+      it "doesn't show the specific hint text about the 2nd dose" do
+        expect(rendered).not_to have_text("2nd dose is not due until")
+      end
+    end
+
+    context "when the patient has received the 1st dose" do
+      let(:programme) { create(:programme, :mmr) }
+
+      before do
+        create(:vaccination_record, patient:, programme:, session:)
+
+        StatusUpdater.call(patient:)
+      end
+
+      it "doesn't show the specific hint text about the 2nd dose" do
+        expect(rendered).to have_text("2nd dose is not due until")
+      end
+    end
+  end
 end

spec/forms/triage_form_spec.rb

@@ -94,4 +94,52 @@
       expect(vaccination_record.reload.next_dose_delay_triage).to eq(triage)
     end
   end
+
+  context "programme is MMR" do
+    let(:programme) { create(:programme, :mmr) }
+
+    describe "validation for delay_vaccination_until" do
+      subject(:validation_errors) do
+        form.save # rubocop:disable Rails/SaveBang
+        form.errors.full_messages
+      end
+
+      let(:delay_vaccination_until) { nil }
+
+      let(:form) do
+        described_class.new(
+          patient:,
+          session:,
+          programme:,
+          delay_vaccination_until:,
+          current_user: create(:user),
+          status_option: "delay_vaccination"
+        )
+      end
+
+      context "patient hasn't received any doses" do
+        let(:delay_vaccination_until) { Date.tomorrow }
+
+        it "doesn't produce any validation errors" do
+          expect(validation_errors).to be_empty
+        end
+      end
+
+      context "patient has had their first dose" do
+        let(:delay_vaccination_until) { Date.tomorrow }
+
+        before do
+          create(:vaccination_record, patient:, programme:, session:)
+
+          StatusUpdater.call(patient:)
+        end
+
+        it "doesn't produce any validation errors" do
+          expect(validation_errors.join).to include(
+            "The vaccination cannot take place before"
+          )
+        end
+      end
+    end
+  end
 end