16978 Add valid parties to CORRECTION_CP_SPECIAL_RESOLUTION

requirements.txt

@@ -1,4 +1,5 @@
 flask
 jsonschema[format]
+referencing
 requests
 strict-rfc3339

requirements/prod.txt

@@ -1,4 +1,5 @@
 flask
 jsonschema
+referencing
 requests
-strict-rfc3339
+strict-rfc3339

src/registry_schemas/example_data/schema_data.py

@@ -2598,7 +2598,82 @@
  'legalType': 'CP',
  'legalName': 'SUPER SUPER COOP'
  },
- 'type': 'CLIENT'
+ 'type': 'CLIENT',
+ 'parties': [
+ {
+ 'officer': {
+ 'id': 2,
+ 'firstName': 'Peter',
+ 'lastName': 'Griffin',
+ 'middleName': '',
+ 'partyType': 'person'
+ },
+ 'mailingAddress': {
+ 'streetAddress': 'mailing_address - address line one',
+ 'streetAddressAdditional': '',
+ 'addressCity': 'mailing_address city',
+ 'addressCountry': 'CA',
+ 'postalCode': 'H0H0H0',
+ 'addressRegion': 'BC'
+ },
+ 'roles': [
+ {
+ 'roleType': 'Completing Party',
+ 'appointmentDate': '2022-01-01'
+ },
+ {
+ 'roleType': 'Director',
+ 'appointmentDate': '2022-01-01'
+ }
+ ]
+ },
+ {
+ 'officer': {
+ 'id': 3,
+ 'firstName': 'Lois',
+ 'lastName': 'Griffin',
+ 'middleName': '',
+ 'partyType': 'person'
+ },
+ 'mailingAddress': {
+ 'streetAddress': 'mailing_address - address line one',
+ 'streetAddressAdditional': '',
+ 'addressCity': 'mailing_address city',
+ 'addressCountry': 'CA',
+ 'postalCode': 'H0H0H0',
+ 'addressRegion': 'BC'
+ },
+ 'roles': [
+ {
+ 'roleType': 'Director',
+ 'appointmentDate': '2022-01-01'
+ }
+ ]
+ },
+ {
+ 'officer': {
+ 'id': 4,
+ 'firstName': 'Glenn',
+ 'lastName': 'Quagmire',
+ 'middleName': '',
+ 'partyType': 'person'
+ },
+ 'mailingAddress': {
+ 'streetAddress': 'mailing_address - address line one',
+ 'streetAddressAdditional': '',
+ 'addressCity': 'mailing_address city',
+ 'addressCountry': 'CA',
+ 'postalCode': 'H0H0H0',
+ 'addressRegion': 'BC'
+ },
+ 'roles': [
+ {
+ 'roleType': 'Director',
+ 'appointmentDate': '2022-01-01'
+ }
+ ]
+ }
+ ]
 }
 
 CORRECTION_CONVERSION = {

src/registry_schemas/schemas/change_of_directors.json

@@ -44,12 +44,12 @@
  "$ref": "https://bcrs.gov.bc.ca/.well_known/schemas/directors#/definitions/director"
  },
  {
- "$ref": "#definitions/actions"
+ "$ref": "#/definitions/actions"
  }
  ]
  }
  }
  }
  }
  }
-}
+}

src/registry_schemas/utils.py

@@ -19,7 +19,9 @@
 from os import listdir, path
 from typing import Tuple
 
-from jsonschema import Draft7Validator, RefResolver, SchemaError
+from jsonschema import Draft7Validator, SchemaError
+from referencing import Registry, Resource
+from referencing.jsonschema import DRAFT7
 
 
 BASE_URI = 'https://bcrs.gov.bc.ca/.well_known/schemas'
@@ -83,26 +85,29 @@ def validate(json_data: json,
  if not schema_store:
  schema_store = get_schema_store(validate_schema, schema_search_path)
 
- schema = schema_store.get(f'{BASE_URI}/{schema_id}')
+ schema_uri = f'{BASE_URI}/{schema_id}'
+ schema = schema_store.get(schema_uri)
  if validate_schema:
  Draft7Validator.check_schema(schema)
 
- schema_file_path = path.join(schema_search_path, schema_id)
- resolver = RefResolver(f'file://{schema_file_path}.json', schema, schema_store)
-
- if Draft7Validator(schema,
- format_checker=Draft7Validator.FORMAT_CHECKER,
- resolver=resolver
- ) \
- .is_valid(json_data):
- return True, None
-
- errors = Draft7Validator(schema,
- format_checker=Draft7Validator.FORMAT_CHECKER,
- resolver=resolver
- ) \
- .iter_errors(json_data)
- return False, errors
+ def retrieve_resource(uri):
+ contents = schema_store.get(uri)
+ return Resource.from_contents(contents)
+
+ registry = Registry(retrieve=retrieve_resource).with_resource(
+ schema_uri,
+ DRAFT7.create_resource(schema)
+ )
+
+ validator = Draft7Validator(
+ {'$ref': schema_uri},
+ registry=registry,
+ format_checker=Draft7Validator.FORMAT_CHECKER
+ )
+ if not validator.is_valid(json_data):
+ return False, validator.iter_errors(json_data)
+
+ return True, None
 
  except SchemaError as error:
  # handle schema error

src/registry_schemas/version.py

@@ -23,4 +23,4 @@
 """
 
 
-__version__ = '2.18.10' # pylint: disable=invalid-name
+__version__ = '2.18.11' # pylint: disable=invalid-name