Merge pull request #3941 from nhsuk/refactor-delivery-vaccine-methods

Refactor methods related to delivery and vaccine methods

Author: thomasleese

app/components/app_programme_status_tags_component.rb

@@ -13,7 +13,7 @@ def call
       programme_statuses.map do |programme, hash|
         status = hash[:status]
         vaccine_methods =
-          (hash[:vaccine_methods] if programme.has_multiple_delivery_methods?)
+          (hash[:vaccine_methods] if programme.has_multiple_vaccine_methods?)
         programme_status_tag(programme, status, vaccine_methods)
       end
     )

app/components/app_triage_form_component.rb

@@ -29,7 +29,7 @@ def builder = GOVUKDesignSystemFormBuilder::FormBuilder
   def fieldset_options
     text = "Is it safe to vaccinate #{patient.given_name}?"
     hint =
-      if programme.has_multiple_delivery_methods?
+      if programme.has_multiple_vaccine_methods?
         if triage_form.consented_to_injection_only?
           "The parent has consented to the injected vaccine only"
         elsif triage_form.consented_to_injection?

app/forms/triage_form.rb

@@ -41,7 +41,7 @@ def save!
 
   def status_and_vaccine_method_options
     safe_to_vaccinate_choices =
-      if programme.has_multiple_delivery_methods?
+      if programme.has_multiple_vaccine_methods?
         consented_vaccine_methods.map { |method| "safe_to_vaccinate_#{method}" }
       else
         ["safe_to_vaccinate"]

app/helpers/consents_helper.rb

@@ -22,7 +22,7 @@ def consent_status_tag(consent)
 
     vaccine_method =
       if consent.vaccine_methods.present? &&
-           consent.programme.has_multiple_delivery_methods?
+           consent.programme.has_multiple_vaccine_methods?
         tag.span(
           Vaccine.human_enum_name(:method, consent.vaccine_methods.join("_")),
           class: "nhsuk-u-secondary-text-color"

app/models/draft_vaccination_record.rb

@@ -38,9 +38,6 @@ def self.request_session_key
               if: :performed_by_user
             }
 
-  INJECTION_DELIVERY_METHODS =
-    Vaccine::AVAILABLE_DELIVERY_METHODS["injection"].freeze
-
   def wizard_steps
     [
       :notes,
@@ -207,8 +204,9 @@ def delivery_method=(value)
     super
     return if delivery_method_was.nil? # Don't clear batch on first set
 
-    previous_value = compute_vaccine_method(delivery_method_was)
-    new_value = compute_vaccine_method(value)
+    previous_value =
+      Vaccine.delivery_method_to_vaccine_method(delivery_method_was)
+    new_value = Vaccine.delivery_method_to_vaccine_method(value)
 
     self.batch_id = nil unless previous_value == new_value
   end
@@ -248,29 +246,13 @@ def vaccine_method_matches_consent_and_triage?
     return true if delivery_method.blank? || !administered?
 
     approved_methods = patient.approved_vaccine_methods(programme:)
-    vaccine_method = delivery_method_to_vaccine_method(delivery_method)
+    vaccine_method = Vaccine.delivery_method_to_vaccine_method(delivery_method)
 
     approved_methods.include?(vaccine_method)
   end
 
   private
 
-  def delivery_method_to_vaccine_method(delivery_method)
-    return nil if delivery_method.nil?
-
-    delivery_method.in?(INJECTION_DELIVERY_METHODS) ? "injection" : "nasal"
-  end
-
-  def compute_vaccine_method(delivery_method)
-    return nil if delivery_method.nil?
-
-    if delivery_method.in?(INJECTION_DELIVERY_METHODS)
-      "injection"
-    else
-      "nasal_spray"
-    end
-  end
-
   def readable_attribute_names
     writable_attribute_names - %w[vaccine_id]
   end
@@ -328,11 +310,11 @@ def delivery_site_matches_delivery_method
     end
 
     case delivery_method
-    when "nasal_spray"
+    when *Vaccine::NASAL_DELIVERY_METHODS
       if delivery_site != "nose"
         errors.add(:delivery_site, :nasal_spray_must_be_nose)
       end
-    when *INJECTION_DELIVERY_METHODS
+    when *Vaccine::INJECTION_DELIVERY_METHODS
       if delivery_site == "nose"
         errors.add(:delivery_site, :injection_cannot_be_nose)
       end

app/models/programme.rb

@@ -75,24 +75,24 @@ def birth_academic_years
 
   def vaccine_methods = vaccines.map(&:method).uniq
 
-  def available_delivery_methods
-    vaccines.flat_map(&:available_delivery_methods).uniq
-  end
-
-  def available_delivery_sites
-    vaccines.flat_map(&:available_delivery_sites).uniq
-  end
-
-  def has_multiple_delivery_methods?
+  def has_multiple_vaccine_methods?
     # TODO: Ideally this would work as below, however that doesn't work well
     #  in a list as it results in N+1 issues, without deeply pre-fetching
     #  the vaccines which is a lot of data.
 
-    # available_delivery_methods.length > 1
+    # vaccine_methods.length > 1
 
     flu?
   end
 
+  def available_delivery_methods
+    vaccines.flat_map(&:available_delivery_methods).uniq
+  end
+
+  def available_delivery_sites
+    vaccines.flat_map(&:available_delivery_sites).uniq
+  end
+
   DOSE_SEQUENCES = {
     "flu" => 1,
     "hpv" => 1,

app/models/vaccine.rb

@@ -79,15 +79,29 @@ def available_delivery_sites
     AVAILABLE_DELIVERY_SITES.fetch(method)
   end
 
+  NASAL_DELIVERY_METHODS = %w[nasal_spray].freeze
+  INJECTION_DELIVERY_METHODS = %w[intramuscular subcutaneous].freeze
+
   AVAILABLE_DELIVERY_METHODS = {
-    "nasal" => %w[nasal_spray],
-    "injection" => %w[intramuscular subcutaneous]
+    "nasal" => NASAL_DELIVERY_METHODS,
+    "injection" => INJECTION_DELIVERY_METHODS
   }.freeze
 
   def available_delivery_methods
     AVAILABLE_DELIVERY_METHODS.fetch(method)
   end
 
+  def self.delivery_method_to_vaccine_method(delivery_method)
+    return nil if delivery_method.nil?
+
+    suitable_delivery_methods =
+      AVAILABLE_DELIVERY_METHODS.select do |_key, value|
+        delivery_method.in?(value)
+      end
+
+    suitable_delivery_methods.keys.first
+  end
+
   private
 
   def fhir_mapper = @fhir_mapper ||= FHIRMapper::Vaccine.new(self)