Merge c3854700f1 into bce3000727

rest_framework/serializers.py

@@ -110,19 +110,21 @@ class BaseSerializer(WritableField):
     _dict_class = SortedDictWithMetadata
 
     def __init__(self, instance=None, data=None, files=None,
-                 context=None, partial=False, many=None, source=None):
+                 context=None, partial=False, many=None, source=None, required=True):
         super(BaseSerializer, self).__init__(source=source)
         self.opts = self._options_class(self.Meta)
         self.parent = None
         self.root = None
         self.partial = partial
         self.many = many
+        self.required = required
 
         self.context = context or {}
 
         self.init_data = data
         self.init_files = files
         self.object = instance
+        self.unused_objects = instance
         self.fields = self.get_fields()
 
         self._data = None
@@ -284,6 +286,19 @@ class BaseSerializer(WritableField):
             ret.fields[key] = field
         return ret
 
+    def _get_object_from_data(self, data):
+        """
+        Get the corresponding object to deserialize the data into.
+        """
+        # Just get the first object in the list.
+        if self.unused_objects:
+            obj = self.unused_objects[0]
+            self.unused_objects.remove(obj)
+        else:
+            obj = None
+
+        return obj
+
     def from_native(self, data, files):
         """
         Deserialize primitives -> objects.
@@ -356,9 +371,20 @@ class BaseSerializer(WritableField):
             if many:
                 ret = []
                 errors = []
+                siblings = []
                 for item in data:
-                    ret.append(self.from_native(item, None))
-                    errors.append(self._errors)
+                    obj = self._get_object_from_data(item)
+                    sibling = self.__class__(obj, data=item)
+                    siblings.append(sibling)
+                    sibling.object = sibling.from_native(item, None)
+                    ret.append(sibling.from_native(item, None))
+                    errors.append(sibling._errors)
+                # Unused objects will be deleted
+                for item in self.unused_objects or []:
+                    sibling = self.__class__(item)
+                    sibling._delete = True
+                    siblings.append(sibling)
+                self._siblings = siblings
                 self._errors = any(errors) and errors or []
             else:
                 ret = self.from_native(data, files)
@@ -450,6 +476,27 @@ class ModelSerializer(Serializer):
         models.ImageField: ImageField,
     }
 
+    def _get_object_from_data(self, data):
+        """
+        Get the corresponding object to deserialize the data into.
+        """
+        if self.unused_objects is None: return None
+
+        # Get the object based on pk
+        pk_field_name = self.opts.model._meta.pk.name
+        pk = data.get(pk_field_name, None)
+        if pk:
+            # Loop through objects and find one with pk or return None
+            obj = [o for o in self.unused_objects if o.pk == pk]
+            if obj:
+                obj = obj[0]
+                self.unused_objects.remove(obj)
+            else:
+                obj = None
+            return obj
+        else:
+            return None
+
     def field_from_native(self, data, files, field_name, into):
         if self.read_only:
             return
@@ -464,15 +511,39 @@ class ModelSerializer(Serializer):
         if self.parent.object:
             # Set the serializer object if it exists
             obj = getattr(self.parent.object, field_name)
+            if is_simple_callable(getattr(obj, 'all', None)):
+                # If this is a relational manager we just want the objects
+                obj = list(obj.all())
             self.object = obj
+            self.unused_objects = obj
 
         if value in (None, ''):
             self._delete = True
             into[(self.source or field_name)] = self
         else:
-            obj = self.from_native(value, files)
+            if self.many:
+                ret = []
+                errors = []
+                siblings = []
+                for item in value:
+                    obj = self._get_object_from_data(item)
+                    sibling = self.__class__(obj, data=item)
+                    siblings.append(sibling)
+                    sibling.object = sibling.from_native(item, None)
+                    ret.append(sibling.from_native(item, None))
+                    errors.append(sibling._errors)
+                # Unused objects will be deleted
+                for item in self.unused_objects or []:
+                    sibling = self.__class__(item)
+                    sibling._delete = True
+                    siblings.append(sibling)
+                self._siblings = siblings
+                self._errors = any(errors) and errors or []
+            else:
+                ret = self.from_native(value, files)
+
             if not self._errors:
-                self.object = obj
+                self.object = ret
                 into[self.source or field_name] = self
             else:
                 # Propagate errors up to our parent
@@ -647,13 +718,23 @@ class ModelSerializer(Serializer):
         Override the default method to also include model field validation.
         """
         instance = super(ModelSerializer, self).from_native(data, files)
-        if instance:
-            return self.full_clean(instance)
+        if self.many and hasattr(self, '_siblings'):
+            objects = [s.full_clean(s.object) if s.object else None for s in self._siblings]
+            self._errors = [s._errors for s in self._siblings]
+            return objects
+        else:
+            if instance:
+                return self.full_clean(instance)
 
     def save_object(self, obj, parent=None, fk_field=None):
         """
         Save the deserialized object and return it.
         """
+        if self.many:
+            for s in self._siblings:
+                s.save_object(s.object, parent, fk_field)
+            return
+
         if self._delete:
             obj.delete()
             return

rest_framework/tests/nesting.py

@@ -4,6 +4,28 @@ from django.test import TestCase
 from rest_framework import serializers
 
 
+class OneToManyTarget(models.Model):
+    name = models.CharField(max_length=100)
+
+
+class OneToManyTargetSource(models.Model):
+    name = models.CharField(max_length=100)
+    target = models.ForeignKey(OneToManyTarget,
+                               related_name='target_sources')
+
+
+class OneToManySource(models.Model):
+    name = models.CharField(max_length=100)
+    target_source = models.ForeignKey(OneToManyTargetSource,
+                                      related_name='sources')
+
+
+class OneToManySource(models.Model):
+    name = models.CharField(max_length=100)
+    target = models.ForeignKey(OneToManyTarget,
+                               related_name='sources')
+
+
 class OneToOneTarget(models.Model):
     name = models.CharField(max_length=100)
 
@@ -39,6 +61,101 @@ class OneToOneTargetSerializer(serializers.ModelSerializer):
         model = OneToOneTarget
 
 
+class OneToManySourceSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = OneToManySource
+        exclude = ('target_source', )
+
+
+class OneToManyTargetSourceSerializer(serializers.ModelSerializer):
+    sources = OneToManySourceSerializer(many=True, required=False)
+
+    class Meta:
+        model = OneToManyTargetSource
+        exclude = ('target', )
+
+
+class OneToManyTargetSerializer(serializers.ModelSerializer):
+    target_sources = OneToManyTargetSourceSerializer(many=True)
+
+    class Meta:
+        model = OneToManyTarget
+
+
+class NestedOneToManyTests(TestCase):
+    def setUp(self):
+        target = OneToManyTarget(name='target-1')
+        target.save()
+        target_source = OneToManyTargetSource(name='target-source-1', target=target)
+        target_source.save()
+        for idx in range(1, 4):
+            source = OneToManySource(name='source-%d' % idx, target_source=target_source)
+            source.save()
+
+    def test_one_to_many_retrieve(self):
+        queryset = OneToManyTarget.objects.all()
+        serializer = OneToManyTargetSerializer(queryset)
+        expected = [
+            {'id': 1, 'name': 'target-1', 'target_sources': [{'id': 1, 'name': 'target-source-1', 'sources': [{'id': 1, 'name': 'source-1'}, {'id': 2, 'name': 'source-2'}, {'id': 3, 'name': 'source-3'}]}]}
+        ]
+        self.assertEquals(serializer.data, expected)
+
+    def test_one_to_many_create(self):
+        # Note the nonsensical source id given
+        data = {'id': 2, 'name': 'target-2', 'target_sources': [{'id': 2, 'name': 'target-source-2', 'sources': [{'id': 2, 'name': 'source-4'}]}]}
+        expected = {'id': 2, 'name': 'target-2', 'target_sources': [{'id': 2, 'name': 'target-source-2', 'sources': [{'id': 4, 'name': 'source-4'}]}]}
+        serializer = OneToManyTargetSerializer(data=data)
+        self.assertTrue(serializer.is_valid())
+        obj = serializer.save()
+        self.assertEquals(serializer.data, expected)
+        self.assertEqual(obj.name, 'target-2')
+
+        # Ensure (target 4, target_source 4, source 4) are added, and
+        # everything else is as expected.
+        queryset = OneToManyTarget.objects.all()
+        serializer = OneToManyTargetSerializer(queryset)
+        expected = [
+            {'id': 1, 'name': 'target-1', 'target_sources': [{'id': 1, 'name': 'target-source-1', 'sources': [{'id': 1, 'name': 'source-1'}, {'id': 2, 'name': 'source-2'}, {'id': 3, 'name': 'source-3'}]}]},
+            {'id': 2, 'name': 'target-2', 'target_sources': [{'id': 2, 'name': 'target-source-2', 'sources': [{'id': 4, 'name': 'source-4'}]}]}
+        ]
+        self.assertEquals(serializer.data, expected)
+
+    def test_one_to_many_update(self):
+        data = {'id': 1, 'name': 'target-1-updated', 'target_sources': [{'id': 1, 'name': 'target-source-1-updated', 'sources': [{'id': 1, 'name': 'source-1-updated'}, {'id': 2, 'name': 'source-2'}, {'id': 3, 'name': 'source-3'}]}]}
+        expected = {'id': 1, 'name': 'target-1-updated', 'target_sources': [{'id': 1, 'name': 'target-source-1-updated', 'sources': [{'id': 1, 'name': 'source-1-updated'}, {'id': 2, 'name': 'source-2'}, {'id': 3, 'name': 'source-3'}]}]}
+        instance = OneToManyTarget.objects.get(pk=1)
+        serializer = OneToManyTargetSerializer(instance, data=data)
+        self.assertTrue(serializer.is_valid())
+        obj = serializer.save()
+        self.assertEquals(serializer.data, expected)
+        self.assertEqual(obj.name, 'target-1-updated')
+
+        # Ensure (target 1, target_source 1, source 1) are updated,
+        # and everything else is as expected.
+        queryset = OneToManyTarget.objects.all()
+        serializer = OneToManyTargetSerializer(queryset)
+        expected = [
+            {'id': 1, 'name': 'target-1-updated', 'target_sources': [{'id': 1, 'name': 'target-source-1-updated', 'sources': [{'id': 1, 'name': 'source-1-updated'}, {'id': 2, 'name': 'source-2'}, {'id': 3, 'name': 'source-3'}]}]}
+            ]
+        self.assertEquals(serializer.data, expected)
+
+    def test_one_to_many_delete(self):
+        data = {'id': 1, 'name': 'target-1', 'target_sources': [{'id': 1, 'name': 'target-source-1', 'sources': [{'id': 2, 'name': 'source-2'}]}]}
+        instance = OneToManyTarget.objects.get(pk=1)
+        serializer = OneToManyTargetSerializer(instance, data=data)
+        self.assertTrue(serializer.is_valid())
+        obj = serializer.save()
+
+        # Ensure target_source 1 is deleted, and everything else is as
+        # expected.
+        queryset = OneToManyTarget.objects.all()
+        serializer = OneToManyTargetSerializer(queryset)
+        expected = [
+            {'id': 1, 'name': 'target-1', 'target_sources': [{'id': 1, 'name': 'target-source-1', 'sources': [{'id': 2, 'name': 'source-2'}]}]}
+            ]
+        self.assertEquals(serializer.data, expected)
+
+
 class NestedOneToOneTests(TestCase):
     def setUp(self):
         for idx in range(1, 4):
@@ -58,7 +175,6 @@ class NestedOneToOneTests(TestCase):
             {'id': 3, 'name': 'target-3', 'target_source': {'id': 3, 'name': 'target-source-3', 'source': {'id': 3, 'name': 'source-3'}}}            
         ]
         self.assertEquals(serializer.data, expected)
-        
 
     def test_one_to_one_create(self):
         data = {'id': 4, 'name': 'target-4', 'target_source': {'id': 4, 'name': 'target-source-4', 'source': {'id': 4, 'name': 'source-4'}}}

rest_framework/tests/serializer.py

@@ -266,7 +266,7 @@ class ValidationTests(TestCase):
         Data of the wrong type is not valid.
         """
         data = ['i am', 'a', 'list']
-        serializer = CommentSerializer(self.comment, data=data, many=True)
+        serializer = CommentSerializer([self.comment], data=data, many=True)
         self.assertEqual(serializer.is_valid(), False)
         self.assertTrue(isinstance(serializer.errors, list))