From 6ae855bd408983bd8a32c5e9a59027cebe7ae7bd Mon Sep 17 00:00:00 2001
From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>
Date: Thu, 20 Feb 2025 10:33:10 +0000
Subject: [PATCH] Revert "Validate entered addresses as within England"

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

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