From 6c8f9363e3e11d52dd21a8df9d3066c3ab3a96ef Mon Sep 17 00:00:00 2001 From: Lekshmi Date: Fri, 10 Jul 2020 13:57:43 -0700 Subject: [PATCH] Added newTranslations to the alteration schema (#37) --- src/registry_schemas/example_data/schema_data.py | 3 ++- .../schemas/alteration_name_translations.json | 13 +++++++++++-- src/registry_schemas/version.py | 2 +- tests/unit/test_alteration.py | 1 + 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/registry_schemas/example_data/schema_data.py b/src/registry_schemas/example_data/schema_data.py index 7778ba2..9cbf9c1 100644 --- a/src/registry_schemas/example_data/schema_data.py +++ b/src/registry_schemas/example_data/schema_data.py @@ -925,9 +925,10 @@ 'nrNumber': 'NR123567' }, 'alterNameTranslations': { + 'newTranslations': ['Financière de l’Odet'], 'modifiedTranslations': [{ 'oldValue': 'A1 Ltd.', - 'newValue': 'A2 Ltd' + 'newValue': 'Société Générale' }], 'ceasedTranslations': ['B1', 'B2'] }, diff --git a/src/registry_schemas/schemas/alteration_name_translations.json b/src/registry_schemas/schemas/alteration_name_translations.json index 2b3030d..7dbccc2 100644 --- a/src/registry_schemas/schemas/alteration_name_translations.json +++ b/src/registry_schemas/schemas/alteration_name_translations.json @@ -5,9 +5,17 @@ "title": "Change of name translations", "anyOf": [ {"required": ["modifiedTranslations"]}, - {"required": ["ceasedTranslations"]} + {"required": ["ceasedTranslations"]}, + {"required": ["newTranslations"]} ], "properties": { + "newTranslations": { + "type": "array", + "items": { + "type": "string", + "pattern": "^[ A-Za-zÀ-ÿ_@./#’&+-]*$" + } + }, "modifiedTranslations": { "type": "array", "items": { @@ -23,7 +31,8 @@ }, "newValue": { "type": "string", - "title": "New Translation" + "title": "New Translation", + "pattern": "^[ A-Za-zÀ-ÿ_@./#’&+-]*$" } } } diff --git a/src/registry_schemas/version.py b/src/registry_schemas/version.py index 7ed8956..01c192e 100644 --- a/src/registry_schemas/version.py +++ b/src/registry_schemas/version.py @@ -22,4 +22,4 @@ Development release segment: .devN """ -__version__ = '2.5.16' # pylint: disable=invalid-name +__version__ = '2.5.17' # pylint: disable=invalid-name diff --git a/tests/unit/test_alteration.py b/tests/unit/test_alteration.py index c1115fd..6d25098 100644 --- a/tests/unit/test_alteration.py +++ b/tests/unit/test_alteration.py @@ -101,6 +101,7 @@ def test_validate_invalid_name_translation_alteration(): alteration_json = copy.deepcopy(ALTERATION) del alteration_json['alterNameTranslations']['modifiedTranslations'] del alteration_json['alterNameTranslations']['ceasedTranslations'] + del alteration_json['alterNameTranslations']['newTranslations'] is_valid, errors = validate(alteration_json, 'alteration')