app/models/validations/property_validations.rb

@@ -63,6 +63,7 @@ module Validations::PropertyValidations
       record.errors.add :la, I18n.t("validations.lettings.property.la.not_in_england")
       record.errors.add :postcode_full, I18n.t("validations.lettings.property.postcode_full.not_in_england")
       record.errors.add :uprn, I18n.t("validations.lettings.property.uprn.not_in_england")
+      record.errors.add :uprn_confirmation, I18n.t("validations.lettings.property.uprn_confirmation.not_in_england")
       record.errors.add :uprn_selection, I18n.t("validations.lettings.property.uprn_selection.not_in_england")
       if record.uprn.present?
         record.errors.add :startdate, I18n.t("validations.lettings.property.startdate.address_not_in_england")
@@ -96,6 +97,7 @@ module Validations::PropertyValidations
       record.errors.add :la, I18n.t("validations.lettings.property.la.la_not_valid_for_date", la: la.name)
       record.errors.add :postcode_full, I18n.t("validations.lettings.property.postcode_full.la_not_valid_for_date", la: la.name)
       record.errors.add :uprn, I18n.t("validations.lettings.property.uprn.la_not_valid_for_date", la: la.name)
+      record.errors.add :uprn_confirmation, I18n.t("validations.lettings.property.uprn_confirmation.la_not_valid_for_date", la: la.name)
       record.errors.add :uprn_selection, I18n.t("validations.lettings.property.uprn_selection.la_not_valid_for_date", la: la.name)
       record.errors.add :startdate, I18n.t("validations.lettings.property.startdate.la_not_valid_for_date", la: la.name)
     elsif record.is_supported_housing?

app/models/validations/sales/property_validations.rb

@@ -49,6 +49,7 @@ module Validations::Sales::PropertyValidations
     record.errors.add :la, I18n.t("validations.sales.property_information.la.not_in_england")
     record.errors.add :postcode_full, I18n.t("validations.sales.property_information.postcode_full.not_in_england")
     record.errors.add :uprn, I18n.t("validations.sales.property_information.uprn.not_in_england")
+    record.errors.add :uprn_confirmation, I18n.t("validations.sales.property_information.uprn_confirmation.not_in_england")
     record.errors.add :uprn_selection, I18n.t("validations.sales.property_information.uprn_selection.not_in_england")
     if record.uprn.present?
       record.errors.add :saledate, :skip_bu_error, message: I18n.t("validations.sales.property_information.saledate.address_not_in_england")
@@ -71,6 +72,7 @@ module Validations::Sales::PropertyValidations
     record.errors.add :la, I18n.t("validations.sales.property_information.la.la_not_valid_for_date", la: la.name)
     record.errors.add :postcode_full, I18n.t("validations.sales.property_information.postcode_full.la_not_valid_for_date", la: la.name)
     record.errors.add :uprn, I18n.t("validations.sales.property_information.uprn.la_not_valid_for_date", la: la.name)
+    record.errors.add :uprn_confirmation, I18n.t("validations.sales.property_information.uprn_confirmation.la_not_valid_for_date", la: la.name)
     record.errors.add :uprn_selection, I18n.t("validations.sales.property_information.uprn_selection.la_not_valid_for_date", la: la.name)
     record.errors.add :saledate, :skip_bu_error, message: I18n.t("validations.sales.property_information.saledate.la_not_valid_for_date", la: la.name)
   end

config/locales/validations/lettings/property_information.en.yml

@@ -24,8 +24,9 @@ en:
           invalid: "UPRN must be 12 digits or less."
           not_in_england: "It looks like you have entered an address outside of England. Only create logs for lettings in England."
           la_not_valid_for_date: "%{la} does not exist on the tenancy start date, due to a change in local authority names and boundaries. Please enter the local authority name in use on the tenancy start date"
-        uprn_confirmation: # legacy question
+        uprn_confirmation:
           not_in_england: "It looks like you have entered an address outside of England. Only create logs for lettings in England."
+          la_not_valid_for_date: "%{la} does not exist on the tenancy start date, due to a change in local authority names and boundaries. Please enter the local authority name in use on the tenancy start date"
         uprn_selection:
           not_in_england: "It looks like you have entered an address outside of England. Only create logs for lettings in England."
           la_not_valid_for_date: "%{la} does not exist on the tenancy start date, due to a change in local authority names and boundaries. Please enter the local authority name in use on the tenancy start date"

config/locales/validations/sales/property_information.en.yml

@@ -33,8 +33,9 @@ en:
         la:
           not_in_england: "It looks like you have entered an address outside of England. Only create logs for sales in England."
           la_not_valid_for_date: "%{la} does not exist on the property sale date, due to a change in local authority names and boundaries. Please enter the local authority name in use on the sale date"
-        uprn_confirmation: # legacy question
+        uprn_confirmation:
           not_in_england: "It looks like you have entered an address outside of England. Only create logs for sales in England."
+          la_not_valid_for_date: "%{la} does not exist on the property sale date, due to a change in local authority names and boundaries. Please enter the local authority name in use on the sale date"
         uprn_selection:
           not_in_england: "It looks like you have entered an address outside of England. Only create logs for sales in England."
           la_not_valid_for_date: "%{la} does not exist on the property sale date, due to a change in local authority names and boundaries. Please enter the local authority name in use on the sale date"

spec/models/validations/property_validations_spec.rb

@@ -221,6 +221,7 @@ RSpec.describe Validations::PropertyValidations do
           expect(log.errors["la"]).to include(I18n.t("validations.lettings.property.la.not_in_england"))
           expect(log.errors["postcode_full"]).to include(I18n.t("validations.lettings.property.postcode_full.not_in_england"))
           expect(log.errors["uprn"]).to include(I18n.t("validations.lettings.property.uprn.not_in_england"))
+          expect(log.errors["uprn_confirmation"]).to include(I18n.t("validations.lettings.property.uprn_confirmation.not_in_england"))
           expect(log.errors["uprn_selection"]).to include(I18n.t("validations.lettings.property.uprn_selection.not_in_england"))
           expect(log.errors["startdate"]).to include(I18n.t("validations.lettings.property.startdate.postcode_not_in_england"))
           expect(log.errors["scheme_id"]).to be_empty
@@ -240,6 +241,7 @@ RSpec.describe Validations::PropertyValidations do
           expect(log.errors["la"]).to be_empty
           expect(log.errors["postcode_full"]).to be_empty
           expect(log.errors["uprn"]).to be_empty
+          expect(log.errors["uprn_confirmation"]).to be_empty
           expect(log.errors["uprn_selection"]).to be_empty
         end
       end
@@ -252,6 +254,7 @@ RSpec.describe Validations::PropertyValidations do
           expect(log.errors["la"]).to be_empty
           expect(log.errors["postcode_full"]).to be_empty
           expect(log.errors["uprn"]).to be_empty
+          expect(log.errors["uprn_confirmation"]).to be_empty
           expect(log.errors["uprn_selection"]).to be_empty
           expect(log.errors["startdate"]).to be_empty
         end
@@ -271,6 +274,7 @@ RSpec.describe Validations::PropertyValidations do
           expect(log.errors["la"]).to be_empty
           expect(log.errors["postcode_full"]).to be_empty
           expect(log.errors["uprn"]).to be_empty
+          expect(log.errors["uprn_confirmation"]).to be_empty
           expect(log.errors["uprn_selection"]).to be_empty
         end
       end
@@ -296,6 +300,7 @@ RSpec.describe Validations::PropertyValidations do
           expect(log.errors["la"]).to be_empty
           expect(log.errors["postcode_full"]).to be_empty
           expect(log.errors["uprn"]).to be_empty
+          expect(log.errors["uprn_confirmation"]).to be_empty
           expect(log.errors["uprn_selection"]).to be_empty
           expect(log.errors["startdate"]).to be_empty
         end
@@ -309,6 +314,7 @@ RSpec.describe Validations::PropertyValidations do
           expect(log.errors["la"]).to include(I18n.t("validations.lettings.property.la.la_not_valid_for_date", la: local_authority_inactive.name))
           expect(log.errors["postcode_full"]).to include(I18n.t("validations.lettings.property.postcode_full.la_not_valid_for_date", la: local_authority_inactive.name))
           expect(log.errors["uprn"]).to include(I18n.t("validations.lettings.property.uprn.la_not_valid_for_date", la: local_authority_inactive.name))
+          expect(log.errors["uprn_confirmation"]).to include(I18n.t("validations.lettings.property.uprn_confirmation.la_not_valid_for_date", la: local_authority_inactive.name))
           expect(log.errors["uprn_selection"]).to include(I18n.t("validations.lettings.property.uprn_selection.la_not_valid_for_date", la: local_authority_inactive.name))
           expect(log.errors["startdate"]).to include(I18n.t("validations.lettings.property.startdate.la_not_valid_for_date", la: local_authority_inactive.name))
           expect(log.errors["scheme_id"]).to be_empty
@@ -328,6 +334,7 @@ RSpec.describe Validations::PropertyValidations do
           expect(log.errors["la"]).to be_empty
           expect(log.errors["postcode_full"]).to be_empty
           expect(log.errors["uprn"]).to be_empty
+          expect(log.errors["uprn_confirmation"]).to be_empty
           expect(log.errors["uprn_selection"]).to be_empty
         end
       end
@@ -344,6 +351,7 @@ RSpec.describe Validations::PropertyValidations do
           expect(log.errors["la"]).to be_empty
           expect(log.errors["postcode_full"]).to be_empty
           expect(log.errors["uprn"]).to be_empty
+          expect(log.errors["uprn_confirmation"]).to be_empty
           expect(log.errors["uprn_selection"]).to be_empty
         end
       end
@@ -362,6 +370,7 @@ RSpec.describe Validations::PropertyValidations do
           expect(log.errors["la"]).to be_empty
           expect(log.errors["postcode_full"]).to be_empty
           expect(log.errors["uprn"]).to be_empty
+          expect(log.errors["uprn_confirmation"]).to be_empty
           expect(log.errors["uprn_selection"]).to be_empty
         end
       end

spec/models/validations/sales/property_validations_spec.rb

@@ -98,6 +98,7 @@ RSpec.describe Validations::Sales::PropertyValidations do
           expect(log.errors["la"]).to include(I18n.t("validations.sales.property_information.la.not_in_england"))
           expect(log.errors["postcode_full"]).to include(I18n.t("validations.sales.property_information.postcode_full.not_in_england"))
           expect(log.errors["uprn"]).to include(I18n.t("validations.sales.property_information.uprn.not_in_england"))
+          expect(log.errors["uprn_confirmation"]).to include(I18n.t("validations.sales.property_information.uprn_confirmation.not_in_england"))
           expect(log.errors["uprn_selection"]).to include(I18n.t("validations.sales.property_information.uprn_selection.not_in_england"))
           expect(log.errors["saledate"]).to include(I18n.t("validations.sales.property_information.saledate.postcode_not_in_england"))
         end
@@ -111,6 +112,7 @@ RSpec.describe Validations::Sales::PropertyValidations do
           expect(log.errors["la"]).to be_empty
           expect(log.errors["postcode_full"]).to be_empty
           expect(log.errors["uprn"]).to be_empty
+          expect(log.errors["uprn_confirmation"]).to be_empty
           expect(log.errors["uprn_selection"]).to be_empty
           expect(log.errors["saledate"]).to be_empty
         end
@@ -130,6 +132,7 @@ RSpec.describe Validations::Sales::PropertyValidations do
           expect(log.errors["la"]).to be_empty
           expect(log.errors["postcode_full"]).to be_empty
           expect(log.errors["uprn"]).to be_empty
+          expect(log.errors["uprn_confirmation"]).to be_empty
           expect(log.errors["uprn_selection"]).to be_empty
           expect(log.errors["saledate"]).to be_empty
         end
@@ -156,6 +159,7 @@ RSpec.describe Validations::Sales::PropertyValidations do
           expect(log.errors["la"]).to be_empty
           expect(log.errors["postcode_full"]).to be_empty
           expect(log.errors["uprn"]).to be_empty
+          expect(log.errors["uprn_confirmation"]).to be_empty
           expect(log.errors["uprn_selection"]).to be_empty
           expect(log.errors["saledate"]).to be_empty
         end
@@ -169,6 +173,7 @@ RSpec.describe Validations::Sales::PropertyValidations do
           expect(log.errors["la"]).to include(I18n.t("validations.sales.property_information.la.la_not_valid_for_date", la: local_authority_inactive.name))
           expect(log.errors["postcode_full"]).to include(I18n.t("validations.sales.property_information.postcode_full.la_not_valid_for_date", la: local_authority_inactive.name))
           expect(log.errors["uprn"]).to include(I18n.t("validations.sales.property_information.uprn.la_not_valid_for_date", la: local_authority_inactive.name))
+          expect(log.errors["uprn_confirmation"]).to include(I18n.t("validations.sales.property_information.uprn_confirmation.la_not_valid_for_date", la: local_authority_inactive.name))
           expect(log.errors["uprn_selection"]).to include(I18n.t("validations.sales.property_information.uprn_selection.la_not_valid_for_date", la: local_authority_inactive.name))
           expect(log.errors["saledate"]).to include(I18n.t("validations.sales.property_information.saledate.la_not_valid_for_date", la: local_authority_inactive.name))
         end
@@ -188,6 +193,7 @@ RSpec.describe Validations::Sales::PropertyValidations do
           expect(log.errors["la"]).to be_empty
           expect(log.errors["postcode_full"]).to be_empty
           expect(log.errors["uprn"]).to be_empty
+          expect(log.errors["uprn_confirmation"]).to be_empty
           expect(log.errors["uprn_selection"]).to be_empty
           expect(log.errors["saledate"]).to be_empty
         end