encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-02-23 15:02:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed min/max attributes for serializers.ListField (#6866)

Browse Source
This commit is contained in:
Dima Knivets 2019-09-03 16:43:54 +03:00 committed by Carlton Gibson
parent f8c16441fa
commit 1cc4be47b4
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rest_framework/schemas/openapi.py
View File

@ -377,7 +377,7 @@ class AutoSchema(ViewInspector):
schema['default'] = field.default schema['default'] = field.default
if field.help_text: if field.help_text:
schema['description'] = str(field.help_text) schema['description'] = str(field.help_text)
self._map_field_validators(field.validators, schema) self._map_field_validators(field, schema)
properties[field.field_name] = schema properties[field.field_name] = schema
@ -389,13 +389,11 @@ class AutoSchema(ViewInspector):
return result return result
def _map_field_validators(self, validators, schema): def _map_field_validators(self, field, schema):
""" """
map field validators map field validators
:param list:validators: list of field validators
:param dict:schema: schema that the validators get added to
""" """
for v in validators: for v in field.validators:
# "Formats such as "email", "uuid", and so on, MAY be used even though undefined by this specification." # "Formats such as "email", "uuid", and so on, MAY be used even though undefined by this specification."
# https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#data-types # https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#data-types
if isinstance(v, EmailValidator): if isinstance(v, EmailValidator):
@ -405,9 +403,15 @@ class AutoSchema(ViewInspector):
if isinstance(v, RegexValidator): if isinstance(v, RegexValidator):
schema['pattern'] = v.regex.pattern schema['pattern'] = v.regex.pattern
elif isinstance(v, MaxLengthValidator): elif isinstance(v, MaxLengthValidator):
schema['maxLength'] = v.limit_value attr_name = 'maxLength'
if isinstance(field, serializers.ListField):
attr_name = 'maxItems'
schema[attr_name] = v.limit_value
elif isinstance(v, MinLengthValidator): elif isinstance(v, MinLengthValidator):
schema['minLength'] = v.limit_value attr_name = 'minLength'
if isinstance(field, serializers.ListField):
attr_name = 'minItems'
schema[attr_name] = v.limit_value
elif isinstance(v, MaxValueValidator): elif isinstance(v, MaxValueValidator):
schema['maximum'] = v.limit_value schema['maximum'] = v.limit_value
elif isinstance(v, MinValueValidator): elif isinstance(v, MinValueValidator):

3
tests/schemas/test_openapi.py
View File

@ -459,6 +459,9 @@ class TestOperationIntrospection(TestCase):
assert properties['string']['minLength'] == 2 assert properties['string']['minLength'] == 2
assert properties['string']['maxLength'] == 10 assert properties['string']['maxLength'] == 10
assert properties['lst']['minItems'] == 2
assert properties['lst']['maxItems'] == 10
assert properties['regex']['pattern'] == r'[ABC]12{3}' assert properties['regex']['pattern'] == r'[ABC]12{3}'
assert properties['regex']['description'] == 'must have an A, B, or C followed by 1222' assert properties['regex']['description'] == 'must have an A, B, or C followed by 1222'

6
tests/schemas/views.py
View File

@ -85,6 +85,12 @@ class ExampleValidatedSerializer(serializers.Serializer):
), ),
help_text='must have an A, B, or C followed by 1222' help_text='must have an A, B, or C followed by 1222'
) )
lst = serializers.ListField(
validators=(
MaxLengthValidator(limit_value=10),
MinLengthValidator(limit_value=2),
)
)
decimal1 = serializers.DecimalField(max_digits=6, decimal_places=2) decimal1 = serializers.DecimalField(max_digits=6, decimal_places=2)
decimal2 = serializers.DecimalField(max_digits=5, decimal_places=0, decimal2 = serializers.DecimalField(max_digits=5, decimal_places=0,
validators=(DecimalValidator(max_digits=17, decimal_places=4),)) validators=(DecimalValidator(max_digits=17, decimal_places=4),))