From 44226f85faf5daea63bb46e99e2da4f15dcc517f Mon Sep 17 00:00:00 2001
From: AGibson <4319494+annajgibson@users.noreply.github.com>
Date: Thu, 15 May 2025 15:31:20 +0100
Subject: [PATCH 1/2] amend regex to look for any digit in pattern

---
 .../jobs/housing/housing_dwellings_list_gx_suite.py    | 10 +++++-----
 .../housing/housing_homeowner_record_sheet_gx_suite.py |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/scripts/jobs/housing/housing_dwellings_list_gx_suite.py b/scripts/jobs/housing/housing_dwellings_list_gx_suite.py
index 911c8c57a..1680e5aa5 100644
--- a/scripts/jobs/housing/housing_dwellings_list_gx_suite.py
+++ b/scripts/jobs/housing/housing_dwellings_list_gx_suite.py
@@ -31,20 +31,20 @@ class ExpectLLPGColumnValueLengthsBetween(gxe.ExpectColumnValueLengthsToBeBetwee
 
 class ExpectBlockRefNoColumnValuesToMatchRegex(gxe.ExpectColumnValuesToMatchRegex):
     column: str = "block_reference_number"
-    regex: str = r"^[0-9]\d+$"
-    description: str = "Expect Block Reference Number to match regex ^[0-9]\d+$ (numerical)"
+    regex: str = "^\d+$"
+    description: str = "Expect Block Reference Number to match regex ^\d+$ (numerical)"
 
 
 class ExpectLLPGColumnValuesToMatchRegex(gxe.ExpectColumnValuesToMatchRegex):
     column: str = "llpg"
-    regex: str = r"^[1-9]\d{10,11}"
+    regex: str = "^[1-9]\d{10,11}"
     description: str = "Expect UPRN (LLPG) to match regex ^[1-9]\d{10,11} (starting with digit 1-9, followed by 10 or 11 digits"
 
 
 class ExpectEstateRefNoColumnValuesToMatchRegex(gxe.ExpectColumnValuesToMatchRegex):
     column: str = "estate_reference_number"
-    regex: str = r"^[0-9]\d+$"
-    description: str = "Expect Estate Reference Number to match regex ^[0-9]\d+$ (numerical)"
+    regex: str = "^\d+$"
+    description: str = "Expect Estate Reference Number to match regex ^\d+$ (numerical)"
 
 
 class ExpectTenureValuesToBeInSet(gxe.ExpectColumnValuesToBeInSet):
diff --git a/scripts/jobs/housing/housing_homeowner_record_sheet_gx_suite.py b/scripts/jobs/housing/housing_homeowner_record_sheet_gx_suite.py
index b472c014a..69a39ccfb 100644
--- a/scripts/jobs/housing/housing_homeowner_record_sheet_gx_suite.py
+++ b/scripts/jobs/housing/housing_homeowner_record_sheet_gx_suite.py
@@ -24,14 +24,14 @@ class ExpectPropNoColumnValuesToNotBeNull(gxe.ExpectColumnValuesToNotBeNull):
 
 class ExpectPropNoNoColumnValuesToMatchRegex(gxe.ExpectColumnValuesToMatchRegex):
     column: str = "property_no"
-    regex: str = r"^[0-9]\d+$"
-    description: str = "Expect Property Number Number to match regex ^[0-9]\d+$ (numerical)"
+    regex: str = r"^\d+$"
+    description: str = "Expect Property Number Number to match regex ^\d+$ (numerical)"
 
 
 class ExpectPaymentRefNoColumnValuesToMatchRegex(gxe.ExpectColumnValuesToMatchRegex):
     column: str = "payment_ref"
-    regex: str = r"^[0-9]\d+$"
-    description: str = "Expect Payment Reference Number to match regex ^[0-9]\d+$ (numerical)"
+    regex: str = r"^\d+$"
+    description: str = "Expect Payment Reference Number to match regex ^\d+$ (numerical)"
 
 
 class ExpectTenureTypeColumnValuesToBeInSet(gxe.ExpectColumnValuesToBeInSet):

From 6fa6cbde2876f18a7f2ddbdf3b03282eb8afda31 Mon Sep 17 00:00:00 2001
From: AGibson <4319494+annajgibson@users.noreply.github.com>
Date: Thu, 15 May 2025 15:32:29 +0100
Subject: [PATCH 2/2] amend regex to look for any digit in pattern

---
 scripts/jobs/housing/housing_dwellings_list_gx_suite.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/jobs/housing/housing_dwellings_list_gx_suite.py b/scripts/jobs/housing/housing_dwellings_list_gx_suite.py
index 1680e5aa5..5edca9ffb 100644
--- a/scripts/jobs/housing/housing_dwellings_list_gx_suite.py
+++ b/scripts/jobs/housing/housing_dwellings_list_gx_suite.py
@@ -31,19 +31,19 @@ class ExpectLLPGColumnValueLengthsBetween(gxe.ExpectColumnValueLengthsToBeBetwee
 
 class ExpectBlockRefNoColumnValuesToMatchRegex(gxe.ExpectColumnValuesToMatchRegex):
     column: str = "block_reference_number"
-    regex: str = "^\d+$"
+    regex: str = r"^\d+$"
     description: str = "Expect Block Reference Number to match regex ^\d+$ (numerical)"
 
 
 class ExpectLLPGColumnValuesToMatchRegex(gxe.ExpectColumnValuesToMatchRegex):
     column: str = "llpg"
-    regex: str = "^[1-9]\d{10,11}"
+    regex: str = r"^[1-9]\d{10,11}"
     description: str = "Expect UPRN (LLPG) to match regex ^[1-9]\d{10,11} (starting with digit 1-9, followed by 10 or 11 digits"
 
 
 class ExpectEstateRefNoColumnValuesToMatchRegex(gxe.ExpectColumnValuesToMatchRegex):
     column: str = "estate_reference_number"
-    regex: str = "^\d+$"
+    regex: str = r"^\d+$"
     description: str = "Expect Estate Reference Number to match regex ^\d+$ (numerical)"