Merge pull request #38 from thorwolpert/4395-staff-payment-alterations

added staff bcol payments and alteration filing changes
bcgov · Jul 29, 2020 · a2acfdb · a2acfdb
2 parents 6c8f936 + 486154c
commit a2acfdb
Show file tree

Hide file tree

Showing 10 changed files with 471 additions and 548 deletions.
diff --git a/src/registry_schemas/example_data/schema_data.py b/src/registry_schemas/example_data/schema_data.py
@@ -914,25 +914,26 @@
     }
 }
 
-
 ALTERATION = {
     'provisionsRemoved': False,
-    'alterCorpType': {
-        'corpType': 'benefitCompany'
+    'business': {
+        'identifier': 'BC1234567',
+        'legalType': 'BC'
     },
-    'alterCorpName': {
-        'legalName': 'new name',
-        'nrNumber': 'NR123567'
+    'nameRequest': {
+        'nrNumber': 'NR 8798956',
+        'legalName': 'HAULER MEDIA INC.',
+        'legalType': 'BC'
     },
-    'alterNameTranslations': {
-        'newTranslations': ['Financière de l’Odet'],
-        'modifiedTranslations': [{
-            'oldValue': 'A1 Ltd.',
-            'newValue': 'Société Générale'
+    'nameTranslations': {
+        'new': ['MÉDIAS DE TRANSPORT INC.'],
+        'modified': [{
+            'oldValue': 'A1 LTD.',
+            'newValue': 'SOCIÉTÉ GÉNÉRALE'
         }],
-        'ceasedTranslations': ['B1', 'B2']
+        'ceased': ['B1', 'B2']
     },
-    'alterShareStructure': {
+    'shareStructure': {
         'resolutionDates': ['2020-05-23', '2020-06-01'],
         'shareClasses': [{
             'name': 'class1',
@@ -944,7 +945,7 @@
             'hasParValue': True,
             'hasRightsOrRestrictions': False,
             'series': [{
-                'name': 'class1',
+                'name': 'series1',
                 'priority': 1,
                 'maxNumberOfShares': 600,
                 'hasMaximumShares': True,

diff --git a/src/registry_schemas/schemas/alteration.json b/src/registry_schemas/schemas/alteration.json
@@ -1,77 +1,44 @@
 {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "$id": "https://bcrs.gov.bc.ca/.well_known/schemas/alteration",
-    "anyOf": [
-        {"required": ["alterCorpType"]},
-        {"required": ["alterCorpName"]},
-        {"required": ["alterNameTranslations"]},
-        {"required": ["alterShareStructure"]}
-    ],
-    "type": "object",
-    "title": "Alteration Filing",
-    "properties": {
-        "provisionsRemoved": {
-            "type": "boolean",
-            "title": "Has Pre-existing company provisions?"
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "https://bcrs.gov.bc.ca/.well_known/schemas/alteration",
+  "anyOf": [
+    { "$ref": "https://bcrs.gov.bc.ca/.well_known/schemas/business" },
+    { "required": ["nameRequest"] },
+    { "required": ["nameTranslations"] },
+    { "required": ["shareStructure"] }
+  ],
+  "type": "object",
+  "title": "Alteration Filing",
+  "properties": {
+    "provisionsRemoved": {
+      "type": "boolean",
+      "title": "Has Pre-existing company provisions?"
+    },
+    "nameRequest": {
+      "$ref": "https://bcrs.gov.bc.ca/.well_known/schemas/name_request"
+    },
+    "nameTranslations": {
+      "$ref": "https://bcrs.gov.bc.ca/.well_known/schemas/name_translations"
+    },
+    "shareStructure": {
+      "type": "object",
+      "title": "New Share Structure",
+      "required": ["resolutionDates", "shareClasses"],
+      "properties": {
+        "resolutionDates": {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "format": "date"
+          }
         },
-        "alterCorpType": {
-            "type": "object",
-            "required": [
-                "corpType"
-            ],
-            "properties": {
-                "corpType": {
-                    "type": "string",
-                    "title": "Corp type to which the business needs to be converted",
-                    "enum": [
-                        "benefitCompany"
-                    ]
-                }
-            }
-        },
-        "alterCorpName": {
-            "type": "object",
-            "required": [
-                "legalName",
-                "nrNumber"
-            ],
-            "properties": {
-                "legalName": {
-                    "$ref": "https://bcrs.gov.bc.ca/.well_known/schemas/business#/definitions/legalName",
-                    "title": "New Legal Name"
-                },
-                "nrNumber": {
-                    "type": "string",
-                    "maxLength": 10,
-                    "title": "Name Request Number"
-                }
-            }
-        },
-        "alterNameTranslations": {
-            "$ref": "https://bcrs.gov.bc.ca/.well_known/schemas/alteration_name_translations"
-        },
-        "alterShareStructure": {
-            "type": "object",
-            "title": "New Share Structure",
-            "required": [
-                "resolutionDates",
-                "shareClasses"
-            ],
-            "properties": {
-                "resolutionDates": {
-                    "type": "array",
-                    "items": {
-                        "type": "string",
-                        "format": "date"
-                    }
-                },
-                "shareClasses": {
-                    "type": "array",
-                    "items": {
-                        "$ref": "https://bcrs.gov.bc.ca/.well_known/schemas/share_class#/definitions/shareClass"
-                    }
-                }
-            }
+        "shareClasses": {
+          "type": "array",
+          "items": {
+            "$ref": "https://bcrs.gov.bc.ca/.well_known/schemas/share_class#/definitions/shareClass"
+          }
         }
+      }
     }
+  }
 }
diff --git a/src/registry_schemas/schemas/alteration_name_translations.json b/src/registry_schemas/schemas/alteration_name_translations.json