From 2dbfbcc8a5188cde7fb0ac0dcdbc5919eefd6a12 Mon Sep 17 00:00:00 2001
From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>
Date: Thu, 20 Feb 2025 09:42:25 +0000
Subject: [PATCH] Validate entered addresses as within England

---
 app/models/validations/property_validations.rb       | 9 +++++++--
 app/models/validations/sales/property_validations.rb | 9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/models/validations/property_validations.rb b/app/models/validations/property_validations.rb
index 1cf710857..3604d1748 100644
--- a/app/models/validations/property_validations.rb
+++ b/app/models/validations/property_validations.rb
@@ -34,9 +34,14 @@ module Validations::PropertyValidations
   def validate_uprn(record)
     return unless record.uprn
 
-    return if record.uprn.match?(/^[0-9]{1,12}$/)
+    unless record.uprn.match?(/^[0-9]{1,12}$/)
+      record.errors.add :uprn, I18n.t("validations.lettings.property.uprn.invalid")
+      return
+    end
 
-    record.errors.add :uprn, I18n.t("validations.lettings.property.uprn.invalid")
+    unless record.la.in?(LocalAuthority.england.pluck(:code))
+      record.errors.add :uprn, I18n.t("validations.lettings.property.uprn.not_in_england")
+    end
   end
 
   def validate_property_postcode(record)
diff --git a/app/models/validations/sales/property_validations.rb b/app/models/validations/sales/property_validations.rb
index 7fd4d2440..20277b052 100644
--- a/app/models/validations/sales/property_validations.rb
+++ b/app/models/validations/sales/property_validations.rb
@@ -24,9 +24,14 @@ module Validations::Sales::PropertyValidations
   def validate_uprn(record)
     return unless record.uprn
 
-    return if record.uprn.match?(/^[0-9]{1,12}$/)
+    unless record.uprn.match?(/^[0-9]{1,12}$/)
+      record.errors.add :uprn, I18n.t("validations.sales.property_information.uprn.invalid")
+      return
+    end
 
-    record.errors.add :uprn, I18n.t("validations.sales.property_information.uprn.invalid")
+    unless record.la.in?(LocalAuthority.england.pluck(:code))
+      record.errors.add :uprn, I18n.t("validations.sales.property_information.uprn.not_in_england")
+    end
   end
 
   def validate_property_postcode(record)