Merge pull request #6400 from NHSDigital/slim-down-govuk-notify-personalisation

Slim down GovukNotifyPersonalisation

Author: benilovj

app/components/app_triage_form_component.rb

@@ -19,7 +19,7 @@ def initialize(form, url:, method: :post, heading: true, continue: false)
   def builder = MavisFormBuilder
 
   def hint_text
-    if programme.mmr? && patient_eligible_for_additional_dose?
+    if programme.mmr? && patient_on_last_dose?
       "2nd dose is not due until #{form.next_mmr_dose_date.to_fs(:long)}"
     else
       "For example, #{hint_date.to_fs(:long)} "
@@ -51,13 +51,10 @@ def fieldset_options
     end
   end
 
-  def patient_eligible_for_additional_dose?
-    next_dose =
-      patient.programme_status(
-        programme,
-        academic_year: session.academic_year
-      ).dose_sequence
-
-    next_dose == programme.maximum_dose_sequence
+  def patient_on_last_dose?
+    patient.programme_status(
+      programme,
+      academic_year: session.academic_year
+    ).on_last_dose?
   end
 end

app/forms/triage_form.rb

@@ -94,13 +94,7 @@ def show_add_patient_specific_direction?(option)
   end
 
   def next_mmr_dose_date
-    programme_status = patient.programme_status(programme, academic_year:)
-
-    if programme_status.cannot_vaccinate_delay_vaccination?
-      programme_status.date
-    elsif (first_dose_date = programme_status.date)
-      (first_dose_date + 28.days).to_date
-    end
+    patient.programme_status(programme, academic_year:).next_dose_eligible_date
   end
 
   private
@@ -256,7 +250,7 @@ def validate_delay_vaccination_until_date
       )
     end
 
-    if programme.mmr? && patient_eligible_for_additional_dose? &&
+    if programme.mmr? && patient_on_last_dose? &&
          delay_vaccination_until < next_mmr_dose_date
       errors.add(
         :delay_vaccination_until,
@@ -276,13 +270,10 @@ def associate_triage_with_vaccination_record(next_dose_delay_triage)
     vaccination_record.presence&.update!(next_dose_delay_triage:)
   end
 
-  def patient_eligible_for_additional_dose?
-    next_dose =
-      patient.programme_status(
-        programme,
-        academic_year: session.academic_year
-      ).dose_sequence
-
-    next_dose == programme.maximum_dose_sequence
+  def patient_on_last_dose?
+    patient.programme_status(
+      programme,
+      academic_year: session.academic_year
+    ).on_last_dose?
   end
 end

app/lib/govuk_notify_personalisation.rb

@@ -49,53 +49,6 @@ def initialize(
       end
   end
 
-  def to_h
-    {
-      batch_name:,
-      consent_deadline:,
-      consent_link:,
-      consented_vaccine_methods_message:,
-      day_month_year_of_vaccination:,
-      delay_vaccination_review_context:,
-      full_and_preferred_patient_name:,
-      invitation_to_clinic_generic_message:,
-      location_name:,
-      invitation_to_clinic_custom_mmr_message:,
-      mmr_or_mmrv_vaccine:,
-      mmr_second_dose_message:,
-      mmr_second_dose_required:,
-      next_or_today_session_date:,
-      next_or_today_session_dates:,
-      next_or_today_session_dates_or:,
-      next_session_date:,
-      next_session_dates:,
-      next_session_dates_or:,
-      patient_date_of_birth:,
-      reason_did_not_vaccinate:,
-      reason_for_refusal:,
-      short_patient_name:,
-      short_patient_name_apos:,
-      subsequent_session_dates_offered_message:,
-      subteam_email:,
-      subteam_name:,
-      subteam_phone:,
-      survey_deadline_date:,
-      talk_to_your_child_message:,
-      team_privacy_notice_url:,
-      team_privacy_policy_url:,
-      today_or_date_of_vaccination:,
-      vaccination:,
-      vaccination_and_dates:,
-      vaccination_and_dates_sms:,
-      vaccination_and_method:,
-      vaccine:,
-      vaccine_and_dose:,
-      vaccine_and_method:,
-      vaccine_brand:,
-      vaccine_side_effects:
-    }.compact
-  end
-
   attr_reader :academic_year,
               :consent,
               :consent_form,
@@ -113,14 +66,7 @@ def batch_name
   end
 
   def consent_deadline
-    return nil if session.nil?
-
-    next_date = session.future_dates.first
-
-    close_consent_at =
-      next_date ? (next_date - 1.day) : session.close_consent_at
-
-    close_consent_at&.to_fs(:short_day_of_week)
+    session&.consent_deadline_date&.to_fs(:short_day_of_week)
   end
 
   def consent_link
@@ -206,7 +152,7 @@ def mmr_second_dose_message
   end
 
   def mmr_second_dose_required?
-    mmr_programme.present? && patient_eligible_for_additional_dose?
+    mmr_programme.present? && patient_on_last_dose?
   end
 
   def mmr_second_dose_required
@@ -259,29 +205,17 @@ def next_mmr_dose_date
     return if patient.nil?
     return if mmr_programme.nil?
 
-    programme_status = patient.programme_status(mmr_programme, academic_year:)
-
-    date =
-      if programme_status.cannot_vaccinate_delay_vaccination?
-        programme_status.date
-      elsif (first_dose_date = programme_status.date)
-        (first_dose_date + 28.days).to_date
-      end
-
-    date.to_fs(:long)
+    patient
+      .programme_status(mmr_programme, academic_year:)
+      .next_dose_eligible_date
+      &.to_fs(:long)
   end
 
-  def patient_eligible_for_additional_dose?
+  def patient_on_last_dose?
     return unless patient
     return if mmr_programme.nil?
 
-    next_dose =
-      patient
-        .reload
-        .programme_status(mmr_programme, academic_year:)
-        .dose_sequence
-
-    next_dose == mmr_programme.maximum_dose_sequence
+    patient.reload.programme_status(mmr_programme, academic_year:).on_last_dose?
   end
 
   def mmr_or_mmrv_vaccine
@@ -302,13 +236,7 @@ def delay_vaccination_review_context
     return if patient.nil? || session.nil?
 
     latest_delayed_triage =
-      patient
-        .triages
-        .not_invalidated
-        .where(programme_type: session.programme_types)
-        .delay_vaccination
-        .order(created_at: :desc)
-        .first
+      patient.latest_delayed_triage(programme_types: session.programme_types)
 
     return if latest_delayed_triage.nil?
 
@@ -393,12 +321,7 @@ def reason_for_refusal
   end
 
   def short_patient_name
-    [
-      consent_form&.preferred_given_name,
-      consent_form&.given_name,
-      patient&.preferred_given_name,
-      patient&.given_name
-    ].compact_blank.first
+    (consent_form || patient)&.short_name
   end
 
   def short_patient_name_apos
@@ -532,13 +455,8 @@ def vaccine_is?(method)
     elsif programmes.present?
       if patient
         programmes.any? do |programme|
-          # We pick the first method as it's the one most likely to be used
-          # to vaccinate the patient. For example, in the case of Flu, the
-          # parents will approve nasal (and then optionally injection).
-          patient
-            .vaccine_criteria(programme:, academic_year:)
-            .vaccine_methods
-            .first == method
+          patient.vaccine_criteria(programme:, academic_year:).primary_method ==
+            method
         end
       else
         Vaccine.for_programmes(programmes).exists?(method:)
@@ -553,18 +471,7 @@ def vaccine_side_effects
       elsif programmes.present?
         if patient
           programmes.flat_map do |programme|
-            # We pick the first method as it's the one most likely to be used
-            # to vaccinate the patient. For example, in the case of Flu, the
-            # parents will approve nasal (and then optionally injection).
-            method =
-              patient
-                .vaccine_criteria(programme:, academic_year:)
-                .vaccine_methods
-                .first
-            Vaccine
-              .for_programme(programme)
-              .where(method:)
-              .flat_map(&:side_effects)
+            patient.vaccine_criteria(programme:, academic_year:).side_effects
           end
         else
           Vaccine.for_programmes(programmes).flat_map(&:side_effects)
@@ -620,10 +527,10 @@ def programme_names_and_methods
                 vaccination_record.delivery_method
               )
             elsif patient
-              patient
-                .vaccine_criteria(programme:, academic_year:)
-                .vaccine_methods
-                .first
+              patient.vaccine_criteria(
+                programme:,
+                academic_year:
+              ).primary_method
             end
 
           method_prefix =

app/lib/notifier/consent.rb

@@ -41,7 +41,7 @@ def send_triage_email(triage, params)
 
   def triage_email_template(triage, session)
     if triage.safe_to_vaccinate?
-      if programme.mmr? && patient_eligible_for_additional_dose?(session)
+      if programme.mmr? && patient_on_last_dose?(session)
         :triage_vaccination_will_happen_mmr_second_dose
       else
         :triage_vaccination_will_happen
@@ -80,13 +80,10 @@ def resolve_email_template(template_name, team)
     template_names.find { NotifyTemplate.exists?(it, channel: :email) }
   end
 
-  def patient_eligible_for_additional_dose?(session)
-    next_dose =
-      patient
-        .reload
-        .programme_status(programme, academic_year: session.academic_year)
-        .dose_sequence
-
-    next_dose == programme.maximum_dose_sequence
+  def patient_on_last_dose?(session)
+    patient
+      .reload
+      .programme_status(programme, academic_year: session.academic_year)
+      .on_last_dose?
   end
 end

app/lib/vaccine_criteria.rb

@@ -36,6 +36,20 @@ def self.from_programme_status(programme_status)
 
   attr_reader :programme, :vaccine_methods, :without_gelatine
 
+  # The first method is the one most likely to be used to vaccinate the
+  # patient. For example, in the case of Flu, the parents will approve
+  # nasal (and then optionally injection).
+  def primary_method
+    vaccine_methods&.first
+  end
+
+  def side_effects
+    Vaccine
+      .for_programme(programme)
+      .where(method: primary_method)
+      .flat_map(&:side_effects)
+  end
+
   def apply(scope)
     scope = scope.with_disease_types(programme.disease_types)
 

app/models/concerns/consentable.rb

@@ -10,6 +10,11 @@ def close_consent_at
     dates.max - 1.day
   end
 
+  def consent_deadline_date
+    next_date = future_dates.first
+    next_date ? (next_date - 1.day) : close_consent_at
+  end
+
   def can_receive_consent?
     !close_consent_at.nil? && Date.current <= close_consent_at
   end

app/models/concerns/full_name_concern.rb

@@ -12,6 +12,10 @@ def full_name(context: :internal)
     FullNameFormatter.call(self, context:)
   end
 
+  def short_name
+    preferred_given_name.presence || given_name
+  end
+
   def has_preferred_name?
     preferred_given_name.present? || preferred_family_name.present?
   end

app/models/patient.rb

@@ -578,6 +578,15 @@ def vaccine_criteria(programme:, academic_year:)
     programme_status(programme, academic_year:).vaccine_criteria
   end
 
+  def latest_delayed_triage(programme_types:)
+    triages
+      .not_invalidated
+      .where(programme_type: programme_types)
+      .delay_vaccination
+      .order(created_at: :desc)
+      .first
+  end
+
   def eligible_for_mmrv?
     date_of_birth >= Programme::MIN_MMRV_ELIGIBILITY_DATE
   end

app/models/patient/programme_status.rb

@@ -161,6 +161,21 @@ def assign
 
   def vaccine_criteria = VaccineCriteria.from_programme_status(self)
 
+  def on_last_dose?
+    dose_sequence == Programme.find(programme_type).maximum_dose_sequence
+  end
+
+  def next_dose_eligible_date
+    interval = Programme.find(programme_type).minimum_dose_interval
+    return unless interval
+
+    if cannot_vaccinate_delay_vaccination?
+      date
+    elsif date
+      (date + interval).to_date
+    end
+  end
+
   private
 
   def generator