From d814f1261ca8b5d078c62853e50811ac680e58a1 Mon Sep 17 00:00:00 2001
From: Kat <54268893+kosiakkatrina@users.noreply.github.com>
Date: Tue, 11 Mar 2025 09:30:54 +0000
Subject: [PATCH] Keep the UPRN for newbuilds if given

---
 app/models/derived_variables/lettings_log_variables.rb |  3 +--
 spec/models/lettings_log_spec.rb                       | 10 +++++-----
 .../bulk_upload/lettings/year2025/row_parser_spec.rb   |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/models/derived_variables/lettings_log_variables.rb b/app/models/derived_variables/lettings_log_variables.rb
index 4993a49bd..08f00cb33 100644
--- a/app/models/derived_variables/lettings_log_variables.rb
+++ b/app/models/derived_variables/lettings_log_variables.rb
@@ -84,8 +84,7 @@ module DerivedVariables::LettingsLogVariables
 
     set_housingneeds_fields if housingneeds?
     if form.start_year_2025_or_later? && is_general_needs?
-      if changed_to_newbuild?
-        self.uprn = nil
+      if changed_to_newbuild? && uprn.nil?
         self.manual_address_entry_selected = true
       end
 
diff --git a/spec/models/lettings_log_spec.rb b/spec/models/lettings_log_spec.rb
index 46fe826ff..9f0ddec42 100644
--- a/spec/models/lettings_log_spec.rb
+++ b/spec/models/lettings_log_spec.rb
@@ -954,7 +954,7 @@ RSpec.describe LettingsLog do
                  uprn: "1")
         end
 
-        it "clears the uprn and keeps the address fields" do
+        it "keeps the uprn" do
           expect(address_lettings_log.manual_address_entry_selected).to eq(false)
           expect(address_lettings_log.uprn).to eq("1")
           expect(address_lettings_log.address_line1).to eq("1, Test Street")
@@ -962,13 +962,13 @@ RSpec.describe LettingsLog do
           expect(address_lettings_log.postcode_full).to eq("AA1 1AA")
 
           address_lettings_log.update!(rsnvac: 15)
-          expect(address_lettings_log.manual_address_entry_selected).to eq(true)
+          expect(address_lettings_log.manual_address_entry_selected).to eq(false)
           expect(address_lettings_log.address_line1).to eq("1, Test Street")
           expect(address_lettings_log.town_or_city).to eq("Test Town")
           expect(address_lettings_log.postcode_full).to eq("AA1 1AA")
-          expect(address_lettings_log.uprn_selection).to eq(nil)
-          expect(address_lettings_log.uprn).to eq(nil)
-          expect(address_lettings_log.uprn_known).to eq(0)
+          expect(address_lettings_log.uprn_selection).to eq("1")
+          expect(address_lettings_log.uprn).to eq("1")
+          expect(address_lettings_log.uprn_known).to eq(1)
         end
       end
 
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 49a4e8616..fa57ec801 100644
--- a/spec/services/bulk_upload/lettings/year2025/row_parser_spec.rb
+++ b/spec/services/bulk_upload/lettings/year2025/row_parser_spec.rb
@@ -237,7 +237,7 @@ RSpec.describe BulkUpload::Lettings::Year2025::RowParser do
             field_128: "1",
             field_129: "34.56",
 
-            field_16: "17",
+            field_16: "15",
             field_30: now.day.to_s,
             field_31: now.month.to_s,
             field_32: now.strftime("%g"),