Browse Source

update error message

pull/1663/head
Phil Lee 3 years ago
parent
commit
dfa5d8cada
  1. 2
      app/services/bulk_upload/lettings/year2022/row_parser.rb
  2. 2
      app/services/bulk_upload/lettings/year2023/row_parser.rb
  3. 2
      app/services/bulk_upload/sales/year2022/row_parser.rb
  4. 2
      app/services/bulk_upload/sales/year2023/row_parser.rb
  5. 11
      config/locales/en.yml
  6. 2
      spec/services/bulk_upload/lettings/validator_spec.rb
  7. 2
      spec/services/bulk_upload/sales/validator_spec.rb

2
app/services/bulk_upload/lettings/year2022/row_parser.rb

@ -457,7 +457,7 @@ class BulkUpload::Lettings::Year2022::RowParser
def add_duplicate_found_in_spreadsheet_errors
spreadsheet_duplicate_hash.each_key do |field|
errors.add(field, "Duplicate row found in spreadsheet", category: :setup)
errors.add(field, :spreadsheet_dupe, category: :setup)
end
end

2
app/services/bulk_upload/lettings/year2023/row_parser.rb

@ -474,7 +474,7 @@ class BulkUpload::Lettings::Year2023::RowParser
def add_duplicate_found_in_spreadsheet_errors
spreadsheet_duplicate_hash.each_key do |field|
errors.add(field, "Duplicate row found in spreadsheet", category: :setup)
errors.add(field, :spreadsheet_dupe, category: :setup)
end
end

2
app/services/bulk_upload/sales/year2022/row_parser.rb

@ -428,7 +428,7 @@ class BulkUpload::Sales::Year2022::RowParser
def add_duplicate_found_in_spreadsheet_errors
spreadsheet_duplicate_hash.each_key do |field|
errors.add(field, "Duplicate row found in spreadsheet", category: :setup)
errors.add(field, :spreadsheet_dupe, category: :setup)
end
end

2
app/services/bulk_upload/sales/year2023/row_parser.rb

@ -550,7 +550,7 @@ class BulkUpload::Sales::Year2023::RowParser
def add_duplicate_found_in_spreadsheet_errors
spreadsheet_duplicate_hash.each_key do |field|
errors.add(field, "Duplicate row found in spreadsheet", category: :setup)
errors.add(field, :spreadsheet_dupe, category: :setup)
end
end

11
config/locales/en.yml

@ -41,10 +41,17 @@ en:
activemodel:
errors:
models:
bulk_upload/sales/year2022/row_parser:
bulk_upload/row_parser: &bulk_upload__row_parser__base
inclusion: Enter a valid value for %{question}
spreadsheet_dupe: This is a duplicate of a log in your file
bulk_upload/lettings/year2022/row_parser:
<<: *bulk_upload__row_parser__base
bulk_upload/lettings/year2023/row_parser:
<<: *bulk_upload__row_parser__base
bulk_upload/sales/year2022/row_parser:
<<: *bulk_upload__row_parser__base
bulk_upload/sales/year2023/row_parser:
inclusion: Enter a valid value for %{question}
<<: *bulk_upload__row_parser__base
bulk_upload/lettings/validator:
attributes:
base:

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

@ -270,7 +270,7 @@ RSpec.describe BulkUpload::Lettings::Validator do
end
it "creates errors" do
expect { validator.call }.to change(BulkUploadError.where(category: :setup, error: "Duplicate row found in spreadsheet"), :count).by(24)
expect { validator.call }.to change(BulkUploadError.where(category: :setup, error: "This is a duplicate of a log in your file"), :count).by(24)
end
end

2
spec/services/bulk_upload/sales/validator_spec.rb

@ -96,7 +96,7 @@ RSpec.describe BulkUpload::Sales::Validator do
end
it "creates errors" do
expect { validator.call }.to change(BulkUploadError.where(category: :setup, error: "Duplicate row found in spreadsheet"), :count).by(20)
expect { validator.call }.to change(BulkUploadError.where(category: :setup, error: "This is a duplicate of a log in your file"), :count).by(20)
end
end
end

Loading…
Cancel
Save