Refactor VaccinateForm

This refactors the form to pass only the vaccine method to the
controller rather than whether the vaccination was administered or not.
This allows for the form to be updated to support choosing from
multiple vaccine methods.

Jira-Issue: MAV-1338

Author: thomasleese

app/components/app_vaccinate_form_component.html.erb

@@ -65,9 +65,9 @@
 
       <% hint = "Pre-screening checks must be completed for vaccination to go ahead" %>
 
-      <%= f.govuk_radio_buttons_fieldset :administered, legend: nil do %>
+      <%= f.govuk_radio_buttons_fieldset :vaccine_method, legend: nil do %>
         <% if common_delivery_sites_options.length > 1 %>
-          <%= f.govuk_radio_button :administered, true, label: { text: "Yes" }, hint: { text: hint }, link_errors: true do %>
+          <%= f.govuk_radio_button :vaccine_method, vaccine_method, label: { text: "Yes" }, hint: { text: hint }, link_errors: true do %>
             <%= f.govuk_collection_radio_buttons :delivery_site,
                                                  common_delivery_sites_options,
                                                  :value,
@@ -78,13 +78,12 @@
                                                  } %>
           <% end %>
         <% else %>
-          <%= f.govuk_radio_button :administered, true, label: { text: "Yes" }, hint: { text: hint }, link_errors: true %>
+          <%= f.govuk_radio_button :vaccine_method, vaccine_method, label: { text: "Yes" }, hint: { text: hint }, link_errors: true %>
           <%= f.hidden_field :delivery_site, value: common_delivery_sites_options.first.value %>
         <% end %>
-        <%= f.govuk_radio_button :administered, false, label: { text: "No" } %>
+        <%= f.govuk_radio_button :vaccine_method, "none", label: { text: "No" } %>
       <% end %>
 
-      <%= f.hidden_field :delivery_method, value: delivery_method %>
       <%= f.hidden_field :dose_sequence, value: dose_sequence %>
       <%= f.hidden_field :programme_id, value: programme.id %>
 

app/components/app_vaccinate_form_component.rb

@@ -22,10 +22,6 @@ def vaccine_method
     patient.approved_vaccine_methods(programme:).first
   end
 
-  def delivery_method
-    Vaccine::AVAILABLE_DELIVERY_METHODS.fetch(vaccine_method).first
-  end
-
   def dose_sequence
     programme.default_dose_sequence
   end

app/controllers/patient_sessions/vaccinations_controller.rb

@@ -54,8 +54,6 @@ def create
   def vaccinate_form_params
     params.expect(
       vaccinate_form: %i[
-        administered
-        delivery_method
         delivery_site
         dose_sequence
         identity_check_confirmed_by_other_name
@@ -64,15 +62,13 @@ def vaccinate_form_params
         pre_screening_confirmed
         pre_screening_notes
         vaccine_id
+        vaccine_method
       ]
     )
   end
 
   def set_todays_batch
-    vaccine_method =
-      Vaccine.delivery_method_to_vaccine_method(
-        vaccinate_form_params[:delivery_method]
-      )
+    vaccine_method = vaccinate_form_params[:vaccine_method]
     return if vaccine_method.nil?
 
     id = todays_batch_id(programme: @programme, vaccine_method:)

app/forms/vaccinate_form.rb

@@ -13,8 +13,7 @@ class VaccinateForm
   attribute :pre_screening_confirmed, :boolean
   attribute :pre_screening_notes, :string
 
-  attribute :administered, :boolean
-  attribute :delivery_method, :string
+  attribute :vaccine_method, :string
   attribute :delivery_site, :string
   attribute :dose_sequence, :integer
   attribute :programme_id, :integer
@@ -32,12 +31,11 @@ class VaccinateForm
               maximum: 300
             }
 
-  validates :administered, inclusion: [true, false]
+  validates :vaccine_method, inclusion: { in: :vaccine_method_options }
   validates :pre_screening_notes, length: { maximum: 1000 }
 
-  with_options if: :administered do
+  with_options if: :administered? do
     validates :pre_screening_confirmed, presence: true
-    validates :delivery_method, presence: true
     validates :delivery_site, presence: true
   end
 
@@ -48,7 +46,7 @@ def save(draft_vaccination_record:)
 
     draft_vaccination_record.reset!
 
-    if administered
+    if administered?
       draft_vaccination_record.outcome = "administered"
 
       if delivery_site != "other"
@@ -80,6 +78,18 @@ def save(draft_vaccination_record:)
 
   delegate :organisation, to: :patient_session
 
+  def administered? = vaccine_method != "none"
+
+  def vaccine_method_options
+    programme.vaccine_methods + ["none"]
+  end
+
+  def delivery_method
+    if administered?
+      Vaccine::AVAILABLE_DELIVERY_METHODS.fetch(vaccine_method).first
+    end
+  end
+
   def pre_screening
     @pre_screening ||=
       patient_session.pre_screenings.build(

config/locales/en.yml

@@ -121,8 +121,6 @@ en:
               inclusion: Choose a status
         vaccinate_form:
           attributes:
-            administered:
-              inclusion: Choose if they are ready to vaccinate
             delivery_site:
               blank: Choose where the injection will be given
             identity_check_confirmed_by_other_name:
@@ -137,6 +135,8 @@ en:
               blank: Confirm you’ve checked the pre-screening statements are true
             pre_screening_notes:
               too_long: Enter notes that are less than %{count} characters long
+            vaccine_method:
+              inclusion: Choose if they are ready to vaccinate
         vaccination_report:
           attributes:
             file_format:

spec/forms/vaccinate_form_spec.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
 describe VaccinateForm do
-  subject(:form) { described_class.new }
+  subject(:form) { described_class.new(programme:) }
+
+  let(:programme) { create(:programme) }
 
   describe "validations" do
     it do
@@ -24,7 +26,10 @@
 
     context "when confirmed by someone else" do
       subject(:form) do
-        described_class.new(identity_check_confirmed_by_patient: false)
+        described_class.new(
+          identity_check_confirmed_by_patient: false,
+          programme:
+        )
       end
 
       it do