Merge pull request #4458 from nhsuk/fix-delegation-psd-bulk-add

Fix bulk PSDs getting added to injection patients

Author: jhenderson

app/controllers/sessions/patient_specific_directions_controller.rb

@@ -72,7 +72,11 @@ def patient_sessions_allowed_psd
     @patient_sessions_allowed_psd ||=
       @session
         .patient_sessions
-        .has_consent_status("given", programme: @programme)
+        .has_consent_status(
+          "given",
+          programme: @programme,
+          vaccine_method: "nasal"
+        )
         .has_triage_status("not_required", programme: @programme)
         .without_patient_specific_direction(programme: @programme)
   end

app/models/patient.rb

@@ -217,14 +217,20 @@ class Patient < ApplicationRecord
         end
 
   scope :has_consent_status,
-        ->(status, programme:, academic_year:) do
-          where(
-            Patient::ConsentStatus
-              .where("patient_id = patients.id")
-              .where(status:, programme:, academic_year:)
-              .arel
-              .exists
-          )
+        ->(status, programme:, academic_year:, vaccine_method: nil) do
+          consent_status_scope =
+            Patient::ConsentStatus.where("patient_id = patients.id").where(
+              status:,
+              programme:,
+              academic_year:
+            )
+
+          if vaccine_method
+            consent_status_scope =
+              consent_status_scope.has_vaccine_method(vaccine_method)
+          end
+
+          where(consent_status_scope.arel.exists)
         end
 
   scope :has_triage_status,

app/models/patient_session.rb

@@ -166,15 +166,19 @@ class PatientSession < ApplicationRecord
         end
 
   scope :has_consent_status,
-        ->(status, programme:) do
-          joins(:session).where(
+        ->(status, programme:, vaccine_method: nil) do
+          consent_status_scope =
             Patient::ConsentStatus
               .where("patient_id = patient_sessions.patient_id")
               .where("academic_year = sessions.academic_year")
               .where(status:, programme:)
-              .arel
-              .exists
-          )
+
+          if vaccine_method
+            consent_status_scope =
+              consent_status_scope.has_vaccine_method(vaccine_method)
+          end
+
+          joins(:session).where(consent_status_scope.arel.exists)
         end
 
   scope :has_registration_status,

app/views/sessions/patient_specific_directions/new.html.erb

@@ -10,9 +10,9 @@
 
 <p class="nhsuk-body">This cannot be undone.</p>
 
-<div class="app-button-group">
+<div class="nhsuk-button-group">
   <%= govuk_button_to "Yes, add PSDs",
-                      session_patient_specific_directions_path(@session) %>
+                      session_patient_specific_directions_path(@session), class: "nhsuk-u-margin-right-4" %>
 
   <%= govuk_link_to "No, return to session",
                     new_session_patient_specific_directions_path(@session) %>

spec/features/patient_specific_directions_spec.rb

@@ -5,24 +5,27 @@
 
   scenario "prescriber can bulk add PSDs to patients that don't require triage" do
     given_a_flu_programme_with_a_running_session(user_type: :with_one_nurse)
-    and_a_patient_who_doesnt_need_triage_exists
+    and_a_patient_with_consent_given_nasal_only_triage_not_needed
+    and_a_patient_with_consent_given_injection_only_triage_not_needed
     and_i_am_signed_in
 
     when_i_go_to_the_session_psds_tab
-    then_the_patient_should_have_psd_status_not_added
+    then_the_patients_should_have_psd_status_not_added
+    and_i_should_only_see_one_child_eligible_for_bulk_adding_psd
     and_i_should_see_one_child_eligible_for_psd
 
     when_i_click_add_new_psds
     and_should_see_again_one_child_eligible_for_psd
 
     when_i_click_on_button_to_bulk_add_psds
-    then_the_patient_should_have_psd_status_added
+    then_the_nasal_patient_should_have_psd_status_added
+    and_the_injection_patient_should_have_psd_status_not_added
     and_zero_children_should_be_eligible_for_psd
   end
 
   scenario "admin cannot bulk add PSDs to patients" do
     given_a_flu_programme_with_a_running_session(user_type: :with_one_admin)
-    and_a_patient_who_doesnt_need_triage_exists
+    and_a_patient_with_consent_given_nasal_only_triage_not_needed
     and_i_am_signed_in(role: :admin)
 
     when_i_go_to_the_session_psds_tab
@@ -33,7 +36,7 @@
     given_a_flu_programme_with_a_running_session(
       user_type: :with_one_healthcare_assistant
     )
-    and_a_patient_who_doesnt_need_triage_exists
+    and_a_patient_with_consent_given_nasal_only_triage_not_needed
     and_i_am_signed_in(role: :healthcare_assistant)
 
     when_i_go_to_the_session_psds_tab
@@ -45,22 +48,33 @@ def given_delegation_feature_flag_is_enabled
   end
 
   def given_a_flu_programme_with_a_running_session(user_type:)
-    programmes = [create(:programme, :flu)]
-    @team = create(:team, user_type, programmes:)
+    @programmes = [create(:programme, :flu)]
+    @team = create(:team, user_type, programmes: @programmes)
 
     @batch =
-      create(:batch, team: @team, vaccine: programmes.first.vaccines.first)
+      create(:batch, team: @team, vaccine: @programmes.first.vaccines.first)
 
-    @session = create(:session, team: @team, programmes:)
+    @session = create(:session, team: @team, programmes: @programmes)
   end
 
-  def and_a_patient_who_doesnt_need_triage_exists
-    @patient_triage_not_needed =
+  def and_a_patient_with_consent_given_nasal_only_triage_not_needed
+    @nasal_patient =
       create(
-        :patient_session,
-        :consent_given_triage_not_needed,
+        :patient,
+        :consent_given_nasal_only_triage_not_needed,
+        programmes: @programmes,
         session: @session
-      ).patient
+      )
+  end
+
+  def and_a_patient_with_consent_given_injection_only_triage_not_needed
+    @injection_patient =
+      create(
+        :patient,
+        :consent_given_injection_only_triage_not_needed,
+        programmes: @programmes,
+        session: @session
+      )
   end
 
   def and_i_am_signed_in(role: :nurse)
@@ -72,12 +86,16 @@ def when_i_go_to_the_session_psds_tab
     visit session_patient_specific_directions_path(@session)
   end
 
-  def then_the_patient_should_have_psd_status_not_added
+  def then_the_patients_should_have_psd_status_not_added
     expect(page).to have_text("PSD not added")
   end
 
-  def then_the_patient_should_have_psd_status_added
-    expect(page).to have_text("PSD added")
+  def then_the_nasal_patient_should_have_psd_status_added
+    expect_patient_to_have_psd_status(@nasal_patient, "PSD added")
+  end
+
+  def and_the_injection_patient_should_have_psd_status_not_added
+    expect_patient_to_have_psd_status(@injection_patient, "PSD not added")
   end
 
   def and_i_should_see_one_child_eligible_for_psd
@@ -103,4 +121,17 @@ def when_i_click_on_button_to_bulk_add_psds
   def then_i_should_not_see_link_to_bulk_add_psds
     expect(page).not_to have_text("Add new PSDs")
   end
+
+  def and_i_should_only_see_one_child_eligible_for_bulk_adding_psd
+    expect(page).to have_text(
+      "There are 1 children with consent for the nasal flu vaccine"
+    )
+  end
+
+  def expect_patient_to_have_psd_status(patient, status)
+    full_name = "#{patient.family_name.upcase}, #{patient.given_name}"
+    patient_link = page.find("a", text: full_name)
+    patient_card = patient_link.ancestor(".nhsuk-card")
+    expect(patient_card).to have_css(".nhsuk-tag", text: status)
+  end
 end