From 0a636e374ba716c8b8745e1f6d60c2586c3e7d7e Mon Sep 17 00:00:00 2001
From: Rachael Booth <rachael.booth@softwire.com>
Date: Tue, 15 Oct 2024 11:53:15 +0100
Subject: [PATCH] Use join to only insert space when both parts of postcode are
 provided

---
 app/services/bulk_upload/lettings/year2024/row_parser.rb       | 2 +-
 app/services/bulk_upload/sales/year2024/row_parser.rb          | 2 +-
 spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/services/bulk_upload/lettings/year2024/row_parser.rb b/app/services/bulk_upload/lettings/year2024/row_parser.rb
index b8b824114..a7eb96c61 100644
--- a/app/services/bulk_upload/lettings/year2024/row_parser.rb
+++ b/app/services/bulk_upload/lettings/year2024/row_parser.rb
@@ -1355,7 +1355,7 @@ private
   end
 
   def postcode_full
-    "#{field_21} #{field_22}" if field_21 || field_22
+    [field_21, field_22].compact_blank.join(" ") if field_21 || field_22
   end
 
   def owning_organisation
diff --git a/app/services/bulk_upload/sales/year2024/row_parser.rb b/app/services/bulk_upload/sales/year2024/row_parser.rb
index 7bf29d61d..fbc99ba02 100644
--- a/app/services/bulk_upload/sales/year2024/row_parser.rb
+++ b/app/services/bulk_upload/sales/year2024/row_parser.rb
@@ -1074,7 +1074,7 @@ private
   end
 
   def postcode_full
-    "#{field_27} #{field_28}" if field_27 || field_28
+    [field_27, field_28].compact_blank.join(" ") if field_27 || field_28
   end
 
   def ppostcode_full
diff --git a/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb b/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb
index 77e2bc6d4..2e4c82635 100644
--- a/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb
+++ b/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb
@@ -2720,7 +2720,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
       end
 
       context "when a partial postcode is provided" do
-        let(:attributes) { { bulk_upload:, field_4: 1, field_21: "EC1N", field_22: nil } }
+        let(:attributes) { { bulk_upload:, field_4: 1, field_21: "EC1N", field_22: "" } }
 
         it "is set to the partial value" do
           expect(parser.log.postcode_full).to eql("EC1N")