From 6254f118fe175018f9ba50819a2df175b694c5a9 Mon Sep 17 00:00:00 2001 From: Sam Seed Date: Tue, 25 Apr 2023 11:02:06 +0100 Subject: [PATCH] fix: ignore BU rows which contain whitespace only --- .../bulk_upload/lettings/year2022/row_parser.rb | 1 + .../bulk_upload/lettings/year2023/row_parser.rb | 1 + .../bulk_upload/lettings/year2022/row_parser_spec.rb | 12 +++++++++++- .../bulk_upload/lettings/year2023/row_parser_spec.rb | 12 +++++++++++- 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/app/services/bulk_upload/lettings/year2022/row_parser.rb b/app/services/bulk_upload/lettings/year2022/row_parser.rb index 650c3e896..5b88ebdbe 100644 --- a/app/services/bulk_upload/lettings/year2022/row_parser.rb +++ b/app/services/bulk_upload/lettings/year2022/row_parser.rb @@ -368,6 +368,7 @@ class BulkUpload::Lettings::Year2022::RowParser .to_hash .reject { |k, _| %w[bulk_upload block_log_creation].include?(k) } .values + .reject(&:blank?) .compact .empty? end diff --git a/app/services/bulk_upload/lettings/year2023/row_parser.rb b/app/services/bulk_upload/lettings/year2023/row_parser.rb index 24b42a608..93b6d6ade 100644 --- a/app/services/bulk_upload/lettings/year2023/row_parser.rb +++ b/app/services/bulk_upload/lettings/year2023/row_parser.rb @@ -373,6 +373,7 @@ class BulkUpload::Lettings::Year2023::RowParser .to_hash .reject { |k, _| %w[bulk_upload block_log_creation field_blank].include?(k) } .values + .reject(&:blank?) .compact .empty? end diff --git a/spec/services/bulk_upload/lettings/year2022/row_parser_spec.rb b/spec/services/bulk_upload/lettings/year2022/row_parser_spec.rb index f092b141e..bd78e469b 100644 --- a/spec/services/bulk_upload/lettings/year2022/row_parser_spec.rb +++ b/spec/services/bulk_upload/lettings/year2022/row_parser_spec.rb @@ -165,7 +165,17 @@ RSpec.describe BulkUpload::Lettings::Year2022::RowParser do end end - context "when any field is populated" do + context "when the only populated fields are whitespace" do + before do + parser.field_18 = " " + end + + it "returns true" do + expect(parser).to be_blank_row + end + end + + context "when any field is populated with something other than whitespace" do before do parser.field_1 = "1" end diff --git a/spec/services/bulk_upload/lettings/year2023/row_parser_spec.rb b/spec/services/bulk_upload/lettings/year2023/row_parser_spec.rb index 89abce90e..ed83bafc5 100644 --- a/spec/services/bulk_upload/lettings/year2023/row_parser_spec.rb +++ b/spec/services/bulk_upload/lettings/year2023/row_parser_spec.rb @@ -48,7 +48,17 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do end end - context "when any field is populated" do + context "when the only populated fields are whitespace" do + before do + parser.field_18 = " " + end + + it "returns true" do + expect(parser).to be_blank_row + end + end + + context "when any field is populated with something other than whitespace" do before do parser.field_1 = "1" end