Fix #92: Exctract value from choice object for validation

bhch · Mar 18, 2023 · c89f6b6 · c89f6b6
1 parent 6266cf2
commit c89f6b6
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/django_jsonform/validators.py b/django_jsonform/validators.py
@@ -100,6 +100,18 @@ def get_datetime(self, value):
         except ValueError:
             return None
 
+    def get_choice_values(self, choices):
+        """Returns values for given choices.
+
+        Useful for extracting choice values for object choices.
+        """
+        values = []
+        for choice in choices:
+            if isinstance(choice, dict):
+                choice = choice.get('value', '')
+            values.append(choice)
+        return values
+
     def validate_array(self, schema, data, coords):
         if not isinstance(data, list):
             data_type = type(data).__name__
@@ -134,8 +146,9 @@ def validate_array(self, schema, data, coords):
                     self.add_error(coords, 'All items in this list must be unique.')
 
         if choices:
+            choice_values = self.get_choice_values(choices)
             for item in data:
-                if item not in choices:
+                if item not in choice_values:
                     self.add_error(coords, 'Invalid choice %s' % item)
                     break
 

diff --git a/tests/test_validators.py b/tests/test_validators.py
@@ -140,6 +140,7 @@ def test_validate_array_uniqueItems(self):
         validator(data_2) # must pass
 
     def test_validate_array_choices(self):
+        # 1. plain choices
         schema = {
             'type': 'array',
             'items': {'type': 'string', 'choices': ['1', '2', '3']}
@@ -150,6 +151,15 @@ def test_validate_array_choices(self):
         self.assertRaises(JSONSchemaValidationError, validator, wrong_data)
         validator(data) # must pass
 
+        # 2. choices with labels
+        schema = {
+            'type': 'array',
+            'items': {'type': 'string', 'choices': [{'label': '1', 'value': '1'}]}
+        }
+        validator = JSONSchemaValidator(schema)
+        self.assertRaises(JSONSchemaValidationError, validator, wrong_data)
+        validator(data) # must pass
+
     def test_validate_object_type(self):
         """Data must be object if schema type is object"""
         # top level object