From 082009681991265ddb43e8b21a15bbfb269c8378 Mon Sep 17 00:00:00 2001 From: Phil Lee Date: Thu, 11 May 2023 16:03:20 +0100 Subject: [PATCH] remove BU min col check from sales --- app/services/bulk_upload/sales/validator.rb | 9 --------- .../bulk_upload/sales/year2022/csv_parser.rb | 1 - .../bulk_upload/sales/year2023/csv_parser.rb | 1 - spec/services/bulk_upload/sales/validator_spec.rb | 12 ------------ 4 files changed, 23 deletions(-) diff --git a/app/services/bulk_upload/sales/validator.rb b/app/services/bulk_upload/sales/validator.rb index ee87530ca..17d78c1d8 100644 --- a/app/services/bulk_upload/sales/validator.rb +++ b/app/services/bulk_upload/sales/validator.rb @@ -4,7 +4,6 @@ class BulkUpload::Sales::Validator attr_reader :bulk_upload, :path validate :validate_file_not_empty - validate :validate_min_columns validate :validate_max_columns def initialize(bulk_upload:, path:) @@ -106,14 +105,6 @@ private end end - def validate_min_columns - return if halt_validations? - - column_count = rows.map(&:size).min - - errors.add(:base, :under_min_column_count) if column_count < csv_parser.class::MIN_COLUMNS - end - def validate_max_columns return if halt_validations? diff --git a/app/services/bulk_upload/sales/year2022/csv_parser.rb b/app/services/bulk_upload/sales/year2022/csv_parser.rb index d9887e5c7..42fb6bcc4 100644 --- a/app/services/bulk_upload/sales/year2022/csv_parser.rb +++ b/app/services/bulk_upload/sales/year2022/csv_parser.rb @@ -1,7 +1,6 @@ require "csv" class BulkUpload::Sales::Year2022::CsvParser - MIN_COLUMNS = 125 MAX_COLUMNS = 126 attr_reader :path diff --git a/app/services/bulk_upload/sales/year2023/csv_parser.rb b/app/services/bulk_upload/sales/year2023/csv_parser.rb index 2080dc4a1..1409d5510 100644 --- a/app/services/bulk_upload/sales/year2023/csv_parser.rb +++ b/app/services/bulk_upload/sales/year2023/csv_parser.rb @@ -1,7 +1,6 @@ require "csv" class BulkUpload::Sales::Year2023::CsvParser - MIN_COLUMNS = 135 MAX_COLUMNS = 142 attr_reader :path diff --git a/spec/services/bulk_upload/sales/validator_spec.rb b/spec/services/bulk_upload/sales/validator_spec.rb index f56c8a95b..a496ad2a3 100644 --- a/spec/services/bulk_upload/sales/validator_spec.rb +++ b/spec/services/bulk_upload/sales/validator_spec.rb @@ -16,18 +16,6 @@ RSpec.describe BulkUpload::Sales::Validator do end end - context "when file has too few columns" do - before do - file.write("a," * 112) - file.write("\n") - file.rewind - end - - it "is not valid" do - expect(validator).not_to be_valid - end - end - context "when file has too many columns" do before do file.write((%w[a] * 127).join(","))