Nest ListField/DictField errors under the idx/key

Ryan P Kilby · Ryan P Kilby · commit 29b4ab246fe3 · 2017-12-05T01:20:43.000-05:00
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
@@ -1626,14 +1626,28 @@ def to_internal_value(self, data):
             self.fail('not_a_list', input_type=type(data).__name__)
         if not self.allow_empty and len(data) == 0:
             self.fail('empty')
-        return [self.child.run_validation(item) for item in data]
+        return self.run_child_validation(data)
 
     def to_representation(self, data):
         """
         List of object instances -> List of dicts of primitive datatypes.
         """
         return [self.child.to_representation(item) if item is not None else None for item in data]
 
+    def run_child_validation(self, data):
+        result = []
+        errors = {}
+
+        for idx, item in enumerate(data):
+            try:
+                result.append(self.child.run_validation(item))
+            except ValidationError as e:
+                errors[idx] = e.detail
+
+        if not errors:
+            return result
+        raise ValidationError(errors)
+
 
 class DictField(Field):
     child = _UnvalidatedField()
@@ -1669,10 +1683,7 @@ def to_internal_value(self, data):
             data = html.parse_html_dict(data)
         if not isinstance(data, dict):
             self.fail('not_a_dict', input_type=type(data).__name__)
-        return {
-            six.text_type(key): self.child.run_validation(value)
-            for key, value in data.items()
-        }
+        return self.run_child_validation(data)
 
     def to_representation(self, value):
         """
@@ -1683,6 +1694,22 @@ def to_representation(self, value):
             for key, val in value.items()
         }
 
+    def run_child_validation(self, data):
+        result = {}
+        errors = {}
+
+        for key, value in data.items():
+            key = six.text_type(key)
+
+            try:
+                result[key] = self.child.run_validation(value)
+            except ValidationError as e:
+                errors[key] = e.detail
+
+        if not errors:
+            return result
+        raise ValidationError(errors)
+
 
 class JSONField(Field):
     default_error_messages = {
diff --git a/tests/test_fields.py b/tests/test_fields.py
@@ -1767,7 +1767,7 @@ class TestListField(FieldValues):
     ]
     invalid_inputs = [
         ('not a list', ['Expected a list of items but got type "str".']),
-        ([1, 2, 'error'], ['A valid integer is required.']),
+        ([1, 2, 'error', 'error'], {2: ['A valid integer is required.'], 3: ['A valid integer is required.']}),
         ({'one': 'two'}, ['Expected a list of items but got type "dict".'])
     ]
     outputs = [
@@ -1840,7 +1840,7 @@ class TestDictField(FieldValues):
         ({'a': 1, 'b': '2', 3: 3}, {'a': '1', 'b': '2', '3': '3'}),
     ]
     invalid_inputs = [
-        ({'a': 1, 'b': None}, ['This field may not be null.']),
+        ({'a': 1, 'b': None, 'c': None}, {'b': ['This field may not be null.'], 'c': ['This field may not be null.']}),
         ('not a dict', ['Expected a dictionary of items but got type "str".']),
     ]
     outputs = [

Original file line number	Diff line number	Diff line change
`@@ -1767,7 +1767,7 @@ class TestListField(FieldValues):`
`1767`	`1767`	`]`
`1768`	`1768`	`invalid_inputs = [`
`1769`	`1769`	`('not a list', ['Expected a list of items but got type "str".']),`
`1770`		`- ([1, 2, 'error'], ['A valid integer is required.']),`
	`1770`	`+ ([1, 2, 'error', 'error'], {2: ['A valid integer is required.'], 3: ['A valid integer is required.']}),`
`1771`	`1771`	`({'one': 'two'}, ['Expected a list of items but got type "dict".'])`
`1772`	`1772`	`]`
`1773`	`1773`	`outputs = [`
`@@ -1840,7 +1840,7 @@ class TestDictField(FieldValues):`
`1840`	`1840`	`({'a': 1, 'b': '2', 3: 3}, {'a': '1', 'b': '2', '3': '3'}),`
`1841`	`1841`	`]`
`1842`	`1842`	`invalid_inputs = [`
`1843`		`- ({'a': 1, 'b': None}, ['This field may not be null.']),`
	`1843`	`+ ({'a': 1, 'b': None, 'c': None}, {'b': ['This field may not be null.'], 'c': ['This field may not be null.']}),`
`1844`	`1844`	`('not a dict', ['Expected a dictionary of items but got type "str".']),`
`1845`	`1845`	`]`
`1846`	`1846`	`outputs = [`