From 346f00f55e97e60a66a7298818bf4e6dbf3161c7 Mon Sep 17 00:00:00 2001 From: Ryan P Kilby Date: Wed, 11 Dec 2019 03:40:29 -0800 Subject: [PATCH 1/5] Add failing tests for unique_together+source --- tests/test_validators.py | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/tests/test_validators.py b/tests/test_validators.py index 5c4a62b314..3763d95d79 100644 --- a/tests/test_validators.py +++ b/tests/test_validators.py @@ -301,6 +301,40 @@ class Meta: ] } + def test_read_only_fields_with_default_and_source(self): + class ReadOnlySerializer(serializers.ModelSerializer): + name = serializers.CharField(source='race_name', default='test', read_only=True) + + class Meta: + model = UniquenessTogetherModel + fields = ['name', 'position'] + validators = [ + UniqueTogetherValidator( + queryset=UniquenessTogetherModel.objects.all(), + fields=['name', 'position'] + ) + ] + + serializer = ReadOnlySerializer(data={'position': 1}) + assert serializer.is_valid(raise_exception=True) + + def test_writeable_fields_with_source(self): + class WriteableSerializer(serializers.ModelSerializer): + name = serializers.CharField(source='race_name') + + class Meta: + model = UniquenessTogetherModel + fields = ['name', 'position'] + validators = [ + UniqueTogetherValidator( + queryset=UniquenessTogetherModel.objects.all(), + fields=['name', 'position'] + ) + ] + + serializer = WriteableSerializer(data={'name': 'test', 'position': 1}) + assert serializer.is_valid(raise_exception=True) + def test_allow_explict_override(self): """ Ensure validators can be explicitly removed.. From 87cba7b8143d9e1026277735bf18994796411cec Mon Sep 17 00:00:00 2001 From: Ryan P Kilby Date: Wed, 11 Dec 2019 04:45:59 -0800 Subject: [PATCH 2/5] Fix UniqueTogetherValidator source handling --- rest_framework/validators.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/rest_framework/validators.py b/rest_framework/validators.py index aa79377142..4681d4fb13 100644 --- a/rest_framework/validators.py +++ b/rest_framework/validators.py @@ -106,7 +106,7 @@ def enforce_required_fields(self, attrs, serializer): missing_items = { field_name: self.missing_message for field_name in self.fields - if field_name not in attrs + if serializer.fields[field_name].source not in attrs } if missing_items: raise ValidationError(missing_items, code='required') @@ -115,17 +115,23 @@ def filter_queryset(self, attrs, queryset, serializer): """ Filter the queryset to all instances matching the given attributes. """ + # field names => field sources + sources = [ + serializer.fields[field_name].source + for field_name in self.fields + ] + # If this is an update, then any unprovided field should # have it's value set based on the existing instance attribute. if serializer.instance is not None: - for field_name in self.fields: - if field_name not in attrs: - attrs[field_name] = getattr(serializer.instance, field_name) + for source in sources: + if source not in attrs: + attrs[source] = getattr(serializer.instance, source) # Determine the filter keyword arguments and filter the queryset. filter_kwargs = { - field_name: attrs[field_name] - for field_name in self.fields + source: attrs[source] + for source in sources } return qs_filter(queryset, **filter_kwargs) From c1529366a72f141d640c8f7fce8422838f5a5f20 Mon Sep 17 00:00:00 2001 From: Ryan P Kilby Date: Wed, 11 Dec 2019 04:52:35 -0800 Subject: [PATCH 3/5] Fix read-only+default+source handling --- rest_framework/serializers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index f5d9a50658..63fab3dc36 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -448,7 +448,7 @@ def _read_only_defaults(self): default = field.get_default() except SkipField: continue - defaults[field.field_name] = default + defaults[field.source] = default return defaults From 32c987517b1c037c5d21d61ed2b4beb51432d055 Mon Sep 17 00:00:00 2001 From: Ryan P Kilby Date: Wed, 11 Dec 2019 04:53:26 -0800 Subject: [PATCH 4/5] Update test to use functional serializer --- tests/test_validators.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tests/test_validators.py b/tests/test_validators.py index 3763d95d79..e61016c82a 100644 --- a/tests/test_validators.py +++ b/tests/test_validators.py @@ -391,13 +391,9 @@ class MockQueryset: def filter(self, **kwargs): self.called_with = kwargs - class MockSerializer: - def __init__(self, instance): - self.instance = instance - data = {'race_name': 'bar'} queryset = MockQueryset() - serializer = MockSerializer(instance=self.instance) + serializer = UniquenessTogetherSerializer(instance=self.instance) validator = UniqueTogetherValidator(queryset, fields=('race_name', 'position')) validator.filter_queryset(attrs=data, queryset=queryset, serializer=serializer) From 0c43371d891d79671fcfcda68678ac3575808537 Mon Sep 17 00:00:00 2001 From: Ryan P Kilby Date: Wed, 11 Dec 2019 22:10:13 -0800 Subject: [PATCH 5/5] Test UniqueTogetherValidator error+source --- tests/test_validators.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/test_validators.py b/tests/test_validators.py index e61016c82a..21c00073d6 100644 --- a/tests/test_validators.py +++ b/tests/test_validators.py @@ -335,6 +335,15 @@ class Meta: serializer = WriteableSerializer(data={'name': 'test', 'position': 1}) assert serializer.is_valid(raise_exception=True) + # Validation error should use seriazlier field name, not source + serializer = WriteableSerializer(data={'position': 1}) + assert not serializer.is_valid() + assert serializer.errors == { + 'name': [ + 'This field is required.' + ] + } + def test_allow_explict_override(self): """ Ensure validators can be explicitly removed..