Skip to content

Commit 0a4a9b3

Browse files
committed
added message_key in UniqueTogetherValidator
1 parent 28d0261 commit 0a4a9b3

File tree

2 files changed

+29
-2
lines changed

2 files changed

+29
-2
lines changed

rest_framework/validators.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,11 @@ class UniqueTogetherValidator:
9999
missing_message = _('This field is required.')
100100
requires_context = True
101101

102-
def __init__(self, queryset, fields, message=None):
102+
def __init__(self, queryset, fields, message=None, message_key=None):
103103
self.queryset = queryset
104104
self.fields = fields
105105
self.message = message or self.message
106+
self.message_key = message_key
106107

107108
def enforce_required_fields(self, attrs, serializer):
108109
"""
@@ -176,7 +177,8 @@ def __call__(self, attrs, serializer):
176177
if checked_values and None not in checked_values and qs_exists(queryset):
177178
field_names = ', '.join(self.fields)
178179
message = self.message.format(field_names=field_names)
179-
raise ValidationError(message, code='unique')
180+
error_message = {self.message_key: message} if self.message_key else message
181+
raise ValidationError(error_message, code='unique')
180182

181183
def __repr__(self):
182184
return '<%s(queryset=%s, fields=%s)>' % (

tests/test_validators.py

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,31 @@ def test_is_not_unique_together(self):
222222
]
223223
}
224224

225+
def test_is_not_unique_together_with_message_key(self):
226+
"""
227+
Failing unique together validation should result in message_key errors.
228+
"""
229+
class ErrorMessageKeySerializer(serializers.ModelSerializer):
230+
class Meta:
231+
model = UniquenessTogetherModel
232+
fields = '__all__'
233+
validators = [
234+
UniqueTogetherValidator(
235+
queryset=UniquenessTogetherModel.objects.all(),
236+
fields=['race_name', 'position'],
237+
message_key='name'
238+
)
239+
]
240+
241+
data = {'race_name': 'example', 'position': 2}
242+
serializer = ErrorMessageKeySerializer(data=data)
243+
assert not serializer.is_valid()
244+
assert serializer.errors == {
245+
'name': [
246+
'The fields race_name, position must make a unique set.'
247+
]
248+
}
249+
225250
def test_is_unique_together(self):
226251
"""
227252
In a unique together validation, one field may be non-unique

0 commit comments

Comments
 (0)