Browse Source

remove expected_log_count and processed

- these fields are no longer used or needed
bulk-upload-resume
Phil Lee 2 years ago
parent
commit
7efc9f79ae
  1. 2
      app/services/bulk_upload/lettings/log_creator.rb
  2. 10
      app/services/bulk_upload/lettings/validator.rb
  3. 2
      app/views/bulk_upload_lettings_resume/confirm.html.erb
  4. 4
      spec/services/bulk_upload/lettings/log_creator_spec.rb
  5. 4
      spec/services/bulk_upload/lettings/validator_spec.rb

2
app/services/bulk_upload/lettings/log_creator.rb

@ -23,8 +23,6 @@ class BulkUpload::Lettings::LogCreator
Sentry.capture_exception(e) Sentry.capture_exception(e)
end end
end end
bulk_upload.update!(processed: true)
end end
private private

10
app/services/bulk_upload/lettings/validator.rb

@ -38,8 +38,6 @@ class BulkUpload::Lettings::Validator
) )
end end
end end
update_expected_log_count
end end
def create_logs? def create_logs?
@ -63,14 +61,6 @@ class BulkUpload::Lettings::Validator
private 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? def over_column_error_threshold?
fields = ("field_1".."field_134").to_a fields = ("field_1".."field_134").to_a
percentage_threshold = (row_parsers.size * COLUMN_PERCENTAGE_ERROR_THRESHOLD).ceil percentage_threshold = (row_parsers.size * COLUMN_PERCENTAGE_ERROR_THRESHOLD).ceil

2
app/views/bulk_upload_lettings_resume/confirm.html.erb

@ -7,7 +7,7 @@
<span class="govuk-caption-l">Bulk upload for lettings (<%= @bulk_upload.year_combo %>)</span> <span class="govuk-caption-l">Bulk upload for lettings (<%= @bulk_upload.year_combo %>)</span>
<h1 class="govuk-heading-l">Are you sure you want to upload all logs from this bulk upload?</h1> <h1 class="govuk-heading-l">Are you sure you want to upload all logs from this bulk upload?</h1>
<p class="govuk-body">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.</p> <p class="govuk-body">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.</p>
<%= govuk_warning_text(icon_fallback_text: "Danger") do %> <%= govuk_warning_text(icon_fallback_text: "Danger") do %>
You can not delete logs once you create them You can not delete logs once you create them

4
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(log.bulk_upload).to eql(bulk_upload)
expect(bulk_upload.lettings_logs).to include(log) expect(bulk_upload.lettings_logs).to include(log)
end end
it "marks bulk upload as processed" do
expect { service.call }.to change(bulk_upload, :processed?).from(false).to(true)
end
end end
context "when a valid csv with several blank rows" do context "when a valid csv with several blank rows" do

4
spec/services/bulk_upload/lettings/validator_spec.rb

@ -69,10 +69,6 @@ RSpec.describe BulkUpload::Lettings::Validator do
expect(error.category).to eql("setup") expect(error.category).to eql("setup")
end end
it "updates expected_log_count" do
expect { validator.call }.to change(bulk_upload, :expected_log_count).from(nil).to(3)
end
end end
context "with arbitrary ordered 23/24 csv" do context "with arbitrary ordered 23/24 csv" do

Loading…
Cancel
Save