Browse Source

refactor: rename validate_fields_count and wrong_field_count

pull/1588/head
Sam Seed 3 years ago
parent
commit
fd815cf8bc
  1. 6
      app/services/bulk_upload/lettings/validator.rb
  2. 2
      config/locales/en.yml

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

@ -9,7 +9,7 @@ class BulkUpload::Lettings::Validator
attr_reader :bulk_upload, :path
validate :validate_file_not_empty
validate :validate_fields_count
validate :validate_field_numbers_count
def initialize(bulk_upload:, path:)
@bulk_upload = bulk_upload
@ -128,10 +128,10 @@ private
end
end
def validate_fields_count
def validate_field_numbers_count
return if halt_validations?
errors.add(:base, :wrong_field_count) if csv_parser.valid_field_numbers_count != csv_parser.class::FIELDS
errors.add(:base, :wrong_field_numbers_count) if csv_parser.valid_field_numbers_count != csv_parser.class::FIELDS
end
def halt_validations!

2
config/locales/en.yml

@ -44,7 +44,7 @@ en:
bulk_upload/lettings/validator:
attributes:
base:
wrong_field_count: "incorrect number of fields, please ensure you have used the correct template"
wrong_field_numbers_count: "incorrect number of fields, please ensure you have used the correct template"
forms/bulk_upload_lettings/year:
attributes:
year:

Loading…
Cancel
Save