Merge pull request #6529 from NHSDigital/unify-school-consent-reminder-templates

Use one template for all school consent reminders and subsequent reminders

Author: benilovj

app/lib/notifier/patient.rb

@@ -3,6 +3,8 @@
 class Notifier::Patient
   extend ActiveSupport::Concern
 
+  CONSENT_REMINDER_TYPES = %i[initial_reminder subsequent_reminder].freeze
+
   def initialize(patient)
     @patient = patient
   end
@@ -246,7 +248,13 @@ def generate_consent_templates(
     type:
   )
     is_school = location.gias_school?
-    base_template = :"consent_#{is_school ? "school" : "clinic"}_#{type}"
+
+    base_template =
+      if is_school && CONSENT_REMINDER_TYPES.include?(type)
+        :consent_school_reminder
+      else
+        :"consent_#{is_school ? "school" : "clinic"}_#{type}"
+      end
 
     # We can only handle a single programme group or variant in the template.
     group = ProgrammeGrouper.call(programmes).keys.sole

app/models/notify_log_entry.rb

@@ -77,7 +77,13 @@ class NotifyLogEntry < ApplicationRecord
     "38727494-9a81-42b3-9c1f-5c31e55333e7" => :vaccination_administered_menacwy,
     "3abe7ca8-a889-484b-ab9f-07523302eb6a" => :vaccination_administered_td_ipv,
     "7238ee27-5840-40e5-b9b9-3130ba4cd4fa" => :vaccination_administered_flu,
-    "0b1095db-fb38-4105-9f01-a364fa8bbb1c" => :vaccination_administered_mmr
+    "0b1095db-fb38-4105-9f01-a364fa8bbb1c" => :vaccination_administered_mmr,
+    "ea03aada-0912-4373-91e1-80082071a7aa" =>
+      :consent_school_subsequent_reminder_doubles,
+    "c942ce27-590e-4387-9aa8-5b9b4f2796d1" =>
+      :consent_school_subsequent_reminder_flu,
+    "5f70d21d-00b6-41e6-bdc9-e64455972b43" =>
+      :consent_school_subsequent_reminder_hpv
   }.freeze
 
   self.inheritance_column = nil

…school_initial_reminder_doubles.text.erb …consent_school_reminder_doubles.text.erbapp/views/notify_templates/email/consent_school_initial_reminder_doubles.text.erb renamed to app/views/notify_templates/email/consent_school_reminder_doubles.text.erb app/views/notify_templates/email/consent_school_initial_reminder_doubles.text.erb renamed to app/views/notify_templates/email/consent_school_reminder_doubles.text.erb

@@ -1,6 +1,6 @@
 ---
 template_id: "3523d4b8-530b-42dd-8b9b-7fed8d1dfff1"
-template_name: consent_school_initial_reminder_doubles
+template_name: consent_school_reminder_doubles
 subject: "Please respond to our request for consent by <%= consent_deadline %>"
 ---
 We wrote to you recently to let you know we’re coming to <%= location_name %> on <%= next_session_dates %> to offer your child their <%= vaccination %>.

…ent_school_initial_reminder_flu.text.erb …ail/consent_school_reminder_flu.text.erbapp/views/notify_templates/email/consent_school_initial_reminder_flu.text.erb renamed to app/views/notify_templates/email/consent_school_reminder_flu.text.erb app/views/notify_templates/email/consent_school_initial_reminder_flu.text.erb renamed to app/views/notify_templates/email/consent_school_reminder_flu.text.erb

@@ -1,6 +1,6 @@
 ---
 template_id: "7f85a5b4-5240-4ae9-94f7-43913852943c"
-template_name: consent_school_initial_reminder_flu
+template_name: consent_school_reminder_flu
 subject: "Please respond to our request for consent by <%= consent_deadline %>"
 ---
 We wrote to you recently to let you know we’re coming to <%= location_name %> on <%= next_session_dates %> to offer your child their annual flu vaccination.

…ent_school_initial_reminder_hpv.text.erb …ail/consent_school_reminder_hpv.text.erbapp/views/notify_templates/email/consent_school_initial_reminder_hpv.text.erb renamed to app/views/notify_templates/email/consent_school_reminder_hpv.text.erb app/views/notify_templates/email/consent_school_initial_reminder_hpv.text.erb renamed to app/views/notify_templates/email/consent_school_reminder_hpv.text.erb

@@ -1,6 +1,6 @@
 ---
 template_id: "0d78bff0-9dde-4192-8cf8-10e83486b54f"
-template_name: consent_school_initial_reminder_hpv
+template_name: consent_school_reminder_hpv
 subject: "Please respond to our request for consent by <%= consent_deadline %>"
 ---
 We wrote to you recently to let you know we’re coming to <%= location_name %> on <%= next_session_dates %> to offer your child their <%= vaccination %>.

…ent_school_initial_reminder_mmr.text.erb …ail/consent_school_reminder_mmr.text.erbapp/views/notify_templates/email/consent_school_initial_reminder_mmr.text.erb renamed to app/views/notify_templates/email/consent_school_reminder_mmr.text.erb app/views/notify_templates/email/consent_school_initial_reminder_mmr.text.erb renamed to app/views/notify_templates/email/consent_school_reminder_mmr.text.erb

@@ -1,6 +1,6 @@
 ---
 template_id: "5462c441-81c0-4ac0-821f-713b4178f8ba"
-template_name: consent_school_initial_reminder_mmr
+template_name: consent_school_reminder_mmr
 subject: "Please respond to our request for consent by <%= consent_deadline %>"
 ---
 We wrote to you recently about MMR catch-up vaccinations at  <%= location_name %> on <%= next_session_dates %>.

…nt_school_initial_reminder_mmrv.text.erb …il/consent_school_reminder_mmrv.text.erbapp/views/notify_templates/email/consent_school_initial_reminder_mmrv.text.erb renamed to app/views/notify_templates/email/consent_school_reminder_mmrv.text.erb app/views/notify_templates/email/consent_school_initial_reminder_mmrv.text.erb renamed to app/views/notify_templates/email/consent_school_reminder_mmrv.text.erb

@@ -1,6 +1,6 @@
 ---
 template_id: "fe47875a-a0a6-40d9-bd41-a411ebb31cff"
-template_name: consent_school_initial_reminder_mmrv
+template_name: consent_school_reminder_mmrv
 subject: "Please respond to our request for consent by <%= consent_deadline %>"
 ---
 We wrote to you recently about <%= vaccine_and_dose %> catch-up vaccinations at  <%= location_name %> on <%= next_session_dates %>.