Merge pull request #3936 from nhsuk/todays-batch-vaccine-method

Allow default daily batch per vaccine method

Author: thomasleese

app/components/app_consent_confirmation_component.rb

@@ -66,14 +66,11 @@ def vaccinations_text(consent_form_programmes)
         .map do |consent_form_programme|
           programme = consent_form_programme.programme
 
-          if programme.flu?
-            if consent_form_programme.vaccine_method_nasal?
-              "nasal flu"
-            elsif consent_form_programme.vaccine_method_injection?
-              "flu injection"
-            else
-              programme.name_in_sentence
-            end
+          if programme.has_multiple_vaccine_methods?
+            vaccine_method = consent_form_programme.vaccine_methods.first
+            method_prefix =
+              Vaccine.human_enum_name(:method_prefix, vaccine_method)
+            "#{method_prefix} #{programme.name_in_sentence}".lstrip
           else
             programme.name_in_sentence
           end

app/components/app_patient_session_record_component.rb

@@ -39,15 +39,11 @@ def default_vaccinate_form
 
   def heading
     vaccination =
-      if programme.flu?
-        if PatientSession
-             .where(patient_id: patient.id)
-             .has_vaccine_method(:nasal, programme:)
-             .exists?
-          "vaccination with nasal spray"
-        else
-          "vaccination with injection"
-        end
+      if programme.has_multiple_vaccine_methods?
+        vaccine_method = patient.approved_vaccine_methods(programme:).first
+        method_string =
+          Vaccine.human_enum_name(:method, vaccine_method).downcase
+        "vaccination with #{method_string}"
       else
         "vaccination"
       end

app/components/app_vaccinate_form_component.rb

@@ -20,9 +20,9 @@ def url
 
   def delivery_method
     if patient.approved_vaccine_methods(programme:).include?("nasal")
-      :nasal_spray
+      "nasal_spray"
     else
-      :intramuscular
+      "intramuscular"
     end
   end
 
@@ -31,8 +31,8 @@ def dose_sequence
   end
 
   COMMON_DELIVERY_SITES = {
-    intramuscular: %w[left_arm_upper_position right_arm_upper_position],
-    nasal_spray: %w[nose]
+    "intramuscular" => %w[left_arm_upper_position right_arm_upper_position],
+    "nasal_spray" => %w[nose]
   }.freeze
 
   CommonDeliverySite = Struct.new(:value, :label)
@@ -48,7 +48,7 @@ def common_delivery_sites_options
               CommonDeliverySite.new(value:, label:)
             end
 
-        if delivery_method == :intramuscular
+        if delivery_method.in?(Vaccine::INJECTION_DELIVERY_METHODS)
           options << CommonDeliverySite.new(value: "other", label: "Other")
         end
 
@@ -58,8 +58,10 @@ def common_delivery_sites_options
 
   def vaccination_name
     vaccination =
-      if programme.flu?
-        delivery_method == :nasal_spray ? "nasal spray" : "injection"
+      if programme.has_multiple_vaccine_methods?
+        vaccine_method =
+          Vaccine.delivery_method_to_vaccine_method(delivery_method)
+        Vaccine.human_enum_name(:method, vaccine_method).downcase
       else
         "vaccination"
       end
@@ -71,5 +73,6 @@ def ask_not_taking_medication? = programme.doubles? || programme.flu?
 
   def ask_not_pregnant? = programme.td_ipv?
 
-  def ask_asthma_flare_up? = programme.flu? && delivery_method == :nasal_spray
+  def ask_asthma_flare_up? =
+    delivery_method.in?(Vaccine::NASAL_DELIVERY_METHODS)
 end

app/controllers/concerns/todays_batch_concern.rb

@@ -3,26 +3,30 @@
 module TodaysBatchConcern
   extend ActiveSupport::Concern
 
-  def todays_batch_id(programme:)
-    if (todays_batch = session.dig(:todays_batch, programme.type))
+  def todays_batch_id(programme:, vaccine_method:)
+    if (
+         todays_batch =
+           session.dig(:todays_batch, programme.type, vaccine_method)
+       )
       if todays_batch[:date] == Date.current.iso8601
         todays_batch[:id].to_i
       else
-        unset_todays_batch(programme:)
+        unset_todays_batch(programme:, vaccine_method:)
         nil
       end
     end
   end
 
   def todays_batch=(batch)
     session[:todays_batch] ||= {}
-    session[:todays_batch][batch.programme.type] = {
+    session[:todays_batch][batch.programme.type] ||= {}
+    session[:todays_batch][batch.programme.type][batch.vaccine.method] = {
       id: batch.id,
       date: Date.current.iso8601
     }
   end
 
-  def unset_todays_batch(programme:)
-    session[:todays_batch]&.delete(programme.type)
+  def unset_todays_batch(programme:, vaccine_method:)
+    session.dig(:todays_batch, programme.type)&.delete(vaccine_method)
   end
 end

app/controllers/patient_sessions/vaccinations_controller.rb

@@ -68,11 +68,20 @@ def vaccinate_form_params
   end
 
   def set_todays_batch
+    vaccine_method =
+      Vaccine.delivery_method_to_vaccine_method(
+        vaccinate_form_params[:delivery_method]
+      )
+    return if vaccine_method.nil?
+
+    id = todays_batch_id(programme: @programme, vaccine_method:)
+    return if id.nil?
+
     @todays_batch =
       policy_scope(Batch)
         .where(vaccine: @session.vaccines)
         .not_archived
         .not_expired
-        .find_by(id: todays_batch_id(programme: @programme))
+        .find_by(id:)
   end
 end

app/controllers/sessions/record_controller.rb

@@ -12,6 +12,7 @@ class Sessions::RecordController < ApplicationController
 
   before_action :set_todays_batches, only: :show
   before_action :set_programme, except: :show
+  before_action :set_vaccine_method, except: :show
   before_action :set_batches, except: :show
 
   def show
@@ -41,9 +42,8 @@ def show
   end
 
   def edit_batch
-    @todays_batch =
-      authorize @batches.find_by(id: todays_batch_id(programme: @programme)),
-                :edit?
+    id = todays_batch_id(programme: @programme, vaccine_method: @vaccine_method)
+    @todays_batch = authorize @batches.find(id), :edit?
 
     render :batch
   end
@@ -80,11 +80,16 @@ def set_session
   def set_todays_batches
     all_batches =
       @session.programmes.index_with do |programme|
-        policy_scope(Batch)
-          .where(vaccine: @session.vaccines)
-          .not_archived
-          .not_expired
-          .find_by(id: todays_batch_id(programme:))
+        programme.vaccine_methods.filter_map do |vaccine_method|
+          id = todays_batch_id(programme:, vaccine_method:)
+          next if id.nil?
+
+          policy_scope(Batch)
+            .where(vaccine: @session.vaccines)
+            .not_archived
+            .not_expired
+            .find_by(id:)
+        end
       end
 
     @todays_batches = all_batches.compact
@@ -94,10 +99,17 @@ def set_programme
     @programme = policy_scope(Programme).find_by!(type: params[:programme_type])
   end
 
+  def set_vaccine_method
+    @vaccine_method = params[:vaccine_method]
+  end
+
   def set_batches
+    vaccines =
+      @session.vaccines.where(programme: @programme, method: @vaccine_method)
+
     @batches =
       policy_scope(Batch)
-        .where(vaccine: @session.vaccines.where(programme: @programme))
+        .where(vaccine: vaccines)
         .not_archived
         .not_expired
         .order_by_name_and_expiration

app/controllers/vaccines_controller.rb

@@ -15,9 +15,11 @@ def index
         .order_by_name_and_expiration
         .group_by(&:vaccine_id)
 
-    @todays_batch_id_by_programme =
+    @todays_batch_id_by_programme_and_vaccine_methods =
       policy_scope(Programme).index_with do |programme|
-        todays_batch_id(programme:)
+        programme.vaccine_methods.index_with do |vaccine_method|
+          todays_batch_id(programme:, vaccine_method:)
+        end
       end
   end
 

app/lib/govuk_notify_personalisation.rb

@@ -396,25 +396,21 @@ def programme_names
   def programme_names_and_methods
     @programme_names_and_methods ||=
       programmes.map do |programme|
-        next programme.name unless programme.flu?
-
-        if vaccination_record
-          if vaccination_record.delivery_method_nasal_spray?
-            "nasal spray flu"
-          else
-            "injected flu"
-          end
-        elsif patient &&
-              (
-                vaccine_methods = patient.approved_vaccine_methods(programme:)
-              ).present?
-          if vaccine_methods.first == "nasal"
-            "nasal spray flu"
-          else
-            "injected flu"
-          end
+        if programme.has_multiple_vaccine_methods?
+          vaccine_method =
+            if vaccination_record
+              Vaccine.delivery_method_to_vaccine_method(
+                vaccination_record.delivery_method
+              )
+            elsif patient
+              patient.approved_vaccine_methods(programme:).first
+            end
+
+          method_prefix =
+            Vaccine.human_enum_name(:method_prefix, vaccine_method)
+          "#{method_prefix} #{programme.name_in_sentence}".lstrip
         else
-          "flu"
+          programme.name_in_sentence
         end
       end
   end

app/views/sessions/record/batch.html.erb

@@ -2,7 +2,13 @@
   <%= render AppBacklinkComponent.new(session_record_path(@session), name: "record") %>
 <% end %>
 
-<% page_title = "Select a default batch for this session" %>
+<% programme_name_and_method = if @programme.has_multiple_vaccine_methods?
+       "#{@programme.name_in_sentence} #{Vaccine.human_enum_name(:vaccine_method, @vaccine_method)}.downcase"
+     else
+       "#{@programme.name_in_sentence}"
+     end %>
+
+<% page_title = "Select a default #{programme_name_and_method} batch for this session" %>
 <% content_for :page_title, page_title %>
 
 <%= form_with model: @todays_batch, url: batch_session_record_path(@session, @programme), method: :post do |f| %>
@@ -14,11 +20,16 @@
     <% @batches.each_with_index do |batch, index| %>
       <% label = proc do %>
         <span class="app-u-monospace"><%= batch.name %></span>
+        (<%= batch.vaccine.brand %>)
+      <% end %>
+
+      <% hint = proc do %>
         <% if (expiry = batch.expiry) %>
-          (expires <%= expiry.to_fs(:long) %>)
+          Expires <%= expiry.to_fs(:long) %>
         <% end %>
       <% end %>
-      <%= f.govuk_radio_button :id, batch.id, label:, link_errors: index.zero? %>
+
+      <%= f.govuk_radio_button :id, batch.id, label:, hint:, link_errors: index.zero? %>
     <% end %>
   <% end %>
 

app/views/sessions/record/show.html.erb

@@ -17,11 +17,21 @@
     </h2>
 
     <ul class="nhsuk-list nhsuk-list--bullet">
-      <% @todays_batches.each do |programme, batch| %>
-        <li>
-          <%= batch.vaccine.brand %> (<%= programme.name %>): <span class="app-u-monospace"><%= batch.name %></span>
-          <a class="nhsuk-link nhsuk-u-margin-left-2" href="<%= batch_session_record_path(@session, programme) %>">Change default batch<span class="nhsuk-u-visually-hidden"> for <%= batch.vaccine.brand %></span></a>
-        </li>
+      <% @todays_batches.each do |programme, batches| %>
+        <% batches.each do |batch| %>
+          <% programme_name = if programme.has_multiple_vaccine_methods?
+                 "#{programme.name_in_sentence} #{batch.vaccine.human_enum_name(:method).downcase}"
+               else
+                 programme.name_in_sentence
+               end %>
+
+          <li>
+            <%= batch.vaccine.brand %> (<%= programme_name %>): <span class="app-u-monospace"><%= batch.name %></span>
+            <a class="nhsuk-link nhsuk-u-margin-left-2" href="<%= batch_session_record_path(@session, programme, batch.vaccine.method) %>">
+              Change default batch<span class="nhsuk-u-visually-hidden"> for <%= batch.vaccine.brand %></span>
+            </a>
+          </li>
+        <% end %>
       <% end %>
     </ul>
   <% end %>