Add chosen journey for lettings soft validations

app/controllers/bulk_upload_lettings_soft_validations_check_controller.rb

@@ -2,10 +2,17 @@ class BulkUploadLettingsSoftValidationsCheckController < ApplicationController
   include ActionView::Helpers::TextHelper
 
   before_action :authenticate_user!
+  before_action :set_no_cache_headers
+
+  def set_no_cache_headers
+    response.set_header("Cache-Control", "no-store")
+  end
 
   def show
     @bulk_upload = current_user.bulk_uploads.find(params[:id])
 
+    return redirect_to form.preflight_redirect unless form.preflight_valid?
+
     render form.view_path
   end
 
@@ -30,6 +37,8 @@ private
     @form ||= case params[:page]
               when "confirm-soft-errors"
                 Forms::BulkUploadLettingsSoftValidationsCheck::ConfirmSoftErrors.new(form_params.merge(bulk_upload: @bulk_upload))
+              when "chosen"
+                Forms::BulkUploadLettingsSoftValidationsCheck::Chosen.new(form_params.merge(bulk_upload: @bulk_upload))
               when "confirm"
                 Forms::BulkUploadLettingsSoftValidationsCheck::Confirm.new(form_params.merge(bulk_upload: @bulk_upload))
               else

app/models/forms/bulk_upload_lettings_soft_validations_check/chosen.rb

@@ -0,0 +1,31 @@
+module Forms
+  module BulkUploadLettingsSoftValidationsCheck
+    class Chosen
+      include ActiveModel::Model
+      include ActiveModel::Attributes
+      include Rails.application.routes.url_helpers
+
+      attribute :bulk_upload
+
+      def view_path
+        "bulk_upload_lettings_soft_validations_check/chosen"
+      end
+
+      def back_path
+        lettings_logs_path
+      end
+
+      def next_path
+        lettings_logs_path
+      end
+
+      def save!
+        true
+      end
+
+      def preflight_valid?
+        true
+      end
+    end
+  end
+end

app/models/forms/bulk_upload_lettings_soft_validations_check/confirm.rb

@@ -20,11 +20,28 @@ module Forms
       end
 
       def save!
-        processor = BulkUpload::Processor.new(bulk_upload:)
-        processor.approve_and_confirm_soft_validations
+        ApplicationRecord.transaction do
+          processor = BulkUpload::Processor.new(bulk_upload:)
+          processor.approve_and_confirm_soft_validations
+
+          bulk_upload.update!(choice: "bulk-confirm-soft-validations")
+        end
 
         true
       end
+
+      def preflight_valid?
+        bulk_upload.choice != "bulk-confirm-soft-validations" && bulk_upload.choice != "create-fix-inline"
+      end
+
+      def preflight_redirect
+        case bulk_upload.choice
+        when "bulk-confirm-soft-validations"
+          page_bulk_upload_lettings_soft_validations_check_path(bulk_upload, :chosen)
+        when "create-fix-inline"
+          page_bulk_upload_lettings_resume_path(bulk_upload, :chosen)
+        end
+      end
     end
   end
 end

app/models/forms/bulk_upload_lettings_soft_validations_check/confirm_soft_errors.rb

@@ -35,6 +35,19 @@ module Forms
       def save!
         true
       end
+
+      def preflight_valid?
+        bulk_upload.choice != "bulk-confirm-soft-validations" && bulk_upload.choice != "create-fix-inline"
+      end
+
+      def preflight_redirect
+        case bulk_upload.choice
+        when "bulk-confirm-soft-validations"
+          page_bulk_upload_lettings_soft_validations_check_path(bulk_upload, :chosen)
+        when "create-fix-inline"
+          page_bulk_upload_lettings_resume_path(bulk_upload, :chosen)
+        end
+      end
     end
   end
 end

app/views/bulk_upload_lettings_soft_validations_check/chosen.html.erb

@@ -0,0 +1,14 @@
+<% content_for :before_content do %>
+  <%= govuk_back_link href: @form.back_path %>
+<% end %>
+
+<div class="govuk-grid-row">
+  <div class="govuk-grid-column-two-thirds">
+    <span class="govuk-caption-l">Bulk upload for lettings (<%= @bulk_upload.year_combo %>)</span>
+    <h1 class="govuk-heading-l">These logs have already been created</h1>
+
+    <p class="govuk-body">You have chosen to create logs from your recent bulk upload. To view and update these logs, return to the list of lettings logs.</p>
+
+    <%= govuk_button_link_to "Return to lettings logs", lettings_logs_path %>
+  </div>
+</div>

spec/requests/bulk_upload_lettings_soft_validations_check_controller_spec.rb

@@ -28,6 +28,32 @@ RSpec.describe BulkUploadLettingsSoftValidationsCheckController, type: :request
       expect(response.body).to include("Tenant code")
       expect(response.body).to include("some error")
     end
+
+    it "sets no cache headers" do
+      get "/lettings-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/confirm-soft-errors"
+
+      expect(response.headers["Cache-Control"]).to eql("no-store")
+    end
+
+    context "and previosuly told us to fix inline" do
+      let(:bulk_upload) { create(:bulk_upload, :lettings, user:, bulk_upload_errors:, choice: "create-fix-inline") }
+
+      it "redirects to resume chosen" do
+        get "/lettings-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/confirm-soft-errors"
+
+        expect(response).to redirect_to("/lettings-logs/bulk-upload-resume/#{bulk_upload.id}/chosen")
+      end
+    end
+
+    context "and previosuly told us to bulk confirm soft validations" do
+      let(:bulk_upload) { create(:bulk_upload, :lettings, user:, bulk_upload_errors:, choice: "bulk-confirm-soft-validations") }
+
+      it "redirects to soft validations check chosen" do
+        get "/lettings-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/confirm-soft-errors"
+
+        expect(response).to redirect_to("/lettings-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/chosen")
+      end
+    end
   end
 
   describe "PATCH /lettings-logs/bulk-upload-soft-validations-check/:ID/confirm-soft-errors" do
@@ -38,6 +64,8 @@ RSpec.describe BulkUploadLettingsSoftValidationsCheckController, type: :request
         expect(response).to be_successful
 
         expect(response.body).to include("You must select if there are errors in these fields")
+
+        expect(bulk_upload.reload.choice).to be_blank
       end
     end
 
@@ -46,6 +74,8 @@ RSpec.describe BulkUploadLettingsSoftValidationsCheckController, type: :request
         patch "/lettings-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/confirm-soft-errors", params: { form: { confirm_soft_errors: "no" } }
 
         expect(response).to redirect_to("/lettings-logs/bulk-upload-resume/#{bulk_upload.id}/fix-choice?soft_errors_only=true")
+
+        expect(bulk_upload.reload.choice).to be_blank
       end
     end
 
@@ -56,6 +86,8 @@ RSpec.describe BulkUploadLettingsSoftValidationsCheckController, type: :request
         expect(response).to redirect_to("/lettings-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/confirm")
         follow_redirect!
         expect(response.body).not_to include("You’ve successfully uploaded")
+
+        expect(bulk_upload.reload.choice).to be_blank
       end
     end
   end
@@ -85,6 +117,8 @@ RSpec.describe BulkUploadLettingsSoftValidationsCheckController, type: :request
       expect(response).to redirect_to("/lettings-logs")
       follow_redirect!
       expect(response.body).to include("You’ve successfully uploaded 2 logs")
+
+      expect(bulk_upload.reload.choice).to eql("bulk-confirm-soft-validations")
     end
   end
 end