mirror of
https://github.com/encode/django-rest-framework.git
synced 2025-07-16 19:22:24 +03:00
added message_key in UniqueTogetherValidator
This commit is contained in:
parent
28d0261afc
commit
0a4a9b30e2
|
@ -99,10 +99,11 @@ class UniqueTogetherValidator:
|
||||||
missing_message = _('This field is required.')
|
missing_message = _('This field is required.')
|
||||||
requires_context = True
|
requires_context = True
|
||||||
|
|
||||||
def __init__(self, queryset, fields, message=None):
|
def __init__(self, queryset, fields, message=None, message_key=None):
|
||||||
self.queryset = queryset
|
self.queryset = queryset
|
||||||
self.fields = fields
|
self.fields = fields
|
||||||
self.message = message or self.message
|
self.message = message or self.message
|
||||||
|
self.message_key = message_key
|
||||||
|
|
||||||
def enforce_required_fields(self, attrs, serializer):
|
def enforce_required_fields(self, attrs, serializer):
|
||||||
"""
|
"""
|
||||||
|
@ -176,7 +177,8 @@ class UniqueTogetherValidator:
|
||||||
if checked_values and None not in checked_values and qs_exists(queryset):
|
if checked_values and None not in checked_values and qs_exists(queryset):
|
||||||
field_names = ', '.join(self.fields)
|
field_names = ', '.join(self.fields)
|
||||||
message = self.message.format(field_names=field_names)
|
message = self.message.format(field_names=field_names)
|
||||||
raise ValidationError(message, code='unique')
|
error_message = {self.message_key: message} if self.message_key else message
|
||||||
|
raise ValidationError(error_message, code='unique')
|
||||||
|
|
||||||
def __repr__(self):
|
def __repr__(self):
|
||||||
return '<%s(queryset=%s, fields=%s)>' % (
|
return '<%s(queryset=%s, fields=%s)>' % (
|
||||||
|
|
|
@ -222,6 +222,31 @@ class TestUniquenessTogetherValidation(TestCase):
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
def test_is_not_unique_together_with_message_key(self):
|
||||||
|
"""
|
||||||
|
Failing unique together validation should result in message_key errors.
|
||||||
|
"""
|
||||||
|
class ErrorMessageKeySerializer(serializers.ModelSerializer):
|
||||||
|
class Meta:
|
||||||
|
model = UniquenessTogetherModel
|
||||||
|
fields = '__all__'
|
||||||
|
validators = [
|
||||||
|
UniqueTogetherValidator(
|
||||||
|
queryset=UniquenessTogetherModel.objects.all(),
|
||||||
|
fields=['race_name', 'position'],
|
||||||
|
message_key='name'
|
||||||
|
)
|
||||||
|
]
|
||||||
|
|
||||||
|
data = {'race_name': 'example', 'position': 2}
|
||||||
|
serializer = ErrorMessageKeySerializer(data=data)
|
||||||
|
assert not serializer.is_valid()
|
||||||
|
assert serializer.errors == {
|
||||||
|
'name': [
|
||||||
|
'The fields race_name, position must make a unique set.'
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
def test_is_unique_together(self):
|
def test_is_unique_together(self):
|
||||||
"""
|
"""
|
||||||
In a unique together validation, one field may be non-unique
|
In a unique together validation, one field may be non-unique
|
||||||
|
|
Loading…
Reference in New Issue
Block a user