From f430ff7b62804fcecaaa2ceda147ccd2796e61ee Mon Sep 17 00:00:00 2001 From: Kat Date: Mon, 12 Feb 2024 17:20:59 +0000 Subject: [PATCH] Add fields check to 2023 sales --- app/services/bulk_upload/sales/year2023/csv_parser.rb | 5 ++++- spec/services/bulk_upload/sales/year2023/csv_parser_spec.rb | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/services/bulk_upload/sales/year2023/csv_parser.rb b/app/services/bulk_upload/sales/year2023/csv_parser.rb index 036198981..c6c07e1d5 100644 --- a/app/services/bulk_upload/sales/year2023/csv_parser.rb +++ b/app/services/bulk_upload/sales/year2023/csv_parser.rb @@ -4,6 +4,7 @@ class BulkUpload::Sales::Year2023::CsvParser include CollectionTimeHelper MAX_COLUMNS = 142 + FIELDS = 135 FORM_YEAR = 2023 attr_reader :path @@ -60,7 +61,9 @@ class BulkUpload::Sales::Year2023::CsvParser end def correct_field_count? - true + valid_field_numbers_count = field_numbers.count { |f| f != "field_blank" } + + valid_field_numbers_count == FIELDS end private diff --git a/spec/services/bulk_upload/sales/year2023/csv_parser_spec.rb b/spec/services/bulk_upload/sales/year2023/csv_parser_spec.rb index 72c19e5d1..6738eb3f3 100644 --- a/spec/services/bulk_upload/sales/year2023/csv_parser_spec.rb +++ b/spec/services/bulk_upload/sales/year2023/csv_parser_spec.rb @@ -28,6 +28,10 @@ RSpec.describe BulkUpload::Sales::Year2023::CsvParser do it "parses csv correctly" do expect(service.row_parsers[0].field_19).to eql(log.uprn) end + + it "counts the number of valid field numbers correctly" do + expect(service).to be_correct_field_count + end end context "when parsing csv with headers in arbitrary order" do