alphagov · brucebolt · Sep 14, 2023 · Sep 13, 2023 · Sep 13, 2023 · Sep 14, 2023
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...emas/examples/corporate_information_page/frontend/best-practice-complaints-procedure.json b/...emas/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
@@ -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
@@ -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/...hemas/examples/corporate_information_page/frontend/best-practice-information-charter.json b/...hemas/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/...t_schemas/examples/corporate_information_page/frontend/best-practice-media-enquiries.json b/...t_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
@@ -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
@@ -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/...chemas/examples/corporate_information_page/frontend/best-practice-publication-scheme.json b/...chemas/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
@@ -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/..._schemas/examples/corporate_information_page/frontend/best-practice-social-media-use.json b/..._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/...ent_schemas/examples/corporate_information_page/frontend/best-practice-statistics-at.json b/...ent_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": {