diff --git a/content_schemas/allowed_document_types.yml b/content_schemas/allowed_document_types.yml index 1aa84f251f..7a34dd6b9c 100644 --- a/content_schemas/allowed_document_types.yml +++ b/content_schemas/allowed_document_types.yml @@ -35,6 +35,7 @@ - countryside_stewardship_grant - data_ethics_guidance_document - decision +- defra_approved_appliance - deputy_head_of_mission_role - detailed_guide - document_collection diff --git a/content_schemas/dist/formats/generic/frontend/schema.json b/content_schemas/dist/formats/generic/frontend/schema.json index 382d35b01f..e288e50f70 100644 --- a/content_schemas/dist/formats/generic/frontend/schema.json +++ b/content_schemas/dist/formats/generic/frontend/schema.json @@ -71,6 +71,7 @@ "countryside_stewardship_grant", "data_ethics_guidance_document", "decision", + "defra_approved_appliance", "deputy_head_of_mission_role", "detailed_guide", "document_collection", diff --git a/content_schemas/dist/formats/generic/notification/schema.json b/content_schemas/dist/formats/generic/notification/schema.json index 7b990dbaf3..ef582e215b 100644 --- a/content_schemas/dist/formats/generic/notification/schema.json +++ b/content_schemas/dist/formats/generic/notification/schema.json @@ -95,6 +95,7 @@ "countryside_stewardship_grant", "data_ethics_guidance_document", "decision", + "defra_approved_appliance", "deputy_head_of_mission_role", "detailed_guide", "document_collection", diff --git a/content_schemas/dist/formats/generic/publisher_v2/schema.json b/content_schemas/dist/formats/generic/publisher_v2/schema.json index 4db5984a46..85d4736e73 100644 --- a/content_schemas/dist/formats/generic/publisher_v2/schema.json +++ b/content_schemas/dist/formats/generic/publisher_v2/schema.json @@ -84,6 +84,7 @@ "countryside_stewardship_grant", "data_ethics_guidance_document", "decision", + "defra_approved_appliance", "deputy_head_of_mission_role", "detailed_guide", "document_collection", diff --git a/content_schemas/dist/formats/generic_with_external_related_links/frontend/schema.json b/content_schemas/dist/formats/generic_with_external_related_links/frontend/schema.json index fffeae7a9b..bd5cf1a0b0 100644 --- a/content_schemas/dist/formats/generic_with_external_related_links/frontend/schema.json +++ b/content_schemas/dist/formats/generic_with_external_related_links/frontend/schema.json @@ -71,6 +71,7 @@ "countryside_stewardship_grant", "data_ethics_guidance_document", "decision", + "defra_approved_appliance", "deputy_head_of_mission_role", "detailed_guide", "document_collection", diff --git a/content_schemas/dist/formats/generic_with_external_related_links/notification/schema.json b/content_schemas/dist/formats/generic_with_external_related_links/notification/schema.json index 3aaa99e0d4..0dff5d1be9 100644 --- a/content_schemas/dist/formats/generic_with_external_related_links/notification/schema.json +++ b/content_schemas/dist/formats/generic_with_external_related_links/notification/schema.json @@ -95,6 +95,7 @@ "countryside_stewardship_grant", "data_ethics_guidance_document", "decision", + "defra_approved_appliance", "deputy_head_of_mission_role", "detailed_guide", "document_collection", diff --git a/content_schemas/dist/formats/generic_with_external_related_links/publisher_v2/schema.json b/content_schemas/dist/formats/generic_with_external_related_links/publisher_v2/schema.json index 7133d160a3..de0cdebd0c 100644 --- a/content_schemas/dist/formats/generic_with_external_related_links/publisher_v2/schema.json +++ b/content_schemas/dist/formats/generic_with_external_related_links/publisher_v2/schema.json @@ -84,6 +84,7 @@ "countryside_stewardship_grant", "data_ethics_guidance_document", "decision", + "defra_approved_appliance", "deputy_head_of_mission_role", "detailed_guide", "document_collection", diff --git a/content_schemas/dist/formats/specialist_document/frontend/schema.json b/content_schemas/dist/formats/specialist_document/frontend/schema.json index bbeea70a4c..d2444c8c5e 100644 --- a/content_schemas/dist/formats/specialist_document/frontend/schema.json +++ b/content_schemas/dist/formats/specialist_document/frontend/schema.json @@ -71,6 +71,7 @@ "countryside_stewardship_grant", "data_ethics_guidance_document", "decision", + "defra_approved_appliance", "deputy_head_of_mission_role", "detailed_guide", "document_collection", @@ -617,6 +618,9 @@ { "$ref": "#/definitions/countryside_stewardship_grant_metadata" }, + { + "$ref": "#/definitions/defra_approved_appliance_metadata" + }, { "$ref": "#/definitions/drcf_digital_markets_research_metadata" }, @@ -925,6 +929,43 @@ } } }, + "defra_approved_appliance_metadata": { + "type": "object", + "additionalProperties": false, + "properties": { + "bulk_published": { + "type": "boolean" + }, + "defra_approved_appliance_country": { + "type": "array", + "items": { + "type": "string" + } + }, + "defra_approved_appliance_fuel_authorised_date": { + "type": "string", + "pattern": "^[1-9][0-9]{3}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[0-1])$" + }, + "defra_approved_appliance_fuel_type": { + "type": "array", + "items": { + "type": "string" + } + }, + "defra_approved_appliance_manufacturer": { + "type": "string" + }, + "defra_approved_appliance_name": { + "type": "string" + }, + "defra_approved_appliance_type": { + "type": "array", + "items": { + "type": "string" + } + } + } + }, "description_optional": { "anyOf": [ { diff --git a/content_schemas/dist/formats/specialist_document/notification/schema.json b/content_schemas/dist/formats/specialist_document/notification/schema.json index 19911357b1..814dea7576 100644 --- a/content_schemas/dist/formats/specialist_document/notification/schema.json +++ b/content_schemas/dist/formats/specialist_document/notification/schema.json @@ -95,6 +95,7 @@ "countryside_stewardship_grant", "data_ethics_guidance_document", "decision", + "defra_approved_appliance", "deputy_head_of_mission_role", "detailed_guide", "document_collection", @@ -705,6 +706,9 @@ { "$ref": "#/definitions/countryside_stewardship_grant_metadata" }, + { + "$ref": "#/definitions/defra_approved_appliance_metadata" + }, { "$ref": "#/definitions/drcf_digital_markets_research_metadata" }, @@ -1013,6 +1017,43 @@ } } }, + "defra_approved_appliance_metadata": { + "type": "object", + "additionalProperties": false, + "properties": { + "bulk_published": { + "type": "boolean" + }, + "defra_approved_appliance_country": { + "type": "array", + "items": { + "type": "string" + } + }, + "defra_approved_appliance_fuel_authorised_date": { + "type": "string", + "pattern": "^[1-9][0-9]{3}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[0-1])$" + }, + "defra_approved_appliance_fuel_type": { + "type": "array", + "items": { + "type": "string" + } + }, + "defra_approved_appliance_manufacturer": { + "type": "string" + }, + "defra_approved_appliance_name": { + "type": "string" + }, + "defra_approved_appliance_type": { + "type": "array", + "items": { + "type": "string" + } + } + } + }, "description_optional": { "anyOf": [ { diff --git a/content_schemas/dist/formats/specialist_document/publisher_v2/schema.json b/content_schemas/dist/formats/specialist_document/publisher_v2/schema.json index 9d7bd14bf4..9ba05fdb37 100644 --- a/content_schemas/dist/formats/specialist_document/publisher_v2/schema.json +++ b/content_schemas/dist/formats/specialist_document/publisher_v2/schema.json @@ -84,6 +84,7 @@ "countryside_stewardship_grant", "data_ethics_guidance_document", "decision", + "defra_approved_appliance", "deputy_head_of_mission_role", "detailed_guide", "document_collection", @@ -551,6 +552,9 @@ { "$ref": "#/definitions/countryside_stewardship_grant_metadata" }, + { + "$ref": "#/definitions/defra_approved_appliance_metadata" + }, { "$ref": "#/definitions/drcf_digital_markets_research_metadata" }, @@ -859,6 +863,43 @@ } } }, + "defra_approved_appliance_metadata": { + "type": "object", + "additionalProperties": false, + "properties": { + "bulk_published": { + "type": "boolean" + }, + "defra_approved_appliance_country": { + "type": "array", + "items": { + "type": "string" + } + }, + "defra_approved_appliance_fuel_authorised_date": { + "type": "string", + "pattern": "^[1-9][0-9]{3}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[0-1])$" + }, + "defra_approved_appliance_fuel_type": { + "type": "array", + "items": { + "type": "string" + } + }, + "defra_approved_appliance_manufacturer": { + "type": "string" + }, + "defra_approved_appliance_name": { + "type": "string" + }, + "defra_approved_appliance_type": { + "type": "array", + "items": { + "type": "string" + } + } + } + }, "description_optional": { "anyOf": [ { diff --git a/content_schemas/formats/shared/definitions/_specialist_document.jsonnet b/content_schemas/formats/shared/definitions/_specialist_document.jsonnet index e5da6b437a..8bf55cfa8f 100644 --- a/content_schemas/formats/shared/definitions/_specialist_document.jsonnet +++ b/content_schemas/formats/shared/definitions/_specialist_document.jsonnet @@ -26,6 +26,9 @@ { "$ref": "#/definitions/countryside_stewardship_grant_metadata", }, + { + "$ref": "#/definitions/defra_approved_appliance_metadata", + }, { "$ref": "#/definitions/drcf_digital_markets_research_metadata", }, @@ -492,6 +495,43 @@ }, }, }, + defra_approved_appliance_metadata: { + type: "object", + additionalProperties: false, + properties: { + bulk_published: { + type: "boolean", + }, + defra_approved_appliance_name: { + type: "string", + }, + defra_approved_appliance_type: { + type: "array", + items: { + type: "string", + }, + }, + defra_approved_appliance_fuel_type: { + type: "array", + items: { + type: "string", + }, + }, + defra_approved_appliance_manufacturer: { + type: "string", + }, + defra_approved_appliance_country: { + type: "array", + items: { + type: "string", + }, + }, + defra_approved_appliance_fuel_authorised_date: { + type: "string", + pattern: "^[1-9][0-9]{3}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[0-1])$", + }, + }, + }, drcf_digital_markets_research_metadata: { type: "object", additionalProperties: false,