Browse Source

feat: remove validations for number of columns

pull/1557/head
Sam Seed 3 years ago
parent
commit
47d507bc76
  1. 18
      app/services/bulk_upload/lettings/validator.rb
  2. 2
      app/services/bulk_upload/lettings/year2023/csv_parser.rb
  3. 2
      config/locales/en.yml

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

@ -10,8 +10,6 @@ class BulkUpload::Lettings::Validator
validate :validate_file_not_empty
validate :validate_fields_count
validate :validate_min_columns
validate :validate_max_columns
def initialize(bulk_upload:, path:)
@bulk_upload = bulk_upload
@ -130,22 +128,6 @@ private
end
end
def validate_min_columns
return if halt_validations?
column_count = rows.map(&:size).min
errors.add(:base, :under_min_column_count) if column_count < csv_parser.class::MIN_COLUMNS
end
def validate_max_columns
return if halt_validations?
column_count = rows.map(&:size).max
errors.add(:base, :over_max_column_count) if column_count > csv_parser.class::MAX_COLUMNS
end
def validate_fields_count
return if halt_validations?

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

@ -1,8 +1,6 @@
require "csv"
class BulkUpload::Lettings::Year2023::CsvParser
MIN_COLUMNS = 141
MAX_COLUMNS = 143
FIELDS = 134
attr_reader :path

2
config/locales/en.yml

@ -44,8 +44,6 @@ en:
bulk_upload/lettings/validator:
attributes:
base:
over_max_column_count: "too many columns, please ensure you have used the correct template"
under_min_column_count: "too few columns, please ensure you have used the correct template"
wrong_field_count: "incorrect number of fields, please ensure you have used the correct template"
forms/bulk_upload_lettings/year:
attributes:

Loading…
Cancel
Save