Merge pull request #4963 from nhsuk/next

Version 5.2.3

Author: benilovj

Gemfile.lock

@@ -101,12 +101,12 @@ GEM
       public_suffix (>= 2.0.2, < 7.0)
     aes_key_wrap (1.1.0)
     amazing_print (2.0.0)
-    annotaterb (4.19.0)
+    annotaterb (4.20.0)
       activerecord (>= 6.0.0)
       activesupport (>= 6.0.0)
     array_enum (1.6.0)
       activemodel
-    asciidoctor (2.0.24)
+    asciidoctor (2.0.25)
     asciidoctor-diagram (3.0.1)
       asciidoctor (>= 1.5.7, < 3.x)
       rexml
@@ -447,7 +447,7 @@ GEM
       date
       stringio
     public_suffix (6.0.2)
-    puma (7.0.4)
+    puma (7.1.0)
       nio4r (~> 2.0)
     pundit (2.5.2)
       activesupport (>= 3.0.0)
@@ -700,8 +700,8 @@ GEM
       unicode-display_width (~> 3.1)
     temple (0.10.0)
     thor (1.4.0)
-    thruster (0.1.15-arm64-darwin)
-    thruster (0.1.15-x86_64-linux)
+    thruster (0.1.16-arm64-darwin)
+    thruster (0.1.16-x86_64-linux)
     tilt (2.6.1)
     timeout (0.4.3)
     tsort (0.2.0)

app/components/app_consent_form_card_component.rb

@@ -43,12 +43,8 @@ def call
 
   def refusal_reason
     {
-      title:
-        Consent.human_enum_name(
-          :reason_for_refusal,
-          @consent_form.reason
-        ).presence,
-      notes: @consent_form.reason_notes
+      title: @consent_form.human_enum_name(:reason_for_refusal),
+      notes: @consent_form.reason_for_refusal_notes
     }
   end
 

app/controllers/draft_consents_controller.rb

@@ -131,7 +131,7 @@ def update_params
         parent_responsibility
       ],
       questions: questions_params,
-      reason: %i[reason_for_refusal],
+      reason_for_refusal: %i[reason_for_refusal],
       route: %i[route],
       who: %i[new_or_existing_contact]
     }.fetch(current_step)

app/controllers/parent_interface/consent_forms/edit_controller.rb

@@ -80,21 +80,31 @@ def finish_wizard_path
 
     def update_params
       permitted_attributes = {
-        name: %i[
-          given_name
-          family_name
-          use_preferred_name
-          preferred_given_name
-          preferred_family_name
+        address: %i[
+          address_line_1
+          address_line_2
+          address_town
+          address_postcode
+        ],
+        confirm_school: %i[school_confirmed],
+        contact_method: %i[
+          parent_contact_method_type
+          parent_contact_method_other_details
         ],
         date_of_birth: %i[
           date_of_birth(3i)
           date_of_birth(2i)
           date_of_birth(1i)
         ],
-        confirm_school: %i[school_confirmed],
         education_setting: %i[education_setting],
-        school: %i[school_id],
+        injection_alternative: %i[injection_alternative],
+        name: %i[
+          given_name
+          family_name
+          use_preferred_name
+          preferred_given_name
+          preferred_family_name
+        ],
         parent: %i[
           parent_email
           parent_full_name
@@ -104,17 +114,12 @@ def update_params
           parent_relationship_type
           parental_responsibility
         ],
-        contact_method: %i[
-          parent_contact_method_type
-          parent_contact_method_other_details
-        ],
-        reason: %i[reason],
-        reason_notes: %i[reason_notes],
+        reason_for_refusal: %i[reason_for_refusal],
+        reason_for_refusal_notes: %i[reason_for_refusal_notes],
         response_doubles: %i[response chosen_programme],
         response_flu: %i[response],
         response_hpv: %i[response],
-        injection_alternative: %i[injection_alternative],
-        address: %i[address_line_1 address_line_2 address_town address_postcode]
+        school: %i[school_id]
       }.fetch(current_step)
 
       params.fetch(:consent_form, {}).permit(permitted_attributes)

app/lib/govuk_notify_personalisation.rb

@@ -232,10 +232,10 @@ def reason_did_not_vaccinate
   end
 
   def reason_for_refusal
-    reason = consent_form&.reason || consent&.reason_for_refusal
+    reason = consent_form&.reason_for_refusal || consent&.reason_for_refusal
     return if reason.nil?
 
-    I18n.t("mailers.consent_form_mailer.reasons_for_refusal.#{reason}")
+    I18n.t(reason, scope: "mailers.consent_form_mailer.reasons_for_refusal")
   end
 
   def short_patient_name

app/lib/programme_grouper.rb

@@ -1,15 +1,12 @@
 # frozen_string_literal: true
 
 class ProgrammeGrouper
-  def initialize(programmes)
-    @programmes = programmes
+  def initialize(objects)
+    @objects = objects
   end
 
   def call
-    programmes
-      .group_by { programme_group(it) }
-      .transform_values { it.sort_by(&:type) }
-      .to_h
+    objects.group_by { group(it) }.transform_values { sorted(it) }.to_h
   end
 
   def self.call(...) = new(...).call
@@ -18,19 +15,13 @@ def self.call(...) = new(...).call
 
   private
 
-  attr_reader :programmes
-
-  def programme_group(programme)
-    if programme.flu?
-      :flu
-    elsif programme.hpv?
-      :hpv
-    elsif programme.doubles?
-      :doubles
-    elsif programme.mmr?
-      :mmr
-    else
-      raise UnsupportedProgramme, programme
-    end
-  end
+  attr_reader :objects
+
+  def programme(object) = object.try(:programme) || object
+
+  def group(object) = programme(object).group
+
+  def type(object) = programme(object).type
+
+  def sorted(objects) = objects.sort_by { type(it) }
 end

app/models/concerns/refusable.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Refusable
+  extend ActiveSupport::Concern
+
+  include Notable
+
+  REASON_FOR_REFUSAL_REQUIRES_NOTES = %w[
+    already_vaccinated
+    medical_reasons
+    other
+    will_be_vaccinated_elsewhere
+  ].freeze
+
+  included do
+    enum :reason_for_refusal,
+         {
+           contains_gelatine: 0,
+           already_vaccinated: 1,
+           will_be_vaccinated_elsewhere: 2,
+           medical_reasons: 3,
+           personal_choice: 4,
+           other: 5
+         },
+         prefix: true,
+         validate: {
+           if: :requires_reason_for_refusal?
+         }
+  end
+
+  def requires_reason_for_refusal?
+    response_refused?
+  end
+
+  def reason_for_refusal_requires_notes?
+    reason_for_refusal.in?(REASON_FOR_REFUSAL_REQUIRES_NOTES)
+  end
+
+  def requires_notes?
+    requires_reason_for_refusal? && reason_for_refusal_requires_notes?
+  end
+end

app/models/consent.rb

@@ -53,6 +53,7 @@ class Consent < ApplicationRecord
   include HasVaccineMethods
   include Invalidatable
   include Notable
+  include Refusable
 
   audited associated_with: :patient
 
@@ -83,20 +84,6 @@ class Consent < ApplicationRecord
        prefix: "via",
        validate: true
 
-  enum :reason_for_refusal,
-       {
-         contains_gelatine: 0,
-         already_vaccinated: 1,
-         will_be_vaccinated_elsewhere: 2,
-         medical_reasons: 3,
-         personal_choice: 4,
-         other: 5
-       },
-       prefix: true,
-       validate: {
-         if: -> { response_refused? || withdrawn? }
-       }
-
   validates :parent, presence: true, unless: :via_self_consent?
   validates :recorded_by,
             presence: true,
@@ -132,6 +119,10 @@ def responded_at
     invalidated_at || withdrawn_at || submitted_at
   end
 
+  def requires_reason_for_refusal? = super || withdrawn?
+
+  def requires_notes? = super || invalidated?
+
   def requires_triage?
     response_given? && health_answers_require_triage?
   end
@@ -156,27 +147,14 @@ def self.from_consent_form!(consent_form, patient:, current_user:)
           .consent_form_programmes
           .includes(:programme)
           .map do |consent_form_programme|
-            notes =
-              if consent_form_programme.response_given?
-                ""
-              else
-                consent_form.reason_notes.presence || ""
-              end
-            reason_for_refusal =
-              if consent_form_programme.response_given?
-                nil
-              else
-                consent_form.reason
-              end
-
             patient.consents.create!(
               consent_form:,
               health_answers: consent_form.health_answers,
-              notes:,
+              notes: consent_form_programme.notes,
               team: consent_form.team,
               parent:,
               programme: consent_form_programme.programme,
-              reason_for_refusal:,
+              reason_for_refusal: consent_form_programme.reason_for_refusal,
               recorded_by: current_user,
               response: consent_form_programme.response,
               route: "website",
@@ -192,21 +170,6 @@ def self.from_consent_form!(consent_form, patient:, current_user:)
     end
   end
 
-  REASON_FOR_REFUSAL_REQUIRES_NOTES = %w[
-    other
-    will_be_vaccinated_elsewhere
-    medical_reasons
-    already_vaccinated
-  ].freeze
-
-  def requires_notes?
-    withdrawn? || invalidated? ||
-      (
-        response_refused? &&
-          reason_for_refusal.in?(REASON_FOR_REFUSAL_REQUIRES_NOTES)
-      )
-  end
-
   def update_vaccination_records_no_notify!
     vaccination_records = VaccinationRecord.where(patient:, programme:)