Browse Source

invert negated predicate

pull/1621/head
Phil Lee 3 years ago
parent
commit
d90398f2de
  1. 2
      app/services/bulk_upload/lettings/validator.rb
  2. 4
      app/services/bulk_upload/lettings/year2022/csv_parser.rb
  3. 4
      app/services/bulk_upload/lettings/year2023/csv_parser.rb
  4. 2
      spec/services/bulk_upload/lettings/year2022/csv_parser_spec.rb
  5. 2
      spec/services/bulk_upload/lettings/year2023/csv_parser_spec.rb

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

@ -126,7 +126,7 @@ private
def validate_field_numbers_count
return if halt_validations?
errors.add(:base, :wrong_field_numbers_count) if csv_parser.incorrect_field_count?
errors.add(:base, :wrong_field_numbers_count) unless csv_parser.correct_field_count?
end
def validate_max_columns_count_if_no_headers

4
app/services/bulk_upload/lettings/year2022/csv_parser.rb

@ -47,10 +47,10 @@ class BulkUpload::Lettings::Year2022::CsvParser
cols[field_numbers.find_index(field) + col_offset]
end
def incorrect_field_count?
def correct_field_count?
valid_field_numbers_count = field_numbers.count { |f| f != "field_blank" }
valid_field_numbers_count != FIELDS
valid_field_numbers_count == FIELDS
end
def too_many_columns?

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

@ -47,10 +47,10 @@ class BulkUpload::Lettings::Year2023::CsvParser
cols[field_numbers.find_index(field) + col_offset]
end
def incorrect_field_count?
def correct_field_count?
valid_field_numbers_count = field_numbers.count { |f| f != "field_blank" }
valid_field_numbers_count != FIELDS
valid_field_numbers_count == FIELDS
end
def too_many_columns?

2
spec/services/bulk_upload/lettings/year2022/csv_parser_spec.rb

@ -78,7 +78,7 @@ RSpec.describe BulkUpload::Lettings::Year2022::CsvParser do
end
it "counts the number of valid field numbers correctly" do
expect(service.incorrect_field_count?).to be false
expect(service).to be_correct_field_count
end
end

2
spec/services/bulk_upload/lettings/year2023/csv_parser_spec.rb

@ -102,7 +102,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::CsvParser do
end
it "counts the number of valid field numbers correctly" do
expect(service.incorrect_field_count?).to be false
expect(service).to be_correct_field_count
end
end

Loading…
Cancel
Save