Merge pull request #4562 from nhsuk/fix-national-old-psd

Fix HCAs unable to record vaccination if PSD exists

Author: thomasleese

app/components/app_vaccinate_form_component.rb

@@ -59,12 +59,13 @@ def show_supplied_by_user_id_inside_vaccine_method?(vaccine_method)
   end
 
   def has_patient_specific_direction?(vaccine_method:)
-    patient.has_patient_specific_direction?(
-      academic_year:,
-      programme:,
-      team:,
-      vaccine_method:
-    )
+    session.psd_enabled? &&
+      patient.has_patient_specific_direction?(
+        academic_year:,
+        programme:,
+        team:,
+        vaccine_method:
+      )
   end
 
   def healthcare_assistant? = current_user.is_healthcare_assistant?

spec/features/flu_vaccination_hca_national_protocol_spec.rb

@@ -20,6 +20,18 @@
     then_i_am_able_to_vaccinate_them(nasal: false)
   end
 
+  scenario "Administered by HCA under national protocol but had a previous PSD" do
+    given_a_session_exists
+    and_patients_exist
+    and_the_nasal_and_injection_patient_has_a_psd
+
+    when_i_visit_the_session_record_tab
+    then_i_see_all_the_patients
+
+    when_i_click_on_the_nasal_and_injection_patient
+    then_i_am_able_to_vaccinate_them(nasal: true)
+  end
+
   scenario "Administered by HCA under national protocol with PSD enabled" do
     given_a_session_exists(psd_enabled: true)
     and_patients_exist

spec/features/flu_vaccination_hca_pgd_supply_spec.rb

@@ -20,6 +20,18 @@
     then_i_am_not_able_to_vaccinate_them
   end
 
+  scenario "Administered by HCA under PGD supply, patient has previous PSD" do
+    given_a_session_exists
+    and_patients_exist
+    and_the_nasal_only_patient_has_a_psd
+
+    when_i_visit_the_session_record_tab
+    then_i_only_see_nasal_spray_patients
+
+    when_i_click_on_the_nasal_only_patient
+    then_i_am_able_to_vaccinate_them_nasal_only
+  end
+
   scenario "Patient consents nasal, has health issues, and is triaged as safe to vaccinate" do
     given_a_session_exists
     and_a_nasal_patient_exists_with_health_issues_marked_safe_vaccinate_with_nasal
@@ -77,6 +89,15 @@ def and_patients_exist
       )
   end
 
+  def and_the_nasal_only_patient_has_a_psd
+    create(
+      :patient_specific_direction,
+      patient: @patient_nasal_only,
+      programme: @programme,
+      team: @team
+    )
+  end
+
   def and_a_nasal_patient_exists_with_health_issues_marked_safe_vaccinate_with_nasal
     @patient_nasal_only =
       create(