Fix DateField and DateTimeField type in OpenAPI schemas.

Author: dongfangtianyu

rest_framework/schemas/openapi.py

@@ -254,14 +254,26 @@ def _map_field(self, field):
                 'type': 'array',
             }
 
+        # DateField and DateTimeField type is string
+        if isinstance(field, serializers.DateField):
+            return {
+                'type': 'string',
+                'format': 'date',
+            }
+
+        if isinstance(field, serializers.DateTimeField):
+            return {
+                'type': 'string',
+                'format': 'date-time',
+            }
+
         # Simplest cases, default to 'string' type:
         FIELD_CLASS_SCHEMA_TYPE = {
             serializers.BooleanField: 'boolean',
             serializers.DecimalField: 'number',
             serializers.FloatField: 'number',
             serializers.IntegerField: 'integer',
-            serializers.DateField: 'date',
-            serializers.DateTimeField: 'date-time',
+
             serializers.JSONField: 'object',
             serializers.DictField: 'object',
         }

tests/schemas/test_openapi.py

@@ -196,3 +196,20 @@ def test_schema_construction(self):
 
         assert 'openapi' in schema
         assert 'paths' in schema
+
+    def test_serializer_datefield(self):
+        patterns = [
+            url(r'^example/?$', views.ExampleGenericViewSet.as_view({"get": "get"})),
+        ]
+        generator = SchemaGenerator(patterns=patterns)
+
+        request = create_request('/')
+        schema = generator.get_schema(request=request)
+
+        response = schema['paths']['/example/']['get']['responses']
+        response_schema = response['200']['content']['application/json']['schema']['properties']
+
+        assert response_schema['date']['type'] == response_schema['datetime']['type'] == 'string'
+
+        assert response_schema['date']['format'] == 'date'
+        assert response_schema['datetime']['format'] == 'date-time'

tests/schemas/views.py

@@ -1,5 +1,7 @@
-from rest_framework import permissions
+from rest_framework import permissions, serializers
+from rest_framework.response import Response
 from rest_framework.views import APIView
+from rest_framework.viewsets import GenericViewSet
 
 
 class ExampleListView(APIView):
@@ -17,3 +19,18 @@ class ExampleDetailView(APIView):
 
     def get(self, *args, **kwargs):
         pass
+
+
+class ExampleGenericViewSet(GenericViewSet):
+    class ExampleSerializer(serializers.Serializer):
+        date = serializers.DateField()
+        datetime = serializers.DateTimeField()
+
+    serializer_class = ExampleSerializer
+
+    def get(self, *args, **kwargs):
+        from datetime import datetime
+        now = datetime.now()
+
+        serializer = self.get_serializer(data=now.date(), datetime=now)
+        return Response(serializer.data)