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

kathryn-ods · web-flow · commit bac0ad00fbef · 2024-09-03T14:42:17.000+01:00
diff --git a/docs/_assets/AlphaBeta.svg b/docs/_assets/AlphaBeta.svg
@@ -468,5 +468,5 @@
        x="96.095589"
        y="174.62761"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12px;line-height:160%;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:start;text-anchor:start"
-       id="tspan23-5">identifiers[0]id: pc-239118274</tspan></text>
+       id="tspan23-5">identifiers[0].id: pc-239118274</tspan></text>
 </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"
-            ]
           }
         },
         {

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@`
`60`	`60`	`"name": "MONSOON HOLDINGS (NO.1) LIMITED"`
`61`	`61`	`}`
`62`	`62`	`},`
`63`		`- "recordId": "387a14452645",`
	`63`	`+ "recordId": "22e8a31863ee",`
`64`	`64`	`"recordStatus": "new",`
`65`	`65`	`"recordType": "entity",`
`66`	`66`	`"recordDetails": {`
`@@ -101,7 +101,7 @@`
`101`	`101`	`{`
`102`	`102`	`"statementPointerTarget": "/interestedParty",`
`103`	`103`	`"motivation": "identifying",`
`104`		`- "description": "Company number missing from benenficial ownership statement. Manually reconciled against official register.",`
	`104`	`+ "description": "Company number missing from beneficial ownership statement. Manually reconciled against official register.",`
`105`	`105`	`"createdBy": {`
`106`	`106`	`"name": "Jack Lord"`
`107`	`107`	`}`
`@@ -119,7 +119,7 @@`
`119`	`119`	`"recordType": "relationship",`
`120`	`120`	`"recordDetails": {`
`121`	`121`	`"isComponent": false,`
`122`		`- "subject": "387a14452645",`
	`122`	`+ "subject": "22e8a31863ee",`
`123`	`123`	`"interestedParty": "387a14452645"`
`124`	`124`	`}`
`125`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -290,6 +290,10 @@`
`290`	`290`	`"format": "uri"`
`291`	`291`	`}`
`292`	`292`	`},`
	`293`	`+ "required":[`
	`294`	`+ "motivation",`
	`295`	`+ "statementPointerTarget"`
	`296`	`+ ],`
`293`	`297`	`"allOf": [`
`294`	`298`	`{`
`295`	`299`	`"if": {`
`@@ -301,16 +305,8 @@`
`301`	`305`	`},`
`302`	`306`	`"then": {`
`303`	`307`	`"required": [`
`304`		`- "statementPointerTarget",`
`305`		`- "motivation",`
`306`	`308`	`"url"`
`307`	`309`	`]`
`308`		`- },`
`309`		`- "else": {`
`310`		`- "required": [`
`311`		`- "statementPointerTarget",`
`312`		`- "motivation"`
`313`		`- ]`
`314`	`310`	`}`
`315`	`311`	`},`
`316`	`312`	`{`