From 0f3e48f80ccd967ee299c00e57f49c7bec615212 Mon Sep 17 00:00:00 2001 From: Sam Seed Date: Tue, 18 Apr 2023 12:24:59 +0100 Subject: [PATCH] refactor: rename non_blank_fields_count to valid_field_numbers_count --- app/services/bulk_upload/lettings/validator.rb | 2 +- app/services/bulk_upload/lettings/year2023/csv_parser.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/services/bulk_upload/lettings/validator.rb b/app/services/bulk_upload/lettings/validator.rb index 0f0be388a..e3f4b004f 100644 --- a/app/services/bulk_upload/lettings/validator.rb +++ b/app/services/bulk_upload/lettings/validator.rb @@ -131,7 +131,7 @@ private def validate_fields_count return if halt_validations? - errors.add(:base, :wrong_field_count) if csv_parser.non_blank_fields_count != csv_parser.class::FIELDS + errors.add(:base, :wrong_field_count) if csv_parser.valid_field_numbers_count != csv_parser.class::FIELDS end def halt_validations! diff --git a/app/services/bulk_upload/lettings/year2023/csv_parser.rb b/app/services/bulk_upload/lettings/year2023/csv_parser.rb index e15bdb8b0..073b0f74d 100644 --- a/app/services/bulk_upload/lettings/year2023/csv_parser.rb +++ b/app/services/bulk_upload/lettings/year2023/csv_parser.rb @@ -46,7 +46,7 @@ class BulkUpload::Lettings::Year2023::CsvParser cols[field_numbers.find_index(field) + col_offset] end - def non_blank_fields_count + def valid_field_numbers_count field_numbers.count { |f| f != "field_blank" } end