Merge branch 'main' into kathryn-ods-patch-1

openownership · Sep 3, 2024 · bac0ad0 · bac0ad0
2 parents d9752d4 + 2e76fba
commit bac0ad0
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 28 deletions.
diff --git a/docs/_assets/AlphaBeta.svg b/docs/_assets/AlphaBeta.svg
diff --git a/examples/bods-package-annotations.json b/examples/bods-package-annotations.json
@@ -60,7 +60,7 @@
         "name": "MONSOON HOLDINGS (NO.1) LIMITED"
       }
     },
-    "recordId": "387a14452645",
+    "recordId": "22e8a31863ee",
     "recordStatus": "new",
     "recordType": "entity",
     "recordDetails": {
@@ -101,7 +101,7 @@
       {
         "statementPointerTarget": "/interestedParty",
         "motivation": "identifying",
-        "description": "Company number missing from benenficial ownership statement. Manually reconciled against official register.",
+        "description": "Company number missing from beneficial ownership statement. Manually reconciled against official register.",
         "createdBy": {
           "name": "Jack Lord"
         }
@@ -119,7 +119,7 @@
     "recordType": "relationship",
     "recordDetails": {
       "isComponent": false,
-      "subject": "387a14452645",
+      "subject": "22e8a31863ee",
       "interestedParty": "387a14452645"
     }
   }

diff --git a/examples/bods-package-entity-owning-entity.json b/examples/bods-package-entity-owning-entity.json
@@ -39,7 +39,7 @@
         "name": "JENEX LIMITED"
       }
     },
-    "recordId": "12b7dd0770ce",
+    "recordId": "e83cce729ada",
     "recordStatus": "new",
     "recordType": "entity",
     "recordDetails": {
@@ -74,7 +74,7 @@
     "recordDetails": {
       "isComponent": false,
       "subject": "12b7dd0770ce",
-      "interestedParty": "12b7dd0770ce",
+      "interestedParty": "e83cce729ada",
       "interests": [
         {
           "type": "shareholding",

diff --git a/examples/bods-package-fi-soe.json b/examples/bods-package-fi-soe.json
@@ -135,7 +135,7 @@
         "url": "http://www.register.example"
       }
     },
-    "recordId": "19f1c5afe9d7",
+    "recordId": "05ce06ec97b1",
     "recordStatus": "new",
     "recordType": "entity",
     "recordDetails": {
@@ -296,7 +296,7 @@
     "recordType": "relationship",
     "recordDetails": {
       "subject": "7ff95ba3682c",
-      "interestedParty": "19f1c5afe9d7",
+      "interestedParty": "05ce06ec97b1",
       "interests": [
         {
           "type": "otherInfluenceOrControl",
@@ -330,7 +330,7 @@
     "recordType": "relationship",
     "recordDetails": {
       "subject": "19f1c5afe9d7",
-      "interestedParty": "19f1c5afe9d7",
+      "interestedParty": "05ce06ec97b1",
       "interests": [
         {
           "type": "shareholding",
@@ -346,12 +346,12 @@
       ],
       "isComponent": false,
       "componentRecords": [
+        "0199c515a699",
+        "7ff95ba3682c",
         "87ed6d1daf8f",
         "e34164e75ac3",
         "10643ee6d6fa",
-        "324d0f570675",
-        "0199c515a699",
-        "19f1c5afe9d7"
+        "324d0f570675"
       ]
     }
   }

diff --git a/examples/joint-ownership.json b/examples/joint-ownership.json
@@ -54,7 +54,7 @@
         "name": "CHRINON LTD"
       }
     },
-    "recordId": "31c55e425764",
+    "recordId": "91b4236a7d89",
     "recordStatus": "new",
     "recordType": "entity",
     "recordDetails": {
@@ -82,7 +82,7 @@
     "recordDetails": {
       "isComponent": false,
       "subject": "31c55e425764",
-      "interestedParty": "31c55e425764",
+      "interestedParty": "91b4236a7d89",
       "interests": [
         {
           "type": "shareholding",
@@ -160,7 +160,7 @@
     "recordType": "relationship",
     "recordDetails": {
       "isComponent": false,
-      "subject": "31c55e425764",
+      "subject": "91b4236a7d89",
       "interestedParty": "1accb8b18b99",
       "interests": [
         {
@@ -191,7 +191,7 @@
     "recordType": "relationship",
     "recordDetails": {
       "isComponent": false,
-      "subject": "31c55e425764",
+      "subject": "91b4236a7d89",
       "interestedParty": "f040df24d9ec",
       "interests": [
         {

diff --git a/requirements.txt b/requirements.txt
@@ -73,7 +73,7 @@ pyyaml==6.0.1
     # via myst-parser
 referencing==0.35.1
     # via sphinxcontrib-opendataservices-jsonschema
-requests==2.31.0
+requests==2.32.2
     # via
     #   -r requirements.in
     #   jscc
@@ -117,7 +117,7 @@ sphinxcontrib-qthelp==1.0.7
     # via sphinx
 sphinxcontrib-serializinghtml==1.1.10
     # via sphinx
-urllib3==2.2.1
+urllib3==2.2.2
     # via
     #   -r requirements.in
     #   requests

diff --git a/requirements_test.txt b/requirements_test.txt
@@ -129,7 +129,7 @@ referencing==0.34.0
     #   jsonschema
     #   jsonschema-specifications
     #   sphinxcontrib-opendataservices-jsonschema
-requests==2.31.0
+requests==2.32.2
     # via
     #   -r requirements.in
     #   jscc
@@ -187,7 +187,7 @@ sphinxcontrib-serializinghtml==1.1.10
     # via sphinx
 strict-rfc3339==0.7
     # via -r requirements_test.in
-urllib3==2.2.1
+urllib3==2.2.2
     # via
     #   -r requirements.in
     #   requests

diff --git a/schema/statement.json b/schema/statement.json
@@ -290,6 +290,10 @@
           "format": "uri"
         }
       },
+      "required":[
+        "motivation",
+        "statementPointerTarget"
+      ],
       "allOf": [
         {
           "if": {
@@ -301,16 +305,8 @@
           },
           "then": {
             "required": [
-              "statementPointerTarget",
-              "motivation",
               "url"
             ]
-          },
-          "else": {
-            "required": [
-              "statementPointerTarget",
-              "motivation"
-            ]
           }
         },
         {