Skip to content

DA-5869: Added rules for schemas to most closely align with validation in ingestion. #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oc-ben-ellis merged 2 commits into from
May 12, 2025
Merged

DA-5869: Added rules for schemas to most closely align with validation in ingestion. #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a36bad
DA-5869: Added rules for schemas to most closely align with validatio…
oc-ben-ellis May 1, 2025
8ea840e
DA-5869: Added blank check for identifier_system_code in identifiers.
oc-ben-ellis May 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions build/accounts-statement-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,9 +596,7 @@
"name": {
"type": "string",
"minLength": 1,
"not": {
"pattern": "^[\\.\\,\\*\\\\\\-\\s\\{\\}\\(\\)]+$"
}
"pattern": "[[:alnum:]]"
},
"start_date": {
"anyOf": [
Expand Down Expand Up @@ -811,7 +809,8 @@
},
"date": {
"type": "string",
"format": "date"
"format": "date",
"minLength": 1
},
"description": {
"type": "string"
Expand Down Expand Up @@ -861,11 +860,17 @@
"uid": {
"type": "string",
"description": "The unique identifier given by the identifier system – it should be unique in the context of the identifier_system",
"minLength": 1
"minLength": 1,
"not": {
"pattern": "\\A[[:space:]]*\\z"
}
},
"identifier_system_code": {
"type": "string",
"description": "An identifier representing the identifier scheme. Some examples of this are us_fein (US Federal tax number), us_sec_cik (US Securities and Exchange Commission CIK), uk_ew_cc (Charity Commission of England & Wales), lei (Global Legal Entity Identifier System)"
"description": "An identifier representing the identifier scheme. Some examples of this are us_fein (US Federal tax number), us_sec_cik (US Securities and Exchange Commission CIK), uk_ew_cc (Charity Commission of England & Wales), lei (Global Legal Entity Identifier System)",
"not": {
"pattern": "\\A[[:space:]]*\\z"
}
}
},
"required": [
Expand Down
17 changes: 11 additions & 6 deletions build/alternate-registration-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,9 +506,7 @@
"name": {
"type": "string",
"minLength": 1,
"not": {
"pattern": "^[\\.\\,\\*\\\\\\-\\s\\{\\}\\(\\)]+$"
}
"pattern": "[[:alnum:]]"
},
"start_date": {
"anyOf": [
Expand Down Expand Up @@ -721,7 +719,8 @@
},
"date": {
"type": "string",
"format": "date"
"format": "date",
"minLength": 1
},
"description": {
"type": "string"
Expand Down Expand Up @@ -771,11 +770,17 @@
"uid": {
"type": "string",
"description": "The unique identifier given by the identifier system – it should be unique in the context of the identifier_system",
"minLength": 1
"minLength": 1,
"not": {
"pattern": "\\A[[:space:]]*\\z"
}
},
"identifier_system_code": {
"type": "string",
"description": "An identifier representing the identifier scheme. Some examples of this are us_fein (US Federal tax number), us_sec_cik (US Securities and Exchange Commission CIK), uk_ew_cc (Charity Commission of England & Wales), lei (Global Legal Entity Identifier System)"
"description": "An identifier representing the identifier scheme. Some examples of this are us_fein (US Federal tax number), us_sec_cik (US Securities and Exchange Commission CIK), uk_ew_cc (Charity Commission of England & Wales), lei (Global Legal Entity Identifier System)",
"not": {
"pattern": "\\A[[:space:]]*\\z"
}
}
},
"required": [
Expand Down
17 changes: 11 additions & 6 deletions build/company-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,9 +338,7 @@
"name": {
"type": "string",
"minLength": 1,
"not": {
"pattern": "^[\\.\\,\\*\\\\\\-\\s\\{\\}\\(\\)]+$"
}
"pattern": "[[:alnum:]]"
},
"start_date": {
"anyOf": [
Expand Down Expand Up @@ -553,7 +551,8 @@
},
"date": {
"type": "string",
"format": "date"
"format": "date",
"minLength": 1
},
"description": {
"type": "string"
Expand Down Expand Up @@ -603,11 +602,17 @@
"uid": {
"type": "string",
"description": "The unique identifier given by the identifier system – it should be unique in the context of the identifier_system",
"minLength": 1
"minLength": 1,
"not": {
"pattern": "\\A[[:space:]]*\\z"
}
},
"identifier_system_code": {
"type": "string",
"description": "An identifier representing the identifier scheme. Some examples of this are us_fein (US Federal tax number), us_sec_cik (US Securities and Exchange Commission CIK), uk_ew_cc (Charity Commission of England & Wales), lei (Global Legal Entity Identifier System)"
"description": "An identifier representing the identifier scheme. Some examples of this are us_fein (US Federal tax number), us_sec_cik (US Securities and Exchange Commission CIK), uk_ew_cc (Charity Commission of England & Wales), lei (Global Legal Entity Identifier System)",
"not": {
"pattern": "\\A[[:space:]]*\\z"
}
}
},
"required": [
Expand Down
17 changes: 11 additions & 6 deletions build/control-statement-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,9 +792,7 @@
"name": {
"type": "string",
"minLength": 1,
"not": {
"pattern": "^[\\.\\,\\*\\\\\\-\\s\\{\\}\\(\\)]+$"
}
"pattern": "[[:alnum:]]"
},
"start_date": {
"anyOf": [
Expand Down Expand Up @@ -1007,7 +1005,8 @@
},
"date": {
"type": "string",
"format": "date"
"format": "date",
"minLength": 1
},
"description": {
"type": "string"
Expand Down Expand Up @@ -1057,11 +1056,17 @@
"uid": {
"type": "string",
"description": "The unique identifier given by the identifier system – it should be unique in the context of the identifier_system",
"minLength": 1
"minLength": 1,
"not": {
"pattern": "\\A[[:space:]]*\\z"
}
},
"identifier_system_code": {
"type": "string",
"description": "An identifier representing the identifier scheme. Some examples of this are us_fein (US Federal tax number), us_sec_cik (US Securities and Exchange Commission CIK), uk_ew_cc (Charity Commission of England & Wales), lei (Global Legal Entity Identifier System)"
"description": "An identifier representing the identifier scheme. Some examples of this are us_fein (US Federal tax number), us_sec_cik (US Securities and Exchange Commission CIK), uk_ew_cc (Charity Commission of England & Wales), lei (Global Legal Entity Identifier System)",
"not": {
"pattern": "\\A[[:space:]]*\\z"
}
}
},
"required": [
Expand Down
20 changes: 13 additions & 7 deletions build/filing-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"filing_date": {
"type": "string",
"description": "Date on which the filing was made – note this is not necessarily the same date as the date on which it was published or the reporting/applicable data on the information contained within it",
"format": "date"
"format": "date",
"minLength": 1
},
"documents": {
"type": "array",
Expand Down Expand Up @@ -519,9 +520,7 @@
"name": {
"type": "string",
"minLength": 1,
"not": {
"pattern": "^[\\.\\,\\*\\\\\\-\\s\\{\\}\\(\\)]+$"
}
"pattern": "[[:alnum:]]"
},
"start_date": {
"anyOf": [
Expand Down Expand Up @@ -734,7 +733,8 @@
},
"date": {
"type": "string",
"format": "date"
"format": "date",
"minLength": 1
},
"description": {
"type": "string"
Expand Down Expand Up @@ -784,11 +784,17 @@
"uid": {
"type": "string",
"description": "The unique identifier given by the identifier system – it should be unique in the context of the identifier_system",
"minLength": 1
"minLength": 1,
"not": {
"pattern": "\\A[[:space:]]*\\z"
}
},
"identifier_system_code": {
"type": "string",
"description": "An identifier representing the identifier scheme. Some examples of this are us_fein (US Federal tax number), us_sec_cik (US Securities and Exchange Commission CIK), uk_ew_cc (Charity Commission of England & Wales), lei (Global Legal Entity Identifier System)"
"description": "An identifier representing the identifier scheme. Some examples of this are us_fein (US Federal tax number), us_sec_cik (US Securities and Exchange Commission CIK), uk_ew_cc (Charity Commission of England & Wales), lei (Global Legal Entity Identifier System)",
"not": {
"pattern": "\\A[[:space:]]*\\z"
}
}
},
"required": [
Expand Down
17 changes: 11 additions & 6 deletions build/gazette-notice-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1150,9 +1150,7 @@
"name": {
"type": "string",
"minLength": 1,
"not": {
"pattern": "^[\\.\\,\\*\\\\\\-\\s\\{\\}\\(\\)]+$"
}
"pattern": "[[:alnum:]]"
},
"start_date": {
"anyOf": [
Expand Down Expand Up @@ -1365,7 +1363,8 @@
},
"date": {
"type": "string",
"format": "date"
"format": "date",
"minLength": 1
},
"description": {
"type": "string"
Expand Down Expand Up @@ -1415,11 +1414,17 @@
"uid": {
"type": "string",
"description": "The unique identifier given by the identifier system – it should be unique in the context of the identifier_system",
"minLength": 1
"minLength": 1,
"not": {
"pattern": "\\A[[:space:]]*\\z"
}
},
"identifier_system_code": {
"type": "string",
"description": "An identifier representing the identifier scheme. Some examples of this are us_fein (US Federal tax number), us_sec_cik (US Securities and Exchange Commission CIK), uk_ew_cc (Charity Commission of England & Wales), lei (Global Legal Entity Identifier System)"
"description": "An identifier representing the identifier scheme. Some examples of this are us_fein (US Federal tax number), us_sec_cik (US Securities and Exchange Commission CIK), uk_ew_cc (Charity Commission of England & Wales), lei (Global Legal Entity Identifier System)",
"not": {
"pattern": "\\A[[:space:]]*\\z"
}
}
},
"required": [
Expand Down
17 changes: 11 additions & 6 deletions build/licence-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,9 +528,7 @@
"name": {
"type": "string",
"minLength": 1,
"not": {
"pattern": "^[\\.\\,\\*\\\\\\-\\s\\{\\}\\(\\)]+$"
}
"pattern": "[[:alnum:]]"
},
"start_date": {
"anyOf": [
Expand Down Expand Up @@ -743,7 +741,8 @@
},
"date": {
"type": "string",
"format": "date"
"format": "date",
"minLength": 1
},
"description": {
"type": "string"
Expand Down Expand Up @@ -793,11 +792,17 @@
"uid": {
"type": "string",
"description": "The unique identifier given by the identifier system – it should be unique in the context of the identifier_system",
"minLength": 1
"minLength": 1,
"not": {
"pattern": "\\A[[:space:]]*\\z"
}
},
"identifier_system_code": {
"type": "string",
"description": "An identifier representing the identifier scheme. Some examples of this are us_fein (US Federal tax number), us_sec_cik (US Securities and Exchange Commission CIK), uk_ew_cc (Charity Commission of England & Wales), lei (Global Legal Entity Identifier System)"
"description": "An identifier representing the identifier scheme. Some examples of this are us_fein (US Federal tax number), us_sec_cik (US Securities and Exchange Commission CIK), uk_ew_cc (Charity Commission of England & Wales), lei (Global Legal Entity Identifier System)",
"not": {
"pattern": "\\A[[:space:]]*\\z"
}
}
},
"required": [
Expand Down
17 changes: 11 additions & 6 deletions build/register-entry-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,11 +188,17 @@
"uid": {
"type": "string",
"description": "The unique identifier given by the identifier system – it should be unique in the context of the identifier_system",
"minLength": 1
"minLength": 1,
"not": {
"pattern": "\\A[[:space:]]*\\z"
}
},
"identifier_system_code": {
"type": "string",
"description": "An identifier representing the identifier scheme. Some examples of this are us_fein (US Federal tax number), us_sec_cik (US Securities and Exchange Commission CIK), uk_ew_cc (Charity Commission of England & Wales), lei (Global Legal Entity Identifier System)"
"description": "An identifier representing the identifier scheme. Some examples of this are us_fein (US Federal tax number), us_sec_cik (US Securities and Exchange Commission CIK), uk_ew_cc (Charity Commission of England & Wales), lei (Global Legal Entity Identifier System)",
"not": {
"pattern": "\\A[[:space:]]*\\z"
}
}
},
"required": [
Expand Down Expand Up @@ -740,9 +746,7 @@
"name": {
"type": "string",
"minLength": 1,
"not": {
"pattern": "^[\\.\\,\\*\\\\\\-\\s\\{\\}\\(\\)]+$"
}
"pattern": "[[:alnum:]]"
},
"start_date": {
"anyOf": [
Expand Down Expand Up @@ -955,7 +959,8 @@
},
"date": {
"type": "string",
"format": "date"
"format": "date",
"minLength": 1
},
"description": {
"type": "string"
Expand Down
17 changes: 11 additions & 6 deletions build/sanctioned-entity-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,11 +186,17 @@
"uid": {
"type": "string",
"description": "The unique identifier given by the identifier system – it should be unique in the context of the identifier_system",
"minLength": 1
"minLength": 1,
"not": {
"pattern": "\\A[[:space:]]*\\z"
}
},
"identifier_system_code": {
"type": "string",
"description": "An identifier representing the identifier scheme. Some examples of this are us_fein (US Federal tax number), us_sec_cik (US Securities and Exchange Commission CIK), uk_ew_cc (Charity Commission of England & Wales), lei (Global Legal Entity Identifier System)"
"description": "An identifier representing the identifier scheme. Some examples of this are us_fein (US Federal tax number), us_sec_cik (US Securities and Exchange Commission CIK), uk_ew_cc (Charity Commission of England & Wales), lei (Global Legal Entity Identifier System)",
"not": {
"pattern": "\\A[[:space:]]*\\z"
}
}
},
"required": [
Expand Down Expand Up @@ -738,9 +744,7 @@
"name": {
"type": "string",
"minLength": 1,
"not": {
"pattern": "^[\\.\\,\\*\\\\\\-\\s\\{\\}\\(\\)]+$"
}
"pattern": "[[:alnum:]]"
},
"start_date": {
"anyOf": [
Expand Down Expand Up @@ -953,7 +957,8 @@
},
"date": {
"type": "string",
"format": "date"
"format": "date",
"minLength": 1
},
"description": {
"type": "string"
Expand Down
Loading