refactor: check fields/columns count within csv parser, not validator

app/services/bulk_upload/lettings/validator.rb

@@ -132,15 +132,13 @@ private
   def validate_field_numbers_count
     return if halt_validations?
 
-    errors.add(:base, :wrong_field_numbers_count) if csv_parser.valid_field_numbers_count != csv_parser.class::FIELDS
+    errors.add(:base, :wrong_field_numbers_count) if csv_parser.incorrect_field_count?
   end
 
   def validate_max_columns_count_if_no_headers
-    return if halt_validations? || csv_parser.with_headers?
+    return if halt_validations?
-
-    max_columns_count = body_rows.map(&:size).max - col_offset
 
-    errors.add(:base, :over_max_column_count) if max_columns_count > csv_parser.class::MAX_COLUMNS
+    errors.add(:base, :over_max_column_count) if csv_parser.too_many_columns?
   end
 
   def halt_validations!

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

@@ -47,12 +47,18 @@ class BulkUpload::Lettings::Year2022::CsvParser
     cols[field_numbers.find_index(field) + col_offset]
   end
 
-  def valid_field_numbers_count
+  def incorrect_field_count?
-    field_numbers.count { |f| f != "field_blank" }
+    valid_field_numbers_count = field_numbers.count { |f| f != "field_blank" }
+
+    valid_field_numbers_count != FIELDS
   end
 
-  def with_headers?
+  def too_many_columns?
-    rows.map { |r| r[0] }.any? { |cell| cell&.match?(/field number/i) }
+    return if with_headers?
+
+    max_columns_count = body_rows.map(&:size).max - col_offset
+
+    max_columns_count > MAX_COLUMNS
   end
 
 private
@@ -69,6 +75,10 @@ private
                        end
   end
 
+  def with_headers?
+    rows.map { |r| r[0] }.any? { |cell| cell&.match?(/field number/i) }
+  end
+
   def row_sep
     "\n"
   end

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

@@ -47,12 +47,18 @@ class BulkUpload::Lettings::Year2023::CsvParser
     cols[field_numbers.find_index(field) + col_offset]
   end
 
-  def valid_field_numbers_count
+  def incorrect_field_count?
-    field_numbers.count { |f| f != "field_blank" }
+    valid_field_numbers_count = field_numbers.count { |f| f != "field_blank" }
+
+    valid_field_numbers_count != FIELDS
   end
 
-  def with_headers?
+  def too_many_columns?
-    rows.map { |r| r[0] }.any? { |cell| cell&.match?(/field number/i) }
+    return if with_headers?
+
+    max_columns_count = body_rows.map(&:size).max - col_offset
+
+    max_columns_count > MAX_COLUMNS
   end
 
 private
@@ -69,6 +75,10 @@ private
                        end
   end
 
+  def with_headers?
+    rows.map { |r| r[0] }.any? { |cell| cell&.match?(/field number/i) }
+  end
+
   def row_sep
     "\n"
   end

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.valid_field_numbers_count).to be(134)
+      expect(service.incorrect_field_count?).to be false
     end
   end