Merge pull request #3955 from nhsuk/filter-vaccine-method-on-safe-to-vaccinate

Filter on patients with approriate vaccine method

Author: thomasleese

app/controllers/sessions/record_controller.rb

@@ -25,16 +25,11 @@ def show
         )
         .has_registration_status(%w[attending completed])
 
-    scope = @form.apply(scope)
-
     patient_sessions =
-      scope.select do |patient_session|
-        @form.programmes.any? do |programme|
-          patient_session.patient.consent_given_and_safe_to_vaccinate?(
-            programme:
-          )
-        end
-      end
+      @form.apply(scope).consent_given_and_ready_to_vaccinate(
+        programmes: @form.programmes,
+        vaccine_method: @form.vaccine_method
+      )
 
     @pagy, @patient_sessions = pagy_array(patient_sessions)
 

app/models/patient.rb

@@ -327,15 +327,23 @@ def vaccination_status(programme:)
       vaccination_statuses.build(programme:)
   end
 
-  def consent_given_and_safe_to_vaccinate?(programme:)
+  def consent_given_and_safe_to_vaccinate?(programme:, vaccine_method: nil)
     return false if vaccination_status(programme:).vaccinated?
 
-    consent_status(programme:).given? &&
-      (
-        triage_status(programme:).safe_to_vaccinate? ||
-          triage_status(programme:).delay_vaccination? ||
-          triage_status(programme:).not_required?
-      )
+    return false unless consent_status(programme:).given?
+
+    unless triage_status(programme:).safe_to_vaccinate? ||
+             triage_status(programme:).delay_vaccination? ||
+             triage_status(programme:).not_required?
+      return false
+    end
+
+    if vaccine_method &&
+         !approved_vaccine_methods(programme:).include?(vaccine_method)
+      return false
+    end
+
+    true
   end
 
   def approved_vaccine_methods(programme:)

app/models/patient_session.rb

@@ -179,6 +179,20 @@ class PatientSession < ApplicationRecord
           )
         end
 
+  scope :consent_given_and_ready_to_vaccinate,
+        ->(programmes:, vaccine_method:) do
+          select do |patient_session|
+            patient = patient_session.patient
+
+            programmes.any? do |programme|
+              patient.consent_given_and_safe_to_vaccinate?(
+                programme:,
+                vaccine_method:
+              )
+            end
+          end
+        end
+
   scope :destroy_all_if_safe,
         -> do
           includes(

spec/features/flu_vaccination_administered_spec.rb

@@ -10,7 +10,7 @@
     and_sync_vaccination_records_to_nhs_on_create_feature_is_enabled
 
     when_i_go_to_the_nasal_only_patient
-    then_i_see_the_vacciantion_form_for_nasal_spray
+    then_i_see_the_vaccination_form_for_nasal_spray
 
     when_i_record_that_the_patient_has_been_vaccinated_with_nasal_spray
     then_i_see_the_check_and_confirm_page_for_nasal_spray
@@ -28,7 +28,7 @@
     and_there_are_nasal_and_injection_batches
 
     when_i_go_to_the_injection_only_patient
-    then_i_see_the_vacciantion_form_for_injection
+    then_i_see_the_vaccination_form_for_injection
 
     when_i_record_that_the_patient_has_been_vaccinated_with_injection
     then_i_see_the_check_and_confirm_page_for_injection
@@ -45,7 +45,7 @@
     and_there_are_nasal_and_injection_batches
 
     when_i_go_to_the_nasal_only_patient
-    then_i_see_the_vacciantion_form_for_nasal_spray
+    then_i_see_the_vaccination_form_for_nasal_spray
 
     when_i_record_that_the_patient_has_been_vaccinated_with_nasal_spray
     then_i_see_the_check_and_confirm_page_for_nasal_spray
@@ -124,14 +124,14 @@ def when_i_go_to_the_injection_only_patient
     click_link @patient.full_name
   end
 
-  def then_i_see_the_vacciantion_form_for_nasal_spray
+  def then_i_see_the_vaccination_form_for_nasal_spray
     expect(page).to have_content("Record flu vaccination with nasal spray")
     expect(page).to have_content(
       "Is #{@patient.given_name} ready for their flu nasal spray?"
     )
   end
 
-  def then_i_see_the_vacciantion_form_for_injection
+  def then_i_see_the_vaccination_form_for_injection
     expect(page).to have_content("Record flu vaccination with injection")
     expect(page).to have_content(
       "Is #{@patient.given_name} ready for their flu injection?"

spec/models/patient_session_spec.rb

@@ -40,6 +40,68 @@
     end
   end
 
+  describe "scopes" do
+    describe "#consent_given_and_ready_to_vaccinate" do
+      subject(:scope) do
+        described_class.consent_given_and_ready_to_vaccinate(
+          programmes:,
+          vaccine_method:
+        )
+      end
+
+      let(:programmes) { [create(:programme, :flu), create(:programme, :hpv)] }
+      let(:vaccine_method) { nil }
+
+      it { should be_empty }
+
+      context "with a patient eligible for vaccination" do
+        let(:patient_session) do
+          create(
+            :patient_session,
+            :consent_given_triage_not_needed,
+            programmes:
+          )
+        end
+
+        it { should include(patient_session) }
+      end
+
+      context "when filtering on nasal spray" do
+        let(:vaccine_method) { "nasal" }
+
+        context "with a patient eligible for vaccination" do
+          let(:patient_session) do
+            create(
+              :patient_session,
+              :consent_given_triage_not_needed,
+              programmes:
+            )
+          end
+
+          before do
+            patient_session
+              .patient
+              .consent_status(programme: programmes.first)
+              .update!(vaccine_methods: %w[nasal injection])
+          end
+
+          it { should include(patient_session) }
+
+          context "when the patient has been vaccinated for flu" do
+            before do
+              patient_session
+                .patient
+                .vaccination_status(programme: programmes.first)
+                .vaccinated!
+            end
+
+            it { should_not include(patient_session) }
+          end
+        end
+      end
+    end
+  end
+
   describe "#safe_to_destroy?" do
     subject(:safe_to_destroy?) { patient_session.safe_to_destroy? }