encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-07-28 17:09:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes

Browse Source 
* no need to change `raise_errors_on_nested_writes` signature
* declare nested-model outside of the test class
This commit is contained in:
Konstantinos Tselepakis 2019-09-06 08:36:20 +03:00
parent 2d52a0f180
commit 3801ef7c6b
2 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rest_framework/serializers.py
View File

@ -773,7 +773,7 @@ class ListSerializer(BaseSerializer):
# ModelSerializer & HyperlinkedModelSerializer
# --------------------------------------------
def raise_errors_on_nested_writes(method_name, serializer, validated_data, model_field_info):
def raise_errors_on_nested_writes(method_name, serializer, validated_data):
"""
Give explicit errors when users attempt to pass writable nested data.
@ -791,6 +791,8 @@ def raise_errors_on_nested_writes(method_name, serializer, validated_data, model
* Silently ignore the nested part of the update.
* Automatically create a profile instance.
"""
ModelClass = serializer.Meta.model
model_field_info = model_meta.get_field_info(ModelClass)
# Ensure we don't have a writable nested field. For example:
#
@ -820,9 +822,7 @@ def raise_errors_on_nested_writes(method_name, serializer, validated_data, model
# ...
# address = serializer.CharField('profile.address')
#
# Though, we can have a dotted field if it is not expressing a model relation.
#
# For example:
# Though, non-relational fields (e.g., JSONField) are acceptable. For example:
#
# class NonRelationalPersonModel(models.Model):
# profile = JSONField()
@ -931,7 +931,7 @@ class ModelSerializer(Serializer):
ModelClass = self.Meta.model
info = model_meta.get_field_info(ModelClass)
raise_errors_on_nested_writes('create', self, validated_data, info)
raise_errors_on_nested_writes('create', self, validated_data)
# Remove many-to-many relationships from validated_data.
# They are not valid arguments to the default `.create()` method,
@ -973,7 +973,7 @@ class ModelSerializer(Serializer):
def update(self, instance, validated_data):
info = model_meta.get_field_info(instance)
raise_errors_on_nested_writes('update', self, validated_data, info)
raise_errors_on_nested_writes('update', self, validated_data)
# Simply set each attribute on the instance, and then save it.
# Note that unlike `.create()` we don't need to treat many-to-many

28
tests/test_serializer_nested.py
View File

@ -6,7 +6,6 @@ from django.test import TestCase
from rest_framework import serializers
from rest_framework.compat import postgres_fields
from rest_framework.serializers import raise_errors_on_nested_writes
from rest_framework.utils import model_meta
class TestNestedSerializer:
@ -307,7 +306,13 @@ class TestNestedWriteErrors(TestCase):
)
@pytest.mark.skipif('not postgres_fields')
if postgres_fields:
class NonRelationalPersonModel(models.Model):
"""Model declaring a postgres JSONField"""
data = postgres_fields.JSONField()
@pytest.mark.skipif(not postgres_fields, reason='psycopg2 is not installed')
class TestNestedNonRelationalFieldWrite:
"""
Test that raise_errors_on_nested_writes does not raise `AssertionError` when the
@ -315,9 +320,6 @@ class TestNestedNonRelationalFieldWrite:
"""
def test_nested_serializer_create_and_update(self):
class NonRelationalPersonModel(models.Model):
"""Model declaring a postgres JSONField"""
data = postgres_fields.JSONField()
class NonRelationalPersonDataSerializer(serializers.Serializer):
occupation = serializers.CharField()
@ -332,15 +334,10 @@ class TestNestedNonRelationalFieldWrite:
serializer = NonRelationalPersonSerializer(data={'data': {'occupation': 'developer'}})
assert serializer.is_valid()
assert serializer.validated_data == {'data': {'occupation': 'developer'}}
ModelClass = serializer.Meta.model
info = model_meta.get_field_info(ModelClass)
raise_errors_on_nested_writes('create', serializer, serializer.validated_data, info)
raise_errors_on_nested_writes('update', serializer, serializer.validated_data, info)
raise_errors_on_nested_writes('create', serializer, serializer.validated_data)
raise_errors_on_nested_writes('update', serializer, serializer.validated_data)
def test_dotted_source_field_create_and_update(self):
class NonRelationalPersonModel(models.Model):
"""Model declaring a postgres JSONField"""
data = postgres_fields.JSONField()
class DottedNonRelationalPersonSerializer(serializers.ModelSerializer):
occupation = serializers.CharField(source='data.occupation')
@ -352,8 +349,5 @@ class TestNestedNonRelationalFieldWrite:
serializer = DottedNonRelationalPersonSerializer(data={'occupation': 'developer'})
assert serializer.is_valid()
assert serializer.validated_data == {'data': {'occupation': 'developer'}}
ModelClass = serializer.Meta.model
info = model_meta.get_field_info(ModelClass)
raise_errors_on_nested_writes('create', serializer, serializer.validated_data, info)
raise_errors_on_nested_writes('update', serializer, serializer.validated_data, info)
assert serializer.data == {'occupation': 'developer'}
raise_errors_on_nested_writes('create', serializer, serializer.validated_data)
raise_errors_on_nested_writes('update', serializer, serializer.validated_data)