diff --git a/app/services/bulk_upload/lettings/log_creator.rb b/app/services/bulk_upload/lettings/log_creator.rb index ccffd1a15..c067c68df 100644 --- a/app/services/bulk_upload/lettings/log_creator.rb +++ b/app/services/bulk_upload/lettings/log_creator.rb @@ -23,8 +23,6 @@ class BulkUpload::Lettings::LogCreator Sentry.capture_exception(e) end end - - bulk_upload.update!(processed: true) end private diff --git a/app/services/bulk_upload/lettings/validator.rb b/app/services/bulk_upload/lettings/validator.rb index 15aef3c4d..1a0e6ecf5 100644 --- a/app/services/bulk_upload/lettings/validator.rb +++ b/app/services/bulk_upload/lettings/validator.rb @@ -38,8 +38,6 @@ class BulkUpload::Lettings::Validator ) end end - - update_expected_log_count end def create_logs? @@ -63,14 +61,6 @@ class BulkUpload::Lettings::Validator private - def update_expected_log_count - bulk_upload.update!(expected_log_count:) - end - - def expected_log_count - row_parsers.count { |row| !row.blank_row? } - end - def over_column_error_threshold? fields = ("field_1".."field_134").to_a percentage_threshold = (row_parsers.size * COLUMN_PERCENTAGE_ERROR_THRESHOLD).ceil diff --git a/app/views/bulk_upload_lettings_resume/confirm.html.erb b/app/views/bulk_upload_lettings_resume/confirm.html.erb index 362480619..119f210a3 100644 --- a/app/views/bulk_upload_lettings_resume/confirm.html.erb +++ b/app/views/bulk_upload_lettings_resume/confirm.html.erb @@ -7,7 +7,7 @@ Bulk upload for lettings (<%= @bulk_upload.year_combo %>)

Are you sure you want to upload all logs from this bulk upload?

-

There are <%= pluralize(@bulk_upload.expected_log_count, "log") %> in this bulk upload with <%= pluralize(@bulk_upload.bulk_upload_errors.count, "error") %> that still need to be fixed after upload.

+

There are <%= pluralize(@bulk_upload.logs.rewhere(visible: false).count, "log") %> in this bulk upload with <%= pluralize(@bulk_upload.bulk_upload_errors.count, "error") %> that still need to be fixed after upload.

<%= govuk_warning_text(icon_fallback_text: "Danger") do %> You can not delete logs once you create them diff --git a/spec/services/bulk_upload/lettings/log_creator_spec.rb b/spec/services/bulk_upload/lettings/log_creator_spec.rb index 2eabfbcf9..d3f6753a0 100644 --- a/spec/services/bulk_upload/lettings/log_creator_spec.rb +++ b/spec/services/bulk_upload/lettings/log_creator_spec.rb @@ -27,10 +27,6 @@ RSpec.describe BulkUpload::Lettings::LogCreator do expect(log.bulk_upload).to eql(bulk_upload) expect(bulk_upload.lettings_logs).to include(log) end - - it "marks bulk upload as processed" do - expect { service.call }.to change(bulk_upload, :processed?).from(false).to(true) - end end context "when a valid csv with several blank rows" do diff --git a/spec/services/bulk_upload/lettings/validator_spec.rb b/spec/services/bulk_upload/lettings/validator_spec.rb index e40db4b87..200f72067 100644 --- a/spec/services/bulk_upload/lettings/validator_spec.rb +++ b/spec/services/bulk_upload/lettings/validator_spec.rb @@ -69,10 +69,6 @@ RSpec.describe BulkUpload::Lettings::Validator do expect(error.category).to eql("setup") end - - it "updates expected_log_count" do - expect { validator.call }.to change(bulk_upload, :expected_log_count).from(nil).to(3) - end end context "with arbitrary ordered 23/24 csv" do