Add "check and confirm" import page

This adds an additional page when importing records that allows the user
to review the records before confirming the import.

I've also amended how we import vaccination records and sessions to
ensure that we don't ignore duplicate records if the file had already
been read in but not confirmed, whilst also preventing the same file
from importing the same records multiple times.

Author: thomasleese

app/controllers/immunisation_imports_controller.rb

@@ -2,13 +2,16 @@
 
 class ImmunisationImportsController < ApplicationController
   before_action :set_campaign
+  before_action :set_immunisation_import, only: %i[show edit update]
+  before_action :set_vaccination_records, only: %i[edit show]
 
   layout "two_thirds", only: :new
 
   def index
     @immunisation_imports =
       @campaign
         .immunisation_imports
+        .recorded
         .includes(:user)
         .order(:created_at)
         .strict_loading
@@ -55,21 +58,25 @@ def create
       ] = "#{ignored_count} records for children who were not vaccinated were omitted"
     end
 
-    redirect_to campaign_immunisation_import_path(
+    redirect_to edit_campaign_immunisation_import_path(
                   @campaign,
                   @immunisation_import
                 )
   end
 
   def show
-    @immunisation_import = @campaign.immunisation_imports.find(params[:id])
+  end
 
-    @vaccination_records =
-      @immunisation_import.vaccination_records.includes(
-        :location,
-        :patient,
-        :session
-      )
+  def edit
+  end
+
+  def update
+    @immunisation_import.record!
+
+    redirect_to campaign_immunisation_import_path(
+                  @campaign,
+                  @immunisation_import
+                )
   end
 
   private
@@ -82,6 +89,19 @@ def set_campaign
         .find(params[:campaign_id])
   end
 
+  def set_immunisation_import
+    @immunisation_import = @campaign.immunisation_imports.find(params[:id])
+  end
+
+  def set_vaccination_records
+    @vaccination_records =
+      @immunisation_import.vaccination_records.includes(
+        :location,
+        :patient,
+        :session
+      )
+  end
+
   def immunisation_import_params
     params
       .fetch(:immunisation_import, {})

app/models/immunisation_import_row.rb

@@ -77,21 +77,22 @@ def to_vaccination_record
 
     return unless administered
 
-    VaccinationRecord.create_with(
-      imported_from: @imported_from,
-      notes:
-    ).find_or_initialize_by(
-      administered_at:,
-      batch:,
-      delivery_method:,
-      delivery_site:,
-      dose_sequence:,
-      patient_session:,
-      performed_by_family_name:,
-      performed_by_given_name:,
-      reason:,
-      vaccine:
-    )
+    VaccinationRecord
+      .recorded
+      .or(VaccinationRecord.where(imported_from:))
+      .create_with(imported_from:, notes:, recorded_at: nil)
+      .find_or_initialize_by(
+        administered_at:,
+        batch:,
+        delivery_method:,
+        delivery_site:,
+        dose_sequence:,
+        patient_session:,
+        performed_by_family_name:,
+        performed_by_given_name:,
+        reason:,
+        vaccine:
+      )
   end
 
   def patient
@@ -118,6 +119,8 @@ def session
     @session ||=
       @campaign
         .sessions
+        .active
+        .or(Session.where(imported_from:))
         .create_with(imported_from:, draft: true)
         .find_or_create_by!(
           date: session_date,

app/views/immunisation_imports/edit.html.erb

@@ -0,0 +1,18 @@
+<% content_for :before_main do %>
+  <%= render AppBacklinkComponent.new(
+        href: new_campaign_immunisation_import_path(@campaign),
+        name: @campaign.name,
+      ) %>
+<% end %>
+
+<% title = "Check and confirm" %>
+
+<span class="nhsuk-caption-l"><%= @campaign.name %></span>
+<%= h1 title, page_title: "#{@campaign.name} – #{title}" %>
+
+<%= govuk_button_to "Upload records", campaign_immunisation_import_path(
+      @campaign,
+      @immunisation_import
+    ), method: :put %>
+
+<%= render AppVaccinationRecordTableComponent.new(@vaccination_records, new_records: true) %>

config/routes.rb

@@ -73,7 +73,7 @@
 
     resources :immunisation_imports,
               path: "immunisation-imports",
-              only: %i[index new create show]
+              except: :destroy
 
     resources :vaccination_records,
               path: "vaccination-records",

spec/features/immunisation_imports_upload_spec.rb

@@ -23,7 +23,10 @@
 
     when_i_upload_a_valid_file
     then_i_should_see_the_success_banner
-    and_i_should_see_the_upload
+    and_i_should_see_the_vaccination_records
+
+    when_i_click_on_upload_records
+    then_i_should_see_the_upload
     and_i_should_see_the_vaccination_records
 
     when_i_click_on_a_vaccination_record
@@ -115,12 +118,6 @@ def then_i_should_see_the_success_banner
     expect(page).to have_content("7 vaccinations uploaded")
   end
 
-  def and_i_should_see_the_upload
-    expect(page).to have_content("Uploaded on")
-    expect(page).to have_content("Uploaded byTest User")
-    expect(page).to have_content("CampaignHPV")
-  end
-
   def and_i_should_see_the_vaccination_records
     expect(page).to have_content(
       "Full nameNHS numberDate of birthVaccination date"
@@ -131,6 +128,16 @@ def and_i_should_see_the_vaccination_records
     expect(page).to have_content("Vaccination date 14 May 2024")
   end
 
+  def when_i_click_on_upload_records
+    click_on "Upload records"
+  end
+
+  def then_i_should_see_the_upload
+    expect(page).to have_content("Uploaded on")
+    expect(page).to have_content("Uploaded byTest User")
+    expect(page).to have_content("CampaignHPV")
+  end
+
   def when_i_click_on_a_vaccination_record
     click_on "Chyna Pickle"
   end

spec/models/immunisation_import_spec.rb

@@ -246,11 +246,15 @@
       let(:file) { "valid_flu.csv" }
 
       it "sets the recorded at time" do
-        expect { record! }.to change(immunisation_import, :recorded_at).from(nil)
+        expect { record! }.to change(immunisation_import, :recorded_at).from(
+          nil
+        )
       end
 
       it "records the vaccination records" do
-        expect { record! }.to change(VaccinationRecord.recorded, :count).from(0).to(7)
+        expect { record! }.to change(VaccinationRecord.recorded, :count).from(
+          0
+        ).to(7)
       end
     end
 
@@ -259,11 +263,15 @@
       let(:file) { "valid_hpv.csv" }
 
       it "sets the recorded at time" do
-        expect { record! }.to change(immunisation_import, :recorded_at).from(nil)
+        expect { record! }.to change(immunisation_import, :recorded_at).from(
+          nil
+        )
       end
 
       it "records the vaccination records" do
-        expect { record! }.to change(VaccinationRecord.recorded, :count).from(0).to(7)
+        expect { record! }.to change(VaccinationRecord.recorded, :count).from(
+          0
+        ).to(7)
       end
     end
   end