Add govspeak support for finder summary

alphagov · Feb 18, 2025 · 1f533fe · 1f533fe
1 parent 85627c1
commit 1f533fe
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 32 deletions.
diff --git a/content_schemas/dist/formats/finder/frontend/schema.json b/content_schemas/dist/formats/finder/frontend/schema.json
@@ -644,14 +644,7 @@
       }
     },
     "finder_summary": {
-      "anyOf": [
-        {
-          "type": "string"
-        },
-        {
-          "type": "null"
-        }
-      ]
+      "type": "string"
     },
     "first_published_at": {
       "description": "The date the content was first published.  Automatically determined by the publishing-api, unless overridden by the publishing application.",

diff --git a/content_schemas/dist/formats/finder/notification/schema.json b/content_schemas/dist/formats/finder/notification/schema.json
@@ -744,14 +744,7 @@
       }
     },
     "finder_summary": {
-      "anyOf": [
-        {
-          "type": "string"
-        },
-        {
-          "type": "null"
-        }
-      ]
+      "$ref": "#/definitions/multiple_content_types"
     },
     "first_published_at": {
       "description": "The date the content was first published.  Automatically determined by the publishing-api, unless overridden by the publishing application.",
@@ -1002,6 +995,25 @@
         "zh-tw"
       ]
     },
+    "multiple_content_types": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "required": [
+          "content_type",
+          "content"
+        ],
+        "additionalProperties": false,
+        "properties": {
+          "content": {
+            "type": "string"
+          },
+          "content_type": {
+            "type": "string"
+          }
+        }
+      }
+    },
     "payload_version": {
       "description": "Counter to indicate when the payload was generated",
       "type": "integer"

diff --git a/content_schemas/dist/formats/finder/publisher_v2/schema.json b/content_schemas/dist/formats/finder/publisher_v2/schema.json
@@ -536,14 +536,7 @@
       }
     },
     "finder_summary": {
-      "anyOf": [
-        {
-          "type": "string"
-        },
-        {
-          "type": "null"
-        }
-      ]
+      "$ref": "#/definitions/multiple_content_types"
     },
     "first_published_at": {
       "description": "The date the content was first published.  Automatically determined by the publishing-api, unless overridden by the publishing application.",
@@ -655,6 +648,25 @@
         "zh-tw"
       ]
     },
+    "multiple_content_types": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "required": [
+          "content_type",
+          "content"
+        ],
+        "additionalProperties": false,
+        "properties": {
+          "content": {
+            "type": "string"
+          },
+          "content_type": {
+            "type": "string"
+          }
+        }
+      }
+    },
     "public_updated_at": {
       "description": "When the content was last significantly changed (a major update). Shown to users.  Automatically determined by the publishing-api, unless overridden by the publishing application.",
       "type": "string",

diff --git a/content_schemas/formats/shared/definitions/finder.jsonnet b/content_schemas/formats/shared/definitions/finder.jsonnet
@@ -269,14 +269,7 @@
     ],
   },
   finder_summary: {
-    anyOf: [
-      {
-        type: "string",
-      },
-      {
-        type: "null",
-      },
-    ],
+    "$ref": "#/definitions/multiple_content_types"
   },
   finder_beta: {
     description: "Indicates if finder is in beta. TODO: Switch to top-level phase label",