feat: update routing so deletion report is not shown once logs uploaded

app/controllers/bulk_upload_lettings_results_controller.rb

@@ -29,12 +29,6 @@ class BulkUploadLettingsResultsController < ApplicationController
     authorize @bulk_upload
   end
 
-  def deletion_report
-    @bulk_upload = BulkUpload.lettings.find(params[:id])
-
-    authorize @bulk_upload
-  end
-
 private
 
   def reset_logs_filters

app/controllers/bulk_upload_lettings_resume_controller.rb

@@ -31,6 +31,12 @@ class BulkUploadLettingsResumeController < ApplicationController
     end
   end
 
+  def deletion_report
+    @bulk_upload = BulkUpload.lettings.find(params[:id])
+
+    authorize @bulk_upload
+  end
+
 private
 
   def form
@@ -41,6 +47,8 @@ private
                 Forms::BulkUploadLettingsResume::Chosen.new(form_params.merge(bulk_upload: @bulk_upload))
               when "confirm"
                 Forms::BulkUploadLettingsResume::Confirm.new(form_params.merge(bulk_upload: @bulk_upload))
+              when "deletion-report"
+                Forms::BulkUploadLettingsResume::DeletionReport.new(form_params.merge(bulk_upload: @bulk_upload))
               else
                 raise "invalid form"
               end

app/controllers/bulk_upload_sales_results_controller.rb

@@ -27,12 +27,6 @@ class BulkUploadSalesResultsController < ApplicationController
     authorize @bulk_upload
   end
 
-  def deletion_report
-    @bulk_upload = BulkUpload.sales.find(params[:id])
-
-    authorize @bulk_upload
-  end
-
 private
 
   def reset_logs_filters

app/controllers/bulk_upload_sales_resume_controller.rb

@@ -31,6 +31,12 @@ class BulkUploadSalesResumeController < ApplicationController
     end
   end
 
+  def deletion_report
+    @bulk_upload = BulkUpload.sales.find(params[:id])
+
+    authorize @bulk_upload
+  end
+
 private
 
   def form
@@ -41,6 +47,8 @@ private
                 Forms::BulkUploadSalesResume::Chosen.new(form_params.merge(bulk_upload: @bulk_upload))
               when "confirm"
                 Forms::BulkUploadSalesResume::Confirm.new(form_params.merge(bulk_upload: @bulk_upload))
+              when "deletion-report"
+                Forms::BulkUploadSalesResume::DeletionReport.new(form_params.merge(bulk_upload: @bulk_upload))
               else
                 raise "invalid form"
               end

app/models/forms/bulk_upload_lettings_resume/deletion_report.rb

@@ -0,0 +1,28 @@
+module Forms
+  module BulkUploadLettingsResume
+    class DeletionReport
+      include ActiveModel::Model
+      include ActiveModel::Attributes
+      include Rails.application.routes.url_helpers
+
+      attribute :bulk_upload
+
+      def view_path
+        "bulk_upload_lettings_resume/deletion_report"
+      end
+
+      def preflight_valid?
+        bulk_upload.choice != "create-fix-inline" && bulk_upload.choice != "bulk-confirm-soft-validations"
+      end
+
+      def preflight_redirect
+        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
+end

app/views/bulk_upload_lettings_resume/confirm.html.erb

@@ -15,7 +15,7 @@
     <% if unique_answers_to_be_cleared(@bulk_upload).present? %>
       <%= govuk_warning_text do %>
         <%= deleted_errors_warning_text(@bulk_upload) %>
-        <%= govuk_link_to "See which answers will be deleted", deletion_report_bulk_upload_lettings_result_path %>
+        <%= govuk_link_to "See which answers will be deleted", deletion_report_bulk_upload_lettings_resume_path %>
       <% end %>
     <% end %>
 

app/views/bulk_upload_sales_resume/confirm.html.erb

@@ -15,7 +15,7 @@
     <% if unique_answers_to_be_cleared(@bulk_upload).present? %>
       <%= govuk_warning_text do %>
         <%= deleted_errors_warning_text(@bulk_upload) %>
-        <%= govuk_link_to "See which answers will be deleted", deletion_report_bulk_upload_sales_result_path %>
+        <%= govuk_link_to "See which answers will be deleted", deletion_report_bulk_upload_sales_resume_path %>
       <% end %>
     <% end %>
 

config/routes.rb

@@ -216,7 +216,6 @@ Rails.application.routes.draw do
         member do
           get :resume
           get :summary
-          get "deletion-report"
         end
       end
 
@@ -226,6 +225,7 @@ Rails.application.routes.draw do
 
           get "*page", to: "bulk_upload_lettings_resume#show", as: "page"
           patch "*page", to: "bulk_upload_lettings_resume#update"
+          get "deletion-report"
         end
       end
 
@@ -281,13 +281,13 @@ Rails.application.routes.draw do
         member do
           get :resume
           get :summary
-          get "deletion-report"
         end
       end
 
       resources :bulk_upload_sales_resume, path: "bulk-upload-resume", only: %i[show update] do
         member do
           get :start
+          get "deletion-report"
 
           get "*page", to: "bulk_upload_sales_resume#show", as: "page"
           patch "*page", to: "bulk_upload_sales_resume#update"