Keep the UPRN for newbuilds if given

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
 

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
 

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"),