Merge pull request #5821 from nhsuk/alistair/national-reporting-edit-vaccine-and-batch

Allow national reporting users to edit vaccine and batch

Author: alistair-white-horne-tng

app/components/app_vaccination_record_summary_component.rb

@@ -51,7 +51,13 @@ def call
           if @vaccine
             row.with_value { vaccine_value }
 
-            if (href = @change_links[:vaccine])
+            if @current_user.selected_team.has_upload_only_access?
+              row.with_action(
+                text: "Change",
+                href: @change_links[:batch],
+                visually_hidden_text: "vaccine"
+              )
+            elsif (href = @change_links[:vaccine])
               row.with_action(
                 text: "Change",
                 visually_hidden_text: "vaccine",
@@ -89,6 +95,14 @@ def call
           summary_list.with_row do |row|
             row.with_key { "Batch expiry date" }
             row.with_value { batch_expiry_value }
+
+            if @current_user.selected_team.has_upload_only_access?
+              row.with_action(
+                text: "Change",
+                href: @change_links[:batch],
+                visually_hidden_text: "batch expiry date"
+              )
+            end
           end
         end
 
@@ -325,7 +339,13 @@ def programme_value
   end
 
   def vaccine_value
-    highlight_if(@vaccine.brand, @vaccination_record.vaccine_id_changed?)
+    display_name =
+      if @current_user.selected_team.has_upload_only_access?
+        @vaccine.nivs_name.presence || @vaccine.brand
+      else
+        @vaccine.brand
+      end
+    highlight_if(display_name, @vaccination_record.vaccine_id_changed?)
   end
 
   def delivery_method_value

app/controllers/draft_vaccination_records_controller.rb

@@ -14,7 +14,16 @@ class DraftVaccinationRecordsController < ApplicationController
   include WizardControllerConcern
 
   before_action :validate_params, only: :update
-  before_action :set_batches, if: -> { current_step == :batch }
+  before_action :set_batches,
+                if: -> do
+                  current_step == :batch &&
+                    !@draft_vaccination_record.bulk_upload_user_and_record?
+                end
+  before_action :set_vaccines,
+                if: -> do
+                  current_step == :batch &&
+                    @draft_vaccination_record.bulk_upload_user_and_record?
+                end
   before_action :set_locations, if: -> { current_step == :location }
   before_action :set_supplied_by_users, if: -> { current_step == :supplier }
   before_action :set_back_link_path
@@ -73,6 +82,20 @@ def validate_params
         @draft_vaccination_record.errors.add(:performed_at, :invalid)
         render_wizard nil, status: :unprocessable_content
       end
+    elsif current_step == :batch &&
+          @draft_vaccination_record.bulk_upload_user_and_record?
+      validator =
+        DateParamsValidator.new(
+          field_name: :batch_expiry,
+          object: @draft_vaccination_record,
+          params: update_params
+        )
+
+      unless validator.date_params_valid?
+        @draft_vaccination_record.errors.add(:batch_expiry, :invalid)
+        set_vaccines
+        render_wizard nil, status: :unprocessable_content
+      end
     end
   end
 
@@ -176,7 +199,7 @@ def finish_wizard_path
 
   def update_params
     permitted_attributes = {
-      batch: %i[batch_id],
+      batch: %i[batch_id vaccine_id batch_name batch_expiry],
       confirm: @draft_vaccination_record.editing? ? [] : %i[notes],
       date_and_time: %i[performed_at],
       delivery: %i[delivery_site delivery_method],
@@ -231,6 +254,10 @@ def set_steps
     self.steps = @draft_vaccination_record.wizard_steps
   end
 
+  def set_vaccines
+    @vaccines = @programme.vaccines.select(&:nivs_name)
+  end
+
   def set_batches
     vaccines = vaccine_criteria.apply(@programme.vaccines)
 

app/forms/batch_form.rb

@@ -9,17 +9,7 @@ class BatchForm
   attribute :name, :string
   attribute :expiry, :date
 
-  NAME_FORMAT = /\A[A-Za-z0-9]+\z/
-
-  validates :name,
-            presence: true,
-            format: {
-              with: NAME_FORMAT
-            },
-            length: {
-              minimum: 2,
-              maximum: 100
-            }
+  validates :name, batch_name: true
 
   validates :expiry,
             comparison: {

app/models/draft_vaccination_record.rb

@@ -10,6 +10,8 @@ class DraftVaccinationRecord
   include VaccinationRecordPerformedByConcern
 
   attribute :batch_id, :integer
+  attribute :batch_name, :string
+  attribute :batch_expiry, :date
   attribute :delivery_method, :string
   attribute :delivery_site, :string
   attribute :disease_types, array: true
@@ -34,6 +36,7 @@ class DraftVaccinationRecord
   attribute :session_id, :integer
   attribute :source, :string
   attribute :supplied_by_user_id, :integer
+  attribute :vaccine_id, :integer
 
   def initialize(current_user:, **attributes)
     @current_user = current_user
@@ -83,7 +86,11 @@ def wizard_steps
   end
 
   on_wizard_step :batch, exact: true do
-    validates :batch_id, presence: true
+    validates :batch_id, presence: true, unless: :bulk_upload_user_and_record?
+
+    validates :vaccine_id, presence: true, if: :bulk_upload_user_and_record?
+    validates :batch_name, batch_name: true, if: :bulk_upload_user_and_record?
+    validates :batch_expiry, presence: true, if: :bulk_upload_user_and_record?
   end
 
   on_wizard_step :dose, exact: true do
@@ -155,6 +162,17 @@ def already_had?
   alias_method :administered, :administered?
 
   def batch
+    if batch_expiry && batch_name && vaccine_id && bulk_upload_user_and_record?
+      return(
+        Batch.create_with(archived_at: Time.current).find_or_create_by!(
+          expiry: batch_expiry,
+          name: batch_name,
+          team_id: nil,
+          vaccine_id: vaccine_id
+        )
+      )
+    end
+
     return nil if batch_id.nil?
     Batch.find(batch_id)
   end
@@ -236,8 +254,6 @@ def delivery_method=(value)
 
   delegate :vaccine, to: :batch, allow_nil: true
 
-  delegate :id, to: :vaccine, prefix: true, allow_nil: true
-
   def vaccine_id_changed? = batch_id_changed?
 
   def location_is_school
@@ -331,6 +347,24 @@ def bulk_upload_user_and_record?
       sourced_from_bulk_upload?
   end
 
+  def read_from!(vaccination_record)
+    self.batch_name = vaccination_record.batch&.name
+    self.batch_expiry = vaccination_record.batch&.expiry
+    self.vaccine_id = vaccination_record.vaccine&.id
+
+    super(vaccination_record)
+  end
+
+  def write_to!(vaccination_record)
+    super(vaccination_record)
+
+    if batch_expiry && batch_name && vaccine_id && bulk_upload_user_and_record?
+      vaccination_record.batch_id = batch&.id
+    end
+
+    vaccination_record.vaccine_id = batch&.vaccine_id
+  end
+
   private
 
   def readable_attribute_names

app/models/immunisation_import_row.rb

@@ -630,7 +630,7 @@ def validate_batch_name
           errors.add(batch_name.header, "must be at most 100 characters long")
         elsif batch_name.to_s.length < 2
           errors.add(batch_name.header, "must be at least 2 characters long")
-        elsif batch_name.to_s !~ BatchForm::NAME_FORMAT
+        elsif batch_name.to_s !~ BatchNameValidator::FORMAT
           errors.add(batch_name.header, "must be only letters and numbers")
         end
       elsif offline_recording? || bulk?

app/validators/batch_name_validator.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class BatchNameValidator < ActiveModel::EachValidator
+  FORMAT = /\A[A-Za-z0-9]+\z/
+  MIN_LENGTH = 2
+  MAX_LENGTH = 100
+
+  def validate_each(record, attribute, value)
+    if value.blank?
+      record.errors.add(attribute, :blank)
+    elsif value.length < MIN_LENGTH
+      record.errors.add(attribute, :too_short, count: MIN_LENGTH)
+    elsif value.length > MAX_LENGTH
+      record.errors.add(attribute, :too_long, count: MAX_LENGTH)
+    elsif value !~ FORMAT
+      record.errors.add(attribute, :invalid)
+    end
+  end
+end

app/views/draft_vaccination_records/batch.html.erb

@@ -7,6 +7,25 @@
 <%= form_with model: @draft_vaccination_record, url: wizard_path, method: :put do |f| %>
   <%= f.govuk_error_summary %>
 
+<% if @draft_vaccination_record.bulk_upload_user_and_record? %>
+
+    <span class="nhsuk-caption-l"><%= @patient.full_name %></span>
+    <%= h1 "Which vaccine and batch did you use?" %>
+
+  <%= f.govuk_radio_buttons_fieldset :vaccine_id,
+                                     legend: { text: "Vaccine", size: "m" } do %>
+    <% @vaccines.each do |vaccine| %>
+      <%= f.govuk_radio_button :vaccine_id, vaccine.id, label: { text: vaccine.nivs_name } %>
+    <% end %>
+  <% end %>
+
+  <%= f.govuk_text_field :batch_name,
+                         label: { text: "Batch number", size: "m" }, width: 10, class: "nhsuk-input--code" %>
+
+  <%= f.govuk_date_field :batch_expiry,
+                         legend: { text: "Batch expiry date", size: "m" },
+                         hint: { text: "For example, 27 10 2025" } %>
+<% else %>
   <%= f.govuk_radio_buttons_fieldset :batch_id,
                                      caption: { text: @patient.full_name, size: "l" },
                                      legend: { size: "l", tag: "h1", text: "Which batch did you use?" } do %>
@@ -31,6 +50,7 @@
       <% end %>
     <% end %>
   <% end %>
+<% end %>
 
   <%= f.govuk_submit "Continue" %>
 <% end %>

config/locales/en.yml

@@ -13,10 +13,10 @@ en:
               missing_year: Enter a year
               taken: This batch already exists
             name:
-              blank: Enter a batch
-              invalid: Enter a batch with only letters and numbers
-              too_short: Enter a batch that is more than %{count} characters long
-              too_long: Enter a batch that is less than %{count} characters long
+              blank: Enter a batch number
+              invalid: Enter a batch number with only letters and numbers
+              too_short: Enter a batch number that is more than %{count} characters long
+              too_long: Enter a batch number that is less than %{count} characters long
         bulk_remove_parents_form:
           attributes:
             remove_option:
@@ -114,6 +114,16 @@ en:
           attributes:
             batch_id:
               blank: Choose a batch
+            batch_name:
+              blank: Enter a batch number
+              invalid: Enter a batch number with only letters and numbers
+              too_short: Enter a batch number that is more than %{count} characters long
+              too_long: Enter a batch number that is less than %{count} characters long
+            batch_expiry:
+              blank: Enter an expiry date
+              missing_day: Enter a day
+              missing_month: Enter a month
+              missing_year: Enter a year
             delivery_method:
               blank: Choose a method of delivery
               inclusion: Choose a method of delivery