From be0530810ea2ad718598399fa0130660565b2d52 Mon Sep 17 00:00:00 2001 From: Barbara Slawinska Date: Tue, 21 Nov 2023 15:11:51 +0000 Subject: [PATCH] Retire and delete OIM finder Following department request. --- content_schemas/allowed_document_types.yml | 1 - .../dist/formats/generic/frontend/schema.json | 1 - .../formats/generic/notification/schema.json | 1 - .../formats/generic/publisher_v2/schema.json | 1 - .../frontend/schema.json | 1 - .../notification/schema.json | 1 - .../publisher_v2/schema.json | 1 - .../specialist_document/frontend/schema.json | 39 ---- .../notification/schema.json | 39 ---- .../publisher_v2/schema.json | 39 ---- .../frontend/oim-project.json | 196 ------------------ .../definitions/_specialist_document.jsonnet | 38 ---- .../formats/specialist_document.jsonnet | 1 - 13 files changed, 359 deletions(-) delete mode 100644 content_schemas/examples/specialist_document/frontend/oim-project.json diff --git a/content_schemas/allowed_document_types.yml b/content_schemas/allowed_document_types.yml index 210b27b3b..01598a668 100644 --- a/content_schemas/allowed_document_types.yml +++ b/content_schemas/allowed_document_types.yml @@ -101,7 +101,6 @@ - official - official_statistics - official_statistics_announcement -- oim_project - open_call_for_evidence - open_consultation - oral_statement diff --git a/content_schemas/dist/formats/generic/frontend/schema.json b/content_schemas/dist/formats/generic/frontend/schema.json index e8c15261e..a4399e612 100644 --- a/content_schemas/dist/formats/generic/frontend/schema.json +++ b/content_schemas/dist/formats/generic/frontend/schema.json @@ -137,7 +137,6 @@ "official", "official_statistics", "official_statistics_announcement", - "oim_project", "open_call_for_evidence", "open_consultation", "oral_statement", diff --git a/content_schemas/dist/formats/generic/notification/schema.json b/content_schemas/dist/formats/generic/notification/schema.json index f7e9e8d9e..e992d6738 100644 --- a/content_schemas/dist/formats/generic/notification/schema.json +++ b/content_schemas/dist/formats/generic/notification/schema.json @@ -161,7 +161,6 @@ "official", "official_statistics", "official_statistics_announcement", - "oim_project", "open_call_for_evidence", "open_consultation", "oral_statement", diff --git a/content_schemas/dist/formats/generic/publisher_v2/schema.json b/content_schemas/dist/formats/generic/publisher_v2/schema.json index ca7113f44..1302c1383 100644 --- a/content_schemas/dist/formats/generic/publisher_v2/schema.json +++ b/content_schemas/dist/formats/generic/publisher_v2/schema.json @@ -147,7 +147,6 @@ "official", "official_statistics", "official_statistics_announcement", - "oim_project", "open_call_for_evidence", "open_consultation", "oral_statement", 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 03707a454..1464a5bf9 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 @@ -137,7 +137,6 @@ "official", "official_statistics", "official_statistics_announcement", - "oim_project", "open_call_for_evidence", "open_consultation", "oral_statement", 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 cbb6874f6..21124c5bb 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 @@ -161,7 +161,6 @@ "official", "official_statistics", "official_statistics_announcement", - "oim_project", "open_call_for_evidence", "open_consultation", "oral_statement", 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 9a400d2bc..2daad2238 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 @@ -147,7 +147,6 @@ "official", "official_statistics", "official_statistics_announcement", - "oim_project", "open_call_for_evidence", "open_consultation", "oral_statement", diff --git a/content_schemas/dist/formats/specialist_document/frontend/schema.json b/content_schemas/dist/formats/specialist_document/frontend/schema.json index d4118e021..08fde5f80 100644 --- a/content_schemas/dist/formats/specialist_document/frontend/schema.json +++ b/content_schemas/dist/formats/specialist_document/frontend/schema.json @@ -55,7 +55,6 @@ "marine_equipment_approved_recommendation", "marine_notice", "medical_safety_alert", - "oim_project", "product_safety_alert_report_recall", "protected_food_drink_name", "raib_report", @@ -578,9 +577,6 @@ { "$ref": "#/definitions/medical_safety_alert_metadata" }, - { - "$ref": "#/definitions/oim_project_metadata" - }, { "$ref": "#/definitions/product_safety_alert_report_recall_metadata" }, @@ -2426,41 +2422,6 @@ }, "minItems": 1 }, - "oim_project_metadata": { - "type": "object", - "additionalProperties": false, - "properties": { - "bulk_published": { - "type": "boolean" - }, - "oim_project_closed_date": { - "type": "string", - "pattern": "^[1-9][0-9]{3}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[0-1])$" - }, - "oim_project_opened_date": { - "type": "string", - "pattern": "^[1-9][0-9]{3}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[0-1])$" - }, - "oim_project_state": { - "type": "string", - "enum": [ - "open", - "closed" - ] - }, - "oim_project_type": { - "type": "string", - "enum": [ - "annual-report", - "five-yearly-report", - "discretionary-report", - "report-on-proposed-regulatory-provision", - "report-after-regulatory-provision-is-passed-or-made", - "report-on-provision-considered-to-have-detrimental-effects" - ] - } - } - }, "product_safety_alert_report_recall_metadata": { "type": "object", "additionalProperties": false, diff --git a/content_schemas/dist/formats/specialist_document/notification/schema.json b/content_schemas/dist/formats/specialist_document/notification/schema.json index 9fd3a63fc..838bc8b39 100644 --- a/content_schemas/dist/formats/specialist_document/notification/schema.json +++ b/content_schemas/dist/formats/specialist_document/notification/schema.json @@ -79,7 +79,6 @@ "marine_equipment_approved_recommendation", "marine_notice", "medical_safety_alert", - "oim_project", "product_safety_alert_report_recall", "protected_food_drink_name", "raib_report", @@ -670,9 +669,6 @@ { "$ref": "#/definitions/medical_safety_alert_metadata" }, - { - "$ref": "#/definitions/oim_project_metadata" - }, { "$ref": "#/definitions/product_safety_alert_report_recall_metadata" }, @@ -2550,41 +2546,6 @@ }, "minItems": 1 }, - "oim_project_metadata": { - "type": "object", - "additionalProperties": false, - "properties": { - "bulk_published": { - "type": "boolean" - }, - "oim_project_closed_date": { - "type": "string", - "pattern": "^[1-9][0-9]{3}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[0-1])$" - }, - "oim_project_opened_date": { - "type": "string", - "pattern": "^[1-9][0-9]{3}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[0-1])$" - }, - "oim_project_state": { - "type": "string", - "enum": [ - "open", - "closed" - ] - }, - "oim_project_type": { - "type": "string", - "enum": [ - "annual-report", - "five-yearly-report", - "discretionary-report", - "report-on-proposed-regulatory-provision", - "report-after-regulatory-provision-is-passed-or-made", - "report-on-provision-considered-to-have-detrimental-effects" - ] - } - } - }, "payload_version": { "description": "Counter to indicate when the payload was generated", "type": "integer" diff --git a/content_schemas/dist/formats/specialist_document/publisher_v2/schema.json b/content_schemas/dist/formats/specialist_document/publisher_v2/schema.json index acc4d4db0..bd9293010 100644 --- a/content_schemas/dist/formats/specialist_document/publisher_v2/schema.json +++ b/content_schemas/dist/formats/specialist_document/publisher_v2/schema.json @@ -65,7 +65,6 @@ "marine_equipment_approved_recommendation", "marine_notice", "medical_safety_alert", - "oim_project", "product_safety_alert_report_recall", "protected_food_drink_name", "raib_report", @@ -494,9 +493,6 @@ { "$ref": "#/definitions/medical_safety_alert_metadata" }, - { - "$ref": "#/definitions/oim_project_metadata" - }, { "$ref": "#/definitions/product_safety_alert_report_recall_metadata" }, @@ -2235,41 +2231,6 @@ }, "minItems": 1 }, - "oim_project_metadata": { - "type": "object", - "additionalProperties": false, - "properties": { - "bulk_published": { - "type": "boolean" - }, - "oim_project_closed_date": { - "type": "string", - "pattern": "^[1-9][0-9]{3}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[0-1])$" - }, - "oim_project_opened_date": { - "type": "string", - "pattern": "^[1-9][0-9]{3}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[0-1])$" - }, - "oim_project_state": { - "type": "string", - "enum": [ - "open", - "closed" - ] - }, - "oim_project_type": { - "type": "string", - "enum": [ - "annual-report", - "five-yearly-report", - "discretionary-report", - "report-on-proposed-regulatory-provision", - "report-after-regulatory-provision-is-passed-or-made", - "report-on-provision-considered-to-have-detrimental-effects" - ] - } - } - }, "product_safety_alert_report_recall_metadata": { "type": "object", "additionalProperties": false, diff --git a/content_schemas/examples/specialist_document/frontend/oim-project.json b/content_schemas/examples/specialist_document/frontend/oim-project.json deleted file mode 100644 index f953b235a..000000000 --- a/content_schemas/examples/specialist_document/frontend/oim-project.json +++ /dev/null @@ -1,196 +0,0 @@ -{ - "content_id": "574585b6-bf99-4cb1-be8b-628695f358d9", - "locale": "en", - "base_path": "/oim-projects/foo-bar-baz", - "title": "Example document", - "description": "Some example content", - "details": { - "body": "

Statutory timetable

\n\n\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n
Phase 1 dateAction
7 September 2015Deadline for phase 1 decision (*)
10 to 24 July 2015Invitation to comment
10 July 2015Launch of merger inquiry
\n\n

(*) This date is the current statutory deadline by when the decision will be announced. If any change occurs, the information is refreshed as soon as practicable. However, the CMA cannot guarantee that the decision will be announced on or before this current deadline, as the deadline of a given case may change during the merger assessment process due to different reasons.

\n\n

Phase 1

\n\n

Invitation to comment: closes 24 July 2015

\n\n

10 July 2015: The CMA is considering whether it is or may be the case that this transaction has resulted in the creation of a relevant merger situation under the merger provisions of the Enterprise Act 2002 and, if so, whether the creation of that situation has resulted, or may be expected to result, in a substantial lessening of competition within any market or markets in the United Kingdom for goods or services.

\n\n

Launch of CMA merger inquiry

\n\n

10 July 2015: The CMA announced the launch of its merger inquiry by notice to the parties.

\n\n\n\n

Contact

\n\n

Please send written representations about any competition issues to:

\n\n

\n\nSuzanne Van Scheijen\n
Competition and Markets Authority \n
Victoria House \n
Southampton Row \n
London \n
WC1B 4AD\n
\n

\n\n

Suzanne.VanScheijen@cma.gsi.gov.uk

\n", - "metadata": { - "bulk_published": false, - "oim_project_type": "annual-report", - "oim_project_state": "closed", - "oim_project_opened_date": "2015-07-10", - "oim_project_closed_date": "2015-08-20" - }, - "max_cache_time": 10, - "change_history": [ - { - "note": "First published.", - "public_timestamp": "2015-07-10T13:09:46+00:00" - } - ], - "headers": [ - { - "text": "Statutory timetable", - "level": 2, - "id": "statutory-timetable" - }, - { - "text": "Phase 1", - "level": 2, - "id": "phase-1", - "headers": [ - { - "text": "Invitation to comment: closes 24 July 2015", - "level": 3, - "id": "invitation-to-comment-closes-24-july-2015" - }, - { - "text": "Launch of CMA merger inquiry", - "level": 3, - "id": "launch-of-cma-merger-inquiry" - }, - { - "text": "Contact", - "level": 3, - "id": "contact" - } - ] - } - ] - }, - "public_updated_at": "2015-07-10T13:09:46+00:00", - "schema_name": "specialist_document", - "document_type": "oim_project", - "links": { - "organisations": [ - { - "analytics_identifier": "D550", - "api_path": "/api/content/government/organisations/office-for-the-internal-market", - "base_path": "/government/organisations/office-for-the-internal-market", - "content_id": "b1123ceb-77e4-40fc-9526-83ad0ba7cf01", - "description": null, - "document_type": "organisation", - "locale": "en", - "public_updated_at": "2015-03-10T16:23:14Z", - "schema_name": "organisation", - "title": "Office for the Internal Market", - "withdrawn": false, - "details": { - "brand": "department-for-business-innovation-skills", - "logo": { - "formatted_title": "Office for the Internal Market", - "crest": null - } - }, - "links": { - }, - "api_url": "https://www.gov.uk/api/content/government/organisations/office-for-the-internal-market", - "web_url": "https://www.gov.uk/government/organisations/office-for-the-internal-market" - } - ], - "finder": [ - { - "analytics_identifier": null, - "api_path": "/api/content/oim-projects", - "base_path": "/oim-projects", - "content_id": "4e4e33ff-271a-468a-b7a8-92d25f3f8ac0", - "description": "Find reports and updates on current and historical OIM projects", - "document_type": "finder", - "locale": "en", - "public_updated_at": "2017-03-15T14:44:21Z", - "schema_name": "finder", - "title": "Office for the Internal Market projects", - "withdrawn": false, - "details": { - "facets": [ - { - "key": "oim_project_type", - "name": "OIM Project type", - "type": "text", - "preposition": "of type", - "display_as_result_metadata": true, - "filterable": true, - "allowed_values": [ - { - "label": "Annual report", - "value": "annual-report" - }, - { - "label": "Five-yearly report", - "value": "five-yearly-report" - }, - { - "label": "Discretionary report", - "value": "discretionary-report" - }, - { - "label": "Advice/report on proposed regulatory provision", - "value": "report-on-proposed-regulatory-provision" - }, - { - "label": "Report after regulatory provision is passed or made", - "value": "report-after-regulatory-provision-is-passed-or-made" - }, - { - "label": "Report on provision considered to have detrimental effects", - "value": "report-on-provision-considered-to-have-detrimental-effects" - } - ] - }, - { - "key": "oim_project_state", - "name": "OIM Project state", - "type": "text", - "preposition": "which are", - "display_as_result_metadata": true, - "filterable": true, - "allowed_values": [ - { - "label": "Open", - "value": "open" - }, - { - "label": "Closed", - "value": "closed" - } - ] - }, - { - "key": "oim_project_opened_date", - "name": "OIM Project opened", - "short_name": "Opened", - "type": "date", - "display_as_result_metadata": true, - "filterable": false - }, - { - "key": "oim_project_closed_date", - "name": "OIM Project closed", - "short_name": "Closed", - "type": "date", - "preposition": "closed", - "display_as_result_metadata": true, - "filterable": true - } - ] - }, - "links": { - }, - "api_url": "https://www.gov.uk/api/content/oim-projects", - "web_url": "https://www.gov.uk/oim-projects" - } - ], - "available_translations": [ - { - "analytics_identifier": null, - "content_id": "27210998-66fb-4ff7-8fa8-7115936d296a", - "description": "Some example content", - "document_type": "cma_case", - "public_updated_at": "2015-10-01T11:00:38Z", - "schema_name": "specialist_document", - "title": "Example document", - "base_path": "/oim-projects/example-document", - "locale": "en", - "api_path": "/api/content/oim-projects/example-document", - "withdrawn": false, - "api_url": "https://www.gov.uk/api/content/oim-projects/example-document", - "web_url": "https://www.gov.uk/oim-projects/example-document", - "links": { - } - } - ] - }, - "updated_at": "2017-06-30T15:44:11.073Z" -} diff --git a/content_schemas/formats/shared/definitions/_specialist_document.jsonnet b/content_schemas/formats/shared/definitions/_specialist_document.jsonnet index 7b4816adf..c632d9bb8 100644 --- a/content_schemas/formats/shared/definitions/_specialist_document.jsonnet +++ b/content_schemas/formats/shared/definitions/_specialist_document.jsonnet @@ -65,9 +65,6 @@ { "$ref": "#/definitions/medical_safety_alert_metadata", }, - { - "$ref": "#/definitions/oim_project_metadata", - }, { "$ref": "#/definitions/product_safety_alert_report_recall_metadata", }, @@ -2149,41 +2146,6 @@ }, }, }, - oim_project_metadata: { - type: "object", - additionalProperties: false, - properties: { - bulk_published: { - type: "boolean", - }, - oim_project_type: { - type: "string", - enum: [ - "annual-report", - "five-yearly-report", - "discretionary-report", - "report-on-proposed-regulatory-provision", - "report-after-regulatory-provision-is-passed-or-made", - "report-on-provision-considered-to-have-detrimental-effects", - ], - }, - oim_project_state: { - type: "string", - enum: [ - "open", - "closed", - ], - }, - oim_project_opened_date: { - type: "string", - pattern: "^[1-9][0-9]{3}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[0-1])$", - }, - oim_project_closed_date: { - type: "string", - pattern: "^[1-9][0-9]{3}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[0-1])$", - }, - }, - }, product_safety_alert_report_recall_metadata: { type: "object", additionalProperties: false, diff --git a/content_schemas/formats/specialist_document.jsonnet b/content_schemas/formats/specialist_document.jsonnet index 21c668474..67ddf00d4 100644 --- a/content_schemas/formats/specialist_document.jsonnet +++ b/content_schemas/formats/specialist_document.jsonnet @@ -21,7 +21,6 @@ "marine_equipment_approved_recommendation", "marine_notice", "medical_safety_alert", - "oim_project", "product_safety_alert_report_recall", "protected_food_drink_name", "raib_report",