baarkerlounger
/
submit-social-housing-lettings-and-sales-data
mirror of https://github.com/communitiesuk/submit-social-housing-lettings-and-sales-data.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

feat: make unique count track repeated errors across rows

pull/2142/head
natdeanlewissoftwire 2 years ago
parent
44e0a00655
commit
e5b8151fb7
2 changed files with 115 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      app/helpers/logs_helper.rb
  2. 153
      spec/helpers/logs_helper_spec.rb

2
app/helpers/logs_helper.rb
Unescape View File

@ -78,7 +78,7 @@ module LogsHelper
end end
def unique_answers_to_be_cleared(bulk_upload) def unique_answers_to_be_cleared(bulk_upload)
all_answers_to_be_cleared(bulk_upload.bulk_upload_errors).uniq(&:field) all_answers_to_be_cleared(bulk_upload.bulk_upload_errors).uniq { |error| [error.field, error.row] }
end end
def answers_to_be_deleted_title_text(bulk_upload) def answers_to_be_deleted_title_text(bulk_upload)

153
spec/helpers/logs_helper_spec.rb
Unescape View File

@ -7,57 +7,132 @@ RSpec.describe LogsHelper, type: :helper do
context "with a lettings bulk upload with various errors" do context "with a lettings bulk upload with various errors" do
let(:bulk_upload) { create(:bulk_upload, :lettings) } let(:bulk_upload) { create(:bulk_upload, :lettings) }
before do context "with one row" do
errors = [OpenStruct.new(attribute: "field_50", message: "you must answer field 50", category: :not_answered), before do
OpenStruct.new(attribute: "field_60", message: "some compound error", category: :other_category), errors = [OpenStruct.new(attribute: "field_50", message: "you must answer field 50", category: :not_answered),
OpenStruct.new(attribute: "field_61", message: "some compound error", category: :other_category), OpenStruct.new(attribute: "field_60", message: "some compound error", category: :other_category),
OpenStruct.new(attribute: "field_61", message: "some other compound error that overlaps with a previous error field", category: :another_category), OpenStruct.new(attribute: "field_61", message: "some compound error", category: :other_category),
OpenStruct.new(attribute: "field_62", message: "some other compound error that overlaps with a previous error field", category: :another_category)] OpenStruct.new(attribute: "field_61", message: "some other compound error that overlaps with a previous error field", category: :another_category),
errors.each do |error| OpenStruct.new(attribute: "field_62", message: "some other compound error that overlaps with a previous error field", category: :another_category),
bulk_upload.bulk_upload_errors.create!( OpenStruct.new(attribute: "field_63", message: "some soft validation error", category: :soft_validation)]
field: error.attribute, errors.each do |error|
error: error.message, bulk_upload.bulk_upload_errors.create!(
tenant_code: "test", field: error.attribute,
property_ref: "test", error: error.message,
row: "test", tenant_code: "test",
cell: "test", property_ref: "test",
col: "test", row: "test",
category: error.category, cell: "test",
) col: "test",
category: error.category,
)
end
end
it "returns the correct unique answers to be cleared" do
expect(result.count).to eq(3)
expect(result.map(&:field)).to match_array(%w[field_60 field_61 field_62])
end end
end end
it "returns the correct unique answers to be cleared" do context "with multiple rows" do
expect(result.count).to eq(3) before do
expect(result.map(&:field)).to match_array(%w[field_60 field_61 field_62]) errors = [OpenStruct.new(attribute: "field_50", message: "you must answer field 50", category: :not_answered, row: 1),
OpenStruct.new(attribute: "field_60", message: "some compound error", category: :other_category, row: 1),
OpenStruct.new(attribute: "field_61", message: "some compound error", category: :other_category, row: 1),
OpenStruct.new(attribute: "field_61", message: "some other compound error that overlaps with a previous error field", category: :another_category, row: 1),
OpenStruct.new(attribute: "field_62", message: "some other compound error that overlaps with a previous error field", category: :another_category, row: 1),
OpenStruct.new(attribute: "field_63", message: "some soft validation error", category: :soft_validation, row: 1),
OpenStruct.new(attribute: "field_50", message: "you must answer field 50", category: :not_answered, row: 2),
OpenStruct.new(attribute: "field_60", message: "some compound error", category: :other_category, row: 2),
OpenStruct.new(attribute: "field_61", message: "some compound error", category: :other_category, row: 2),
OpenStruct.new(attribute: "field_61", message: "some other compound error that overlaps with a previous error field", category: :another_category, row: 2),
OpenStruct.new(attribute: "field_62", message: "some other compound error that overlaps with a previous error field", category: :another_category, row: 2),
OpenStruct.new(attribute: "field_63", message: "some soft validation error", category: :soft_validation, row: 2)]
errors.each do |error|
bulk_upload.bulk_upload_errors.create!(
field: error.attribute,
error: error.message,
tenant_code: "test",
property_ref: "test",
row: error.row,
cell: "test",
col: "test",
category: error.category,
)
end
end
it "returns the correct unique answers to be cleared" do
expect(result.count).to eq(6)
expect(result.map(&:field)).to match_array(%w[field_60 field_61 field_62 field_60 field_61 field_62])
end
end end
end end
context "with a sales bulk upload with various errors" do context "with a sales bulk upload with various errors" do
let(:bulk_upload) { create(:bulk_upload, :sales) } let(:bulk_upload) { create(:bulk_upload, :sales) }
before do context "with one row" do
errors = [OpenStruct.new(attribute: "field_50", message: "you must answer field 50", category: :not_answered), before do
OpenStruct.new(attribute: "field_60", message: "some compound error", category: :other_category), errors = [OpenStruct.new(attribute: "field_50", message: "you must answer field 50", category: :not_answered),
OpenStruct.new(attribute: "field_61", message: "some compound error", category: :other_category), OpenStruct.new(attribute: "field_60", message: "some compound error", category: :other_category),
OpenStruct.new(attribute: "field_61", message: "some other compound error that overlaps with a previous error field", category: :another_category), OpenStruct.new(attribute: "field_61", message: "some compound error", category: :other_category),
OpenStruct.new(attribute: "field_62", message: "some other compound error that overlaps with a previous error field", category: :another_category)] OpenStruct.new(attribute: "field_61", message: "some other compound error that overlaps with a previous error field", category: :another_category),
errors.each do |error| OpenStruct.new(attribute: "field_62", message: "some other compound error that overlaps with a previous error field", category: :another_category),
bulk_upload.bulk_upload_errors.create!( OpenStruct.new(attribute: "field_63", message: "some soft validation error", category: :soft_validation)]
field: error.attribute, errors.each do |error|
error: error.message, bulk_upload.bulk_upload_errors.create!(
purchaser_code: "test", field: error.attribute,
row: "test", error: error.message,
cell: "test", tenant_code: "test",
col: "test", property_ref: "test",
category: error.category, row: "test",
) cell: "test",
col: "test",
category: error.category,
)
end
end
it "returns the correct unique answers to be cleared" do
expect(result.count).to eq(3)
expect(result.map(&:field)).to match_array(%w[field_60 field_61 field_62])
end end
end end
it "returns the correct unique answers to be cleared" do context "with multiple rows" do
expect(result.count).to eq(3) before do
expect(result.map(&:field)).to match_array(%w[field_60 field_61 field_62]) errors = [OpenStruct.new(attribute: "field_50", message: "you must answer field 50", category: :not_answered, row: 1),
OpenStruct.new(attribute: "field_60", message: "some compound error", category: :other_category, row: 1),
OpenStruct.new(attribute: "field_61", message: "some compound error", category: :other_category, row: 1),
OpenStruct.new(attribute: "field_61", message: "some other compound error that overlaps with a previous error field", category: :another_category, row: 1),
OpenStruct.new(attribute: "field_62", message: "some other compound error that overlaps with a previous error field", category: :another_category, row: 1),
OpenStruct.new(attribute: "field_63", message: "some soft validation error", category: :soft_validation, row: 1),
OpenStruct.new(attribute: "field_50", message: "you must answer field 50", category: :not_answered, row: 2),
OpenStruct.new(attribute: "field_60", message: "some compound error", category: :other_category, row: 2),
OpenStruct.new(attribute: "field_61", message: "some compound error", category: :other_category, row: 2),
OpenStruct.new(attribute: "field_61", message: "some other compound error that overlaps with a previous error field", category: :another_category, row: 2),
OpenStruct.new(attribute: "field_62", message: "some other compound error that overlaps with a previous error field", category: :another_category, row: 2),
OpenStruct.new(attribute: "field_63", message: "some soft validation error", category: :soft_validation, row: 2)]
errors.each do |error|
bulk_upload.bulk_upload_errors.create!(
field: error.attribute,
error: error.message,
tenant_code: "test",
property_ref: "test",
row: error.row,
cell: "test",
col: "test",
category: error.category,
)
end
end
it "returns the correct unique answers to be cleared" do
expect(result.count).to eq(6)
expect(result.map(&:field)).to match_array(%w[field_60 field_61 field_62 field_60 field_61 field_62])
end
end end
end end
end end

Write Preview
Loading…
Cancel
Save