Change naming

app/controllers/bulk_upload_lettings_soft_validations_check_controller.rb

@@ -1,4 +1,4 @@
-class BulkUploadSalesDataCheckController < ApplicationController
+class BulkUploadLettingsSoftValidationsCheckController < ApplicationController
   include ActionView::Helpers::TextHelper
 
   before_action :authenticate_user!
@@ -29,9 +29,9 @@ private
   def form
     @form ||= case params[:page]
               when "soft-errors-valid"
-                Forms::BulkUploadSalesDataCheck::SoftErrorsValid.new(form_params.merge(bulk_upload: @bulk_upload))
+                Forms::BulkUploadLettingsSoftValidationsCheck::SoftErrorsValid.new(form_params.merge(bulk_upload: @bulk_upload))
               when "confirm"
-                Forms::BulkUploadSalesDataCheck::Confirm.new(form_params.merge(bulk_upload: @bulk_upload))
+                Forms::BulkUploadLettingsSoftValidationsCheck::Confirm.new(form_params.merge(bulk_upload: @bulk_upload))
               else
                 raise "invalid form"
               end

app/controllers/bulk_upload_sales_soft_validations_check_controller.rb

@@ -1,4 +1,4 @@
-class BulkUploadLettingsDataCheckController < ApplicationController
+class BulkUploadSalesSoftValidationsCheckController < ApplicationController
   include ActionView::Helpers::TextHelper
 
   before_action :authenticate_user!
@@ -29,9 +29,9 @@ private
   def form
     @form ||= case params[:page]
               when "soft-errors-valid"
-                Forms::BulkUploadLettingsDataCheck::SoftErrorsValid.new(form_params.merge(bulk_upload: @bulk_upload))
+                Forms::BulkUploadSalesSoftValidationsCheck::SoftErrorsValid.new(form_params.merge(bulk_upload: @bulk_upload))
               when "confirm"
-                Forms::BulkUploadLettingsDataCheck::Confirm.new(form_params.merge(bulk_upload: @bulk_upload))
+                Forms::BulkUploadSalesSoftValidationsCheck::Confirm.new(form_params.merge(bulk_upload: @bulk_upload))
               else
                 raise "invalid form"
               end

app/mailers/bulk_upload_mailer.rb

@@ -29,7 +29,7 @@ class BulkUploadMailer < NotifyMailer
   def send_check_soft_validations_mail(bulk_upload:)
     title = "Check your file data"
     description = "Some of your #{bulk_upload.year_combo} #{bulk_upload.log_type} data might not be right. Click the link below to review the potential errors, and check your file to see if the data is correct."
-    cta_link = bulk_upload.sales? ? bulk_upload_sales_data_check_url(bulk_upload, page: "soft-errors-valid") : bulk_upload_lettings_data_check_url(bulk_upload, page: "soft-errors-valid")
+    cta_link = bulk_upload.sales? ? bulk_upload_sales_check_soft_validations_url(bulk_upload, page: "soft-errors-valid") : bulk_upload_lettings_check_soft_validations_url(bulk_upload, page: "soft-errors-valid")
 
     send_email(
       bulk_upload.user.email,

app/models/forms/bulk_upload_lettings_soft_validations_check/confirm.rb

@@ -1,5 +1,5 @@
 module Forms
-  module BulkUploadLettingsDataCheck
+  module BulkUploadLettingsSoftValidationsCheck
     class Confirm
       include ActiveModel::Model
       include ActiveModel::Attributes
@@ -8,11 +8,11 @@ module Forms
       attribute :bulk_upload
 
       def view_path
-        "bulk_upload_lettings_data_check/confirm"
+        "bulk_upload_lettings_soft_validations_check/confirm"
       end
 
       def back_path
-        page_bulk_upload_lettings_data_check_path(bulk_upload, page: "soft-errors-valid")
+        page_bulk_upload_lettings_soft_validations_check_path(bulk_upload, page: "soft-errors-valid")
       end
 
       def next_path

app/models/forms/bulk_upload_lettings_soft_validations_check/soft_errors_valid.rb

@@ -1,5 +1,5 @@
 module Forms
-  module BulkUploadLettingsDataCheck
+  module BulkUploadLettingsSoftValidationsCheck
     class SoftErrorsValid
       include ActiveModel::Model
       include ActiveModel::Attributes
@@ -18,7 +18,7 @@ module Forms
       end
 
       def view_path
-        "bulk_upload_lettings_data_check/soft_errors_valid"
+        "bulk_upload_lettings_soft_validations_check/soft_errors_valid"
       end
 
       def next_path
@@ -26,7 +26,7 @@ module Forms
         when "yes"
           page_bulk_upload_lettings_resume_path(bulk_upload, page: "fix-choice")
         when "no"
-          page_bulk_upload_lettings_data_check_path(bulk_upload, page: "confirm")
+          page_bulk_upload_lettings_soft_validations_check_path(bulk_upload, page: "confirm")
         else
           raise "invalid choice"
         end

app/models/forms/bulk_upload_sales_soft_validations_check/confirm.rb

@@ -1,5 +1,5 @@
 module Forms
-  module BulkUploadSalesDataCheck
+  module BulkUploadSalesSoftValidationsCheck
     class Confirm
       include ActiveModel::Model
       include ActiveModel::Attributes
@@ -8,11 +8,11 @@ module Forms
       attribute :bulk_upload
 
       def view_path
-        "bulk_upload_sales_data_check/confirm"
+        "bulk_upload_sales_soft_validations_check/confirm"
       end
 
       def back_path
-        page_bulk_upload_sales_data_check_path(bulk_upload, page: "soft-errors-valid")
+        page_bulk_upload_sales_soft_validations_check_path(bulk_upload, page: "soft-errors-valid")
       end
 
       def next_path

app/models/forms/bulk_upload_sales_soft_validations_check/soft_errors_valid.rb

@@ -1,5 +1,5 @@
 module Forms
-  module BulkUploadSalesDataCheck
+  module BulkUploadSalesSoftValidationsCheck
     class SoftErrorsValid
       include ActiveModel::Model
       include ActiveModel::Attributes
@@ -18,7 +18,7 @@ module Forms
       end
 
       def view_path
-        "bulk_upload_sales_data_check/soft_errors_valid"
+        "bulk_upload_sales_soft_validations_check/soft_errors_valid"
       end
 
       def next_path
@@ -26,7 +26,7 @@ module Forms
         when "yes"
           page_bulk_upload_sales_resume_path(bulk_upload, page: "fix-choice")
         when "no"
-          page_bulk_upload_sales_data_check_path(bulk_upload, page: "confirm")
+          page_bulk_upload_sales_soft_validations_check_path(bulk_upload, page: "confirm")
         else
           raise "invalid choice"
         end

app/views/bulk_upload_lettings_soft_validations_check/confirm.html.erb

@@ -13,7 +13,7 @@
       You can not delete logs once you create them
     <% end %>
 
-    <%= form_with model: @form, scope: :form, url: page_bulk_upload_lettings_data_check_path(@bulk_upload, page: "confirm"), method: :patch do |f| %>
+    <%= form_with model: @form, scope: :form, url: page_bulk_upload_lettings_soft_validations_check_path(@bulk_upload, page: "confirm"), method: :patch do |f| %>
       <%= f.govuk_submit %>
 
       <%= govuk_button_link_to "Cancel", @form.back_path, secondary: true %>

app/views/bulk_upload_lettings_soft_validations_check/soft_errors_valid.html.erb

@@ -1,4 +1,4 @@
-<%= form_with model: @form, scope: :form, url: page_bulk_upload_lettings_data_check_path(@bulk_upload, page: "soft-errors-valid"), method: :patch do |f| %>
+<%= form_with model: @form, scope: :form, url: page_bulk_upload_lettings_soft_validations_check_path(@bulk_upload, page: "soft-errors-valid"), method: :patch do |f| %>
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
         <%= f.govuk_error_summary %>

app/views/bulk_upload_sales_soft_validations_check/confirm.html.erb

@@ -13,7 +13,7 @@
       You can not delete logs once you create them
     <% end %>
 
-    <%= form_with model: @form, scope: :form, url: page_bulk_upload_sales_data_check_path(@bulk_upload, page: "confirm"), method: :patch do |f| %>
+    <%= form_with model: @form, scope: :form, url: page_bulk_upload_sales_soft_validations_check_path(@bulk_upload, page: "confirm"), method: :patch do |f| %>
       <%= f.govuk_submit %>
 
       <%= govuk_button_link_to "Cancel", @form.back_path, secondary: true %>

app/views/bulk_upload_sales_soft_validations_check/soft_errors_valid.html.erb

@@ -1,4 +1,4 @@
-<%= form_with model: @form, scope: :form, url: page_bulk_upload_sales_data_check_path(@bulk_upload, page: "soft-errors-valid"), method: :patch do |f| %>
+<%= form_with model: @form, scope: :form, url: page_bulk_upload_sales_soft_validations_check_path(@bulk_upload, page: "soft-errors-valid"), method: :patch do |f| %>
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
       <%= f.govuk_error_summary %>

config/locales/en.yml

@@ -73,11 +73,11 @@ en:
             choice:
               blank: You must select how would you like to fix errors
               inclusion: You must select one of the following options for how would like to fix errors
-        forms/bulk_upload_lettings_data_check/soft_errors_valid:
+        forms/bulk_upload_lettings_soft_validations_check/soft_errors_valid:
           attributes:
             soft_errors_valid:
               blank: You must select if there are errors in these fields
-        forms/bulk_upload_sales_data_check/soft_errors_valid:
+        forms/bulk_upload_sales_soft_validations_check/soft_errors_valid:
           attributes:
             soft_errors_valid:
               blank: You must select if there are errors in these fields

config/routes.rb

@@ -180,10 +180,10 @@ Rails.application.routes.draw do
         end
       end
 
-      resources :bulk_upload_lettings_data_check, path: "bulk-upload-data-check", only: %i[show update] do
+      resources :bulk_upload_lettings_soft_validations_check, path: "bulk-upload-soft-validations-check", only: %i[show update] do
         member do
-          get "*page", to: "bulk_upload_lettings_data_check#show", as: "page"
+          get "*page", to: "bulk_upload_lettings_soft_validations_check#show", as: "page"
-          patch "*page", to: "bulk_upload_lettings_data_check#update"
+          patch "*page", to: "bulk_upload_lettings_soft_validations_check#update"
         end
       end
 
@@ -235,10 +235,10 @@ Rails.application.routes.draw do
         end
       end
 
-      resources :bulk_upload_sales_data_check, path: "bulk-upload-data-check", only: %i[show update] do
+      resources :bulk_upload_sales_soft_validations_check, path: "bulk-upload-soft-validations-check", only: %i[show update] do
         member do
-          get "*page", to: "bulk_upload_sales_data_check#show", as: "page"
+          get "*page", to: "bulk_upload_sales_soft_validations_check#show", as: "page"
-          patch "*page", to: "bulk_upload_sales_data_check#update"
+          patch "*page", to: "bulk_upload_sales_soft_validations_check#update"
         end
       end
     end

spec/mailers/bulk_upload_mailer_spec.rb

@@ -113,7 +113,7 @@ RSpec.describe BulkUploadMailer do
           filename: bulk_upload.filename,
           upload_timestamp: bulk_upload.created_at.to_fs(:govuk_date_and_time),
           description: "Some of your 2022/23 lettings data might not be right. Click the link below to review the potential errors, and check your file to see if the data is correct.",
-          cta_link: bulk_upload_lettings_data_check_url(bulk_upload, page: "soft-errors-valid"),
+          cta_link: bulk_upload_lettings_soft_validations_check_url(bulk_upload, page: "soft-errors-valid"),
         },
       )
 

spec/requests/bulk_upload_lettings_soft_validations_check_controller_spec.rb

@@ -1,6 +1,6 @@
 require "rails_helper"
 
-RSpec.describe BulkUploadLettingsDataCheckController, type: :request do
+RSpec.describe BulkUploadLettingsSoftValidationsCheckController, type: :request do
   let(:user) { create(:user) }
   let(:bulk_upload) { create(:bulk_upload, :lettings, user:, bulk_upload_errors:) }
   let(:bulk_upload_errors) { create_list(:bulk_upload_error, 2) }
@@ -10,9 +10,9 @@ RSpec.describe BulkUploadLettingsDataCheckController, type: :request do
     sign_in user
   end
 
-  describe "GET /lettings-logs/bulk-upload-data-check/:ID/soft-errors-valid" do
+  describe "GET /lettings-logs/bulk-upload-soft-validations-check/:ID/soft-errors-valid" do
     it "shows the soft validation errors with confirmation question" do
-      get "/lettings-logs/bulk-upload-data-check/#{bulk_upload.id}/soft-errors-valid"
+      get "/lettings-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/soft-errors-valid"
 
       expect(response.body).to include("Bulk upload for lettings")
       expect(response.body).to include("2022/23")
@@ -22,7 +22,7 @@ RSpec.describe BulkUploadLettingsDataCheckController, type: :request do
     end
 
     it "shows the soft validation and lists the errors" do
-      get "/lettings-logs/bulk-upload-data-check/#{bulk_upload.id}/soft-errors-valid"
+      get "/lettings-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/soft-errors-valid"
 
       expect(response.body).to include("Row #{bulk_upload_errors.first.row}")
       expect(response.body).to include("Tenant code")
@@ -30,10 +30,10 @@ RSpec.describe BulkUploadLettingsDataCheckController, type: :request do
     end
   end
 
-  describe "PATCH /lettings-logs/bulk-upload-data-check/:ID/soft-errors-valid" do
+  describe "PATCH /lettings-logs/bulk-upload-soft-validations-check/:ID/soft-errors-valid" do
     context "when no option selected" do
       it "renders error message" do
-        patch "/lettings-logs/bulk-upload-data-check/#{bulk_upload.id}/soft-errors-valid"
+        patch "/lettings-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/soft-errors-valid"
 
         expect(response).to be_successful
 
@@ -43,7 +43,7 @@ RSpec.describe BulkUploadLettingsDataCheckController, type: :request do
 
     context "when yes is selected" do
       it "sends them to the fix choice page" do
-        patch "/lettings-logs/bulk-upload-data-check/#{bulk_upload.id}/soft-errors-valid", params: { form: { soft_errors_valid: "yes" } }
+        patch "/lettings-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/soft-errors-valid", params: { form: { soft_errors_valid: "yes" } }
 
         expect(response).to redirect_to("/lettings-logs/bulk-upload-resume/#{bulk_upload.id}/fix-choice")
       end
@@ -51,18 +51,18 @@ RSpec.describe BulkUploadLettingsDataCheckController, type: :request do
 
     context "when no is selected" do
       it "sends them to confirm choice" do
-        patch "/lettings-logs/bulk-upload-data-check/#{bulk_upload.id}/soft-errors-valid", params: { form: { soft_errors_valid: "no" } }
+        patch "/lettings-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/soft-errors-valid", params: { form: { soft_errors_valid: "no" } }
 
-        expect(response).to redirect_to("/lettings-logs/bulk-upload-data-check/#{bulk_upload.id}/confirm")
+        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")
       end
     end
   end
 
-  describe "GET /lettings-logs/bulk-upload-data-check/:ID/confirm" do
+  describe "GET /lettings-logs/bulk-upload-soft-validations-check/:ID/confirm" do
     it "renders page" do
-      get "/lettings-logs/bulk-upload-data-check/#{bulk_upload.id}/confirm"
+      get "/lettings-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/confirm"
 
       expect(response).to be_successful
 
@@ -72,13 +72,13 @@ RSpec.describe BulkUploadLettingsDataCheckController, type: :request do
     end
   end
 
-  describe "PATCH /lettings-logs/bulk-upload-data-check/:ID/confirm" do
+  describe "PATCH /lettings-logs/bulk-upload-soft-validations-check/:ID/confirm" do
     let(:mock_processor) { instance_double(BulkUpload::Processor, approve_and_confirm_soft_validations: nil) }
 
     it "approves logs for creation" do
       allow(BulkUpload::Processor).to receive(:new).with(bulk_upload:).and_return(mock_processor)
 
-      patch "/lettings-logs/bulk-upload-data-check/#{bulk_upload.id}/confirm"
+      patch "/lettings-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/confirm"
 
       expect(mock_processor).to have_received(:approve_and_confirm_soft_validations)
 

spec/requests/bulk_upload_sales_soft_validations_check_controller_spec.rb

@@ -1,6 +1,6 @@
 require "rails_helper"
 
-RSpec.describe BulkUploadSalesDataCheckController, type: :request do
+RSpec.describe BulkUploadSalesSoftValidationsCheckController, type: :request do
   let(:user) { create(:user) }
   let(:bulk_upload) { create(:bulk_upload, :sales, user:, bulk_upload_errors:) }
   let(:bulk_upload_errors) { create_list(:bulk_upload_error, 2) }
@@ -10,9 +10,9 @@ RSpec.describe BulkUploadSalesDataCheckController, type: :request do
     sign_in user
   end
 
-  describe "GET /sales-logs/bulk-upload-data-check/:ID/soft-errors-valid" do
+  describe "GET /sales-logs/bulk-upload-soft-validations-check/:ID/soft-errors-valid" do
     it "shows the soft validation errors with confirmation question" do
-      get "/sales-logs/bulk-upload-data-check/#{bulk_upload.id}/soft-errors-valid"
+      get "/sales-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/soft-errors-valid"
 
       expect(response.body).to include("Bulk upload for sales")
       expect(response.body).to include("2022/23")
@@ -22,7 +22,7 @@ RSpec.describe BulkUploadSalesDataCheckController, type: :request do
     end
 
     it "shows the soft validation and lists the errors" do
-      get "/sales-logs/bulk-upload-data-check/#{bulk_upload.id}/soft-errors-valid"
+      get "/sales-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/soft-errors-valid"
 
       expect(response.body).to include("Row #{bulk_upload_errors.first.row}")
       expect(response.body).to include("Purchaser code")
@@ -30,10 +30,10 @@ RSpec.describe BulkUploadSalesDataCheckController, type: :request do
     end
   end
 
-  describe "PATCH /sales-logs/bulk-upload-data-check/:ID/soft-errors-valid" do
+  describe "PATCH /sales-logs/bulk-upload-soft-validations-check/:ID/soft-errors-valid" do
     context "when no option selected" do
       it "renders error message" do
-        patch "/sales-logs/bulk-upload-data-check/#{bulk_upload.id}/soft-errors-valid"
+        patch "/sales-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/soft-errors-valid"
 
         expect(response).to be_successful
 
@@ -43,7 +43,7 @@ RSpec.describe BulkUploadSalesDataCheckController, type: :request do
 
     context "when yes is selected" do
       it "sends them to the fix choice page" do
-        patch "/sales-logs/bulk-upload-data-check/#{bulk_upload.id}/soft-errors-valid", params: { form: { soft_errors_valid: "yes" } }
+        patch "/sales-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/soft-errors-valid", params: { form: { soft_errors_valid: "yes" } }
 
         expect(response).to redirect_to("/sales-logs/bulk-upload-resume/#{bulk_upload.id}/fix-choice")
       end
@@ -51,18 +51,18 @@ RSpec.describe BulkUploadSalesDataCheckController, type: :request do
 
     context "when no is selected" do
       it "sends them to confirm choice" do
-        patch "/sales-logs/bulk-upload-data-check/#{bulk_upload.id}/soft-errors-valid", params: { form: { soft_errors_valid: "no" } }
+        patch "/sales-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/soft-errors-valid", params: { form: { soft_errors_valid: "no" } }
 
-        expect(response).to redirect_to("/sales-logs/bulk-upload-data-check/#{bulk_upload.id}/confirm")
+        expect(response).to redirect_to("/sales-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/confirm")
         follow_redirect!
         expect(response.body).not_to include("You’ve successfully uploaded")
       end
     end
   end
 
-  describe "GET /sales-logs/bulk-upload-data-check/:ID/confirm" do
+  describe "GET /sales-logs/bulk-upload-soft-validations-check/:ID/confirm" do
     it "renders page" do
-      get "/sales-logs/bulk-upload-data-check/#{bulk_upload.id}/confirm"
+      get "/sales-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/confirm"
 
       expect(response).to be_successful
 
@@ -72,13 +72,13 @@ RSpec.describe BulkUploadSalesDataCheckController, type: :request do
     end
   end
 
-  describe "PATCH /sales-logs/bulk-upload-data-check/:ID/confirm" do
+  describe "PATCH /sales-logs/bulk-upload-soft-validations-check/:ID/confirm" do
     let(:mock_processor) { instance_double(BulkUpload::Processor, approve_and_confirm_soft_validations: nil) }
 
     it "approves logs for creation" do
       allow(BulkUpload::Processor).to receive(:new).with(bulk_upload:).and_return(mock_processor)
 
-      patch "/sales-logs/bulk-upload-data-check/#{bulk_upload.id}/confirm"
+      patch "/sales-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/confirm"
 
       expect(mock_processor).to have_received(:approve_and_confirm_soft_validations)