Rename error message variable and add Decimal into values accepted fo…

…r min/max
ONSdigital · Dec 20, 2023 · 26b20e0 · 26b20e0
1 parent 06b4792
commit 26b20e0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/app/validators/answers/number_answer_validator.py b/app/validators/answers/number_answer_validator.py
@@ -1,3 +1,5 @@
+from decimal import Decimal
+
 from app.validators.answers.answer_validator import AnswerValidator
 from app.validators.routing.types import TYPE_NUMBER, resolve_value_source_json_type
 
@@ -22,7 +24,7 @@ class NumberAnswerValidator(AnswerValidator):
     GREATER_DECIMALS_ON_ANSWER_REFERENCE = (
         "The referenced answer has a greater number of decimal places than answer"
     )
-    MAX_MIN_IS_STRING = "The minimum or maximum value is not a float or an integer"
+    MIN_OR_MAX_IS_NOT_NUMERIC = "The minimum or maximum value is not a float or an integer"
 
     def __init__(self, schema_element, questionnaire_schema):
         super().__init__(schema_element, questionnaire_schema)
@@ -75,10 +77,10 @@ def validate_min_max_is_number(self):
                         resolve_value_source_json_type(value, self.questionnaire_schema)
                         != TYPE_NUMBER
                     ):
-                        self.add_error(self.MAX_MIN_IS_STRING)
+                        self.add_error(self.MIN_OR_MAX_IS_NOT_NUMERIC)
                 else:
-                    if not isinstance(value, int | float):
-                        self.add_error(self.MAX_MIN_IS_STRING)
+                    if not isinstance(value, int | float | Decimal):
+                        self.add_error(self.MIN_OR_MAX_IS_NOT_NUMERIC)
 
     def validate_value_in_limits(self):
         min_value = self.answer.get("minimum", {}).get("value", 0)

diff --git a/tests/validators/answers/test_number_answer_validator.py b/tests/validators/answers/test_number_answer_validator.py
@@ -96,7 +96,7 @@ def test_maximum_set_as_string():
     validator.validate_min_max_is_number()
 
     assert validator.errors[0] == {
-        "message": validator.MAX_MIN_IS_STRING,
+        "message": validator.MIN_OR_MAX_IS_NOT_NUMERIC,
         "answer_id": "total-percentage",
     }
 
@@ -119,7 +119,7 @@ def test_minimum_set_as_string():
     validator.validate_min_max_is_number()
 
     assert validator.errors[0] == {
-        "message": validator.MAX_MIN_IS_STRING,
+        "message": validator.MIN_OR_MAX_IS_NOT_NUMERIC,
         "answer_id": "total-percentage",
     }
 
@@ -143,7 +143,7 @@ def test_min_and_max_set_as_string():
     validator.validate_min_max_is_number()
 
     assert validator.errors[1] == {
-        "message": validator.MAX_MIN_IS_STRING,
+        "message": validator.MIN_OR_MAX_IS_NOT_NUMERIC,
         "answer_id": "total-percentage",
     }
     assert len(validator.errors) == 2