Merge pull request #3978 from nhsuk/triage-delay-clinic-invitation

Fix: add generic triage clinic invitation email template for non-CWPT organisations

Author: jhenderson

app/controllers/concerns/triage_mailer_concern.rb

@@ -6,6 +6,7 @@ module TriageMailerConcern
   def send_triage_confirmation(patient_session, consent)
     session = patient_session.session
     patient = patient_session.patient
+    organisation = patient_session.organisation
 
     return unless patient.send_notifications?
     return if consent.via_self_consent?
@@ -17,7 +18,9 @@ def send_triage_confirmation(patient_session, consent)
     elsif vaccination_wont_happen?(patient, consent)
       EmailDeliveryJob.perform_later(:triage_vaccination_wont_happen, **params)
     elsif vaccination_at_clinic?(patient, consent)
-      EmailDeliveryJob.perform_later(:triage_vaccination_at_clinic, **params)
+      email_template =
+        resolve_email_template(:triage_vaccination_at_clinic, organisation)
+      EmailDeliveryJob.perform_later(email_template, **params)
     elsif consent.requires_triage?
       EmailDeliveryJob.perform_later(:consent_confirmation_triage, **params)
     elsif consent.response_refused?
@@ -54,4 +57,12 @@ def vaccination_at_clinic?(patient, consent)
     consent.requires_triage? &&
       patient.triage_status(programme_id:).delay_vaccination?
   end
+
+  def resolve_email_template(template_name, organisation)
+    template_names = [
+      :"#{template_name}_#{organisation.ods_code.downcase}",
+      template_name
+    ]
+    template_names.find { GOVUK_NOTIFY_EMAIL_TEMPLATES.key?(it) }
+  end
 end

config/initializers/govuk_notify.rb

@@ -25,7 +25,8 @@
   session_clinic_subsequent_invitation_ryg:
     "eee59c1b-3af4-4ccd-8653-940887066390",
   session_school_reminder: "8b8a9566-bb03-4b3c-8abc-5bd5a4b8797d",
-  triage_vaccination_at_clinic: "9faef718-bd76-4c30-93ea-fbe8584388a6",
+  triage_vaccination_at_clinic: "3c7461bd-e3cf-4ff9-9053-b4e87490aa45",
+  triage_vaccination_at_clinic_ryg: "9faef718-bd76-4c30-93ea-fbe8584388a6",
   triage_vaccination_will_happen: "279c517c-4c52-4a69-96cb-31355bfa4e21",
   triage_vaccination_wont_happen: "d1faf47e-ccc3-4481-975b-1ec34211a21f",
   vaccination_administered_flu: "7238ee27-5840-40e5-b9b9-3130ba4cd4fa",

spec/controllers/concerns/triage_mailer_concern_spec.rb

@@ -75,6 +75,19 @@ def initialize(current_user:)
       it "doesn't send a text message" do
         expect { send_triage_confirmation }.not_to have_delivered_sms
       end
+
+      context "when the organisation is Coventry & Warwickshire Partnership NHS Trust (CWPT)" do
+        let(:session) do
+          create(:session, programmes: [programme], organisation:)
+        end
+        let(:organisation) { create(:organisation, ods_code: "RYG") }
+
+        it "enqueues an email using the CWPT-specific template" do
+          expect { send_triage_confirmation }.to have_delivered_email(
+            :triage_vaccination_at_clinic_ryg
+          ).with(consent:, session:, sent_by: current_user)
+        end
+      end
     end
 
     context "when the parents agree and triage is not required" do