Skip to content

D
django-rest-framework
Commit addf7e9b by Tom Christie
Options

Defer the writable nested modelserializers work

parent 9cdf8411
Showing with 73 additions and 92 deletions
rest_framework/serializers.py
...@@ -753,16 +753,7 @@ class ModelSerializer(Serializer): ...@@ -753,16 +753,7 @@ class ModelSerializer(Serializer):
if getattr(obj, '_related_data', None): if getattr(obj, '_related_data', None):
for accessor_name, related in obj._related_data.items(): for accessor_name, related in obj._related_data.items():
if related is None: setattr(obj, accessor_name, related)
previous = getattr(obj, accessor_name, related)
if previous:
previous.delete()
elif isinstance(related, models.Model):
fk_field = obj._meta.get_field_by_name(accessor_name)[0].field.name
setattr(related, fk_field, obj)
self.save_object(related)
else:
setattr(obj, accessor_name, related)
del(obj._related_data) del(obj._related_data)
......
rest_framework/tests/relations_nested.py
from __future__ import unicode_literals from __future__ import unicode_literals
from django.db import models
from django.test import TestCase from django.test import TestCase
from rest_framework import serializers from rest_framework import serializers
from rest_framework.tests.models import ForeignKeyTarget, ForeignKeySource, NullableForeignKeySource, OneToOneTarget, NullableOneToOneSource
class OneToOneTarget(models.Model): class ForeignKeySourceSerializer(serializers.ModelSerializer):
name = models.CharField(max_length=100) class Meta:
depth = 1
model = ForeignKeySource
class OneToOneTargetSource(models.Model):
name = models.CharField(max_length=100)
target = models.OneToOneField(OneToOneTarget, null=True, blank=True,
related_name='target_source')
class FlatForeignKeySourceSerializer(serializers.ModelSerializer):
class Meta:
model = ForeignKeySource
class OneToOneSource(models.Model):
name = models.CharField(max_length=100)
target_source = models.OneToOneField(OneToOneTargetSource, related_name='source')
class ForeignKeyTargetSerializer(serializers.ModelSerializer):
sources = FlatForeignKeySourceSerializer(many=True)
class OneToOneSourceSerializer(serializers.ModelSerializer):
class Meta: class Meta:
model = OneToOneSource model = ForeignKeyTarget
exclude = ('target_source', )
class NullableForeignKeySourceSerializer(serializers.ModelSerializer):
class Meta:
depth = 1
model = NullableForeignKeySource
class OneToOneTargetSourceSerializer(serializers.ModelSerializer):
source = OneToOneSourceSerializer()
class NullableOneToOneSourceSerializer(serializers.ModelSerializer):
class Meta: class Meta:
model = OneToOneTargetSource model = NullableOneToOneSource
exclude = ('target', )
class OneToOneTargetSerializer(serializers.ModelSerializer): class NullableOneToOneTargetSerializer(serializers.ModelSerializer):
target_source = OneToOneTargetSourceSerializer() nullable_source = NullableOneToOneSourceSerializer()
class Meta: class Meta:
model = OneToOneTarget model = OneToOneTarget
class NestedOneToOneTests(TestCase): class ReverseForeignKeyTests(TestCase):
def setUp(self): def setUp(self):
target = ForeignKeyTarget(name='target-1')
target.save()
new_target = ForeignKeyTarget(name='target-2')
new_target.save()
for idx in range(1, 4): for idx in range(1, 4):
target = OneToOneTarget(name='target-%d' % idx) source = ForeignKeySource(name='source-%d' % idx, target=target)
target.save()
target_source = OneToOneTargetSource(name='target-source-%d' % idx, target=target)
target_source.save()
source = OneToOneSource(name='source-%d' % idx, target_source=target_source)
source.save() source.save()
def test_one_to_one_retrieve(self): def test_foreign_key_retrieve(self):
queryset = OneToOneTarget.objects.all() queryset = ForeignKeySource.objects.all()
serializer = OneToOneTargetSerializer(queryset) serializer = ForeignKeySourceSerializer(queryset, many=True)
expected = [ expected = [
{'id': 1, 'name': 'target-1', 'target_source': {'id': 1, 'name': 'target-source-1', 'source': {'id': 1, 'name': 'source-1'}}}, {'id': 1, 'name': 'source-1', 'target': {'id': 1, 'name': 'target-1'}},
{'id': 2, 'name': 'target-2', 'target_source': {'id': 2, 'name': 'target-source-2', 'source': {'id': 2, 'name': 'source-2'}}}, {'id': 2, 'name': 'source-2', 'target': {'id': 1, 'name': 'target-1'}},
{'id': 3, 'name': 'target-3', 'target_source': {'id': 3, 'name': 'target-source-3', 'source': {'id': 3, 'name': 'source-3'}}} {'id': 3, 'name': 'source-3', 'target': {'id': 1, 'name': 'target-1'}},
] ]
self.assertEqual(serializer.data, expected) self.assertEqual(serializer.data, expected)
def test_one_to_one_create(self): def test_reverse_foreign_key_retrieve(self):
data = {'id': 4, 'name': 'target-4', 'target_source': {'id': 4, 'name': 'target-source-4', 'source': {'id': 4, 'name': 'source-4'}}} queryset = ForeignKeyTarget.objects.all()
serializer = OneToOneTargetSerializer(data=data) serializer = ForeignKeyTargetSerializer(queryset, many=True)
self.assertTrue(serializer.is_valid())
obj = serializer.save()
self.assertEqual(serializer.data, data)
self.assertEqual(obj.name, 'target-4')
# Ensure (target 4, target_source 4, source 4) are added, and
# everything else is as expected.
queryset = OneToOneTarget.objects.all()
serializer = OneToOneTargetSerializer(queryset)
expected = [ expected = [
{'id': 1, 'name': 'target-1', 'target_source': {'id': 1, 'name': 'target-source-1', 'source': {'id': 1, 'name': 'source-1'}}}, {'id': 1, 'name': 'target-1', 'sources': [
{'id': 2, 'name': 'target-2', 'target_source': {'id': 2, 'name': 'target-source-2', 'source': {'id': 2, 'name': 'source-2'}}}, {'id': 1, 'name': 'source-1', 'target': 1},
{'id': 3, 'name': 'target-3', 'target_source': {'id': 3, 'name': 'target-source-3', 'source': {'id': 3, 'name': 'source-3'}}}, {'id': 2, 'name': 'source-2', 'target': 1},
{'id': 4, 'name': 'target-4', 'target_source': {'id': 4, 'name': 'target-source-4', 'source': {'id': 4, 'name': 'source-4'}}} {'id': 3, 'name': 'source-3', 'target': 1},
]},
{'id': 2, 'name': 'target-2', 'sources': [
]}
] ]
self.assertEqual(serializer.data, expected) self.assertEqual(serializer.data, expected)
def test_one_to_one_create_with_invalid_data(self):
data = {'id': 4, 'name': 'target-4', 'target_source': {'id': 4, 'name': 'target-source-4', 'source': {'id': 4}}} class NestedNullableForeignKeyTests(TestCase):
serializer = OneToOneTargetSerializer(data=data) def setUp(self):
self.assertFalse(serializer.is_valid()) target = ForeignKeyTarget(name='target-1')
self.assertEqual(serializer.errors, {'target_source': [{'source': [{'name': ['This field is required.']}]}]}) target.save()
for idx in range(1, 4):
def test_one_to_one_update(self): if idx == 3:
data = {'id': 3, 'name': 'target-3-updated', 'target_source': {'id': 3, 'name': 'target-source-3-updated', 'source': {'id': 3, 'name': 'source-3-updated'}}} target = None
instance = OneToOneTarget.objects.get(pk=3) source = NullableForeignKeySource(name='source-%d' % idx, target=target)
serializer = OneToOneTargetSerializer(instance, data=data) source.save()
self.assertTrue(serializer.is_valid())
obj = serializer.save() def test_foreign_key_retrieve_with_null(self):
self.assertEqual(serializer.data, data) queryset = NullableForeignKeySource.objects.all()
self.assertEqual(obj.name, 'target-3-updated') serializer = NullableForeignKeySourceSerializer(queryset, many=True)
# Ensure (target 3, target_source 3, source 3) are updated,
# and everything else is as expected.
queryset = OneToOneTarget.objects.all()
serializer = OneToOneTargetSerializer(queryset)
expected = [ expected = [
{'id': 1, 'name': 'target-1', 'target_source': {'id': 1, 'name': 'target-source-1', 'source': {'id': 1, 'name': 'source-1'}}}, {'id': 1, 'name': 'source-1', 'target': {'id': 1, 'name': 'target-1'}},
{'id': 2, 'name': 'target-2', 'target_source': {'id': 2, 'name': 'target-source-2', 'source': {'id': 2, 'name': 'source-2'}}}, {'id': 2, 'name': 'source-2', 'target': {'id': 1, 'name': 'target-1'}},
{'id': 3, 'name': 'target-3-updated', 'target_source': {'id': 3, 'name': 'target-source-3-updated', 'source': {'id': 3, 'name': 'source-3-updated'}}} {'id': 3, 'name': 'source-3', 'target': None},
] ]
self.assertEqual(serializer.data, expected) self.assertEqual(serializer.data, expected)
def test_one_to_one_delete(self):
data = {'id': 3, 'name': 'target-3', 'target_source': None}
instance = OneToOneTarget.objects.get(pk=3)
serializer = OneToOneTargetSerializer(instance, data=data)
self.assertTrue(serializer.is_valid())
serializer.save()
# Ensure (target_source 3, source 3) are deleted, class NestedNullableOneToOneTests(TestCase):
# and everything else is as expected. def setUp(self):
target = OneToOneTarget(name='target-1')
target.save()
new_target = OneToOneTarget(name='target-2')
new_target.save()
source = NullableOneToOneSource(name='source-1', target=target)
source.save()
def test_reverse_foreign_key_retrieve_with_null(self):
queryset = OneToOneTarget.objects.all() queryset = OneToOneTarget.objects.all()
serializer = OneToOneTargetSerializer(queryset) serializer = NullableOneToOneTargetSerializer(queryset, many=True)
expected = [ expected = [
{'id': 1, 'name': 'target-1', 'target_source': {'id': 1, 'name': 'target-source-1', 'source': {'id': 1, 'name': 'source-1'}}}, {'id': 1, 'name': 'target-1', 'nullable_source': {'id': 1, 'name': 'source-1', 'target': 1}},
{'id': 2, 'name': 'target-2', 'target_source': {'id': 2, 'name': 'target-source-2', 'source': {'id': 2, 'name': 'source-2'}}}, {'id': 2, 'name': 'target-2', 'nullable_source': None},
{'id': 3, 'name': 'target-3', 'target_source': None}
] ]
self.assertEqual(serializer.data, expected) self.assertEqual(serializer.data, expected)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment