Vaccs recording: make the back links work as expected

This requires pre-populating the VaccinationRecord with "delivery_site_other" value out of the session, and "todays_batch", otherwise the form steps aren't derived correctly.

app/controllers/vaccinations/edit_controller.rb

@@ -43,6 +43,8 @@ def handle_confirm
       send_vaccination_mail(@draft_vaccination_record)
       @patient_session.do_vaccination!
 
+      session.delete(:delivery_site_other)
+
       heading =
         if @draft_vaccination_record.administered?
           t("vaccinations.flash.given")
@@ -87,6 +89,13 @@ def set_steps
 
   def set_draft_vaccination_record
     @draft_vaccination_record = @patient_session.draft_vaccination_record
+    if (session[:delivery_site_other] = "true")
+      @draft_vaccination_record.delivery_site_other = true
+    end
+    if todays_batch_id.present?
+      @draft_vaccination_record.todays_batch =
+        policy_scope(Batch).find(todays_batch_id)
+    end
   end
 
   def set_batches

app/controllers/vaccinations_controller.rb

@@ -54,6 +54,10 @@ def index
 
   def create
     if @draft_vaccination_record.update create_params.merge(user: current_user)
+      session[:delivery_site_other] = "true" if delivery_site_param_other?
+      @draft_vaccination_record.todays_batch =
+        todays_batch_id if todays_batch_id.present?
+
       redirect_to session_patient_vaccinations_edit_path(
                     @session,
                     patient_id: @patient.id,

app/helpers/vaccinations_helper.rb

@@ -38,4 +38,14 @@ def in_tab_vaccinated?(_action, outcome)
   def in_tab_not_vaccinated?(_action, outcome)
     outcome.in? %i[do_not_vaccinate not_vaccinated]
   end
+
+  # rubocop:disable Rails/HelperInstanceVariable
+  def vaccinations_back_link_path
+    if current_step?(@draft_vaccination_record.form_steps.first.to_s)
+      session_patient_path(@session, id: @patient.id)
+    else
+      previous_wizard_path
+    end
+  end
+  # rubocop:enable Rails/HelperInstanceVariable
 end

app/models/vaccination_record.rb

@@ -130,10 +130,7 @@ class VaccinationRecord < ApplicationRecord
   end
 
   on_wizard_step :reason, exact: true do
-    validates :reason,
-              inclusion: {
-                in: VaccinationRecord.reasons.keys
-              }
+    validates :reason, inclusion: { in: VaccinationRecord.reasons.keys }
   end
 
   on_wizard_step :batch, exact: true do
@@ -154,8 +151,8 @@ def recorded?
 
   def form_steps
     [
-      ("delivery-site" if administered? && delivery_site.nil?),
-      (:batch if administered? && batch_id.nil?),
+      ("delivery-site" if administered? && delivery_site_other),
+      (:batch if administered? && todays_batch.nil?),
       (:reason if not_administered?),
       :confirm
     ].compact

app/views/vaccinations/edit/batch.html.erb

@@ -1,6 +1,6 @@
 <% content_for :before_main do %>
   <%= render AppBacklinkComponent.new(
-        href: previous_wizard_path,
+        href: vaccinations_back_link_path,
         name: "vaccination page",
       ) %>
 <% end %>

app/views/vaccinations/edit/confirm.html.erb

@@ -1,7 +1,7 @@
 <% content_for :before_main do %>
 
   <%= render AppBacklinkComponent.new(
-        href: previous_wizard_path,
+        href: vaccinations_back_link_path,
         name: "vaccination page",
       ) %>
 <% end %>

app/views/vaccinations/edit/delivery-site.html.erb

@@ -1,6 +1,6 @@
 <% content_for :before_main do %>
   <%= render AppBacklinkComponent.new(
-        href: session_patient_vaccinations_path(@session, @patient),
+        href: vaccinations_back_link_path,
         name: "vaccination page",
       ) %>
 <% end %>

app/views/vaccinations/edit/reason.html.erb

@@ -1,6 +1,6 @@
 <% content_for :before_main do %>
   <%= render AppBacklinkComponent.new(
-        href: previous_wizard_path,
+        href: vaccinations_back_link_path,
         name: "vaccination page",
       ) %>
 <% end %>