From 9d6ffc3baa3b50b319f9b489296ed26e5ec7e7ec Mon Sep 17 00:00:00 2001
From: Samuel Young <samuel.young@softwire.com>
Date: Tue, 3 Mar 2026 16:37:11 +0000
Subject: [PATCH] CLDC-4119: Add UPRN & address line 1 to 2025 bulk upload
 duplicate check (#3205)

---
 app/services/bulk_upload/lettings/year2025/row_parser.rb    | 6 ++++++
 .../bulk_upload/lettings/year2025/row_parser_spec.rb        | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/app/services/bulk_upload/lettings/year2025/row_parser.rb b/app/services/bulk_upload/lettings/year2025/row_parser.rb
index 5d132d3ef..ea52aa9f9 100644
--- a/app/services/bulk_upload/lettings/year2025/row_parser.rb
+++ b/app/services/bulk_upload/lettings/year2025/row_parser.rb
@@ -555,6 +555,8 @@ class BulkUpload::Lettings::Year2025::RowParser
       "field_10", # startdate
       "field_13", # tenancycode
       !general_needs? ? :field_6.to_s : nil, # location
+      !supported_housing? ? "field_18" : nil,  # uprn
+      !supported_housing? ? "field_19" : nil,  # address line 1
       !supported_housing? ? "field_23" : nil,  # postcode
       !supported_housing? ? "field_24" : nil,  # postcode
       "field_42", # age1
@@ -718,6 +720,8 @@ private
       "ecstat1",
       "owning_organisation",
       "tcharge",
+      !supported_housing? ? "uprn" : nil,
+      !supported_housing? ? "address_line1" : nil,
       !supported_housing? ? "postcode_full" : nil,
       !general_needs? ? "location" : nil,
       "tenancycode",
@@ -1000,6 +1004,8 @@ private
       errors.add(:field_13, error_message) # tenancycode
       errors.add(:field_6, error_message) if !general_needs? && :field_6.present? # location
       errors.add(:field_5, error_message) if !general_needs? && :field_6.blank? # add to Scheme field as unclear whether log uses New or Old CORE ids
+      errors.add(:field_18, error_message) unless supported_housing? # uprn
+      errors.add(:field_19, error_message) unless supported_housing? # address_line1
       errors.add(:field_23, error_message) unless supported_housing? # postcode_full
       errors.add(:field_24, error_message) unless supported_housing? # postcode_full
       errors.add(:field_25, error_message) unless supported_housing? # la
diff --git a/spec/services/bulk_upload/lettings/year2025/row_parser_spec.rb b/spec/services/bulk_upload/lettings/year2025/row_parser_spec.rb
index fcc4e9f46..7f4384410 100644
--- a/spec/services/bulk_upload/lettings/year2025/row_parser_spec.rb
+++ b/spec/services/bulk_upload/lettings/year2025/row_parser_spec.rb
@@ -291,6 +291,8 @@ RSpec.describe BulkUpload::Lettings::Year2025::RowParser do
                 :field_9, # startdate
                 :field_10, # startdate
                 :field_13, # tenancycode
+                :field_18, # uprn
+                :field_19, # address_line1
                 :field_23, # postcode_full
                 :field_24, # postcode_full
                 :field_25, # postcode_full