Merge pull request #5751 from nhsuk/fix-next-dose-triage-logic-for-invalid-mmr-dose

Fix triage delay not being created for invalid MMR doses

Author: jhenderson

app/lib/next_dose_triage_factory.rb

@@ -32,10 +32,9 @@ def should_create?
 
     return false if next_date.past?
 
-    dose_sequence =
-      patient.vaccination_status(programme:, academic_year:).dose_sequence
+    status = patient.vaccination_status(programme:, academic_year:)
 
-    dose_sequence != programme.maximum_dose_sequence
+    !status.vaccinated?
   end
 
   def next_date = vaccination_record.performed_at + 28.days

spec/lib/next_dose_triage_factory_spec.rb

@@ -37,5 +37,37 @@
         expect { call }.not_to(change(Triage, :count))
       end
     end
+
+    context "when it is an invalid second MMR dose (too early)" do
+      let(:patient) do
+        create(
+          :patient,
+          :consent_given_triage_safe_to_vaccinate,
+          year_group: 9,
+          session:
+        )
+      end
+      let(:session) { create(:session, programmes: [programme]) }
+
+      it "shows delay vaccination 28 days after last vaccine" do
+        create(
+          :vaccination_record,
+          programme:,
+          patient:,
+          session:,
+          performed_at: 20.days.ago
+        )
+        second_dose =
+          create(:vaccination_record, programme:, session:, patient:)
+
+        StatusUpdater.call(patient:)
+
+        described_class.call(vaccination_record: second_dose.reload)
+
+        triage = second_dose.reload.next_dose_delay_triage
+
+        expect(triage.delay_vaccination_until).to eq(28.days.from_now.to_date)
+      end
+    end
   end
 end