mirror of
https://github.com/encode/django-rest-framework.git
synced 2025-08-01 11:00:13 +03:00
Rename & refactor UniqueForXValidator utility
This commit is contained in:
parent
8547dbcbc5
commit
553b1161f3
|
@ -215,16 +215,19 @@ class BaseUniqueForValidator(object):
|
||||||
if missing_items:
|
if missing_items:
|
||||||
raise ValidationError(missing_items, code='required')
|
raise ValidationError(missing_items, code='required')
|
||||||
|
|
||||||
def _get_field_values(self, attrs):
|
def get_value_and_date(self, attrs):
|
||||||
"""Returns tuple (value, date_value) from attrs or instance"""
|
"""Returns tuple (value, date) from attrs or instance"""
|
||||||
value = attrs.get(self.field)
|
instance = getattr(self, "instance", None)
|
||||||
date_value = attrs.get(self.date_field)
|
if instance is not None:
|
||||||
if hasattr(self, "instance") and self.instance is not None:
|
instance_value = getattr(instance, self.field)
|
||||||
if value is None:
|
instance_date = getattr(instance, self.date_field)
|
||||||
value = getattr(self.instance, self.field)
|
value = attrs.get(self.field, instance_value)
|
||||||
if date_value is None:
|
date = attrs.get(self.date_field, instance_date)
|
||||||
date_value = getattr(self.instance, self.date_field)
|
else:
|
||||||
return (value, date_value)
|
value = attrs[self.field]
|
||||||
|
date = attrs[self.date_field]
|
||||||
|
|
||||||
|
return (value, date)
|
||||||
|
|
||||||
def filter_queryset(self, attrs, queryset):
|
def filter_queryset(self, attrs, queryset):
|
||||||
raise NotImplementedError('`filter_queryset` must be implemented.')
|
raise NotImplementedError('`filter_queryset` must be implemented.')
|
||||||
|
@ -262,7 +265,7 @@ class UniqueForDateValidator(BaseUniqueForValidator):
|
||||||
message = _('This field must be unique for the "{date_field}" date.')
|
message = _('This field must be unique for the "{date_field}" date.')
|
||||||
|
|
||||||
def filter_queryset(self, attrs, queryset):
|
def filter_queryset(self, attrs, queryset):
|
||||||
value, date = self._get_field_values(attrs)
|
value, date = self.get_value_and_date(attrs)
|
||||||
|
|
||||||
filter_kwargs = {}
|
filter_kwargs = {}
|
||||||
filter_kwargs[self.field_name] = value
|
filter_kwargs[self.field_name] = value
|
||||||
|
@ -276,7 +279,7 @@ class UniqueForMonthValidator(BaseUniqueForValidator):
|
||||||
message = _('This field must be unique for the "{date_field}" month.')
|
message = _('This field must be unique for the "{date_field}" month.')
|
||||||
|
|
||||||
def filter_queryset(self, attrs, queryset):
|
def filter_queryset(self, attrs, queryset):
|
||||||
value, date = self._get_field_values(attrs)
|
value, date = self.get_value_and_date(attrs)
|
||||||
|
|
||||||
filter_kwargs = {}
|
filter_kwargs = {}
|
||||||
filter_kwargs[self.field_name] = value
|
filter_kwargs[self.field_name] = value
|
||||||
|
@ -288,7 +291,7 @@ class UniqueForYearValidator(BaseUniqueForValidator):
|
||||||
message = _('This field must be unique for the "{date_field}" year.')
|
message = _('This field must be unique for the "{date_field}" year.')
|
||||||
|
|
||||||
def filter_queryset(self, attrs, queryset):
|
def filter_queryset(self, attrs, queryset):
|
||||||
value, date = self._get_field_values(attrs)
|
value, date = self.get_value_and_date(attrs)
|
||||||
|
|
||||||
filter_kwargs = {}
|
filter_kwargs = {}
|
||||||
filter_kwargs[self.field_name] = value
|
filter_kwargs[self.field_name] = value
|
||||||
|
|
Loading…
Reference in New Issue
Block a user