From d90398f2de5ab102b91e32736ef6b00c9fb9254f Mon Sep 17 00:00:00 2001 From: Phil Lee Date: Thu, 11 May 2023 16:20:06 +0100 Subject: [PATCH] invert negated predicate --- app/services/bulk_upload/lettings/validator.rb | 2 +- app/services/bulk_upload/lettings/year2022/csv_parser.rb | 4 ++-- app/services/bulk_upload/lettings/year2023/csv_parser.rb | 4 ++-- .../services/bulk_upload/lettings/year2022/csv_parser_spec.rb | 2 +- .../services/bulk_upload/lettings/year2023/csv_parser_spec.rb | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/services/bulk_upload/lettings/validator.rb b/app/services/bulk_upload/lettings/validator.rb index 5fdb9921d..e161d1284 100644 --- a/app/services/bulk_upload/lettings/validator.rb +++ b/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 diff --git a/app/services/bulk_upload/lettings/year2022/csv_parser.rb b/app/services/bulk_upload/lettings/year2022/csv_parser.rb index 3e6aaa640..08cf4709d 100644 --- a/app/services/bulk_upload/lettings/year2022/csv_parser.rb +++ b/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? diff --git a/app/services/bulk_upload/lettings/year2023/csv_parser.rb b/app/services/bulk_upload/lettings/year2023/csv_parser.rb index cc351d603..b3b959be6 100644 --- a/app/services/bulk_upload/lettings/year2023/csv_parser.rb +++ b/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? diff --git a/spec/services/bulk_upload/lettings/year2022/csv_parser_spec.rb b/spec/services/bulk_upload/lettings/year2022/csv_parser_spec.rb index cae0285bf..f2b9dda6a 100644 --- a/spec/services/bulk_upload/lettings/year2022/csv_parser_spec.rb +++ b/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 diff --git a/spec/services/bulk_upload/lettings/year2023/csv_parser_spec.rb b/spec/services/bulk_upload/lettings/year2023/csv_parser_spec.rb index c94bdae35..936cf1103 100644 --- a/spec/services/bulk_upload/lettings/year2023/csv_parser_spec.rb +++ b/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