Merge pull request #3066 from alphagov/tidy-up-config

Tidy up specialist_document.jsonnet
alphagov · Dec 31, 2024 · 3386bde · 3386bde
2 parents 303baf6 + 0630a6e
commit 3386bde
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 56 deletions.
diff --git a/content_schemas/dist/formats/specialist_document/frontend/schema.json b/content_schemas/dist/formats/specialist_document/frontend/schema.json
@@ -642,13 +642,13 @@
           "$ref": "#/definitions/international_development_fund_metadata"
         },
         {
-          "$ref": "#/definitions/licence_transaction_metadata"
+          "$ref": "#/definitions/farming_grant_metadata"
         },
         {
           "$ref": "#/definitions/flood_and_coastal_erosion_risk_management_research_report"
         },
         {
-          "$ref": "#/definitions/farming_grant_metadata"
+          "$ref": "#/definitions/licence_transaction_metadata"
         },
         {
           "$ref": "#/definitions/life_saving_maritime_appliance_service_station_metadata"
@@ -1847,10 +1847,7 @@
           "pattern": "^[1-9][0-9]{3}[-/](0[1-9]|1[0-2])[-/](0[1-9]|[12][0-9]|3[0-1])$"
         },
         "research_document_type": {
-          "type": "string",
-          "items": {
-            "type": "string"
-          }
+          "type": "string"
         },
         "review_status": {
           "type": "string"

diff --git a/content_schemas/dist/formats/specialist_document/notification/schema.json b/content_schemas/dist/formats/specialist_document/notification/schema.json
@@ -730,13 +730,13 @@
           "$ref": "#/definitions/international_development_fund_metadata"
         },
         {
-          "$ref": "#/definitions/licence_transaction_metadata"
+          "$ref": "#/definitions/farming_grant_metadata"
         },
         {
           "$ref": "#/definitions/flood_and_coastal_erosion_risk_management_research_report"
         },
         {
-          "$ref": "#/definitions/farming_grant_metadata"
+          "$ref": "#/definitions/licence_transaction_metadata"
         },
         {
           "$ref": "#/definitions/life_saving_maritime_appliance_service_station_metadata"
@@ -1966,10 +1966,7 @@
           "pattern": "^[1-9][0-9]{3}[-/](0[1-9]|1[0-2])[-/](0[1-9]|[12][0-9]|3[0-1])$"
         },
         "research_document_type": {
-          "type": "string",
-          "items": {
-            "type": "string"
-          }
+          "type": "string"
         },
         "review_status": {
           "type": "string"

diff --git a/content_schemas/dist/formats/specialist_document/publisher_v2/schema.json b/content_schemas/dist/formats/specialist_document/publisher_v2/schema.json
@@ -576,13 +576,13 @@
           "$ref": "#/definitions/international_development_fund_metadata"
         },
         {
-          "$ref": "#/definitions/licence_transaction_metadata"
+          "$ref": "#/definitions/farming_grant_metadata"
         },
         {
           "$ref": "#/definitions/flood_and_coastal_erosion_risk_management_research_report"
         },
         {
-          "$ref": "#/definitions/farming_grant_metadata"
+          "$ref": "#/definitions/licence_transaction_metadata"
         },
         {
           "$ref": "#/definitions/life_saving_maritime_appliance_service_station_metadata"
@@ -1658,10 +1658,7 @@
           "pattern": "^[1-9][0-9]{3}[-/](0[1-9]|1[0-2])[-/](0[1-9]|[12][0-9]|3[0-1])$"
         },
         "research_document_type": {
-          "type": "string",
-          "items": {
-            "type": "string"
-          }
+          "type": "string"
         },
         "review_status": {
           "type": "string"

diff --git a/content_schemas/formats/shared/definitions/_specialist_document.jsonnet b/content_schemas/formats/shared/definitions/_specialist_document.jsonnet
@@ -51,13 +51,13 @@
         "$ref": "#/definitions/international_development_fund_metadata",
       },
       {
-        "$ref": "#/definitions/licence_transaction_metadata",
+        "$ref": "#/definitions/farming_grant_metadata",
       },
       {
         "$ref": "#/definitions/flood_and_coastal_erosion_risk_management_research_report",
       },
       {
-        "$ref": "#/definitions/farming_grant_metadata",
+        "$ref": "#/definitions/licence_transaction_metadata",
       },
       {
           "$ref": "#/definitions/life_saving_maritime_appliance_service_station_metadata",
@@ -653,6 +653,33 @@
       },
     },
   },
+  farming_grant_metadata: {
+    type: "object",
+    additionalProperties: false,
+    properties: {
+      bulk_published: {
+        type: "boolean",
+      },
+      areas_of_interest: {
+        type: "array",
+        items: {
+          type: "string",
+        }
+      },
+      land_types: {
+        type: "array",
+        items: {
+          type: "string",
+        }
+      },
+      payment_types: {
+        type: "array",
+        items: {
+          type: "string",
+        },
+      },
+    },
+  },
   flood_and_coastal_erosion_risk_management_research_report: {
     type: "object",
     additionalProperties: false,
@@ -749,33 +776,6 @@
       },
     },
   },
-  farming_grant_metadata: {
-    type: "object",
-    additionalProperties: false,
-    properties: {
-      bulk_published: {
-        type: "boolean",
-      },
-      areas_of_interest: {
-        type: "array",
-        items: {
-          type: "string",
-        }
-      },
-      land_types: {
-        type: "array",
-        items: {
-          type: "string",
-        }
-      },
-      payment_types: {
-        type: "array",
-        items: {
-          type: "string",
-        },
-      },
-    },
-  },
   life_saving_maritime_appliance_service_station_metadata: {
     type: "object",
     additionalProperties: false,
@@ -1048,9 +1048,6 @@
       },
       research_document_type: {
         type: "string",
-        items: {
-          type: "string",
-        },
       },
     },
   },
@@ -1161,20 +1158,20 @@
     type: "object",
     additionalProperties: false,
     properties: {
-      "decision_subject": {
-        "type": "string",
+      decision_subject: {
+        type: "string",
       },
       regions: {
         type: "array",
         items: {
           type: "string",
         },
       },
-      "case_type": {
-        "type": "string",
+      case_type: {
+        type: "string",
       },
-      "outcome_type": {
-        "type": "string",
+      outcome_type: {
+        type: "string",
       },
       first_published_at: {
         type: "string",