Also redirect fix inline and confirm if soft validations are chosen to be bulk fixed

app/models/forms/bulk_upload_lettings_resume/confirm.rb

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

app/models/forms/bulk_upload_lettings_resume/fix_choice.rb

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

app/models/forms/bulk_upload_sales_resume/confirm.rb

@@ -31,11 +31,16 @@ module Forms
       end
 
       def preflight_valid?
-        bulk_upload.choice != "create-fix-inline"
+        bulk_upload.choice != "create-fix-inline" && bulk_upload.choice != "bulk-confirm-soft-validations"
       end
 
       def preflight_redirect
-        page_bulk_upload_sales_resume_path(bulk_upload, :chosen)
+        case bulk_upload.choice
+        when "create-fix-inline"
+          page_bulk_upload_sales_resume_path(bulk_upload, :chosen)
+        when "bulk-confirm-soft-validations"
+          page_bulk_upload_sales_soft_validations_check_path(bulk_upload, :chosen)
+        end
       end
     end
   end

app/models/forms/bulk_upload_sales_resume/fix_choice.rb

@@ -52,11 +52,16 @@ module Forms
       end
 
       def preflight_valid?
-        bulk_upload.choice != "create-fix-inline"
+        bulk_upload.choice != "create-fix-inline" && bulk_upload.choice != "bulk-confirm-soft-validations"
       end
 
       def preflight_redirect
-        page_bulk_upload_sales_resume_path(bulk_upload, :chosen)
+        case bulk_upload.choice
+        when "create-fix-inline"
+          page_bulk_upload_sales_resume_path(bulk_upload, :chosen)
+        when "bulk-confirm-soft-validations"
+          page_bulk_upload_sales_soft_validations_check_path(bulk_upload, :chosen)
+        end
       end
     end
   end

spec/requests/bulk_upload_lettings_resume_controller_spec.rb

@@ -36,7 +36,7 @@ RSpec.describe BulkUploadLettingsResumeController, type: :request do
       expect(response.headers["Cache-Control"]).to eql("no-store")
     end
 
-    context "and previosuly told us to fix inline" do
+    context "and previously told us to fix inline" do
       let(:bulk_upload) { create(:bulk_upload, :lettings, user:, bulk_upload_errors:, choice: "create-fix-inline") }
 
       it "redirects to chosen" do
@@ -45,6 +45,16 @@ RSpec.describe BulkUploadLettingsResumeController, type: :request do
         expect(response).to redirect_to("/lettings-logs/bulk-upload-resume/#{bulk_upload.id}/chosen")
       end
     end
+
+    context "and previously 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-resume/#{bulk_upload.id}/fix-choice"
+
+        expect(response).to redirect_to("/lettings-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/chosen")
+      end
+    end
   end
 
   describe "GET /lettings-logs/bulk-upload-resume/:ID/fix-choice?soft_errors_only=true" do
@@ -105,7 +115,7 @@ RSpec.describe BulkUploadLettingsResumeController, type: :request do
       expect(response.headers["Cache-Control"]).to eql("no-store")
     end
 
-    context "and previosuly told us to fix inline" do
+    context "and previously told us to fix inline" do
       let(:bulk_upload) { create(:bulk_upload, :lettings, user:, bulk_upload_errors:, choice: "create-fix-inline") }
 
       it "redirects to chosen" do
@@ -114,6 +124,16 @@ RSpec.describe BulkUploadLettingsResumeController, type: :request do
         expect(response).to redirect_to("/lettings-logs/bulk-upload-resume/#{bulk_upload.id}/chosen")
       end
     end
+
+    context "and previously 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-resume/#{bulk_upload.id}/confirm"
+
+        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-resume/:ID/confirm" do

spec/requests/bulk_upload_lettings_soft_validations_check_controller_spec.rb

@@ -35,7 +35,7 @@ RSpec.describe BulkUploadLettingsSoftValidationsCheckController, type: :request
       expect(response.headers["Cache-Control"]).to eql("no-store")
     end
 
-    context "and previosuly told us to fix inline" do
+    context "and previously 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
@@ -45,7 +45,7 @@ RSpec.describe BulkUploadLettingsSoftValidationsCheckController, type: :request
       end
     end
 
-    context "and previosuly told us to bulk confirm soft validations" do
+    context "and previously 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

spec/requests/bulk_upload_sales_resume_controller_spec.rb

@@ -36,7 +36,7 @@ RSpec.describe BulkUploadSalesResumeController, type: :request do
       expect(response.headers["Cache-Control"]).to eql("no-store")
     end
 
-    context "and previosuly told us to fix inline" do
+    context "and previously told us to fix inline" do
       let(:bulk_upload) { create(:bulk_upload, :sales, user:, bulk_upload_errors:, choice: "create-fix-inline") }
 
       it "redirects to chosen" do
@@ -45,6 +45,16 @@ RSpec.describe BulkUploadSalesResumeController, type: :request do
         expect(response).to redirect_to("/sales-logs/bulk-upload-resume/#{bulk_upload.id}/chosen")
       end
     end
+
+    context "and previously told us to bulk confirm soft validations" do
+      let(:bulk_upload) { create(:bulk_upload, :sales, user:, bulk_upload_errors:, choice: "bulk-confirm-soft-validations") }
+
+      it "redirects to soft validations check chosen" do
+        get "/sales-logs/bulk-upload-resume/#{bulk_upload.id}/fix-choice"
+
+        expect(response).to redirect_to("/sales-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/chosen")
+      end
+    end
   end
 
   describe "GET /sales-logs/bulk-upload-resume/:ID/fix-choice?soft_errors_only=true" do
@@ -104,6 +114,16 @@ RSpec.describe BulkUploadSalesResumeController, type: :request do
 
       expect(response.headers["Cache-Control"]).to eql("no-store")
     end
+
+    context "and previously told us to bulk confirm soft validations" do
+      let(:bulk_upload) { create(:bulk_upload, :sales, user:, bulk_upload_errors:, choice: "bulk-confirm-soft-validations") }
+
+      it "redirects to soft validations check chosen" do
+        get "/sales-logs/bulk-upload-resume/#{bulk_upload.id}/confirm"
+
+        expect(response).to redirect_to("/sales-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/chosen")
+      end
+    end
   end
 
   describe "PATCH /sales-logs/bulk-upload-resume/:ID/confirm" do

spec/requests/bulk_upload_sales_soft_validations_check_controller_spec.rb

@@ -35,7 +35,7 @@ RSpec.describe BulkUploadSalesSoftValidationsCheckController, type: :request do
       expect(response.headers["Cache-Control"]).to eql("no-store")
     end
 
-    context "and previosuly told us to fix inline" do
+    context "and previously told us to fix inline" do
       let(:bulk_upload) { create(:bulk_upload, :sales, user:, bulk_upload_errors:, choice: "create-fix-inline") }
 
       it "redirects to resume chosen" do
@@ -45,7 +45,7 @@ RSpec.describe BulkUploadSalesSoftValidationsCheckController, type: :request do
       end
     end
 
-    context "and previosuly told us to bulk confirm soft validations" do
+    context "and previously told us to bulk confirm soft validations" do
       let(:bulk_upload) { create(:bulk_upload, :sales, user:, bulk_upload_errors:, choice: "bulk-confirm-soft-validations") }
 
       it "redirects to soft validations check chosen" do