diff --git a/app/queries/get_content_collection.rb b/app/queries/get_content_collection.rb index bb2d763cb..466111965 100644 --- a/app/queries/get_content_collection.rb +++ b/app/queries/get_content_collection.rb @@ -11,7 +11,7 @@ class GetContentCollection :states, ) - def initialize(fields:, document_types: [], filters: {}, pagination: Pagination.new, search_query: "", search_in: nil) + def initialize(fields:, document_types: @document_types, filters: {}, pagination: Pagination.new, search_query: "", search_in: nil) self.document_types = Array(document_types) self.fields = (fields || default_fields) + %w[total] self.publishing_app = filters[:publishing_app] @@ -47,17 +47,13 @@ def call def editions scope = Edition.with_document - scope = scope.where(document_type: document_types) if document_types.any? + scope = scope.where(document_type: @document_types) if @document_types.any? scope = scope.where(publishing_app:) if publishing_app scope = scope.where("documents.locale": locale) unless locale == "all" scope = Link.filter_editions(scope, link_filters) if link_filters.present? scope end - def document_types - @document_types.flat_map { |d| [d, "placeholder_#{d}"] } - end - def validate_fields! return unless fields diff --git a/app/queries/get_linkables.rb b/app/queries/get_linkables.rb index 7dd122a12..145d45f65 100644 --- a/app/queries/get_linkables.rb +++ b/app/queries/get_linkables.rb @@ -18,17 +18,13 @@ def call attr_reader :document_type def latest_updated_at(document_type) - non_placeholder = Edition.where(document_type:) - .maximum("updated_at") - placeholder = Edition.where(document_type: "placeholder_#{document_type}") - .maximum("updated_at") - [non_placeholder, placeholder].compact.max + Edition.where(document_type:).maximum("updated_at") end def linkables_query(document_type) Edition.with_document .where( - document_type: [document_type, "placeholder_#{document_type}"], + document_type:, state: %w[published draft], "documents.locale": "en", ) diff --git a/app/validators/schema_validator.rb b/app/validators/schema_validator.rb index 2cc6bbfc0..a65bb2bd4 100644 --- a/app/validators/schema_validator.rb +++ b/app/validators/schema_validator.rb @@ -13,8 +13,6 @@ def initialize(payload:, schema: nil, schema_name: nil, schema_type: :publisher) end def valid? - return true if schema_name_exception? - @errors += JSON::Validator.fully_validate( schema, payload, @@ -55,10 +53,6 @@ def schema_name @schema_name || payload[:schema_name] end - def schema_name_exception? - schema_name.to_s.match(/placeholder_/) - end - def missing_schema_message "Unable to find schema for schema_name #{schema_name}" end diff --git a/content_schemas/allowed_document_types.yml b/content_schemas/allowed_document_types.yml index e2d1e898c..210b27b3b 100644 --- a/content_schemas/allowed_document_types.yml +++ b/content_schemas/allowed_document_types.yml @@ -112,7 +112,6 @@ - personal_information_charter - petitions_and_campaigns - place -- placeholder - policy_paper - press_release - procurement diff --git a/content_schemas/dist/formats/generic/frontend/schema.json b/content_schemas/dist/formats/generic/frontend/schema.json index baa100b7f..e8c15261e 100644 --- a/content_schemas/dist/formats/generic/frontend/schema.json +++ b/content_schemas/dist/formats/generic/frontend/schema.json @@ -148,7 +148,6 @@ "personal_information_charter", "petitions_and_campaigns", "place", - "placeholder", "policy_paper", "press_release", "procurement", diff --git a/content_schemas/dist/formats/generic/notification/schema.json b/content_schemas/dist/formats/generic/notification/schema.json index aebf496e3..f7e9e8d9e 100644 --- a/content_schemas/dist/formats/generic/notification/schema.json +++ b/content_schemas/dist/formats/generic/notification/schema.json @@ -172,7 +172,6 @@ "personal_information_charter", "petitions_and_campaigns", "place", - "placeholder", "policy_paper", "press_release", "procurement", diff --git a/content_schemas/dist/formats/generic/publisher_v2/schema.json b/content_schemas/dist/formats/generic/publisher_v2/schema.json index c94465034..ca7113f44 100644 --- a/content_schemas/dist/formats/generic/publisher_v2/schema.json +++ b/content_schemas/dist/formats/generic/publisher_v2/schema.json @@ -158,7 +158,6 @@ "personal_information_charter", "petitions_and_campaigns", "place", - "placeholder", "policy_paper", "press_release", "procurement", 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 d0ae4f272..03707a454 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 @@ -148,7 +148,6 @@ "personal_information_charter", "petitions_and_campaigns", "place", - "placeholder", "policy_paper", "press_release", "procurement", 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 acceee158..cbb6874f6 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 @@ -172,7 +172,6 @@ "personal_information_charter", "petitions_and_campaigns", "place", - "placeholder", "policy_paper", "press_release", "procurement", 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 0cd5939d4..9a400d2bc 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 @@ -158,7 +158,6 @@ "personal_information_charter", "petitions_and_campaigns", "place", - "placeholder", "policy_paper", "press_release", "procurement", diff --git a/content_schemas/dist/formats/placeholder/frontend/schema.json b/content_schemas/dist/formats/placeholder/frontend/schema.json index 48b9c954f..319d0eac8 100644 --- a/content_schemas/dist/formats/placeholder/frontend/schema.json +++ b/content_schemas/dist/formats/placeholder/frontend/schema.json @@ -148,7 +148,6 @@ "personal_information_charter", "petitions_and_campaigns", "place", - "placeholder", "policy_paper", "press_release", "procurement", @@ -399,9 +398,10 @@ ] }, "schema_name": { - "description": "Should be of the form 'placeholder_my_format_name'. 'placeholder' is allowed for backwards compatibility.", "type": "string", - "pattern": "^(placeholder|placeholder_.+)$" + "enum": [ + "placeholder" + ] }, "title": { "$ref": "#/definitions/title" diff --git a/content_schemas/dist/formats/placeholder/notification/schema.json b/content_schemas/dist/formats/placeholder/notification/schema.json index 457143fa5..b9cbbaf2a 100644 --- a/content_schemas/dist/formats/placeholder/notification/schema.json +++ b/content_schemas/dist/formats/placeholder/notification/schema.json @@ -172,7 +172,6 @@ "personal_information_charter", "petitions_and_campaigns", "place", - "placeholder", "policy_paper", "press_release", "procurement", @@ -483,9 +482,10 @@ "$ref": "#/definitions/routes" }, "schema_name": { - "description": "Should be of the form 'placeholder_my_format_name'. 'placeholder' is allowed for backwards compatibility.", "type": "string", - "pattern": "^(placeholder|placeholder_.+)$" + "enum": [ + "placeholder" + ] }, "search_user_need_document_supertype": { "description": "Document supertype grouping core and government documents", diff --git a/content_schemas/dist/formats/placeholder/publisher_v2/schema.json b/content_schemas/dist/formats/placeholder/publisher_v2/schema.json index 10a81a06f..3e5014ae1 100644 --- a/content_schemas/dist/formats/placeholder/publisher_v2/schema.json +++ b/content_schemas/dist/formats/placeholder/publisher_v2/schema.json @@ -158,7 +158,6 @@ "personal_information_charter", "petitions_and_campaigns", "place", - "placeholder", "policy_paper", "press_release", "procurement", @@ -286,9 +285,10 @@ "$ref": "#/definitions/routes" }, "schema_name": { - "description": "Should be of the form 'placeholder_my_format_name'. 'placeholder' is allowed for backwards compatibility.", "type": "string", - "pattern": "^(placeholder|placeholder_.+)$" + "enum": [ + "placeholder" + ] }, "title": { "$ref": "#/definitions/title" diff --git a/content_schemas/examples/answer/frontend/answer-with-step-navs.json b/content_schemas/examples/answer/frontend/answer-with-step-navs.json index 92bed857a..4f1f5fadd 100644 --- a/content_schemas/examples/answer/frontend/answer-with-step-navs.json +++ b/content_schemas/examples/answer/frontend/answer-with-step-navs.json @@ -267,7 +267,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2015-05-13T10:09:06Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "HM Revenue & Customs", "withdrawn": false, "details": { diff --git a/content_schemas/examples/answer/frontend/answer.json b/content_schemas/examples/answer/frontend/answer.json index 35cab81e0..43c6b06d6 100644 --- a/content_schemas/examples/answer/frontend/answer.json +++ b/content_schemas/examples/answer/frontend/answer.json @@ -25,7 +25,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2015-05-13T10:09:06Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "HM Revenue & Customs", "withdrawn": false, "details": { diff --git a/content_schemas/examples/case_study/frontend/best-practice-case-study.json b/content_schemas/examples/case_study/frontend/best-practice-case-study.json index 2f0acba94..0fcaf4d43 100644 --- a/content_schemas/examples/case_study/frontend/best-practice-case-study.json +++ b/content_schemas/examples/case_study/frontend/best-practice-case-study.json @@ -25,7 +25,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2016-08-09T10:56:17Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "UK Trade & Investment", "withdrawn": false, "details": { @@ -50,7 +50,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2016-08-09T10:56:17Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "UK Trade & Investment", "withdrawn": false, "details": { @@ -105,7 +105,7 @@ "document_type": "worldwide_organisation", "locale": "en", "public_updated_at": "2016-11-11T16:13:06Z", - "schema_name": "placeholder", + "schema_name": "worldwide_organisation", "title": "Department for International Trade Turkey", "withdrawn": false, "links": { diff --git a/content_schemas/examples/consultation/frontend/best-practice-consultation.json b/content_schemas/examples/consultation/frontend/best-practice-consultation.json index 890b6877c..83da930c4 100644 --- a/content_schemas/examples/consultation/frontend/best-practice-consultation.json +++ b/content_schemas/examples/consultation/frontend/best-practice-consultation.json @@ -44,7 +44,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2016-08-01T15:38:37Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department for Business, Innovation & Skills", "withdrawn": false, "details": { @@ -65,10 +65,10 @@ "api_path": "/api/content/government/topics/consumer-rights-and-issues", "base_path": "/government/topics/consumer-rights-and-issues", "content_id": "9d7b90e5-625c-4203-a62a-be9be43d35f3", - "document_type": "placeholder_policy_area", + "document_type": "policy_area", "locale": "en", "public_updated_at": "2016-02-04T11:25:05Z", - "schema_name": "placeholder_policy_area", + "schema_name": "policy_area", "title": "Consumer rights and issues", "withdrawn": false, "links": { @@ -86,7 +86,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2016-08-01T15:38:37Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department for Business, Innovation & Skills", "withdrawn": false, "details": { diff --git a/content_schemas/examples/contact/frontend/contact_with_email_and_no_other_contacts.json b/content_schemas/examples/contact/frontend/contact_with_email_and_no_other_contacts.json index 2e5171fa6..d485b0cac 100644 --- a/content_schemas/examples/contact/frontend/contact_with_email_and_no_other_contacts.json +++ b/content_schemas/examples/contact/frontend/contact_with_email_and_no_other_contacts.json @@ -25,7 +25,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2015-05-13T10:09:06Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "HM Revenue & Customs", "details": { "brand": "hm-revenue-customs", diff --git a/content_schemas/examples/contact/frontend/contact_with_webchat.json b/content_schemas/examples/contact/frontend/contact_with_webchat.json index 03d270fda..1156b1768 100644 --- a/content_schemas/examples/contact/frontend/contact_with_webchat.json +++ b/content_schemas/examples/contact/frontend/contact_with_webchat.json @@ -25,7 +25,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2015-05-13T10:09:06Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "HM Revenue & Customs", "withdrawn": false, "details": { diff --git a/content_schemas/examples/contact/frontend/contact_with_welsh.json b/content_schemas/examples/contact/frontend/contact_with_welsh.json index 28d81a181..d470ee241 100644 --- a/content_schemas/examples/contact/frontend/contact_with_welsh.json +++ b/content_schemas/examples/contact/frontend/contact_with_welsh.json @@ -25,7 +25,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2015-05-13T10:09:06Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "HM Revenue & Customs", "withdrawn": false, "details": { diff --git a/content_schemas/examples/corporate_information_page/frontend/best-practice-about-page.json b/content_schemas/examples/corporate_information_page/frontend/best-practice-about-page.json index 413d273fc..d39015449 100644 --- a/content_schemas/examples/corporate_information_page/frontend/best-practice-about-page.json +++ b/content_schemas/examples/corporate_information_page/frontend/best-practice-about-page.json @@ -219,7 +219,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2015-02-17T11:00:13Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Intellectual Property Office", "withdrawn": false, "details": { diff --git a/content_schemas/examples/corporate_information_page/frontend/best-practice-complaints-procedure.json b/content_schemas/examples/corporate_information_page/frontend/best-practice-complaints-procedure.json index 603b2bca4..434bac569 100644 --- a/content_schemas/examples/corporate_information_page/frontend/best-practice-complaints-procedure.json +++ b/content_schemas/examples/corporate_information_page/frontend/best-practice-complaints-procedure.json @@ -25,7 +25,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2018-01-09T10:07:59Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Ministry of Defence", "withdrawn": false, "details": { diff --git a/content_schemas/examples/corporate_information_page/frontend/best-practice-energy-use.json b/content_schemas/examples/corporate_information_page/frontend/best-practice-energy-use.json index 88af701c1..7856d8cb2 100644 --- a/content_schemas/examples/corporate_information_page/frontend/best-practice-energy-use.json +++ b/content_schemas/examples/corporate_information_page/frontend/best-practice-energy-use.json @@ -25,7 +25,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2018-01-09T10:08:03Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department for Transport", "withdrawn": false, "details": { diff --git a/content_schemas/examples/corporate_information_page/frontend/best-practice-governance.json b/content_schemas/examples/corporate_information_page/frontend/best-practice-governance.json index 49ecf5817..ed347403a 100644 --- a/content_schemas/examples/corporate_information_page/frontend/best-practice-governance.json +++ b/content_schemas/examples/corporate_information_page/frontend/best-practice-governance.json @@ -25,7 +25,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2016-03-31T15:08:50Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "National Measurement and Regulation Office", "withdrawn": false, "details": { diff --git a/content_schemas/examples/corporate_information_page/frontend/best-practice-information-charter.json b/content_schemas/examples/corporate_information_page/frontend/best-practice-information-charter.json index 5b3b4821c..e74c0998c 100644 --- a/content_schemas/examples/corporate_information_page/frontend/best-practice-information-charter.json +++ b/content_schemas/examples/corporate_information_page/frontend/best-practice-information-charter.json @@ -25,7 +25,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2017-08-11T15:05:39Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Natural England", "withdrawn": false, "details": { diff --git a/content_schemas/examples/corporate_information_page/frontend/best-practice-media-enquiries.json b/content_schemas/examples/corporate_information_page/frontend/best-practice-media-enquiries.json index 714da2921..c0c0c76fd 100644 --- a/content_schemas/examples/corporate_information_page/frontend/best-practice-media-enquiries.json +++ b/content_schemas/examples/corporate_information_page/frontend/best-practice-media-enquiries.json @@ -25,7 +25,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2017-12-12T21:20:49Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Driver and Vehicle Standards Agency", "withdrawn": false, "details": { diff --git a/content_schemas/examples/corporate_information_page/frontend/best-practice-membership.json b/content_schemas/examples/corporate_information_page/frontend/best-practice-membership.json index 46af6575a..ea9c02b95 100644 --- a/content_schemas/examples/corporate_information_page/frontend/best-practice-membership.json +++ b/content_schemas/examples/corporate_information_page/frontend/best-practice-membership.json @@ -25,7 +25,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2014-11-11T11:26:34Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Independent Reconfiguration Panel", "withdrawn": false, "details": { diff --git a/content_schemas/examples/corporate_information_page/frontend/best-practice-procurement.json b/content_schemas/examples/corporate_information_page/frontend/best-practice-procurement.json index 156c73fc1..e04fc8eda 100644 --- a/content_schemas/examples/corporate_information_page/frontend/best-practice-procurement.json +++ b/content_schemas/examples/corporate_information_page/frontend/best-practice-procurement.json @@ -25,7 +25,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2015-07-24T14:52:30Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Civil Nuclear Constabulary", "withdrawn": false, "details": { diff --git a/content_schemas/examples/corporate_information_page/frontend/best-practice-publication-scheme.json b/content_schemas/examples/corporate_information_page/frontend/best-practice-publication-scheme.json index fb2728c7c..0b21f67b2 100644 --- a/content_schemas/examples/corporate_information_page/frontend/best-practice-publication-scheme.json +++ b/content_schemas/examples/corporate_information_page/frontend/best-practice-publication-scheme.json @@ -25,7 +25,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2016-08-01T15:38:37Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department for Business, Innovation & Skills", "withdrawn": false, "details": { diff --git a/content_schemas/examples/corporate_information_page/frontend/best-practice-research-at.json b/content_schemas/examples/corporate_information_page/frontend/best-practice-research-at.json index ee0c2908e..2b3ae240a 100644 --- a/content_schemas/examples/corporate_information_page/frontend/best-practice-research-at.json +++ b/content_schemas/examples/corporate_information_page/frontend/best-practice-research-at.json @@ -25,7 +25,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2017-10-05T08:43:12Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Environment Agency", "withdrawn": false, "details": { diff --git a/content_schemas/examples/corporate_information_page/frontend/best-practice-social-media-use.json b/content_schemas/examples/corporate_information_page/frontend/best-practice-social-media-use.json index 892824bb0..52329eb06 100644 --- a/content_schemas/examples/corporate_information_page/frontend/best-practice-social-media-use.json +++ b/content_schemas/examples/corporate_information_page/frontend/best-practice-social-media-use.json @@ -25,7 +25,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2018-01-09T10:08:03Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department for Transport", "withdrawn": false, "details": { diff --git a/content_schemas/examples/corporate_information_page/frontend/best-practice-statistics-at.json b/content_schemas/examples/corporate_information_page/frontend/best-practice-statistics-at.json index 0be8d001b..ff5ac410a 100644 --- a/content_schemas/examples/corporate_information_page/frontend/best-practice-statistics-at.json +++ b/content_schemas/examples/corporate_information_page/frontend/best-practice-statistics-at.json @@ -25,7 +25,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2017-07-04T14:35:36Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Ofsted", "withdrawn": false, "details": { diff --git a/content_schemas/examples/corporate_information_page/frontend/best-practice-welsh-language-scheme.json b/content_schemas/examples/corporate_information_page/frontend/best-practice-welsh-language-scheme.json index ae81b4626..c781b7db3 100644 --- a/content_schemas/examples/corporate_information_page/frontend/best-practice-welsh-language-scheme.json +++ b/content_schemas/examples/corporate_information_page/frontend/best-practice-welsh-language-scheme.json @@ -25,7 +25,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2018-01-09T10:08:03Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department for Work and Pensions", "withdrawn": false, "details": { diff --git a/content_schemas/examples/corporate_information_page/frontend/best-practice-working-at.json b/content_schemas/examples/corporate_information_page/frontend/best-practice-working-at.json index d295a2f0d..0af8c4872 100644 --- a/content_schemas/examples/corporate_information_page/frontend/best-practice-working-at.json +++ b/content_schemas/examples/corporate_information_page/frontend/best-practice-working-at.json @@ -25,7 +25,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2017-10-05T08:43:12Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Environment Agency", "withdrawn": false, "details": { diff --git a/content_schemas/examples/detailed_guide/frontend/best-practice-detailed-guide.json b/content_schemas/examples/detailed_guide/frontend/best-practice-detailed-guide.json index 792b326aa..b93b8be53 100644 --- a/content_schemas/examples/detailed_guide/frontend/best-practice-detailed-guide.json +++ b/content_schemas/examples/detailed_guide/frontend/best-practice-detailed-guide.json @@ -44,7 +44,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2014-10-15T14:36:48Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "UK Visas and Immigration", "withdrawn": false, "details": { @@ -101,10 +101,10 @@ "api_path": "/api/content/government/topics/borders-and-immigration", "base_path": "/government/topics/borders-and-immigration", "content_id": "40c81f52-e1e0-474f-8df6-cd4de9218bac", - "document_type": "placeholder_policy_area", + "document_type": "policy_area", "locale": "en", "public_updated_at": "2016-02-04T11:25:07Z", - "schema_name": "placeholder_policy_area", + "schema_name": "policy_area", "title": "Borders and immigration", "withdrawn": false, "links": { @@ -122,7 +122,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2014-10-15T14:36:48Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "UK Visas and Immigration", "withdrawn": false, "details": { diff --git a/content_schemas/examples/detailed_guide/frontend/england-2014-to-2020-european-structural-and-investment-funds.json b/content_schemas/examples/detailed_guide/frontend/england-2014-to-2020-european-structural-and-investment-funds.json index 90caee52f..bd59f64f7 100644 --- a/content_schemas/examples/detailed_guide/frontend/england-2014-to-2020-european-structural-and-investment-funds.json +++ b/content_schemas/examples/detailed_guide/frontend/england-2014-to-2020-european-structural-and-investment-funds.json @@ -48,7 +48,7 @@ }, "document_type": "organisation", "public_updated_at": "2016-07-18T17:26:51Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department for Environment, Food & Rural Affairs", "base_path": "/government/organisations/department-for-environment-food-rural-affairs", "locale": "en", @@ -71,7 +71,7 @@ }, "document_type": "organisation", "public_updated_at": "2016-07-18T17:26:50Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department for Communities and Local Government", "base_path": "/government/organisations/department-for-communities-and-local-government", "locale": "en", @@ -94,7 +94,7 @@ }, "document_type": "organisation", "public_updated_at": "2016-09-20T15:10:54Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department for Business, Energy & Industrial Strategy", "base_path": "/government/organisations/department-for-business-energy-and-industrial-strategy", "locale": "en", @@ -117,7 +117,7 @@ }, "document_type": "organisation", "public_updated_at": "2016-07-18T17:26:50Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department for Work and Pensions", "base_path": "/government/organisations/department-for-work-pensions", "locale": "en", @@ -133,9 +133,9 @@ "analytics_identifier": null, "content_id": "f10df7ae-e3a6-4f9c-b764-541f62c8e6cf", "description": null, - "document_type": "placeholder_policy_area", + "document_type": "policy_area", "public_updated_at": "2016-02-04T11:25:06Z", - "schema_name": "placeholder_policy_area", + "schema_name": "policy_area", "title": "UK economy", "base_path": "/government/topics/uk-economy", "locale": "en", @@ -151,7 +151,7 @@ "description": null, "document_type": "policy_area", "public_updated_at": "2016-07-05T09:05:43Z", - "schema_name": "placeholder", + "schema_name": "policy_area", "title": "Europe", "base_path": "/government/topics/europe", "locale": "en", @@ -165,9 +165,9 @@ "analytics_identifier": null, "content_id": "eaffa04f-549d-4ece-90dd-c23a44703a53", "description": null, - "document_type": "placeholder_policy_area", + "document_type": "policy_area", "public_updated_at": "2016-02-04T11:25:07Z", - "schema_name": "placeholder_policy_area", + "schema_name": "policy_area", "title": "Business and enterprise", "base_path": "/government/topics/business-and-enterprise", "locale": "en", @@ -203,7 +203,7 @@ "description": "Information about the European Social Fund (ESF) programme for 2007 to 2013 in England and Gibraltar.", "document_type": "document_collection", "public_updated_at": "2016-09-02T11:34:32Z", - "schema_name": "placeholder_document_collection", + "schema_name": "document_collection", "title": "European Social Fund (ESF): 2007 to 2013", "base_path": "/government/collections/european-social-fund-2007-to-2013", "locale": "en", diff --git a/content_schemas/examples/detailed_guide/frontend/translated_detailed_guide.json b/content_schemas/examples/detailed_guide/frontend/translated_detailed_guide.json index 24751327b..4e82b9062 100644 --- a/content_schemas/examples/detailed_guide/frontend/translated_detailed_guide.json +++ b/content_schemas/examples/detailed_guide/frontend/translated_detailed_guide.json @@ -127,12 +127,12 @@ "formatted_title": "Charity Commission" } }, - "document_type": "placeholder_organisation", + "document_type": "organisation", "links": { }, "locale": "en", "public_updated_at": "2014-10-15T14:35:31.000+00:00", - "schema_name": "placeholder_organisation", + "schema_name": "organisation", "title": "The Charity Commission", "web_url": "https://www.gov.uk/government/organisations/charity-commission" } diff --git a/content_schemas/examples/document_collection/frontend/best-practice-document-collection.json b/content_schemas/examples/document_collection/frontend/best-practice-document-collection.json index 66c04bfae..8f5c735f7 100644 --- a/content_schemas/examples/document_collection/frontend/best-practice-document-collection.json +++ b/content_schemas/examples/document_collection/frontend/best-practice-document-collection.json @@ -158,7 +158,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2017-12-12T21:20:49Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Driver and Vehicle Standards Agency", "withdrawn": false, "details": { @@ -200,7 +200,7 @@ "document_type": "policy_area", "locale": "en", "public_updated_at": "2013-07-22T09:04:54Z", - "schema_name": "placeholder", + "schema_name": "policy_area", "title": "Transport", "withdrawn": false, "links": { @@ -218,7 +218,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2017-12-12T21:20:49Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Driver and Vehicle Standards Agency", "withdrawn": false, "details": { diff --git a/content_schemas/examples/document_collection/frontend/best-practice-events-collection.json b/content_schemas/examples/document_collection/frontend/best-practice-events-collection.json index d9d3b25bf..3c3cf0e38 100644 --- a/content_schemas/examples/document_collection/frontend/best-practice-events-collection.json +++ b/content_schemas/examples/document_collection/frontend/best-practice-events-collection.json @@ -734,7 +734,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2017-01-09T11:45:43Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Academy for Justice Commissioning", "withdrawn": false, "details": { @@ -755,10 +755,10 @@ "api_path": "/api/content/government/topics/government-efficiency-transparency-and-accountability", "base_path": "/government/topics/government-efficiency-transparency-and-accountability", "content_id": "0a12a282-10eb-4c83-9db4-16540ae5ab01", - "document_type": "placeholder_policy_area", + "document_type": "policy_area", "locale": "en", "public_updated_at": "2016-02-04T11:25:06Z", - "schema_name": "placeholder_policy_area", + "schema_name": "policy_area", "title": "Government efficiency, transparency and accountability", "withdrawn": false, "links": { @@ -776,7 +776,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2017-01-09T11:45:43Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Academy for Justice Commissioning", "withdrawn": false, "details": { diff --git a/content_schemas/examples/document_collection/frontend/document_collection.json b/content_schemas/examples/document_collection/frontend/document_collection.json index d58124232..e53c2e4dc 100644 --- a/content_schemas/examples/document_collection/frontend/document_collection.json +++ b/content_schemas/examples/document_collection/frontend/document_collection.json @@ -112,7 +112,7 @@ "api_url": "https://www.gov.uk/api/content/government/publications/car-and-light-van-driver-competence-framework", "web_url": "https://www.gov.uk/government/publications/car-and-light-van-driver-competence-framework", "locale": "en", - "schema_name": "placeholder_publication", + "schema_name": "publication", "document_type": "guidance", "analytics_identifier": null }, @@ -126,7 +126,7 @@ "api_url": "https://www.gov.uk/api/content/government/publications/competence-framework-for-moped-and-motorcycle-riders", "web_url": "https://www.gov.uk/government/publications/competence-framework-for-moped-and-motorcycle-riders", "locale": "en", - "schema_name": "placeholder_publication", + "schema_name": "publication", "document_type": "guidance", "analytics_identifier": null }, @@ -140,7 +140,7 @@ "api_url": "https://www.gov.uk/api/content/government/publications/car-and-small-van-driving-syllabus", "web_url": "https://www.gov.uk/government/publications/car-and-small-van-driving-syllabus", "locale": "en", - "schema_name": "placeholder_publication", + "schema_name": "publication", "document_type": "guidance", "analytics_identifier": null }, @@ -154,7 +154,7 @@ "api_url": "https://www.gov.uk/api/content/government/publications/national-standard-for-developed-driving-competence", "web_url": "https://www.gov.uk/government/publications/national-standard-for-developed-driving-competence", "locale": "en", - "schema_name": "placeholder_publication", + "schema_name": "publication", "document_type": "guidance", "analytics_identifier": null }, @@ -168,7 +168,7 @@ "api_url": "https://www.gov.uk/api/content/government/publications/national-standard-for-driver-and-rider-training", "web_url": "https://www.gov.uk/government/publications/national-standard-for-driver-and-rider-training", "locale": "en", - "schema_name": "placeholder_publication", + "schema_name": "publication", "document_type": "guidance", "analytics_identifier": null }, @@ -182,7 +182,7 @@ "api_url": "https://www.gov.uk/api/content/government/publications/national-standard-for-driving-buses-and-coaches", "web_url": "https://www.gov.uk/government/publications/national-standard-for-driving-buses-and-coaches", "locale": "en", - "schema_name": "placeholder_publication", + "schema_name": "publication", "document_type": "guidance", "analytics_identifier": null }, @@ -196,7 +196,7 @@ "api_url": "https://www.gov.uk/api/content/government/publications/national-standard-for-driving-lorries", "web_url": "https://www.gov.uk/government/publications/national-standard-for-driving-lorries", "locale": "en", - "schema_name": "placeholder_publication", + "schema_name": "publication", "document_type": "guidance", "analytics_identifier": null }, @@ -210,7 +210,7 @@ "api_url": "https://www.gov.uk/api/content/government/publications/national-standard-for-riding-mopeds-and-motorcycles", "web_url": "https://www.gov.uk/government/publications/national-standard-for-riding-mopeds-and-motorcycles", "locale": "en", - "schema_name": "placeholder_publication", + "schema_name": "publication", "document_type": "guidance", "analytics_identifier": null }, @@ -224,7 +224,7 @@ "api_url": "https://www.gov.uk/api/content/government/publications/national-standard-for-driving-cars-and-light-vans", "web_url": "https://www.gov.uk/government/publications/national-standard-for-driving-cars-and-light-vans", "locale": "en", - "schema_name": "placeholder_publication", + "schema_name": "publication", "document_type": "guidance", "analytics_identifier": null } diff --git a/content_schemas/examples/document_collection/frontend/document_collection_political.json b/content_schemas/examples/document_collection/frontend/document_collection_political.json index db0db0a30..c7ce67613 100644 --- a/content_schemas/examples/document_collection/frontend/document_collection_political.json +++ b/content_schemas/examples/document_collection/frontend/document_collection_political.json @@ -111,7 +111,7 @@ "api_url": "https://www.gov.uk/api/content/government/publications/car-and-light-van-driver-competence-framework", "web_url": "https://www.gov.uk/government/publications/car-and-light-van-driver-competence-framework", "locale": "en", - "schema_name": "placeholder_publication", + "schema_name": "publication", "document_type": "guidance", "analytics_identifier": null }, @@ -125,7 +125,7 @@ "api_url": "https://www.gov.uk/api/content/government/publications/competence-framework-for-moped-and-motorcycle-riders", "web_url": "https://www.gov.uk/government/publications/competence-framework-for-moped-and-motorcycle-riders", "locale": "en", - "schema_name": "placeholder_publication", + "schema_name": "publication", "document_type": "guidance", "analytics_identifier": null }, @@ -139,7 +139,7 @@ "api_url": "https://www.gov.uk/api/content/government/publications/car-and-small-van-driving-syllabus", "web_url": "https://www.gov.uk/government/publications/car-and-small-van-driving-syllabus", "locale": "en", - "schema_name": "placeholder_publication", + "schema_name": "publication", "document_type": "guidance", "analytics_identifier": null }, @@ -153,7 +153,7 @@ "api_url": "https://www.gov.uk/api/content/government/publications/national-standard-for-developed-driving-competence", "web_url": "https://www.gov.uk/government/publications/national-standard-for-developed-driving-competence", "locale": "en", - "schema_name": "placeholder_publication", + "schema_name": "publication", "document_type": "guidance", "analytics_identifier": null }, @@ -167,7 +167,7 @@ "api_url": "https://www.gov.uk/api/content/government/publications/national-standard-for-driver-and-rider-training", "web_url": "https://www.gov.uk/government/publications/national-standard-for-driver-and-rider-training", "locale": "en", - "schema_name": "placeholder_publication", + "schema_name": "publication", "document_type": "guidance", "analytics_identifier": null }, @@ -181,7 +181,7 @@ "api_url": "https://www.gov.uk/api/content/government/publications/national-standard-for-driving-buses-and-coaches", "web_url": "https://www.gov.uk/government/publications/national-standard-for-driving-buses-and-coaches", "locale": "en", - "schema_name": "placeholder_publication", + "schema_name": "publication", "document_type": "guidance", "analytics_identifier": null }, @@ -195,7 +195,7 @@ "api_url": "https://www.gov.uk/api/content/government/publications/national-standard-for-driving-lorries", "web_url": "https://www.gov.uk/government/publications/national-standard-for-driving-lorries", "locale": "en", - "schema_name": "placeholder_publication", + "schema_name": "publication", "document_type": "guidance", "analytics_identifier": null }, @@ -209,7 +209,7 @@ "api_url": "https://www.gov.uk/api/content/government/publications/national-standard-for-riding-mopeds-and-motorcycles", "web_url": "https://www.gov.uk/government/publications/national-standard-for-riding-mopeds-and-motorcycles", "locale": "en", - "schema_name": "placeholder_publication", + "schema_name": "publication", "document_type": "guidance", "analytics_identifier": null }, @@ -223,7 +223,7 @@ "api_url": "https://www.gov.uk/api/content/government/publications/national-standard-for-driving-cars-and-light-vans", "web_url": "https://www.gov.uk/government/publications/national-standard-for-driving-cars-and-light-vans", "locale": "en", - "schema_name": "placeholder_publication", + "schema_name": "publication", "document_type": "guidance", "analytics_identifier": null } diff --git a/content_schemas/examples/document_collection/frontend/document_collection_with_single_missing_document.json b/content_schemas/examples/document_collection/frontend/document_collection_with_single_missing_document.json index dffb81acf..da9be1c87 100644 --- a/content_schemas/examples/document_collection/frontend/document_collection_with_single_missing_document.json +++ b/content_schemas/examples/document_collection/frontend/document_collection_with_single_missing_document.json @@ -74,7 +74,7 @@ "api_url": "https://www.gov.uk/api/content/government/publications/national-standard-for-developed-driving-competence", "web_url": "https://www.gov.uk/government/publications/national-standard-for-developed-driving-competence", "locale": "en", - "schema_name": "placeholder_publication", + "schema_name": "publication", "document_type": "guidance", "analytics_identifier": null } diff --git a/content_schemas/examples/document_collection/frontend/document_collection_withdrawn.json b/content_schemas/examples/document_collection/frontend/document_collection_withdrawn.json index 71ca39392..64e69c6d5 100644 --- a/content_schemas/examples/document_collection/frontend/document_collection_withdrawn.json +++ b/content_schemas/examples/document_collection/frontend/document_collection_withdrawn.json @@ -113,7 +113,7 @@ "api_url": "https://www.gov.uk/api/content/government/publications/car-and-light-van-driver-competence-framework", "web_url": "https://www.gov.uk/government/publications/car-and-light-van-driver-competence-framework", "locale": "en", - "schema_name": "placeholder_publication", + "schema_name": "publication", "document_type": "guidance", "analytics_identifier": null }, @@ -127,7 +127,7 @@ "api_url": "https://www.gov.uk/api/content/government/publications/competence-framework-for-moped-and-motorcycle-riders", "web_url": "https://www.gov.uk/government/publications/competence-framework-for-moped-and-motorcycle-riders", "locale": "en", - "schema_name": "placeholder_publication", + "schema_name": "publication", "document_type": "guidance", "analytics_identifier": null }, @@ -141,7 +141,7 @@ "api_url": "https://www.gov.uk/api/content/government/publications/car-and-small-van-driving-syllabus", "web_url": "https://www.gov.uk/government/publications/car-and-small-van-driving-syllabus", "locale": "en", - "schema_name": "placeholder_publication", + "schema_name": "publication", "document_type": "guidance", "analytics_identifier": null }, @@ -155,7 +155,7 @@ "api_url": "https://www.gov.uk/api/content/government/publications/national-standard-for-developed-driving-competence", "web_url": "https://www.gov.uk/government/publications/national-standard-for-developed-driving-competence", "locale": "en", - "schema_name": "placeholder_publication", + "schema_name": "publication", "document_type": "guidance", "analytics_identifier": null }, @@ -169,7 +169,7 @@ "api_url": "https://www.gov.uk/api/content/government/publications/national-standard-for-driver-and-rider-training", "web_url": "https://www.gov.uk/government/publications/national-standard-for-driver-and-rider-training", "locale": "en", - "schema_name": "placeholder_publication", + "schema_name": "publication", "document_type": "guidance", "analytics_identifier": null }, @@ -183,7 +183,7 @@ "api_url": "https://www.gov.uk/api/content/government/publications/national-standard-for-driving-buses-and-coaches", "web_url": "https://www.gov.uk/government/publications/national-standard-for-driving-buses-and-coaches", "locale": "en", - "schema_name": "placeholder_publication", + "schema_name": "publication", "document_type": "guidance", "analytics_identifier": null }, @@ -197,7 +197,7 @@ "api_url": "https://www.gov.uk/api/content/government/publications/national-standard-for-driving-lorries", "web_url": "https://www.gov.uk/government/publications/national-standard-for-driving-lorries", "locale": "en", - "schema_name": "placeholder_publication", + "schema_name": "publication", "document_type": "guidance", "analytics_identifier": null }, @@ -211,7 +211,7 @@ "api_url": "https://www.gov.uk/api/content/government/publications/national-standard-for-riding-mopeds-and-motorcycles", "web_url": "https://www.gov.uk/government/publications/national-standard-for-riding-mopeds-and-motorcycles", "locale": "en", - "schema_name": "placeholder_publication", + "schema_name": "publication", "document_type": "guidance", "analytics_identifier": null }, @@ -225,7 +225,7 @@ "api_url": "https://www.gov.uk/api/content/government/publications/national-standard-for-driving-cars-and-light-vans", "web_url": "https://www.gov.uk/government/publications/national-standard-for-driving-cars-and-light-vans", "locale": "en", - "schema_name": "placeholder_publication", + "schema_name": "publication", "document_type": "guidance", "analytics_identifier": null } diff --git a/content_schemas/examples/finder_email_signup/frontend/cma-cases-email-signup.json b/content_schemas/examples/finder_email_signup/frontend/cma-cases-email-signup.json index c98a02ad2..f7af27373 100644 --- a/content_schemas/examples/finder_email_signup/frontend/cma-cases-email-signup.json +++ b/content_schemas/examples/finder_email_signup/frontend/cma-cases-email-signup.json @@ -42,8 +42,8 @@ "web_url": "https://www.gov.uk/government/organisations/competition-and-markets-authority", "locale": "en", "public_updated_at": "2015-03-10T16:23:14.000+00:00", - "schema_name": "placeholder_organisation", - "document_type": "placeholder_organisation", + "schema_name": "organisation", + "document_type": "organisation", "analytics_identifier": "D550", "links": { }, diff --git a/content_schemas/examples/generic/frontend/services_and_information.json b/content_schemas/examples/generic/frontend/services_and_information.json index d71744961..5b0babf03 100644 --- a/content_schemas/examples/generic/frontend/services_and_information.json +++ b/content_schemas/examples/generic/frontend/services_and_information.json @@ -25,7 +25,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2016-11-10T12:58:31Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Highways England", "details": { "brand": null, diff --git a/content_schemas/examples/guide/frontend/guide-with-facet-groups.json b/content_schemas/examples/guide/frontend/guide-with-facet-groups.json index 6b3f03434..833df8562 100644 --- a/content_schemas/examples/guide/frontend/guide-with-facet-groups.json +++ b/content_schemas/examples/guide/frontend/guide-with-facet-groups.json @@ -536,7 +536,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2016-09-23T09:06:42Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department for Education", "withdrawn": false, "details": { diff --git a/content_schemas/examples/guide/frontend/guide-with-related-link-overrides.json b/content_schemas/examples/guide/frontend/guide-with-related-link-overrides.json index eaa697299..e59b7a6c3 100644 --- a/content_schemas/examples/guide/frontend/guide-with-related-link-overrides.json +++ b/content_schemas/examples/guide/frontend/guide-with-related-link-overrides.json @@ -611,7 +611,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2016-09-23T09:06:42Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department for Education", "withdrawn": false, "details": { diff --git a/content_schemas/examples/guide/frontend/guide-with-step-navs.json b/content_schemas/examples/guide/frontend/guide-with-step-navs.json index 8a8348b8d..c6a015aba 100644 --- a/content_schemas/examples/guide/frontend/guide-with-step-navs.json +++ b/content_schemas/examples/guide/frontend/guide-with-step-navs.json @@ -760,7 +760,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2016-09-23T09:06:42Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department for Education", "withdrawn": false, "details": { diff --git a/content_schemas/examples/guide/frontend/guide.json b/content_schemas/examples/guide/frontend/guide.json index e68059a37..22aace826 100644 --- a/content_schemas/examples/guide/frontend/guide.json +++ b/content_schemas/examples/guide/frontend/guide.json @@ -611,7 +611,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2016-09-23T09:06:42Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department for Education", "withdrawn": false, "details": { diff --git a/content_schemas/examples/guide/frontend/no-part-guide-with-step-navs-and-hide-navigation.json b/content_schemas/examples/guide/frontend/no-part-guide-with-step-navs-and-hide-navigation.json index 037cd53c1..cf5bbce93 100644 --- a/content_schemas/examples/guide/frontend/no-part-guide-with-step-navs-and-hide-navigation.json +++ b/content_schemas/examples/guide/frontend/no-part-guide-with-step-navs-and-hide-navigation.json @@ -436,7 +436,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2014-10-15T14:35:28Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "HM Passport Office", "withdrawn": false, "details": { diff --git a/content_schemas/examples/guide/frontend/no-part-guide.json b/content_schemas/examples/guide/frontend/no-part-guide.json index 8b158d811..fc2c00151 100644 --- a/content_schemas/examples/guide/frontend/no-part-guide.json +++ b/content_schemas/examples/guide/frontend/no-part-guide.json @@ -194,7 +194,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2014-10-15T14:35:28Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "HM Passport Office", "withdrawn": false, "details": { diff --git a/content_schemas/examples/guide/frontend/single-page-guide.json b/content_schemas/examples/guide/frontend/single-page-guide.json index 06a507d18..13e82f439 100644 --- a/content_schemas/examples/guide/frontend/single-page-guide.json +++ b/content_schemas/examples/guide/frontend/single-page-guide.json @@ -312,10 +312,10 @@ "base_path": "/government/organisations/animal-health-and-veterinary-laboratories-agency", "content_id": "e0a272d7-82da-495a-a8c5-cc3787817271", "description": null, - "document_type": "placeholder_organisation", + "document_type": "organisation", "locale": "en", "public_updated_at": "2014-10-15T14:35:26Z", - "schema_name": "placeholder_organisation", + "schema_name": "organisation", "title": "Animal Health and Veterinary Laboratories Agency", "withdrawn": false, "details": { @@ -339,7 +339,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2016-12-09T12:38:41Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department for Environment, Food & Rural Affairs", "withdrawn": false, "details": { @@ -363,7 +363,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2016-03-22T14:43:46Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Foreign & Commonwealth Office", "withdrawn": false, "details": { diff --git a/content_schemas/examples/html_publication/frontend/arabic_translation.json b/content_schemas/examples/html_publication/frontend/arabic_translation.json index eed892790..2730da84c 100644 --- a/content_schemas/examples/html_publication/frontend/arabic_translation.json +++ b/content_schemas/examples/html_publication/frontend/arabic_translation.json @@ -13,7 +13,7 @@ "parent": [ { "content_id": "8b19c238-54e3-4e27-b0d7-60f8e2a677c9", - "schema_name": "placeholder_publication", + "schema_name": "publication", "document_type": "promotional", "title": "لٍم تعتبر المملكة المتحدة الوجهة الأمثل لتؤسس الشركات الأجنبية أعمالها فيها", "api_path": "/api/content/government/publications/why-overseas-companies-should-set-up-in-the-uk.ar", diff --git a/content_schemas/examples/html_publication/frontend/best-practice-HC-paper-2.json b/content_schemas/examples/html_publication/frontend/best-practice-HC-paper-2.json index 1e9fd2267..70dff8a37 100644 --- a/content_schemas/examples/html_publication/frontend/best-practice-HC-paper-2.json +++ b/content_schemas/examples/html_publication/frontend/best-practice-HC-paper-2.json @@ -25,7 +25,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2016-12-28T14:18:40Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Driver and Vehicle Licensing Agency", "withdrawn": false, "details": { diff --git a/content_schemas/examples/html_publication/frontend/best-practice-HC-paper.json b/content_schemas/examples/html_publication/frontend/best-practice-HC-paper.json index 268bc6ec3..46ef2e2b2 100644 --- a/content_schemas/examples/html_publication/frontend/best-practice-HC-paper.json +++ b/content_schemas/examples/html_publication/frontend/best-practice-HC-paper.json @@ -25,7 +25,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2018-01-09T10:07:57Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "HM Treasury", "withdrawn": false, "details": { diff --git a/content_schemas/examples/html_publication/frontend/best-practice-command-paper.json b/content_schemas/examples/html_publication/frontend/best-practice-command-paper.json index 872eab827..ee88527f6 100644 --- a/content_schemas/examples/html_publication/frontend/best-practice-command-paper.json +++ b/content_schemas/examples/html_publication/frontend/best-practice-command-paper.json @@ -25,7 +25,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2018-01-09T10:08:03Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department for Transport", "withdrawn": false, "details": { diff --git a/content_schemas/examples/html_publication/frontend/fractions_and_unnumbered_headings.json b/content_schemas/examples/html_publication/frontend/fractions_and_unnumbered_headings.json index 6527e2f0d..6ce040526 100644 --- a/content_schemas/examples/html_publication/frontend/fractions_and_unnumbered_headings.json +++ b/content_schemas/examples/html_publication/frontend/fractions_and_unnumbered_headings.json @@ -13,7 +13,7 @@ "parent": [ { "content_id": "8b19c238-54e3-4e27-b0d7-60f8e2a677c9", - "schema_name": "placeholder_publication", + "schema_name": "publication", "document_type": "statutory_guidance", "title": "National curriculum in England: mathematics programmes of study", "api_path": "/api/content/government/publications/national-curriculum-in-england-mathematics-programmes-of-study", diff --git a/content_schemas/examples/html_publication/frontend/long_form_and_automatically_numbered_headings.json b/content_schemas/examples/html_publication/frontend/long_form_and_automatically_numbered_headings.json index 3592ed889..2fde7efdb 100644 --- a/content_schemas/examples/html_publication/frontend/long_form_and_automatically_numbered_headings.json +++ b/content_schemas/examples/html_publication/frontend/long_form_and_automatically_numbered_headings.json @@ -13,7 +13,7 @@ "parent": [ { "content_id": "8b19c238-54e3-4e27-b0d7-60f8e2a677c9", - "schema_name": "placeholder_publication", + "schema_name": "publication", "document_type": "policy_paper", "title": "Summer Budget 2015", "api_path": "/api/content/government/publications/summer-budget-2015", diff --git a/content_schemas/examples/html_publication/frontend/multiple_organisations.json b/content_schemas/examples/html_publication/frontend/multiple_organisations.json index 8c4cb973a..984198a61 100644 --- a/content_schemas/examples/html_publication/frontend/multiple_organisations.json +++ b/content_schemas/examples/html_publication/frontend/multiple_organisations.json @@ -13,7 +13,7 @@ "parent": [ { "content_id": "8b19c238-54e3-4e27-b0d7-60f8e2a677c9", - "schema_name": "placeholder_publication", + "schema_name": "publication", "document_type": "guidance", "title": "Proof of identity checklist", "api_path": "/api/content/government/publications/proof-of-identity-checklist", diff --git a/content_schemas/examples/html_publication/frontend/national_applicability_alternative_url_html_publication.json b/content_schemas/examples/html_publication/frontend/national_applicability_alternative_url_html_publication.json index dcf0094b4..555f35296 100644 --- a/content_schemas/examples/html_publication/frontend/national_applicability_alternative_url_html_publication.json +++ b/content_schemas/examples/html_publication/frontend/national_applicability_alternative_url_html_publication.json @@ -51,7 +51,7 @@ "parent": [ { "content_id": "8b19c238-54e3-4e27-b0d7-60f8e2a677c9", - "schema_name": "placeholder_publication", + "schema_name": "publication", "document_type": "notice", "title": "TR4 8EE, Mr Derek Mears: environmental permit application advertisement", "api_path": "/api/content/government/publications/tr4-8ee-mr-derek-mears-environmental-permit-application-advertisement", diff --git a/content_schemas/examples/html_publication/frontend/prime_ministers_office.json b/content_schemas/examples/html_publication/frontend/prime_ministers_office.json index 42d44e192..960704642 100644 --- a/content_schemas/examples/html_publication/frontend/prime_ministers_office.json +++ b/content_schemas/examples/html_publication/frontend/prime_ministers_office.json @@ -13,7 +13,7 @@ "parent": [ { "content_id": "8b19c238-54e3-4e27-b0d7-60f8e2a677c9", - "schema_name": "placeholder_publication", + "schema_name": "publication", "document_type": "policy_paper", "title": "Canada-United Kingdom Joint Declaration", "api_path": "/api/content/government/publications/canada-united-kingdom-joint-declaration", diff --git a/content_schemas/examples/html_publication/frontend/print_with_meta_data.json b/content_schemas/examples/html_publication/frontend/print_with_meta_data.json index 9fcc534e5..942e90507 100644 --- a/content_schemas/examples/html_publication/frontend/print_with_meta_data.json +++ b/content_schemas/examples/html_publication/frontend/print_with_meta_data.json @@ -14,7 +14,7 @@ "parent": [ { "content_id": "5ec69271-7631-11e4-a3cb-005056011aef", - "schema_name": "placeholder_publication", + "schema_name": "publication", "document_type": "policy_paper", "title": "Working with the Overseas Territories", "api_path": "/api/content/government/publications/working-with-the-overseas-territories", diff --git a/content_schemas/examples/html_publication/frontend/published.json b/content_schemas/examples/html_publication/frontend/published.json index b73902dda..6fea44a15 100644 --- a/content_schemas/examples/html_publication/frontend/published.json +++ b/content_schemas/examples/html_publication/frontend/published.json @@ -13,7 +13,7 @@ "parent": [ { "content_id": "8b19c238-54e3-4e27-b0d7-60f8e2a677c9", - "schema_name": "placeholder_publication", + "schema_name": "publication", "document_type": "notice", "title": "TR4 8EE, Mr Derek Mears: environmental permit application advertisement", "api_path": "/api/content/government/publications/tr4-8ee-mr-derek-mears-environmental-permit-application-advertisement", diff --git a/content_schemas/examples/html_publication/frontend/published_with_history_mode.json b/content_schemas/examples/html_publication/frontend/published_with_history_mode.json index 958dfa351..326e38b37 100644 --- a/content_schemas/examples/html_publication/frontend/published_with_history_mode.json +++ b/content_schemas/examples/html_publication/frontend/published_with_history_mode.json @@ -32,7 +32,7 @@ "parent": [ { "content_id": "8b19c238-54e3-4e27-b0d7-60f8e2a677c9", - "schema_name": "placeholder_publication", + "schema_name": "publication", "document_type": "notice", "title": "TR4 8EE, Mr Derek Mears: environmental permit application advertisement", "api_path": "/api/content/government/publications/tr4-8ee-mr-derek-mears-environmental-permit-application-advertisement", diff --git a/content_schemas/examples/html_publication/frontend/stats_headline_and_manually_numbered_headings.json b/content_schemas/examples/html_publication/frontend/stats_headline_and_manually_numbered_headings.json index b35814c95..f18ab4a5b 100644 --- a/content_schemas/examples/html_publication/frontend/stats_headline_and_manually_numbered_headings.json +++ b/content_schemas/examples/html_publication/frontend/stats_headline_and_manually_numbered_headings.json @@ -13,7 +13,7 @@ "parent": [ { "content_id": "8b19c238-54e3-4e27-b0d7-60f8e2a677c9", - "schema_name": "placeholder_publication", + "schema_name": "publication", "document_type": "corporate_report", "title": "National curriculum in England: mathematics programmes of study", "api_path": "/api/content/government/publications/dwp-single-departmental-plan-2015-to-2020", diff --git a/content_schemas/examples/html_publication/frontend/updated.json b/content_schemas/examples/html_publication/frontend/updated.json index 049015508..dae42bb8b 100644 --- a/content_schemas/examples/html_publication/frontend/updated.json +++ b/content_schemas/examples/html_publication/frontend/updated.json @@ -13,7 +13,7 @@ "parent": [ { "content_id": "8b19c238-54e3-4e27-b0d7-60f8e2a677c9", - "schema_name": "placeholder_publication", + "schema_name": "publication", "document_type": "notice", "title": "TR4 8EE, Mr Derek Mears: environmental permit application advertisement", "api_path": "/api/content/government/publications/tr4-8ee-mr-derek-mears-environmental-permit-application-advertisement", diff --git a/content_schemas/examples/licence/frontend/licence_with_continuation_link.json b/content_schemas/examples/licence/frontend/licence_with_continuation_link.json index 9669ab176..02479ec1c 100644 --- a/content_schemas/examples/licence/frontend/licence_with_continuation_link.json +++ b/content_schemas/examples/licence/frontend/licence_with_continuation_link.json @@ -22,10 +22,10 @@ "base_path": "/government/organisations/department-of-agriculture-and-rural-development", "content_id": "11e064e0-5079-4216-b693-c10b8167c620", "description": null, - "document_type": "placeholder_organisation", + "document_type": "organisation", "locale": "en", "public_updated_at": "2014-10-15T14:37:34Z", - "schema_name": "placeholder_organisation", + "schema_name": "organisation", "title": "Department of Agriculture and Rural Development", "withdrawn": false, "details": { @@ -46,10 +46,10 @@ "base_path": "/government/organisations/northern-ireland-executive", "content_id": "2aecc4c9-6ef3-43fb-9a82-987e3321db25", "description": null, - "document_type": "placeholder_organisation", + "document_type": "organisation", "locale": "en", "public_updated_at": "2014-10-15T14:38:39Z", - "schema_name": "placeholder_organisation", + "schema_name": "organisation", "title": "Northern Ireland Executive ", "withdrawn": false, "details": { diff --git a/content_schemas/examples/licence/frontend/licence_without_continuation_link.json b/content_schemas/examples/licence/frontend/licence_without_continuation_link.json index 477a3425c..60970871d 100644 --- a/content_schemas/examples/licence/frontend/licence_without_continuation_link.json +++ b/content_schemas/examples/licence/frontend/licence_without_continuation_link.json @@ -156,7 +156,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2016-07-18T17:26:50Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department for Communities and Local Government", "withdrawn": false, "details": { diff --git a/content_schemas/examples/local_transaction/frontend/local_transaction.json b/content_schemas/examples/local_transaction/frontend/local_transaction.json index 8abc2eed8..2e5227160 100644 --- a/content_schemas/examples/local_transaction/frontend/local_transaction.json +++ b/content_schemas/examples/local_transaction/frontend/local_transaction.json @@ -228,7 +228,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2016-12-09T12:38:41Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department for Environment, Food & Rural Affairs", "withdrawn": false, "details": { diff --git a/content_schemas/examples/local_transaction/frontend/local_transaction_with_devolved_administration_availability.json b/content_schemas/examples/local_transaction/frontend/local_transaction_with_devolved_administration_availability.json index 88196a104..dcb693dfe 100644 --- a/content_schemas/examples/local_transaction/frontend/local_transaction_with_devolved_administration_availability.json +++ b/content_schemas/examples/local_transaction/frontend/local_transaction_with_devolved_administration_availability.json @@ -228,7 +228,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2016-12-09T12:38:41Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department for Environment, Food & Rural Affairs", "withdrawn": false, "details": { diff --git a/content_schemas/examples/news_article/frontend/best-practice-event.json b/content_schemas/examples/news_article/frontend/best-practice-event.json index c795ba0ec..3c6a09eb8 100644 --- a/content_schemas/examples/news_article/frontend/best-practice-event.json +++ b/content_schemas/examples/news_article/frontend/best-practice-event.json @@ -61,7 +61,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2015-05-26T10:35:43Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Defence Science and Technology Laboratory", "withdrawn": false, "details": { @@ -87,7 +87,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2016-12-08T06:57:48Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Centre for Defence Enterprise", "withdrawn": false, "details": { @@ -111,7 +111,7 @@ "document_type": "policy_area", "locale": "en", "public_updated_at": "2013-07-22T16:15:27Z", - "schema_name": "placeholder", + "schema_name": "policy_area", "title": "Business and enterprise", "withdrawn": false, "links": { @@ -123,10 +123,10 @@ "api_path": "/api/content/government/topics/defence-and-armed-forces", "base_path": "/government/topics/defence-and-armed-forces", "content_id": "b360d7b0-664d-4030-93f9-ee8bff36ab53", - "document_type": "placeholder_policy_area", + "document_type": "policy_area", "locale": "en", "public_updated_at": "2016-02-04T11:25:07Z", - "schema_name": "placeholder_policy_area", + "schema_name": "policy_area", "title": "Defence and armed forces", "withdrawn": false, "links": { @@ -138,10 +138,10 @@ "api_path": "/api/content/government/topics/science-and-innovation", "base_path": "/government/topics/science-and-innovation", "content_id": "296af982-4a36-4f6f-801d-b550fed1bd38", - "document_type": "placeholder_policy_area", + "document_type": "policy_area", "locale": "en", "public_updated_at": "2016-02-04T11:25:06Z", - "schema_name": "placeholder_policy_area", + "schema_name": "policy_area", "title": "Science and innovation", "withdrawn": false, "links": { @@ -153,10 +153,10 @@ "api_path": "/api/content/government/topics/national-security", "base_path": "/government/topics/national-security", "content_id": "78d0cadd-ce01-4c74-8f7d-2a0fb9364c7c", - "document_type": "placeholder_policy_area", + "document_type": "policy_area", "locale": "en", "public_updated_at": "2016-02-04T11:25:08Z", - "schema_name": "placeholder_policy_area", + "schema_name": "policy_area", "title": "National security", "withdrawn": false, "links": { @@ -174,7 +174,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2016-12-08T06:57:48Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Centre for Defence Enterprise", "withdrawn": false, "details": { diff --git a/content_schemas/examples/news_article/frontend/best-practice-government-response.json b/content_schemas/examples/news_article/frontend/best-practice-government-response.json index 7ed770825..0aea64f60 100644 --- a/content_schemas/examples/news_article/frontend/best-practice-government-response.json +++ b/content_schemas/examples/news_article/frontend/best-practice-government-response.json @@ -44,7 +44,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2018-01-09T10:08:01Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department for Education", "withdrawn": false, "details": { @@ -67,7 +67,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2018-01-09T10:08:02Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department for Environment, Food & Rural Affairs", "withdrawn": false, "details": { @@ -90,7 +90,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2018-01-09T14:42:42Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department of Health and Social Care", "withdrawn": false, "details": { @@ -111,10 +111,10 @@ "api_path": "/api/content/government/topics/national-health-service", "base_path": "/government/topics/national-health-service", "content_id": "7aa4e8aa-0466-414c-bfa8-36e4f3c9fdf9", - "document_type": "placeholder_policy_area", + "document_type": "policy_area", "locale": "en", "public_updated_at": "2016-02-04T11:25:07Z", - "schema_name": "placeholder_policy_area", + "schema_name": "policy_area", "title": "National Health Service", "withdrawn": false, "links": { @@ -126,10 +126,10 @@ "api_path": "/api/content/government/topics/public-health", "base_path": "/government/topics/public-health", "content_id": "26d3fe8e-5ed5-4430-99e9-af78d44cddd2", - "document_type": "placeholder_policy_area", + "document_type": "policy_area", "locale": "en", "public_updated_at": "2016-02-04T11:25:07Z", - "schema_name": "placeholder_policy_area", + "schema_name": "policy_area", "title": "Public health", "withdrawn": false, "links": { @@ -147,7 +147,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2018-01-09T14:42:42Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department of Health and Social Care", "withdrawn": false, "details": { diff --git a/content_schemas/examples/news_article/frontend/best-practice-news-story.json b/content_schemas/examples/news_article/frontend/best-practice-news-story.json index a4dc2c52b..e468b3104 100644 --- a/content_schemas/examples/news_article/frontend/best-practice-news-story.json +++ b/content_schemas/examples/news_article/frontend/best-practice-news-story.json @@ -43,7 +43,7 @@ "document_type": "person", "locale": "en", "public_updated_at": "2017-07-24T13:25:54Z", - "schema_name": "placeholder", + "schema_name": "person", "title": "Robert Goodwill MP", "withdrawn": false, "links": { @@ -61,7 +61,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2018-01-09T10:08:03Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department for Transport", "withdrawn": false, "details": { @@ -85,7 +85,7 @@ "document_type": "policy_area", "locale": "en", "public_updated_at": "2013-07-22T09:04:54Z", - "schema_name": "placeholder", + "schema_name": "policy_area", "title": "Transport", "withdrawn": false, "links": { @@ -103,7 +103,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2018-01-09T10:08:03Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department for Transport", "withdrawn": false, "details": { @@ -142,10 +142,10 @@ "api_path": "/api/content/government/ministers/parliamentary-under-secretary-of-state-for-transport--2", "base_path": "/government/ministers/parliamentary-under-secretary-of-state-for-transport--2", "content_id": "846dcc00-c0f1-11e4-8223-005056011aef", - "document_type": "placeholder_ministerial_role", + "document_type": "ministerial_role", "locale": "en", "public_updated_at": "2015-12-09T11:14:21Z", - "schema_name": "placeholder_ministerial_role", + "schema_name": "ministerial_role", "title": "Parliamentary Under Secretary of State for Transport", "withdrawn": false, "links": { diff --git a/content_schemas/examples/news_article/frontend/best-practice-press-release.json b/content_schemas/examples/news_article/frontend/best-practice-press-release.json index 741d762d2..9e12ea814 100644 --- a/content_schemas/examples/news_article/frontend/best-practice-press-release.json +++ b/content_schemas/examples/news_article/frontend/best-practice-press-release.json @@ -79,7 +79,7 @@ "document_type": "person", "locale": "en", "public_updated_at": "2016-07-19T14:23:28Z", - "schema_name": "placeholder", + "schema_name": "person", "title": "Jeremy Browne", "withdrawn": false, "links": { @@ -97,7 +97,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2018-01-09T10:07:58Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Home Office", "withdrawn": false, "details": { @@ -118,10 +118,10 @@ "api_path": "/api/content/government/topics/national-health-service", "base_path": "/government/topics/national-health-service", "content_id": "7aa4e8aa-0466-414c-bfa8-36e4f3c9fdf9", - "document_type": "placeholder_policy_area", + "document_type": "policy_area", "locale": "en", "public_updated_at": "2016-02-04T11:25:07Z", - "schema_name": "placeholder_policy_area", + "schema_name": "policy_area", "title": "National Health Service", "withdrawn": false, "links": { @@ -133,10 +133,10 @@ "api_path": "/api/content/government/topics/public-health", "base_path": "/government/topics/public-health", "content_id": "26d3fe8e-5ed5-4430-99e9-af78d44cddd2", - "document_type": "placeholder_policy_area", + "document_type": "policy_area", "locale": "en", "public_updated_at": "2016-02-04T11:25:07Z", - "schema_name": "placeholder_policy_area", + "schema_name": "policy_area", "title": "Public health", "withdrawn": false, "links": { @@ -154,7 +154,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2018-01-09T10:07:58Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Home Office", "withdrawn": false, "details": { @@ -193,10 +193,10 @@ "api_path": "/api/content/government/ministers/minister-of-state--21", "base_path": "/government/ministers/minister-of-state--21", "content_id": "84616464-c0f1-11e4-8223-005056011aef", - "document_type": "placeholder_ministerial_role", + "document_type": "ministerial_role", "locale": "en", "public_updated_at": "2013-11-12T10:58:13Z", - "schema_name": "placeholder_ministerial_role", + "schema_name": "ministerial_role", "title": "Minister of State for Crime Prevention", "withdrawn": false, "links": { diff --git a/content_schemas/examples/place/frontend/find-regional-passport-office.json b/content_schemas/examples/place/frontend/find-regional-passport-office.json index eeab7fddb..eefd07da7 100644 --- a/content_schemas/examples/place/frontend/find-regional-passport-office.json +++ b/content_schemas/examples/place/frontend/find-regional-passport-office.json @@ -98,10 +98,10 @@ "base_path": "/government/organisations/hm-passport-office", "content_id": "3a96a1e0-21e3-4aae-8e84-f90860ed3dbf", "description": null, - "document_type": "placeholder_organisation", + "document_type": "organisation", "locale": "en", "public_updated_at": "2014-10-15T14:35:28Z", - "schema_name": "placeholder_organisation", + "schema_name": "organisation", "title": "HM Passport Office", "withdrawn": false, "details": { @@ -125,7 +125,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2015-06-03T13:12:46Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Home Office", "withdrawn": false, "details": { diff --git a/content_schemas/examples/placeholder/frontend/placeholder.json b/content_schemas/examples/placeholder/frontend/placeholder.json deleted file mode 100644 index db2adf810..000000000 --- a/content_schemas/examples/placeholder/frontend/placeholder.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "base_path": "/some-placeholder", - "content_id": "5c806926-7631-11e4-a3cb-005056011aea", - "title": "Some placeholder", - "locale": "en", - "updated_at": "2015-12-02T10:51:26.334Z", - "public_updated_at": "2011-11-17T00:00:00.000+00:00", - "phase": "live", - "links": { - }, - "description": "A placeholder", - "details": { - }, - "schema_name": "placeholder", - "document_type": "placeholder" -} diff --git a/content_schemas/examples/publication/frontend/best-practice-HC-paper-splash-2.json b/content_schemas/examples/publication/frontend/best-practice-HC-paper-splash-2.json index 9768638ea..f1a2ef2ea 100644 --- a/content_schemas/examples/publication/frontend/best-practice-HC-paper-splash-2.json +++ b/content_schemas/examples/publication/frontend/best-practice-HC-paper-splash-2.json @@ -115,7 +115,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2016-12-28T14:18:40Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Driver and Vehicle Licensing Agency", "withdrawn": false, "details": { @@ -139,7 +139,7 @@ "document_type": "policy_area", "locale": "en", "public_updated_at": "2013-07-22T09:04:54Z", - "schema_name": "placeholder", + "schema_name": "policy_area", "title": "Transport", "withdrawn": false, "links": { @@ -157,7 +157,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2016-12-28T14:18:40Z", - "schema_name": "placeholder", + "schema_name": "placehoorganisationlder", "title": "Driver and Vehicle Licensing Agency", "withdrawn": false, "details": { diff --git a/content_schemas/examples/publication/frontend/best-practice-HC-paper-splash-page.json b/content_schemas/examples/publication/frontend/best-practice-HC-paper-splash-page.json index e8f283602..204b03218 100644 --- a/content_schemas/examples/publication/frontend/best-practice-HC-paper-splash-page.json +++ b/content_schemas/examples/publication/frontend/best-practice-HC-paper-splash-page.json @@ -111,7 +111,7 @@ "document_type": "person", "locale": "en", "public_updated_at": "2017-06-09T16:12:14Z", - "schema_name": "placeholder", + "schema_name": "person", "title": "The Rt Hon Philip Hammond MP", "withdrawn": false, "links": { @@ -129,7 +129,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2018-01-09T10:07:57Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "HM Treasury", "withdrawn": false, "details": { @@ -153,7 +153,7 @@ "document_type": "person", "locale": "en", "public_updated_at": "2017-06-09T16:12:14Z", - "schema_name": "placeholder", + "schema_name": "person", "title": "The Rt Hon Philip Hammond MP", "withdrawn": false, "links": { @@ -167,10 +167,10 @@ "api_path": "/api/content/government/topics/government-spending", "base_path": "/government/topics/government-spending", "content_id": "c75939ac-59b4-4a00-ad23-107d6cecf95b", - "document_type": "placeholder_policy_area", + "document_type": "policy_area", "locale": "en", "public_updated_at": "2016-02-04T11:25:09Z", - "schema_name": "placeholder_policy_area", + "schema_name": "policy_area", "title": "Government spending", "withdrawn": false, "links": { @@ -182,10 +182,10 @@ "api_path": "/api/content/government/topics/tax-and-revenue", "base_path": "/government/topics/tax-and-revenue", "content_id": "8034be95-4ac2-4fff-93c5-e7514ed9504a", - "document_type": "placeholder_policy_area", + "document_type": "policy_area", "locale": "en", "public_updated_at": "2016-02-04T11:25:07Z", - "schema_name": "placeholder_policy_area", + "schema_name": "policy_area", "title": "Tax and revenue", "withdrawn": false, "links": { @@ -197,10 +197,10 @@ "api_path": "/api/content/government/topics/uk-economy", "base_path": "/government/topics/uk-economy", "content_id": "f10df7ae-e3a6-4f9c-b764-541f62c8e6cf", - "document_type": "placeholder_policy_area", + "document_type": "policy_area", "locale": "en", "public_updated_at": "2016-02-04T11:25:06Z", - "schema_name": "placeholder_policy_area", + "schema_name": "policy_area", "title": "UK economy", "withdrawn": false, "links": { @@ -218,7 +218,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2018-01-09T10:07:57Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "HM Treasury", "withdrawn": false, "details": { @@ -242,7 +242,7 @@ "document_type": "ministerial_role", "locale": "en", "public_updated_at": "2013-04-24T14:21:55Z", - "schema_name": "placeholder", + "schema_name": "ministerial_role", "title": "Chancellor of the Exchequer", "withdrawn": false, "links": { @@ -259,7 +259,7 @@ "document_type": "topical_event", "locale": "en", "public_updated_at": "2017-03-09T14:17:03Z", - "schema_name": "placeholder", + "schema_name": "topical_event", "title": "Spring Budget 2017", "withdrawn": false, "details": { diff --git a/content_schemas/examples/publication/frontend/best-practice-cmd-list.json b/content_schemas/examples/publication/frontend/best-practice-cmd-list.json index 55246ca04..b2497f6e0 100644 --- a/content_schemas/examples/publication/frontend/best-practice-cmd-list.json +++ b/content_schemas/examples/publication/frontend/best-practice-cmd-list.json @@ -79,7 +79,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2018-01-09T10:08:03Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department for Transport", "withdrawn": false, "details": { @@ -103,7 +103,7 @@ "document_type": "policy_area", "locale": "en", "public_updated_at": "2013-07-22T09:04:54Z", - "schema_name": "placeholder", + "schema_name": "policy_area", "title": "Transport", "withdrawn": false, "links": { @@ -115,10 +115,10 @@ "api_path": "/api/content/government/topics/uk-economy", "base_path": "/government/topics/uk-economy", "content_id": "f10df7ae-e3a6-4f9c-b764-541f62c8e6cf", - "document_type": "placeholder_policy_area", + "document_type": "policy_area", "locale": "en", "public_updated_at": "2016-02-04T11:25:06Z", - "schema_name": "placeholder_policy_area", + "schema_name": "policy_area", "title": "UK economy", "withdrawn": false, "links": { @@ -136,7 +136,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2018-01-09T10:08:03Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department for Transport", "withdrawn": false, "details": { diff --git a/content_schemas/examples/publication/frontend/best-practice-corporate-report.json b/content_schemas/examples/publication/frontend/best-practice-corporate-report.json index 2f72606d7..934486f65 100644 --- a/content_schemas/examples/publication/frontend/best-practice-corporate-report.json +++ b/content_schemas/examples/publication/frontend/best-practice-corporate-report.json @@ -80,7 +80,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2017-03-31T23:55:16Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Skills Funding Agency", "withdrawn": false, "details": { @@ -101,10 +101,10 @@ "api_path": "/api/content/government/topics/further-education-and-skills", "base_path": "/government/topics/further-education-and-skills", "content_id": "a4c81f7a-93c4-4c47-8761-fd78e4771f7e", - "document_type": "placeholder_policy_area", + "document_type": "policy_area", "locale": "en", "public_updated_at": "2016-02-04T11:25:06Z", - "schema_name": "placeholder_policy_area", + "schema_name": "policy_area", "title": "Further education and skills", "withdrawn": false, "links": { @@ -122,7 +122,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2017-03-31T23:55:16Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Skills Funding Agency", "withdrawn": false, "details": { diff --git a/content_schemas/examples/publication/frontend/best-practice-foi-release.json b/content_schemas/examples/publication/frontend/best-practice-foi-release.json index a5fb6e950..c38103982 100644 --- a/content_schemas/examples/publication/frontend/best-practice-foi-release.json +++ b/content_schemas/examples/publication/frontend/best-practice-foi-release.json @@ -44,7 +44,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2018-01-09T10:07:59Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Ministry of Defence", "withdrawn": false, "details": { @@ -65,10 +65,10 @@ "api_path": "/api/content/government/topics/defence-and-armed-forces", "base_path": "/government/topics/defence-and-armed-forces", "content_id": "b360d7b0-664d-4030-93f9-ee8bff36ab53", - "document_type": "placeholder_policy_area", + "document_type": "policy_area", "locale": "en", "public_updated_at": "2016-02-04T11:25:07Z", - "schema_name": "placeholder_policy_area", + "schema_name": "policy_area", "title": "Defence and armed forces", "withdrawn": false, "links": { @@ -86,7 +86,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2018-01-09T10:07:59Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Ministry of Defence", "withdrawn": false, "details": { diff --git a/content_schemas/examples/publication/frontend/best-practice-form-2.json b/content_schemas/examples/publication/frontend/best-practice-form-2.json index 3ac0f2d01..7029f7f71 100644 --- a/content_schemas/examples/publication/frontend/best-practice-form-2.json +++ b/content_schemas/examples/publication/frontend/best-practice-form-2.json @@ -44,7 +44,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2017-12-12T21:20:49Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Driver and Vehicle Standards Agency", "withdrawn": false, "details": { @@ -86,7 +86,7 @@ "document_type": "policy_area", "locale": "en", "public_updated_at": "2013-07-22T09:04:54Z", - "schema_name": "placeholder", + "schema_name": "policy_area", "title": "Transport", "withdrawn": false, "links": { @@ -104,7 +104,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2017-12-12T21:20:49Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Driver and Vehicle Standards Agency", "withdrawn": false, "details": { diff --git a/content_schemas/examples/publication/frontend/best-practice-form.json b/content_schemas/examples/publication/frontend/best-practice-form.json index 4c7f3c76b..b4c669487 100644 --- a/content_schemas/examples/publication/frontend/best-practice-form.json +++ b/content_schemas/examples/publication/frontend/best-practice-form.json @@ -60,7 +60,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2014-10-15T14:36:48Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "UK Visas and Immigration", "withdrawn": false, "details": { @@ -81,10 +81,10 @@ "api_path": "/api/content/government/topics/borders-and-immigration", "base_path": "/government/topics/borders-and-immigration", "content_id": "40c81f52-e1e0-474f-8df6-cd4de9218bac", - "document_type": "placeholder_policy_area", + "document_type": "policy_area", "locale": "en", "public_updated_at": "2016-02-04T11:25:07Z", - "schema_name": "placeholder_policy_area", + "schema_name": "policy_area", "title": "Borders and immigration", "withdrawn": false, "links": { @@ -102,7 +102,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2014-10-15T14:36:48Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "UK Visas and Immigration", "withdrawn": false, "details": { diff --git a/content_schemas/examples/publication/frontend/best-practice-guidance.json b/content_schemas/examples/publication/frontend/best-practice-guidance.json index b45309155..9a8aff21d 100644 --- a/content_schemas/examples/publication/frontend/best-practice-guidance.json +++ b/content_schemas/examples/publication/frontend/best-practice-guidance.json @@ -80,7 +80,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2017-12-12T21:20:49Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Driver and Vehicle Standards Agency", "withdrawn": false, "details": { @@ -122,7 +122,7 @@ "document_type": "policy_area", "locale": "en", "public_updated_at": "2013-07-22T09:04:54Z", - "schema_name": "placeholder", + "schema_name": "policy_area", "title": "Transport", "withdrawn": false, "links": { @@ -140,7 +140,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2017-12-12T21:20:49Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Driver and Vehicle Standards Agency", "withdrawn": false, "details": { diff --git a/content_schemas/examples/publication/frontend/best-practice-impact-assessment.json b/content_schemas/examples/publication/frontend/best-practice-impact-assessment.json index 1fe02d0d9..f713899f5 100644 --- a/content_schemas/examples/publication/frontend/best-practice-impact-assessment.json +++ b/content_schemas/examples/publication/frontend/best-practice-impact-assessment.json @@ -44,7 +44,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2016-08-01T15:38:37Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department for Business, Innovation & Skills", "withdrawn": false, "details": { @@ -68,7 +68,7 @@ "document_type": "policy_area", "locale": "en", "public_updated_at": "2013-07-22T16:15:27Z", - "schema_name": "placeholder", + "schema_name": "policy_area", "title": "Business and enterprise", "withdrawn": false, "links": { @@ -80,10 +80,10 @@ "api_path": "/api/content/government/topics/employment", "base_path": "/government/topics/employment", "content_id": "88f76819-ccbe-4bcd-90b8-9e7d38f2f7b4", - "document_type": "placeholder_policy_area", + "document_type": "policy_area", "locale": "en", "public_updated_at": "2016-02-04T11:25:05Z", - "schema_name": "placeholder_policy_area", + "schema_name": "policy_area", "title": "Employment", "withdrawn": false, "links": { @@ -101,7 +101,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2016-08-01T15:38:37Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department for Business, Innovation & Skills", "withdrawn": false, "details": { diff --git a/content_schemas/examples/publication/frontend/best-practice-independent-report.json b/content_schemas/examples/publication/frontend/best-practice-independent-report.json index 4b28b887b..d968cb463 100644 --- a/content_schemas/examples/publication/frontend/best-practice-independent-report.json +++ b/content_schemas/examples/publication/frontend/best-practice-independent-report.json @@ -44,7 +44,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2018-01-09T14:42:42Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department of Health and Social Care", "withdrawn": false, "details": { @@ -65,10 +65,10 @@ "api_path": "/api/content/government/topics/public-health", "base_path": "/government/topics/public-health", "content_id": "26d3fe8e-5ed5-4430-99e9-af78d44cddd2", - "document_type": "placeholder_policy_area", + "document_type": "policy_area", "locale": "en", "public_updated_at": "2016-02-04T11:25:07Z", - "schema_name": "placeholder_policy_area", + "schema_name": "policy_area", "title": "Public health", "withdrawn": false, "links": { @@ -86,7 +86,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2018-01-09T14:42:42Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department of Health and Social Care", "withdrawn": false, "details": { diff --git a/content_schemas/examples/publication/frontend/best-practice-national-statistics.json b/content_schemas/examples/publication/frontend/best-practice-national-statistics.json index 4e3e7ed97..de3ccd97d 100644 --- a/content_schemas/examples/publication/frontend/best-practice-national-statistics.json +++ b/content_schemas/examples/publication/frontend/best-practice-national-statistics.json @@ -80,7 +80,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2018-01-09T10:08:03Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department for Transport", "withdrawn": false, "details": { @@ -104,7 +104,7 @@ "document_type": "policy_area", "locale": "en", "public_updated_at": "2013-07-22T09:04:54Z", - "schema_name": "placeholder", + "schema_name": "policy_area", "title": "Transport", "withdrawn": false, "links": { @@ -116,10 +116,10 @@ "api_path": "/api/content/government/topics/uk-economy", "base_path": "/government/topics/uk-economy", "content_id": "f10df7ae-e3a6-4f9c-b764-541f62c8e6cf", - "document_type": "placeholder_policy_area", + "document_type": "policy_area", "locale": "en", "public_updated_at": "2016-02-04T11:25:06Z", - "schema_name": "placeholder_policy_area", + "schema_name": "policy_area", "title": "UK economy", "withdrawn": false, "links": { @@ -137,7 +137,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2018-01-09T10:08:03Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department for Transport", "withdrawn": false, "details": { diff --git a/content_schemas/examples/publication/frontend/best-practice-notice.json b/content_schemas/examples/publication/frontend/best-practice-notice.json index 6a6e72955..7d3e17762 100644 --- a/content_schemas/examples/publication/frontend/best-practice-notice.json +++ b/content_schemas/examples/publication/frontend/best-practice-notice.json @@ -77,7 +77,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2017-10-05T08:43:12Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Environment Agency", "withdrawn": false, "details": { @@ -101,10 +101,10 @@ "api_path": "/api/content/government/topics/consumer-rights-and-issues", "base_path": "/government/topics/consumer-rights-and-issues", "content_id": "9d7b90e5-625c-4203-a62a-be9be43d35f3", - "document_type": "placeholder_policy_area", + "document_type": "policy_area", "locale": "en", "public_updated_at": "2016-02-04T11:25:05Z", - "schema_name": "placeholder_policy_area", + "schema_name": "policy_area", "title": "Consumer rights and issues", "withdrawn": false, "links": { @@ -116,10 +116,10 @@ "api_path": "/api/content/government/topics/environment", "base_path": "/government/topics/environment", "content_id": "21c18504-c671-455d-a37c-0a6ecc73c4ed", - "document_type": "placeholder_policy_area", + "document_type": "policy_area", "locale": "en", "public_updated_at": "2016-02-04T11:25:09Z", - "schema_name": "placeholder_policy_area", + "schema_name": "policy_area", "title": "Environment", "withdrawn": false, "links": { @@ -131,10 +131,10 @@ "api_path": "/api/content/government/topics/government-efficiency-transparency-and-accountability", "base_path": "/government/topics/government-efficiency-transparency-and-accountability", "content_id": "0a12a282-10eb-4c83-9db4-16540ae5ab01", - "document_type": "placeholder_policy_area", + "document_type": "policy_area", "locale": "en", "public_updated_at": "2016-02-04T11:25:06Z", - "schema_name": "placeholder_policy_area", + "schema_name": "policy_area", "title": "Government efficiency, transparency and accountability", "withdrawn": false, "links": { @@ -152,7 +152,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2017-10-05T08:43:12Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Environment Agency", "withdrawn": false, "details": { diff --git a/content_schemas/examples/publication/frontend/best-practice-official-statistics.json b/content_schemas/examples/publication/frontend/best-practice-official-statistics.json index 9f9987e72..ea3fe4945 100644 --- a/content_schemas/examples/publication/frontend/best-practice-official-statistics.json +++ b/content_schemas/examples/publication/frontend/best-practice-official-statistics.json @@ -80,7 +80,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2017-07-04T14:35:36Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Ofsted", "withdrawn": false, "details": { @@ -104,10 +104,10 @@ "api_path": "/api/content/government/topics/social-care", "base_path": "/government/topics/social-care", "content_id": "a90d4fac-5656-4745-9c16-08542f42c3ac", - "document_type": "placeholder_policy_area", + "document_type": "policy_area", "locale": "en", "public_updated_at": "2016-02-04T11:25:08Z", - "schema_name": "placeholder_policy_area", + "schema_name": "policy_area", "title": "Social care", "withdrawn": false, "links": { @@ -125,7 +125,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2017-07-04T14:35:36Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Ofsted", "withdrawn": false, "details": { diff --git a/content_schemas/examples/publication/frontend/best-practice-policy-paper.json b/content_schemas/examples/publication/frontend/best-practice-policy-paper.json index dbe2b55d1..5976a8caa 100644 --- a/content_schemas/examples/publication/frontend/best-practice-policy-paper.json +++ b/content_schemas/examples/publication/frontend/best-practice-policy-paper.json @@ -115,7 +115,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2016-07-06T07:11:26Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "The Charity Commission", "withdrawn": false, "details": { @@ -139,10 +139,10 @@ "api_path": "/api/content/government/topics/community-and-society", "base_path": "/government/topics/community-and-society", "content_id": "27c0084e-6549-4042-b0f6-986e0f24cadf", - "document_type": "placeholder_policy_area", + "document_type": "policy_area", "locale": "en", "public_updated_at": "2016-02-04T11:25:06Z", - "schema_name": "placeholder_policy_area", + "schema_name": "policy_area", "title": "Community and society", "withdrawn": false, "links": { @@ -160,7 +160,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2016-07-06T07:11:26Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "The Charity Commission", "withdrawn": false, "details": { diff --git a/content_schemas/examples/publication/frontend/best-practice-promotional-material.json b/content_schemas/examples/publication/frontend/best-practice-promotional-material.json index 009568f36..d1dedcd61 100644 --- a/content_schemas/examples/publication/frontend/best-practice-promotional-material.json +++ b/content_schemas/examples/publication/frontend/best-practice-promotional-material.json @@ -80,7 +80,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2014-10-15T14:36:33Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Public Health England", "withdrawn": false, "details": { @@ -101,10 +101,10 @@ "api_path": "/api/content/government/topics/national-health-service", "base_path": "/government/topics/national-health-service", "content_id": "7aa4e8aa-0466-414c-bfa8-36e4f3c9fdf9", - "document_type": "placeholder_policy_area", + "document_type": "policy_area", "locale": "en", "public_updated_at": "2016-02-04T11:25:07Z", - "schema_name": "placeholder_policy_area", + "schema_name": "policy_area", "title": "National Health Service", "withdrawn": false, "links": { @@ -116,10 +116,10 @@ "api_path": "/api/content/government/topics/public-health", "base_path": "/government/topics/public-health", "content_id": "26d3fe8e-5ed5-4430-99e9-af78d44cddd2", - "document_type": "placeholder_policy_area", + "document_type": "policy_area", "locale": "en", "public_updated_at": "2016-02-04T11:25:07Z", - "schema_name": "placeholder_policy_area", + "schema_name": "policy_area", "title": "Public health", "withdrawn": false, "links": { @@ -137,7 +137,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2014-10-15T14:36:33Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Public Health England", "withdrawn": false, "details": { diff --git a/content_schemas/examples/publication/frontend/best-practice-regulation.json b/content_schemas/examples/publication/frontend/best-practice-regulation.json index cfa353678..aaf1ac5c2 100644 --- a/content_schemas/examples/publication/frontend/best-practice-regulation.json +++ b/content_schemas/examples/publication/frontend/best-practice-regulation.json @@ -80,7 +80,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2018-01-09T10:07:59Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Ministry of Defence", "withdrawn": false, "details": { @@ -103,7 +103,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2015-03-18T16:01:40Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Military Aviation Authority", "withdrawn": false, "details": { @@ -127,10 +127,10 @@ "api_path": "/api/content/government/topics/defence-and-armed-forces", "base_path": "/government/topics/defence-and-armed-forces", "content_id": "b360d7b0-664d-4030-93f9-ee8bff36ab53", - "document_type": "placeholder_policy_area", + "document_type": "policy_area", "locale": "en", "public_updated_at": "2016-02-04T11:25:07Z", - "schema_name": "placeholder_policy_area", + "schema_name": "policy_area", "title": "Defence and armed forces", "withdrawn": false, "links": { @@ -148,7 +148,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2018-01-09T10:07:59Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Ministry of Defence", "withdrawn": false, "details": { diff --git a/content_schemas/examples/publication/frontend/best-practice-research.json b/content_schemas/examples/publication/frontend/best-practice-research.json index bbb7a1e2d..072969772 100644 --- a/content_schemas/examples/publication/frontend/best-practice-research.json +++ b/content_schemas/examples/publication/frontend/best-practice-research.json @@ -44,7 +44,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2018-01-09T10:08:01Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department for Education", "withdrawn": false, "details": { @@ -65,10 +65,10 @@ "api_path": "/api/content/government/topics/children-and-young-people", "base_path": "/government/topics/children-and-young-people", "content_id": "89a2270a-8c81-4336-b68c-3e4fb5ac319c", - "document_type": "placeholder_policy_area", + "document_type": "policy_area", "locale": "en", "public_updated_at": "2016-02-04T11:25:08Z", - "schema_name": "placeholder_policy_area", + "schema_name": "policy_area", "title": "Children and young people", "withdrawn": false, "links": { @@ -86,7 +86,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2018-01-09T10:08:01Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department for Education", "withdrawn": false, "details": { diff --git a/content_schemas/examples/publication/frontend/best-practice-statutory-guidance.json b/content_schemas/examples/publication/frontend/best-practice-statutory-guidance.json index 4a16a9a0c..8392f7ba5 100644 --- a/content_schemas/examples/publication/frontend/best-practice-statutory-guidance.json +++ b/content_schemas/examples/publication/frontend/best-practice-statutory-guidance.json @@ -80,7 +80,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2018-01-09T10:08:01Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department for Education", "withdrawn": false, "details": { @@ -103,7 +103,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2017-03-31T23:54:26Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Education Funding Agency", "withdrawn": false, "details": { @@ -124,10 +124,10 @@ "api_path": "/api/content/government/topics/schools", "base_path": "/government/topics/schools", "content_id": "88d627cb-0ae5-4fc9-b5ac-bb7eb6fddf72", - "document_type": "placeholder_policy_area", + "document_type": "policy_area", "locale": "en", "public_updated_at": "2016-02-04T11:25:08Z", - "schema_name": "placeholder_policy_area", + "schema_name": "policy_area", "title": "Schools", "withdrawn": false, "links": { @@ -145,7 +145,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2018-01-09T10:08:01Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department for Education", "withdrawn": false, "details": { diff --git a/content_schemas/examples/publication/frontend/best-practice-transparency-data.json b/content_schemas/examples/publication/frontend/best-practice-transparency-data.json index 389a44f05..bf6df350d 100644 --- a/content_schemas/examples/publication/frontend/best-practice-transparency-data.json +++ b/content_schemas/examples/publication/frontend/best-practice-transparency-data.json @@ -80,7 +80,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2018-01-09T10:07:57Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Cabinet Office", "withdrawn": false, "details": { @@ -103,7 +103,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2015-03-09T20:00:54Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Prime Minister's Office, 10 Downing Street", "withdrawn": false, "details": { @@ -126,7 +126,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2015-05-11T16:17:58Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Deputy Prime Minister's Office", "withdrawn": false, "details": { @@ -147,10 +147,10 @@ "api_path": "/api/content/government/topics/government-efficiency-transparency-and-accountability", "base_path": "/government/topics/government-efficiency-transparency-and-accountability", "content_id": "0a12a282-10eb-4c83-9db4-16540ae5ab01", - "document_type": "placeholder_policy_area", + "document_type": "policy_area", "locale": "en", "public_updated_at": "2016-02-04T11:25:06Z", - "schema_name": "placeholder_policy_area", + "schema_name": "policy_area", "title": "Government efficiency, transparency and accountability", "withdrawn": false, "links": { @@ -168,7 +168,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2018-01-09T10:07:57Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Cabinet Office", "withdrawn": false, "details": { diff --git a/content_schemas/examples/role/frontend/prime_minister.json b/content_schemas/examples/role/frontend/prime_minister.json index 469b7564d..cc889ae51 100644 --- a/content_schemas/examples/role/frontend/prime_minister.json +++ b/content_schemas/examples/role/frontend/prime_minister.json @@ -125,7 +125,7 @@ "base_path": "/government/ministers", "document_type": "finder", "public_updated_at": "2020-05-18T15:47:56Z", - "schema_name": "placeholder", + "schema_name": "finder", "withdrawn": false, "links": { }, diff --git a/content_schemas/examples/simple_smart_answer/frontend/simple-smart-answer-with-step-navs.json b/content_schemas/examples/simple_smart_answer/frontend/simple-smart-answer-with-step-navs.json index bbce33fd4..2044bc81a 100644 --- a/content_schemas/examples/simple_smart_answer/frontend/simple-smart-answer-with-step-navs.json +++ b/content_schemas/examples/simple_smart_answer/frontend/simple-smart-answer-with-step-navs.json @@ -453,7 +453,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2016-11-18T12:50:04Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Driver and Vehicle Standards Agency", "withdrawn": false, "details": { diff --git a/content_schemas/examples/simple_smart_answer/frontend/simple-smart-answer.json b/content_schemas/examples/simple_smart_answer/frontend/simple-smart-answer.json index 39fd5392a..c1e2380f3 100644 --- a/content_schemas/examples/simple_smart_answer/frontend/simple-smart-answer.json +++ b/content_schemas/examples/simple_smart_answer/frontend/simple-smart-answer.json @@ -211,7 +211,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2016-11-18T12:50:04Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Driver and Vehicle Standards Agency", "withdrawn": false, "details": { diff --git a/content_schemas/examples/specialist_document/frontend/aaib-reports.json b/content_schemas/examples/specialist_document/frontend/aaib-reports.json index 4a3c115df..ee8a8af16 100644 --- a/content_schemas/examples/specialist_document/frontend/aaib-reports.json +++ b/content_schemas/examples/specialist_document/frontend/aaib-reports.json @@ -71,7 +71,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2015-04-15T10:04:28Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Air Accidents Investigation Branch", "web_url": "https://www.gov.uk/government/organisations/air-accidents-investigation-branch", "details": { diff --git a/content_schemas/examples/specialist_document/frontend/ai-assurance-portfolio-technique.json b/content_schemas/examples/specialist_document/frontend/ai-assurance-portfolio-technique.json index 39a69c8f2..b12ba80b1 100644 --- a/content_schemas/examples/specialist_document/frontend/ai-assurance-portfolio-technique.json +++ b/content_schemas/examples/specialist_document/frontend/ai-assurance-portfolio-technique.json @@ -98,7 +98,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2015-03-10T16:23:14Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Centre for Data Ethics and Innovation", "withdrawn": false, "details": { @@ -121,7 +121,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2015-03-10T16:23:14Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department for Science, Innovation and Technology", "withdrawn": false, "details": { diff --git a/content_schemas/examples/specialist_document/frontend/cma-cases.json b/content_schemas/examples/specialist_document/frontend/cma-cases.json index f98c070aa..ff6437466 100644 --- a/content_schemas/examples/specialist_document/frontend/cma-cases.json +++ b/content_schemas/examples/specialist_document/frontend/cma-cases.json @@ -90,7 +90,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2015-03-10T16:23:14Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Competition and Markets Authority", "withdrawn": false, "details": { diff --git a/content_schemas/examples/specialist_document/frontend/drug-device-alerts.json b/content_schemas/examples/specialist_document/frontend/drug-device-alerts.json index 376fa102d..57d6f053e 100644 --- a/content_schemas/examples/specialist_document/frontend/drug-device-alerts.json +++ b/content_schemas/examples/specialist_document/frontend/drug-device-alerts.json @@ -151,7 +151,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2015-06-29T14:33:29Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Medicines and Healthcare products Regulatory Agency", "withdrawn": false, "details": { diff --git a/content_schemas/examples/specialist_document/frontend/drug-safety-update.json b/content_schemas/examples/specialist_document/frontend/drug-safety-update.json index 1760563f5..d2a9d41de 100644 --- a/content_schemas/examples/specialist_document/frontend/drug-safety-update.json +++ b/content_schemas/examples/specialist_document/frontend/drug-safety-update.json @@ -76,7 +76,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2015-06-29T14:33:29Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Medicines and Healthcare products Regulatory Agency", "withdrawn": false, "details": { diff --git a/content_schemas/examples/speech/frontend/best-practice-oral-statement.json b/content_schemas/examples/speech/frontend/best-practice-oral-statement.json index 77ace09b1..e71eeabf6 100644 --- a/content_schemas/examples/speech/frontend/best-practice-oral-statement.json +++ b/content_schemas/examples/speech/frontend/best-practice-oral-statement.json @@ -44,7 +44,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2018-01-09T10:07:58Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Home Office", "withdrawn": false, "details": { @@ -68,7 +68,7 @@ "document_type": "person", "locale": "en", "public_updated_at": "2017-06-09T16:13:13Z", - "schema_name": "placeholder", + "schema_name": "person", "title": "The Rt Hon Theresa May MP", "withdrawn": false, "links": { @@ -82,10 +82,10 @@ "api_path": "/api/content/government/topics/crime-and-policing", "base_path": "/government/topics/crime-and-policing", "content_id": "fbfe60f4-f329-4264-810b-f2a0bd9da243", - "document_type": "placeholder_policy_area", + "document_type": "policy_area", "locale": "en", "public_updated_at": "2016-02-04T11:25:08Z", - "schema_name": "placeholder_policy_area", + "schema_name": "policy_area", "title": "Crime and policing", "withdrawn": false, "links": { @@ -103,7 +103,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2018-01-09T10:07:58Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Home Office", "withdrawn": false, "details": { @@ -127,7 +127,7 @@ "document_type": "ministerial_role", "locale": "en", "public_updated_at": "2013-11-11T16:36:01Z", - "schema_name": "placeholder", + "schema_name": "ministerial_role", "title": "Secretary of State for the Home Department", "withdrawn": false, "links": { @@ -144,7 +144,7 @@ "document_type": "person", "locale": "en", "public_updated_at": "2017-06-09T16:13:13Z", - "schema_name": "placeholder", + "schema_name": "person", "title": "The Rt Hon Theresa May MP", "withdrawn": false, "links": { diff --git a/content_schemas/examples/speech/frontend/best-practice-speaking-notes.json b/content_schemas/examples/speech/frontend/best-practice-speaking-notes.json index 3c82801c9..84f1a5665 100644 --- a/content_schemas/examples/speech/frontend/best-practice-speaking-notes.json +++ b/content_schemas/examples/speech/frontend/best-practice-speaking-notes.json @@ -44,7 +44,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2018-01-09T10:07:59Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Ministry of Justice", "withdrawn": false, "details": { @@ -65,10 +65,10 @@ "api_path": "/api/content/government/people/lord-mcnally", "base_path": "/government/people/lord-mcnally", "content_id": "85293a0e-c0f1-11e4-8223-005056011aef", - "document_type": "placeholder_person", + "document_type": "person", "locale": "en", "public_updated_at": "2014-07-09T11:54:37Z", - "schema_name": "placeholder_person", + "schema_name": "person", "title": "The Rt Hon Lord McNally", "withdrawn": false, "links": { @@ -86,7 +86,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2018-01-09T10:07:59Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Ministry of Justice", "withdrawn": false, "details": { @@ -107,10 +107,10 @@ "api_path": "/api/content/government/ministers/minister-of-state--18", "base_path": "/government/ministers/minister-of-state--18", "content_id": "845e7e2f-c0f1-11e4-8223-005056011aef", - "document_type": "placeholder_ministerial_role", + "document_type": "ministerial_role", "locale": "en", "public_updated_at": "2013-12-19T12:47:10Z", - "schema_name": "placeholder_ministerial_role", + "schema_name": "ministerial_role", "title": "Minister of State for Justice", "withdrawn": false, "links": { @@ -124,10 +124,10 @@ "api_path": "/api/content/government/people/lord-mcnally", "base_path": "/government/people/lord-mcnally", "content_id": "85293a0e-c0f1-11e4-8223-005056011aef", - "document_type": "placeholder_person", + "document_type": "person", "locale": "en", "public_updated_at": "2014-07-09T11:54:37Z", - "schema_name": "placeholder_person", + "schema_name": "person", "title": "The Rt Hon Lord McNally", "withdrawn": false, "links": { diff --git a/content_schemas/examples/speech/frontend/best-practice-written-statement.json b/content_schemas/examples/speech/frontend/best-practice-written-statement.json index f745934c1..8067e6d75 100644 --- a/content_schemas/examples/speech/frontend/best-practice-written-statement.json +++ b/content_schemas/examples/speech/frontend/best-practice-written-statement.json @@ -44,7 +44,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2018-01-09T10:08:03Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department for Transport", "withdrawn": false, "details": { @@ -67,7 +67,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2014-10-15T14:36:33Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Civil Aviation Authority", "withdrawn": false, "details": { @@ -90,7 +90,7 @@ "document_type": "person", "locale": "en", "public_updated_at": "2017-07-24T13:25:54Z", - "schema_name": "placeholder", + "schema_name": "person", "title": "Robert Goodwill MP", "withdrawn": false, "links": { @@ -143,7 +143,7 @@ "document_type": "policy_area", "locale": "en", "public_updated_at": "2013-07-22T09:04:54Z", - "schema_name": "placeholder", + "schema_name": "policy_area", "title": "Transport", "withdrawn": false, "links": { @@ -155,10 +155,10 @@ "api_path": "/api/content/government/topics/uk-economy", "base_path": "/government/topics/uk-economy", "content_id": "f10df7ae-e3a6-4f9c-b764-541f62c8e6cf", - "document_type": "placeholder_policy_area", + "document_type": "policy_area", "locale": "en", "public_updated_at": "2016-02-04T11:25:06Z", - "schema_name": "placeholder_policy_area", + "schema_name": "policy_area", "title": "UK economy", "withdrawn": false, "links": { @@ -176,7 +176,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2018-01-09T10:08:03Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department for Transport", "withdrawn": false, "details": { @@ -215,10 +215,10 @@ "api_path": "/api/content/government/ministers/parliamentary-under-secretary-of-state-for-transport--2", "base_path": "/government/ministers/parliamentary-under-secretary-of-state-for-transport--2", "content_id": "846dcc00-c0f1-11e4-8223-005056011aef", - "document_type": "placeholder_ministerial_role", + "document_type": "ministerial_role", "locale": "en", "public_updated_at": "2015-12-09T11:14:21Z", - "schema_name": "placeholder_ministerial_role", + "schema_name": "ministerial_role", "title": "Parliamentary Under Secretary of State for Transport", "withdrawn": false, "links": { @@ -235,7 +235,7 @@ "document_type": "person", "locale": "en", "public_updated_at": "2017-07-24T13:25:54Z", - "schema_name": "placeholder", + "schema_name": "person", "title": "Robert Goodwill MP", "withdrawn": false, "links": { diff --git a/content_schemas/examples/speech/frontend/speech.json b/content_schemas/examples/speech/frontend/speech.json index e7fb0dcf5..9e1da3de6 100644 --- a/content_schemas/examples/speech/frontend/speech.json +++ b/content_schemas/examples/speech/frontend/speech.json @@ -90,10 +90,10 @@ "api_path": "/api/content/government/topics/energy", "base_path": "/government/topics/energy", "content_id": "c637a660-4903-404b-87cc-d50101822916", - "document_type": "placeholder_policy_area", + "document_type": "policy_area", "locale": "en", "public_updated_at": "2016-02-04T11:25:06Z", - "schema_name": "placeholder_policy_area", + "schema_name": "policy_area", "title": "Energy", "withdrawn": false, "links": { @@ -110,7 +110,7 @@ "document_type": "person", "locale": "en", "public_updated_at": "2017-06-11T18:07:35Z", - "schema_name": "placeholder", + "schema_name": "person", "title": "The Rt Hon Andrea Leadsom MP", "withdrawn": false, "links": { diff --git a/content_schemas/examples/statistics_announcement/frontend/best-practice-statistics-announcement.json b/content_schemas/examples/statistics_announcement/frontend/best-practice-statistics-announcement.json index ca960627a..8150da72c 100644 --- a/content_schemas/examples/statistics_announcement/frontend/best-practice-statistics-announcement.json +++ b/content_schemas/examples/statistics_announcement/frontend/best-practice-statistics-announcement.json @@ -25,7 +25,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2018-01-09T10:08:03Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department for Transport", "withdrawn": false, "details": { @@ -49,7 +49,7 @@ "document_type": "policy_area", "locale": "en", "public_updated_at": "2013-07-22T09:04:54Z", - "schema_name": "placeholder", + "schema_name": "policy_area", "title": "Transport", "withdrawn": false, "links": { diff --git a/content_schemas/examples/transaction/frontend/apply-blue-badge.json b/content_schemas/examples/transaction/frontend/apply-blue-badge.json index ec3cc517a..948d33287 100644 --- a/content_schemas/examples/transaction/frontend/apply-blue-badge.json +++ b/content_schemas/examples/transaction/frontend/apply-blue-badge.json @@ -679,7 +679,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2016-12-20T14:44:50Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department for Transport", "withdrawn": false, "details": { @@ -703,7 +703,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2016-07-18T17:26:50Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department for Communities and Local Government", "withdrawn": false, "details": { diff --git a/content_schemas/examples/transaction/frontend/apply-marine-licence.json b/content_schemas/examples/transaction/frontend/apply-marine-licence.json index 0a6c37908..831bac798 100644 --- a/content_schemas/examples/transaction/frontend/apply-marine-licence.json +++ b/content_schemas/examples/transaction/frontend/apply-marine-licence.json @@ -168,7 +168,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2017-02-15T12:04:27Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Marine Management Organisation", "withdrawn": false, "details": { diff --git a/content_schemas/examples/transaction/frontend/child-maintenance.json b/content_schemas/examples/transaction/frontend/child-maintenance.json index 5852041ab..e2d7a25d3 100644 --- a/content_schemas/examples/transaction/frontend/child-maintenance.json +++ b/content_schemas/examples/transaction/frontend/child-maintenance.json @@ -437,7 +437,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2016-12-16T11:37:21Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department for Work and Pensions", "withdrawn": false, "details": { diff --git a/content_schemas/examples/transaction/frontend/chwilio-am-swydd.json b/content_schemas/examples/transaction/frontend/chwilio-am-swydd.json index 7f16b66ed..91d6f5839 100644 --- a/content_schemas/examples/transaction/frontend/chwilio-am-swydd.json +++ b/content_schemas/examples/transaction/frontend/chwilio-am-swydd.json @@ -44,7 +44,7 @@ }, "withdrawn": false, "title": "Adran Gwaith a Phensiynau", - "schema_name": "placeholder", + "schema_name": "organisation", "analytics_identifier": "D10", "api_path": "/api/content/government/organisations/department-for-work-pensions.cy", "base_path": "/government/organisations/department-for-work-pensions.cy", diff --git a/content_schemas/examples/transaction/frontend/jobsearch.json b/content_schemas/examples/transaction/frontend/jobsearch.json index 011c33eec..f352935b7 100644 --- a/content_schemas/examples/transaction/frontend/jobsearch.json +++ b/content_schemas/examples/transaction/frontend/jobsearch.json @@ -85,7 +85,7 @@ }, "withdrawn": false, "title": "Department for Work and Pensions", - "schema_name": "placeholder", + "schema_name": "organisation", "analytics_identifier": "D10", "api_path": "/api/content/government/organisations/department-for-work-pensions", "base_path": "/government/organisations/department-for-work-pensions", diff --git a/content_schemas/examples/transaction/frontend/transaction-with-step-navs.json b/content_schemas/examples/transaction/frontend/transaction-with-step-navs.json index c2845db7e..87564beff 100644 --- a/content_schemas/examples/transaction/frontend/transaction-with-step-navs.json +++ b/content_schemas/examples/transaction/frontend/transaction-with-step-navs.json @@ -344,7 +344,7 @@ }, "withdrawn": false, "title": "Department for Communities and Local Government", - "schema_name": "placeholder", + "schema_name": "organisation", "analytics_identifier": "D4", "api_path": "/api/content/government/organisations/department-for-communities-and-local-government", "base_path": "/government/organisations/department-for-communities-and-local-government", @@ -368,7 +368,7 @@ }, "withdrawn": false, "title": "Valuation Office Agency", - "schema_name": "placeholder", + "schema_name": "organisation", "analytics_identifier": "EA87", "api_path": "/api/content/government/organisations/valuation-office-agency", "base_path": "/government/organisations/valuation-office-agency", diff --git a/content_schemas/examples/transaction/frontend/transaction-with-variants.json b/content_schemas/examples/transaction/frontend/transaction-with-variants.json index 4822b4faf..f4f0d1cf4 100644 --- a/content_schemas/examples/transaction/frontend/transaction-with-variants.json +++ b/content_schemas/examples/transaction/frontend/transaction-with-variants.json @@ -109,7 +109,7 @@ }, "withdrawn": false, "title": "Department for Communities and Local Government", - "schema_name": "placeholder", + "schema_name": "organisation", "analytics_identifier": "D4", "api_path": "/api/content/government/organisations/department-for-communities-and-local-government", "base_path": "/government/organisations/department-for-communities-and-local-government", @@ -133,7 +133,7 @@ }, "withdrawn": false, "title": "Valuation Office Agency", - "schema_name": "placeholder", + "schema_name": "organisation", "analytics_identifier": "EA87", "api_path": "/api/content/government/organisations/valuation-office-agency", "base_path": "/government/organisations/valuation-office-agency", diff --git a/content_schemas/examples/transaction/frontend/transaction.json b/content_schemas/examples/transaction/frontend/transaction.json index fa6b0a876..00595e6fb 100644 --- a/content_schemas/examples/transaction/frontend/transaction.json +++ b/content_schemas/examples/transaction/frontend/transaction.json @@ -102,7 +102,7 @@ }, "withdrawn": false, "title": "Department for Communities and Local Government", - "schema_name": "placeholder", + "schema_name": "organisation", "analytics_identifier": "D4", "api_path": "/api/content/government/organisations/department-for-communities-and-local-government", "base_path": "/government/organisations/department-for-communities-and-local-government", @@ -126,7 +126,7 @@ }, "withdrawn": false, "title": "Valuation Office Agency", - "schema_name": "placeholder", + "schema_name": "organisation", "analytics_identifier": "EA87", "api_path": "/api/content/government/organisations/valuation-office-agency", "base_path": "/government/organisations/valuation-office-agency", diff --git a/content_schemas/examples/transaction/frontend/transaction_with_downtime.json b/content_schemas/examples/transaction/frontend/transaction_with_downtime.json index 7247b488e..d9e13412a 100644 --- a/content_schemas/examples/transaction/frontend/transaction_with_downtime.json +++ b/content_schemas/examples/transaction/frontend/transaction_with_downtime.json @@ -262,7 +262,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2016-12-20T14:44:50Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department for Transport", "withdrawn": false, "details": { diff --git a/content_schemas/examples/travel_advice/frontend/alt-country.json b/content_schemas/examples/travel_advice/frontend/alt-country.json index a93e5e67d..e5d1ed022 100644 --- a/content_schemas/examples/travel_advice/frontend/alt-country.json +++ b/content_schemas/examples/travel_advice/frontend/alt-country.json @@ -264,7 +264,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2016-03-22T14:43:46Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Foreign & Commonwealth Office", "withdrawn": false, "details": { diff --git a/content_schemas/examples/travel_advice/frontend/full-country-without-summary.json b/content_schemas/examples/travel_advice/frontend/full-country-without-summary.json index 6b87f91c2..8befbd618 100644 --- a/content_schemas/examples/travel_advice/frontend/full-country-without-summary.json +++ b/content_schemas/examples/travel_advice/frontend/full-country-without-summary.json @@ -264,7 +264,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2016-03-22T14:43:46Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Foreign & Commonwealth Office", "withdrawn": false, "details": { diff --git a/content_schemas/examples/travel_advice/frontend/full-country.json b/content_schemas/examples/travel_advice/frontend/full-country.json index 4c221d22f..0259868ba 100644 --- a/content_schemas/examples/travel_advice/frontend/full-country.json +++ b/content_schemas/examples/travel_advice/frontend/full-country.json @@ -264,7 +264,7 @@ "document_type": "organisation", "locale": "en", "public_updated_at": "2016-03-22T14:43:46Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Foreign & Commonwealth Office", "withdrawn": false, "details": { diff --git a/content_schemas/examples/worldwide_organisation/frontend/worldwide_organisation.json b/content_schemas/examples/worldwide_organisation/frontend/worldwide_organisation.json index 678407474..ecca13a58 100644 --- a/content_schemas/examples/worldwide_organisation/frontend/worldwide_organisation.json +++ b/content_schemas/examples/worldwide_organisation/frontend/worldwide_organisation.json @@ -86,7 +86,7 @@ "base_path": "/world/organisations/british-deputy-high-commission-hyderabad/about/personal-information-charter", "document_type": "personal_information_charter", "public_updated_at": "2013-03-21T07:28:00Z", - "schema_name": "placeholder_corporate_information_page", + "schema_name": "corporate_information_page", "withdrawn": false, "links": {}, "api_url": "https://www.integration.publishing.service.gov.uk/api/content/world/organisations/british-deputy-high-commission-hyderabad/about/personal-information-charter", @@ -100,7 +100,7 @@ "base_path": "/world/organisations/british-deputy-high-commission-hyderabad/about/about", "document_type": "about", "public_updated_at": "2014-10-27T11:03:46Z", - "schema_name": "placeholder_corporate_information_page", + "schema_name": "corporate_information_page", "withdrawn": false, "links": {}, "api_url": "https://www.integration.publishing.service.gov.uk/api/content/world/organisations/british-deputy-high-commission-hyderabad/about/about", @@ -114,7 +114,7 @@ "base_path": "/world/organisations/british-deputy-high-commission-hyderabad/about/complaints-procedure", "document_type": "complaints_procedure", "public_updated_at": "2019-04-03T13:30:35Z", - "schema_name": "placeholder_corporate_information_page", + "schema_name": "corporate_information_page", "withdrawn": false, "links": {}, "api_url": "https://www.integration.publishing.service.gov.uk/api/content/world/organisations/british-deputy-high-commission-hyderabad/about/complaints-procedure", diff --git a/docs/link-expansion.md b/docs/link-expansion.md index 1acb01f21..23c3cbbd9 100644 --- a/docs/link-expansion.md +++ b/docs/link-expansion.md @@ -62,7 +62,7 @@ expansion has occurred. "document_type": "organisation", "locale": "en", "public_updated_at": "2015-06-03T13:12:51Z", - "schema_name": "placeholder", + "schema_name": "organisation", "title": "Department for Transport", "details": { "brand": "department-for-transport", @@ -82,7 +82,7 @@ expansion has occurred. "document_type": "welsh_language_scheme", "locale": "en", "public_updated_at": "2013-06-21T13:22:34Z", - "schema_name": "placeholder_corporate_information_page", + "schema_name": "corporate_information_page", "title": "Welsh language scheme", "links": {} }, { @@ -94,7 +94,7 @@ expansion has occurred. "document_type": "welsh_language_scheme", "locale": "cy", "public_updated_at": "2013-06-21T13:22:34Z", - "schema_name": "placeholder_corporate_information_page", + "schema_name": "corporate_information_page", "title": "Cynllun iaith Gymraeg", "links": {} }] diff --git a/lib/expansion_rules.rb b/lib/expansion_rules.rb index 87aa8d0a5..9ed0ea561 100644 --- a/lib/expansion_rules.rb +++ b/lib/expansion_rules.rb @@ -164,12 +164,8 @@ def details_fields(*fields) fields: CONTACT_FIELDS }, { document_type: :topical_event, fields: DEFAULT_FIELDS }, - { document_type: :placeholder_topical_event, - fields: DEFAULT_FIELDS }, { document_type: :organisation, fields: ORGANISATION_FIELDS }, - { document_type: :placeholder_organisation, - fields: ORGANISATION_FIELDS }, { document_type: :taxon, fields: TAXON_FIELDS }, { document_type: :need, diff --git a/lib/schema_generator/format.rb b/lib/schema_generator/format.rb index 4f422c1e7..cf75aa2fc 100644 --- a/lib/schema_generator/format.rb +++ b/lib/schema_generator/format.rb @@ -123,18 +123,10 @@ def content_links end def schema_name_definition - if schema_name == "placeholder" - { - "type" => "string", - "pattern" => "^(placeholder|placeholder_.+)$", - "description" => "Should be of the form 'placeholder_my_format_name'. 'placeholder' is allowed for backwards compatibility.", - } - else - { - "enum" => [schema_name], - "type" => "string", - } - end + { + "enum" => [schema_name], + "type" => "string", + } end def publisher_required diff --git a/spec/lib/expansion_rules_spec.rb b/spec/lib/expansion_rules_spec.rb index 4c13b2104..ae8f83720 100644 --- a/spec/lib/expansion_rules_spec.rb +++ b/spec/lib/expansion_rules_spec.rb @@ -71,8 +71,6 @@ specify { expect(rules.expansion_fields(:mainstream_browse_page)).to eq(default_fields_and_description) } specify { expect(rules.expansion_fields(:need)).to eq(need_fields) } specify { expect(rules.expansion_fields(:organisation)).to eq(organisation_fields) } - specify { expect(rules.expansion_fields(:placeholder_organisation)).to eq(organisation_fields) } - specify { expect(rules.expansion_fields(:placeholder_topical_event)).to eq(default_fields) } specify { expect(rules.expansion_fields(:person, link_type: :people)).to eq(default_fields) } specify { expect(rules.expansion_fields(:person, link_type: :person)).to eq(person_fields) } specify { expect(rules.expansion_fields(:role_appointment)).to eq(role_appointment_fields) } diff --git a/spec/queries/get_content_collection_spec.rb b/spec/queries/get_content_collection_spec.rb index 595f4a23f..1cc06aa64 100644 --- a/spec/queries/get_content_collection_spec.rb +++ b/spec/queries/get_content_collection_spec.rb @@ -74,26 +74,19 @@ end end - it "returns the editions of the given format, and placeholder_format" do + it "returns the editions of the given format" do create( :draft_edition, base_path: "/a", document_type: "topic", schema_name: "topic", ) - create( - :draft_edition, - base_path: "/b", - document_type: "placeholder_topic", - schema_name: "placeholder_topic", - ) expect(Queries::GetContentCollection.new( document_types: "topic", fields: %w[base_path publication_state], ).call).to match_array([ hash_including("base_path" => "/a", "publication_state" => "draft"), - hash_including("base_path" => "/b", "publication_state" => "draft"), ]) end @@ -401,8 +394,8 @@ :draft_edition, base_path: "/b", details: { baz: :bat }, - document_type: "placeholder_topic", - schema_name: "placeholder_topic", + document_type: "topic", + schema_name: "topic", publishing_app: "publisher", ) end diff --git a/spec/queries/get_linkables.rb b/spec/queries/get_linkables.rb index 7e660d969..8775e7cdb 100644 --- a/spec/queries/get_linkables.rb +++ b/spec/queries/get_linkables.rb @@ -68,24 +68,6 @@ end end - context "when there is a an edition with a placeholder of the document_type" do - let!(:editions) do - [ - create(:live_edition, document_type: "contact"), - create(:live_edition, document_type: "placeholder_contact"), - ] - end - let(:edition_content_ids) { editions.map { |e| e.document.content_id } } - - it "returns both linkables" do - expect(linkables.length).to be(2) - end - - it "returns the editions" do - expect(linkables.map(&:content_id)).to match_array(edition_content_ids) - end - end - context "when there is a an edition with a different document_type" do before do create(:live_edition, document_type: "different")