encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-07-28 17:09:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix boolean case

Browse Source
This commit is contained in:
Dhaval Mehta 2020-01-25 18:54:08 +05:30
parent 0a6322e7d5
commit 96119603e4
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rest_framework/schemas/openapi.py
View File

@ -214,11 +214,7 @@ class AutoSchema(ViewInspector):
def _map_choicefield(self, field): def _map_choicefield(self, field):
choices = list(field.choices) choices = list(field.choices)
if all(isinstance(choice, bool) for choice in choices): if all(isinstance(choice, bool) for choice in choices):
# Here we can not use `boolean` as type because choicefield expects `True` and `False` which is different type = 'boolean'
# from the `true` and `false` of OpenAPI Specification.
# Ref: https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#format
type = 'string'
choices = list(map(lambda choice: str(choice), choices))
elif all(isinstance(choice, int) for choice in choices): elif all(isinstance(choice, int) for choice in choices):
type = 'integer' type = 'integer'
elif all(isinstance(choice, (int, float, Decimal)) for choice in choices): # `number` includes `integer` elif all(isinstance(choice, (int, float, Decimal)) for choice in choices): # `number` includes `integer`

2
tests/schemas/test_openapi.py
View File

@ -63,7 +63,7 @@ class TestFieldMapping(TestCase):
(serializers.ListField(child=serializers.ChoiceField(choices=[(1.1, 'First'), (2.2, 'Second')])), (serializers.ListField(child=serializers.ChoiceField(choices=[(1.1, 'First'), (2.2, 'Second')])),
{'items': {'enum': [1.1, 2.2], 'type': 'number'}, 'type': 'array'}), {'items': {'enum': [1.1, 2.2], 'type': 'number'}, 'type': 'array'}),
(serializers.ListField(child=serializers.ChoiceField(choices=[(True, 'true'), (False, 'false')])), (serializers.ListField(child=serializers.ChoiceField(choices=[(True, 'true'), (False, 'false')])),
{'items': {'enum': ['True', 'False'], 'type': 'string'}, 'type': 'array'}), {'items': {'enum': [True, False], 'type': 'boolean'}, 'type': 'array'}),
(serializers.ListField(child=serializers.ChoiceField(choices=[(uuid1, 'uuid1'), (uuid2, 'uuid2')])), (serializers.ListField(child=serializers.ChoiceField(choices=[(uuid1, 'uuid1'), (uuid2, 'uuid2')])),
{'items': {'enum': [uuid1, uuid2]}, 'type': 'array'}), {'items': {'enum': [uuid1, uuid2]}, 'type': 'array'}),
(serializers.ListField(child=serializers.ChoiceField(choices=[(1, 'One'), ('a', 'Choice A')])), (serializers.ListField(child=serializers.ChoiceField(choices=[(1, 'One'), ('a', 'Choice A')])),