diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html index 06f84217..91bbcb3f 100644 --- a/docs/_templates/layout.html +++ b/docs/_templates/layout.html @@ -1,14 +1,6 @@ {% extends "!layout.html" %} {% block footer %} - - - - + + {% endblock %} diff --git a/examples/bods-package-annotations.json b/examples/bods-package-annotations.json index 7dfc36b2..007a5188 100644 --- 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 index ece589c2..4e88ab35 100644 --- 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 index de177a48..844b9df4 100644 --- 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": { @@ -183,9 +183,7 @@ "directOrIndirect": "direct", "beneficialOwnershipOrControl": false, "share": { - "exact": 76.5, - "maximum": 76.5, - "minimum": 76.5 + "exact": 76.5 }, "startDate": "2020-01-01" } @@ -223,9 +221,7 @@ "directOrIndirect": "direct", "beneficialOwnershipOrControl": false, "share": { - "exact": 100, - "maximum": 100, - "minimum": 100 + "exact": 100 }, "startDate": "2020-01-01" } @@ -263,9 +259,7 @@ "directOrIndirect": "direct", "beneficialOwnershipOrControl": false, "share": { - "exact": 23.5, - "maximum": 23.5, - "minimum": 23.5 + "exact": 23.5 }, "startDate": "2020-01-01" } @@ -296,7 +290,7 @@ "recordType": "relationship", "recordDetails": { "subject": "7ff95ba3682c", - "interestedParty": "19f1c5afe9d7", + "interestedParty": "05ce06ec97b1", "interests": [ { "type": "otherInfluenceOrControl", @@ -330,28 +324,26 @@ "recordType": "relationship", "recordDetails": { "subject": "19f1c5afe9d7", - "interestedParty": "19f1c5afe9d7", + "interestedParty": "05ce06ec97b1", "interests": [ { "type": "shareholding", "directOrIndirect": "indirect", "beneficialOwnershipOrControl": false, "share": { - "exact": 100, - "maximum": 100, - "minimum": 100 + "exact": 100 }, "startDate": "2020-01-01" } ], "isComponent": false, "componentRecords": [ - "xregi-oocs-00000384456595684844606", - "xregi-oocs-00004319992040145444606", - "xregi-oocs-00007980570744606044606", - "xregi-oocs-00000137020039066644606", - "xregi-es-00008546493688880044606", - "xregi-es-00001461827397290944606" + "0199c515a699", + "7ff95ba3682c", + "87ed6d1daf8f", + "e34164e75ac3", + "10643ee6d6fa", + "324d0f570675" ] } } diff --git a/examples/fermcat.json b/examples/fermcat.json index 5579bdb7..4442a774 100644 --- a/examples/fermcat.json +++ b/examples/fermcat.json @@ -28,7 +28,7 @@ "identifiers": [ { "id": "7700225VH", - "scheme": "IE-TAXID", + "scheme": "IRL-TAXID", "schemeName": "Ireland Personal Public Service Number" } ], @@ -84,7 +84,7 @@ "identifiers": [ { "id": "0691084DH", - "scheme": "IE-TAXID", + "scheme": "IRL-TAXID", "schemeName": "Ireland Personal Public Service Number" } ], @@ -146,7 +146,7 @@ "identifiers": [ { "id": "434151", - "scheme": "IE-BAU", + "scheme": "IRL-BAU", "schemeName": "Irish Business Authority " } ], @@ -290,7 +290,7 @@ "identifiers": [ { "id": "7700225VH", - "scheme": "IE-TAXID", + "scheme": "IRL-TAXID", "schemeName": "Ireland Personal Public Service Number" } ], @@ -346,7 +346,7 @@ "identifiers": [ { "id": "0691084DH", - "scheme": "IE-TAXID", + "scheme": "IRL-TAXID", "schemeName": "Ireland Personal Public Service Number" } ], @@ -408,7 +408,7 @@ "identifiers": [ { "id": "434151", - "scheme": "IE-BAU", + "scheme": "IRL-BAU", "schemeName": "Irish Business Authority " } ], @@ -552,7 +552,7 @@ "identifiers": [ { "id": "7700225VH", - "scheme": "IE-TAXID", + "scheme": "IRL-TAXID", "schemeName": "Ireland Personal Public Service Number" } ], @@ -609,7 +609,7 @@ "identifiers": [ { "id": "9857460SH", - "scheme": "IE-TAXID", + "scheme": "IRL-TAXID", "schemeName": "Ireland Personal Public Service Number" } ], @@ -753,7 +753,7 @@ "identifiers": [ { "id": "0691084DH", - "scheme": "IE-TAXID", + "scheme": "IRL-TAXID", "schemeName": "Ireland Personal Public Service Number" } ], @@ -805,7 +805,7 @@ "identifiers": [ { "id": "9857460SH", - "scheme": "IE-TAXID", + "scheme": "IRL-TAXID", "schemeName": "Ireland Personal Public Service Number" } ], @@ -867,7 +867,7 @@ "identifiers": [ { "id": "434151", - "scheme": "IE-BAU", + "scheme": "IRL-BAU", "schemeName": "Irish Business Authority " } ], @@ -1005,7 +1005,7 @@ "identifiers": [ { "id": "0691084DH", - "scheme": "IE-TAXID", + "scheme": "IRL-TAXID", "schemeName": "Ireland Personal Public Service Number" } ], @@ -1056,7 +1056,7 @@ "identifiers": [ { "id": "9857460SH", - "scheme": "IE-TAXID", + "scheme": "IRL-TAXID", "schemeName": "Ireland Personal Public Service Number" } ], diff --git a/examples/indirect-ownership.json b/examples/indirect-ownership.json index ed6954ed..4358fcea 100644 --- a/examples/indirect-ownership.json +++ b/examples/indirect-ownership.json @@ -118,9 +118,7 @@ "directOrIndirect": "direct", "beneficialOwnershipOrControl": false, "share": { - "exact": 60, - "maximum": 60, - "minimum": 60 + "exact": 60 }, "startDate": "2017-11-01" } @@ -191,17 +189,15 @@ "directOrIndirect": "indirect", "beneficialOwnershipOrControl": true, "share": { - "exact": 30, - "maximum": 30, - "minimum": 30 + "exact": 30 }, "startDate": "2017-11-01" } ], "componentRecords": [ - "e2bbe3ce-f5b4-42d0-bb68-9b405e8fd6a0", - "7fff3986-233f-413f-bec8-3b28c62a4a51", - "860155d1-a4fb-4742-9735-7a7deb899075" + "d4ab89ea169a", + "4cf2837bd01f", + "05e81af035e4" ] } } diff --git a/examples/joint-ownership.json b/examples/joint-ownership.json index 89215041..a3475b68 100644 --- 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": [ { @@ -176,7 +176,7 @@ } }, { - "statementId": "c222fe05-2bf3-4cc0-b126-f665109d7211", + "statementId": "4b915fa6-a748-11ef-a7c7-6bccb97aad80", "declarationSubject": "31c55e425764", "statementDate": "2018-01-05", "publicationDetails": { @@ -191,7 +191,7 @@ "recordType": "relationship", "recordDetails": { "isComponent": false, - "subject": "31c55e425764", + "subject": "91b4236a7d89", "interestedParty": "f040df24d9ec", "interests": [ { diff --git a/examples/listed-company-exempt-from-disclosure.json b/examples/listed-company-exempt-from-disclosure.json index 16e2a2f2..416f5b70 100644 --- a/examples/listed-company-exempt-from-disclosure.json +++ b/examples/listed-company-exempt-from-disclosure.json @@ -26,6 +26,9 @@ "type": "registeredEntity" }, "name": "Listed Company OS-17", + "publicListing": { + "hasPublicListing": true + }, "identifiers": [ { "scheme": "GB-COH", diff --git a/examples/mixed-direct-and-indirect-ownership.json b/examples/mixed-direct-and-indirect-ownership.json index 3e15346c..33ef040b 100644 --- a/examples/mixed-direct-and-indirect-ownership.json +++ b/examples/mixed-direct-and-indirect-ownership.json @@ -7,7 +7,7 @@ "publicationDate": "2017-12-01", "bodsVersion": "0.4", "publisher": { - "name": "XXXXXXXXX" + "name": "Companies House" } }, "recordId": "9bfe59b6a869", @@ -35,7 +35,7 @@ "publicationDate": "2017-12-01", "bodsVersion": "0.4", "publisher": { - "name": "XXXXXXXXX" + "name": "Companies House" } }, "recordId": "ec61aeda7141", @@ -63,7 +63,7 @@ "publicationDate": "2017-12-01", "bodsVersion": "0.4", "publisher": { - "name": "XXXXXXXXX" + "name": "Companies House" } }, "recordId": "53508b65253f", @@ -102,7 +102,7 @@ "publicationDate": "2017-12-01", "bodsVersion": "0.4", "publisher": { - "name": "XXXXXXXXX" + "name": "Companies House" } }, "recordId": "07f0f7024a92", @@ -118,9 +118,7 @@ "directOrIndirect": "direct", "beneficialOwnershipOrControl": false, "share": { - "exact": 50, - "maximum": 50, - "minimum": 50 + "exact": 50 }, "startDate": "2017-11-01" } @@ -142,7 +140,7 @@ "publicationDate": "2017-12-01", "bodsVersion": "0.4", "publisher": { - "name": "XXXXXXXXX" + "name": "Companies House" } }, "recordId": "acdf30ece808", @@ -175,7 +173,7 @@ "publicationDate": "2017-12-01", "bodsVersion": "0.4", "publisher": { - "name": "XXXXXXXXX" + "name": "Companies House" } }, "recordId": "f5a45a6daf31", @@ -191,9 +189,7 @@ "directOrIndirect": "indirect", "beneficialOwnershipOrControl": true, "share": { - "exact": 50, - "minimum": 50, - "maximum": 50 + "exact": 50 }, "startDate": "2017-11-01" }, @@ -202,17 +198,15 @@ "directOrIndirect": "direct", "beneficialOwnershipOrControl": true, "share": { - "exact": 50, - "minimum": 50, - "maximum": 50 + "exact": 50 }, "startDate": "2019-05-01" } ], "componentRecords": [ - "9f188b1a-cb45-4e6b-abe5-252378d6a0f5", - "f500210d-c8b0-4f74-9bbd-ca762724d0e8", - "30f1cb63-d849-4550-b6cd-2a6b7268d0cb" + "ec61aeda7141", + "acdf30ece808", + "07f0f7024a92" ] } } diff --git a/examples/multiple-indirect-ownership.json b/examples/multiple-indirect-ownership.json index 59bf8fba..307d7d3a 100644 --- a/examples/multiple-indirect-ownership.json +++ b/examples/multiple-indirect-ownership.json @@ -30,7 +30,7 @@ { "statementId": "2ba6417f-bd77-4e8c-a4c6-6d6f10315bdb", "declarationSubject": "63e3a8a8946f", - "statementDate": "2018-12-17", + "statementDate": "2019-05-16", "publicationDetails": { "publicationDate": "2017-12-01", "bodsVersion": "0.4", @@ -118,7 +118,7 @@ { "statementId": "3cfba7c7-95c9-4194-9d6b-0ce063a4d4c5", "declarationSubject": "63e3a8a8946f", - "statementDate": "2018-12-17", + "statementDate": "2019-05-16", "publicationDetails": { "publicationDate": "2017-12-01", "bodsVersion": "0.4", @@ -139,9 +139,7 @@ "directOrIndirect": "direct", "beneficialOwnershipOrControl": false, "share": { - "exact": 50, - "maximum": 50, - "minimum": 50 + "exact": 50 }, "startDate": "2017-11-01" } @@ -151,7 +149,7 @@ { "statementId": "ffb65ea4-fe51-46f7-b9c7-b40b375c7b56", "declarationSubject": "63e3a8a8946f", - "statementDate": "2018-12-17", + "statementDate": "2019-05-16", "publicationDetails": { "publicationDate": "2017-12-01", "bodsVersion": "0.4", @@ -172,9 +170,7 @@ "directOrIndirect": "direct", "beneficialOwnershipOrControl": false, "share": { - "exact": 50, - "maximum": 50, - "minimum": 50 + "exact": 50 }, "startDate": "2017-11-01" } @@ -194,7 +190,7 @@ ] }, "declarationSubject": "63e3a8a8946f", - "statementDate": "2018-12-17", + "statementDate": "2019-05-16", "publicationDetails": { "publicationDate": "2017-12-01", "bodsVersion": "0.4", @@ -230,7 +226,7 @@ ] }, "declarationSubject": "63e3a8a8946f", - "statementDate": "2018-12-17", + "statementDate": "2019-05-16", "publicationDetails": { "publicationDate": "2017-12-01", "bodsVersion": "0.4", @@ -263,7 +259,7 @@ ] }, "declarationSubject": "63e3a8a8946f", - "statementDate": "2018-12-17", + "statementDate": "2019-05-16", "publicationDetails": { "publicationDate": "2017-12-01", "bodsVersion": "0.4", @@ -284,20 +280,18 @@ "directOrIndirect": "indirect", "beneficialOwnershipOrControl": true, "share": { - "exact": 60, - "maximum": 60, - "minimum": 60 + "exact": 60 }, "startDate": "2017-11-01" } ], "componentRecords": [ - "8a323bcd-f047-41d5-a194-205ebffedd7", - "e408d5c2-c41c-4b14-a43e-b0b7e9808328", - "3cfba7c7-95c9-4194-9d6b-0ce063a4d4c5", - "ffb65ea4-fe51-46f7-b9c7-b40b375c7b56", - "a0decdf4-6b57-4dc1-ba57-42533e2d17c4", - "caa00429-44b2-44da-b562-1384b4cd2a85" + "d177864a8b39", + "05fbbfb94b79", + "40b9a74c70c4", + "9615ef9a4a0b", + "e351a9247e22", + "721da228c733" ] } } diff --git a/examples/multiple-tax-residencies.json b/examples/multiple-tax-residencies.json index 4751e377..dc49bd65 100644 --- a/examples/multiple-tax-residencies.json +++ b/examples/multiple-tax-residencies.json @@ -2,7 +2,7 @@ { "statementId": "a7b06b12-f5ff-49ff-a83f-41b2883d229b", "declarationSubject": "fd5c8dbc9a91", - "statementDate": "2019-05-15", + "statementDate": "2017-11-18", "publicationDetails": { "publicationDate": "2019-05-15", "bodsVersion": "0.4", @@ -114,9 +114,7 @@ "beneficialOwnershipOrControl": true, "startDate": "2016-04-06", "share": { - "exact": 100, - "minimum": 100, - "maximum": 100 + "exact": 100 } } ] diff --git a/examples/mutilple-indirect-ownership-2.json b/examples/mutilple-indirect-ownership-2.json index 353b296e..ee30b5e7 100644 --- a/examples/mutilple-indirect-ownership-2.json +++ b/examples/mutilple-indirect-ownership-2.json @@ -146,9 +146,7 @@ "directOrIndirect": "direct", "beneficialOwnershipOrControl": false, "share": { - "exact": 40, - "maximum": 40, - "minimum": 40 + "exact": 40 }, "startDate": "2017-11-01" } @@ -186,9 +184,7 @@ "directOrIndirect": "direct", "beneficialOwnershipOrControl": false, "share": { - "exact": 20, - "maximum": 20, - "minimum": 20 + "exact": 20 }, "startDate": "2017-11-01" } @@ -292,20 +288,18 @@ "directOrIndirect": "indirect", "beneficialOwnershipOrControl": true, "share": { - "exact": 60, - "minimum": 60, - "maximum": 60 + "exact": 60 }, "startDate": "2017-11-01" } ], "componentRecords": [ - "59368bde-e38d-4a95-9a6c-8ef6aec54f9f", - "829ec2d1-6ecb-4ca6-874f-c9c59f2cd843", - "426507cf-e5ac-45c4-b6b0-92952a954623", - "3a1ba916-5f3d-4335-860d-3f7c20283c42", - "a56a0ced-447e-420d-9a07-42dcbc960a5f", - "337d8ba1-9d0d-4a64-bc5d-820c95a127fc" + "41454e3ba398", + "6c9fd5c92201", + "803a942b3ec8", + "9f4256f3de2f", + "b8e59fa7e1a6", + "5a8646b55833" ] } } diff --git a/examples/nomination.json b/examples/nomination.json index 79ff257d..6f3b8b35 100644 --- a/examples/nomination.json +++ b/examples/nomination.json @@ -354,7 +354,8 @@ "isComponent": false, "componentRecords": [ "103AB1984D", - "105AB1984B;107AC1984F" + "105AB1984B", + "107AC1984F" ], "subject": "104AB1984C", "interestedParty": "101AB1984F" diff --git a/examples/tecido.json b/examples/tecido.json index 9937bad5..5027cd6e 100644 --- a/examples/tecido.json +++ b/examples/tecido.json @@ -120,9 +120,7 @@ "directOrIndirect": "direct", "beneficialOwnershipOrControl": true, "share": { - "exact": 100, - "maximum": 100, - "minimum": 100 + "exact": 100 }, "startDate": "2002-03-09" }, @@ -131,9 +129,7 @@ "directOrIndirect": "direct", "beneficialOwnershipOrControl": true, "share": { - "exact": 100, - "maximum": 100, - "minimum": 100 + "exact": 100 }, "startDate": "2002-03-09" }, @@ -226,9 +222,7 @@ "type": "shareholding", "directOrIndirect": "direct", "share": { - "exact": 60, - "maximum": 60, - "minimum": 60 + "exact": 60 }, "startDate": "2021-09-24" }, @@ -236,9 +230,7 @@ "type": "votingRights", "directOrIndirect": "direct", "share": { - "exact": 60, - "maximum": 60, - "minimum": 60 + "exact": 60 }, "startDate": "2021-09-24" } @@ -281,9 +273,7 @@ "directOrIndirect": "direct", "beneficialOwnershipOrControl": true, "share": { - "exact": 40, - "maximum": 40, - "minimum": 40 + "exact": 40 }, "startDate": "2021-09-24" }, @@ -292,9 +282,7 @@ "directOrIndirect": "direct", "beneficialOwnershipOrControl": true, "share": { - "exact": 40, - "maximum": 40, - "minimum": 40 + "exact": 40 }, "startDate": "2021-09-24" }, @@ -342,9 +330,7 @@ "type": "shareholding", "directOrIndirect": "direct", "share": { - "exact": 70, - "maximum": 70, - "minimum": 70 + "exact": 70 }, "startDate": "2022-09-21" }, @@ -352,9 +338,7 @@ "type": "votingRights", "directOrIndirect": "direct", "share": { - "exact": 70, - "maximum": 70, - "minimum": 70 + "exact": 70 }, "startDate": "2022-09-21" } @@ -397,9 +381,7 @@ "directOrIndirect": "direct", "beneficialOwnershipOrControl": true, "share": { - "exact": 30, - "maximum": 30, - "minimum": 30 + "exact": 30 }, "startDate": "2022-09-21" }, @@ -408,9 +390,7 @@ "directOrIndirect": "direct", "beneficialOwnershipOrControl": true, "share": { - "exact": 30, - "maximum": 30, - "minimum": 30 + "exact": 30 }, "startDate": "2022-09-21" }, @@ -419,9 +399,7 @@ "directOrIndirect": "direct", "beneficialOwnershipOrControl": true, "share": { - "exact": 30, - "maximum": 30, - "minimum": 30 + "exact": 30 }, "startDate": "2022-09-21" } @@ -504,9 +482,7 @@ "directOrIndirect": "direct", "beneficialOwnershipOrControl": true, "share": { - "exact": 30, - "maximum": 30, - "minimum": 30 + "exact": 30 }, "startDate": "2022-09-21" }, @@ -515,9 +491,7 @@ "directOrIndirect": "direct", "beneficialOwnershipOrControl": true, "share": { - "exact": 30, - "maximum": 30, - "minimum": 30 + "exact": 30 }, "startDate": "2022-09-21" }, @@ -526,9 +500,7 @@ "directOrIndirect": "direct", "beneficialOwnershipOrControl": true, "share": { - "exact": 30, - "maximum": 30, - "minimum": 30 + "exact": 30 }, "startDate": "2022-09-21" } @@ -570,9 +542,7 @@ "type": "shareholding", "directOrIndirect": "direct", "share": { - "exact": 80, - "maximum": 80, - "minimum": 80 + "exact": 80 }, "startDate": "2023-03-01" }, @@ -580,9 +550,7 @@ "type": "votingRights", "directOrIndirect": "direct", "share": { - "exact": 80, - "maximum": 80, - "minimum": 80 + "exact": 80 }, "startDate": "2023-03-01" } diff --git a/schema/statement.json b/schema/statement.json index b6263360..b59bbdb9 100644 --- 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" - ] } }, {