From 5d673cad2f174d87ded11fe8ef460e8abc8b0dd2 Mon Sep 17 00:00:00 2001 From: Phil Lee Date: Tue, 14 Mar 2023 17:36:09 +0000 Subject: [PATCH] tweak max permitted columns --- app/services/bulk_upload/lettings/validator.rb | 4 ++-- app/services/bulk_upload/lettings/year2022/csv_parser.rb | 2 ++ app/services/bulk_upload/lettings/year2023/csv_parser.rb | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/services/bulk_upload/lettings/validator.rb b/app/services/bulk_upload/lettings/validator.rb index b6df4b1bc..b76e95fec 100644 --- a/app/services/bulk_upload/lettings/validator.rb +++ b/app/services/bulk_upload/lettings/validator.rb @@ -130,9 +130,9 @@ private def validate_max_columns return if halt_validations? - max_row_size = rows.map(&:size).max + column_count = rows.map(&:size).max - errors.add(:file, :max_row_size) if max_row_size > 136 + errors.add(:file, :column_count) if column_count > csv_parser.class::MAX_COLUMNS end def halt_validations! diff --git a/app/services/bulk_upload/lettings/year2022/csv_parser.rb b/app/services/bulk_upload/lettings/year2022/csv_parser.rb index ddbd8e31b..0e337abf0 100644 --- a/app/services/bulk_upload/lettings/year2022/csv_parser.rb +++ b/app/services/bulk_upload/lettings/year2022/csv_parser.rb @@ -1,6 +1,8 @@ require "csv" class BulkUpload::Lettings::Year2022::CsvParser + MAX_COLUMNS = 136 + attr_reader :path def initialize(path:) diff --git a/app/services/bulk_upload/lettings/year2023/csv_parser.rb b/app/services/bulk_upload/lettings/year2023/csv_parser.rb index ea686566d..17d14f86c 100644 --- a/app/services/bulk_upload/lettings/year2023/csv_parser.rb +++ b/app/services/bulk_upload/lettings/year2023/csv_parser.rb @@ -1,6 +1,8 @@ require "csv" class BulkUpload::Lettings::Year2023::CsvParser + MAX_COLUMNS = 143 + attr_reader :path def initialize(path:)