Merge pull request #115 from vysakh-menon-aot/feature/14097

14097 update address schema to be consistent
bcgov · Nov 7, 2022 · 54bd868 · 54bd868
2 parents 35a99ea + fbb47e1
commit 54bd868
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/src/registry_schemas/schemas/address.json b/src/registry_schemas/schemas/address.json
@@ -10,7 +10,10 @@
             "maxLength": 50
         },
         "streetAddressAdditional": {
-            "type": "string",
+            "type": [
+                "string",
+                "null"
+            ],
             "maxLength": 50
         },
         "addressCity": {
@@ -43,7 +46,6 @@
         "streetAddress",
         "addressCity",
         "addressCountry",
-        "postalCode",
-        "addressRegion"
+        "postalCode"
     ]
 }
diff --git a/src/registry_schemas/version.py b/src/registry_schemas/version.py
@@ -22,4 +22,4 @@
 Development release segment: .devN
 """
 
-__version__ = '2.15.36'  # pylint: disable=invalid-name
+__version__ = '2.15.37'  # pylint: disable=invalid-name
diff --git a/tests/unit/test_addresses.py b/tests/unit/test_addresses.py
@@ -17,6 +17,8 @@
 """
 import copy
 
+import pytest
+
 from registry_schemas import validate
 from registry_schemas.example_data import ADDRESS
 
@@ -63,10 +65,16 @@ def test_invalid_address():
     assert not is_valid
 
 
-def test_invalid_address_missing_region():
+@pytest.mark.parametrize('field', [
+    'streetAddress',
+    'addressCity',
+    'addressCountry',
+    'postalCode'
+])
+def test_invalid_address_missing_field(field):
     """Assert that an invalid address fails - missing required field addressRegion."""
     address = copy.deepcopy(ADDRESS)
-    del address['addressRegion']
+    del address[field]
 
     is_valid, errors = validate(address, 'address')