From 8dcd80e4f89ac7123d1e01d35ac9f97178125de1 Mon Sep 17 00:00:00 2001
From: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com>
Date: Thu, 11 Jul 2024 09:35:47 +0100
Subject: [PATCH] Strip scheme ID (#2487)

---
 .../bulk_upload/lettings/year2023/row_parser.rb        |  6 +++---
 .../bulk_upload/lettings/year2024/row_parser.rb        |  2 +-
 .../bulk_upload/lettings/year2023/row_parser_spec.rb   | 10 ++++++++++
 .../bulk_upload/lettings/year2024/row_parser_spec.rb   |  9 +++++++++
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/app/services/bulk_upload/lettings/year2023/row_parser.rb b/app/services/bulk_upload/lettings/year2023/row_parser.rb
index 51f772bcc..1684d22ab 100644
--- a/app/services/bulk_upload/lettings/year2023/row_parser.rb
+++ b/app/services/bulk_upload/lettings/year2023/row_parser.rb
@@ -1317,11 +1317,11 @@ private
   end
 
   def log_uses_new_scheme_id?
-    field_16&.start_with?("S")
+    field_16&.strip&.start_with?("S")
   end
 
   def log_uses_old_scheme_id?
-    field_16.present? && !field_16.start_with?("S")
+    field_16.present? && !field_16.strip.start_with?("S")
   end
 
   def scheme_field
@@ -1330,7 +1330,7 @@ private
   end
 
   def scheme_id
-    return field_16 if log_uses_new_scheme_id?
+    return field_16.strip if log_uses_new_scheme_id?
     return field_15 if log_uses_old_scheme_id?
   end
 
diff --git a/app/services/bulk_upload/lettings/year2024/row_parser.rb b/app/services/bulk_upload/lettings/year2024/row_parser.rb
index c124fe09b..16e876384 100644
--- a/app/services/bulk_upload/lettings/year2024/row_parser.rb
+++ b/app/services/bulk_upload/lettings/year2024/row_parser.rb
@@ -1358,7 +1358,7 @@ private
   def scheme
     return if field_5.nil? || owning_organisation.nil? || managing_organisation.nil?
 
-    @scheme ||= Scheme.where(id: (owning_organisation.owned_schemes + managing_organisation.owned_schemes).map(&:id)).find_by_id_on_multiple_fields(field_5, field_6)
+    @scheme ||= Scheme.where(id: (owning_organisation.owned_schemes + managing_organisation.owned_schemes).map(&:id)).find_by_id_on_multiple_fields(field_5.strip, field_6)
   end
 
   def location
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 ee8675bd3..1d6d16b5f 100644
--- a/spec/services/bulk_upload/lettings/year2023/row_parser_spec.rb
+++ b/spec/services/bulk_upload/lettings/year2023/row_parser_spec.rb
@@ -1004,6 +1004,16 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
           end
         end
 
+        context "when scheme ID has leading spaces" do
+          let(:attributes) { { bulk_upload:, field_1: owning_org.old_visible_id, field_2: owning_org.old_visible_id, field_4: "2", field_5: "2", field_16: "  S#{scheme.id}", field_17: location.id } }
+
+          it "does not return an error" do
+            expect(parser.errors[:field_15]).to be_blank
+            expect(parser.errors[:field_16]).to be_blank
+            expect(parser.errors[:field_17]).to be_blank
+          end
+        end
+
         context "when location exists but not related" do
           let(:other_scheme) { create(:scheme, :with_old_visible_id) }
           let(:other_location) { create(:location, :with_old_visible_id, scheme: other_scheme) }
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 175925cac..e53850d1c 100644
--- a/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb
+++ b/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb
@@ -936,6 +936,15 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
           end
         end
 
+        context "when scheme ID has leading spaces" do
+          let(:attributes) { { bulk_upload:, field_1: owning_org.old_visible_id, field_2: owning_org.old_visible_id, field_4: "2", field_11: "1", field_5: " S#{scheme.id}", field_6: location.id } }
+
+          it "does not return an error" do
+            expect(parser.errors[:field_5]).to be_blank
+            expect(parser.errors[:field_6]).to be_blank
+          end
+        end
+
         context "when location exists but not related" do
           let(:other_scheme) { create(:scheme, :with_old_visible_id) }
           let(:other_location) { create(:location, :with_old_visible_id, scheme: other_scheme) }