Merge pull request #3156 from alphagov/content-modelling/932-improve-…

…validation-for-rate-amounts (932) Improve validation for rate amounts
alphagov · Feb 21, 2025 · 73dcb21 · 73dcb21
2 parents a2d06c9 + 52a6fe8
commit 73dcb21
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 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
@@ -403,7 +403,7 @@
               "properties": {
                 "amount": {
                   "type": "string",
-                  "pattern": "£[0-9]+\\.[0-9]+"
+                  "pattern": "^£{1}[1-9]{1,3}(,\\d{3})*(\\.\\d{2})?"
                 },
                 "cadence": {
                   "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
@@ -220,7 +220,7 @@
               "properties": {
                 "amount": {
                   "type": "string",
-                  "pattern": "£[0-9]+\\.[0-9]+"
+                  "pattern": "^£{1}[1-9]{1,3}(,\\d{3})*(\\.\\d{2})?"
                 },
                 "cadence": {
                   "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
@@ -13,6 +13,18 @@
         "amount": "£221.20",
         "cadence": "a week",
         "description": "Your weekly pension amount"
+      },
+      "rate-2": {
+        "name": "Rate without decimal point",
+        "amount": "£221",
+        "cadence": "a week",
+        "description": "Your weekly pension amount"
+      },
+      "rate-3": {
+        "name": "Rate with big value",
+        "amount": "£1,223",
+        "cadence": "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
@@ -14,7 +14,7 @@ local utils = import "shared/utils/content_block_utils.jsonnet";
           {
             amount: {
               type: "string",
-              pattern: "£[0-9]+\\.[0-9]+",
+              pattern: "^£{1}[1-9]{1,3}(,\\d{3})*(\\.\\d{2})?",
             },
             cadence: {
               type: "string",