|
|
|
@ -10,8 +10,6 @@ class BulkUpload::Lettings::Validator |
|
|
|
|
|
|
|
|
|
|
|
validate :validate_file_not_empty |
|
|
|
validate :validate_file_not_empty |
|
|
|
validate :validate_fields_count |
|
|
|
validate :validate_fields_count |
|
|
|
validate :validate_min_columns |
|
|
|
|
|
|
|
validate :validate_max_columns |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def initialize(bulk_upload:, path:) |
|
|
|
def initialize(bulk_upload:, path:) |
|
|
|
@bulk_upload = bulk_upload |
|
|
|
@bulk_upload = bulk_upload |
|
|
|
@ -130,22 +128,6 @@ private |
|
|
|
end |
|
|
|
end |
|
|
|
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 |
|
|
|
def validate_fields_count |
|
|
|
return if halt_validations? |
|
|
|
return if halt_validations? |
|
|
|
|
|
|
|
|
|
|
|
|