Merge pull request #3164 from alphagov/content-modelling/942-change-c…

…adence-to-frequency content-modelling/942- change cadence to frequency
alphagov · Feb 27, 2025 · 1c32ad5 · 1c32ad5
2 parents efce132 + ff170b0
commit 1c32ad5
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/content_schemas/dist/formats/content_block_pension/notification/schema.json b/content_schemas/dist/formats/content_block_pension/notification/schema.json
@@ -395,21 +395,24 @@
               "required": [
                 "name",
                 "amount",
-                "cadence"
+                "frequency"
               ],
               "additionalProperties": false,
               "order": [
                 "name",
                 "amount",
-                "cadence",
-                "description"
+                "description",
+                "frequency"
               ],
               "properties": {
                 "amount": {
                   "type": "string",
                   "pattern": "^£{1}[1-9]{1,3}(,\\d{3})*(\\.\\d{2})?"
                 },
-                "cadence": {
+                "description": {
+                  "type": "string"
+                },
+                "frequency": {
                   "type": "string",
                   "enum": [
                     "a day",
@@ -418,9 +421,6 @@
                     "a year"
                   ]
                 },
-                "description": {
-                  "type": "string"
-                },
                 "name": {
                   "type": "string"
                 }

diff --git a/content_schemas/dist/formats/content_block_pension/publisher_v2/schema.json b/content_schemas/dist/formats/content_block_pension/publisher_v2/schema.json
@@ -208,21 +208,24 @@
               "required": [
                 "name",
                 "amount",
-                "cadence"
+                "frequency"
               ],
               "additionalProperties": false,
               "order": [
                 "name",
                 "amount",
-                "cadence",
-                "description"
+                "description",
+                "frequency"
               ],
               "properties": {
                 "amount": {
                   "type": "string",
                   "pattern": "^£{1}[1-9]{1,3}(,\\d{3})*(\\.\\d{2})?"
                 },
-                "cadence": {
+                "description": {
+                  "type": "string"
+                },
+                "frequency": {
                   "type": "string",
                   "enum": [
                     "a day",
@@ -231,9 +234,6 @@
                     "a year"
                   ]
                 },
-                "description": {
-                  "type": "string"
-                },
                 "name": {
                   "type": "string"
                 }

diff --git a/content_schemas/examples/content_block_pension/publisher_v2/example.json b/content_schemas/examples/content_block_pension/publisher_v2/example.json
@@ -11,19 +11,19 @@
       "rate-1": {
         "name": "Rate 1",
         "amount": "£221.20",
-        "cadence": "a week",
+        "frequency": "a week",
         "description": "Your weekly pension amount"
       },
       "rate-2": {
         "name": "Rate without decimal point",
         "amount": "£221",
-        "cadence": "a week",
+        "frequency": "a week",
         "description": "Your weekly pension amount"
       },
       "rate-3": {
         "name": "Rate with big value",
         "amount": "£1,223",
-        "cadence": "a week",
+        "frequency": "a week",
         "description": "Your weekly pension amount"
       }
     }

diff --git a/content_schemas/formats/content_block_pension.jsonnet b/content_schemas/formats/content_block_pension.jsonnet
@@ -16,15 +16,15 @@ local utils = import "shared/utils/content_block_utils.jsonnet";
               type: "string",
               pattern: "^£{1}[1-9]{1,3}(,\\d{3})*(\\.\\d{2})?",
             },
-            cadence: {
+            frequency: {
               type: "string",
               enum: ["a day", "a week", "a month", "a year"],
             },
             description: {
               type: "string",
             },
           },
-          ["amount", "cadence"],
+          ["amount", "frequency"],
         ),
       },
     },