Fix nested serializer schema rendering

Lucidiot · carltongibson · commit f74d3bf66e93 · 2019-05-13T09:16:17.000+02:00
Add a nested serializer test case
diff --git a/rest_framework/schemas/openapi.py b/rest_framework/schemas/openapi.py
@@ -214,10 +214,9 @@ def _map_field(self, field):
                 'items': self._map_serializer(field.child)
             }
         if isinstance(field, serializers.Serializer):
-            return {
-                'type': 'object',
-                'properties': self._map_serializer(field)
-            }
+            data = self._map_serializer(field)
+            data['type'] = 'object'
+            return data
 
         # Related fields.
         if isinstance(field, serializers.ManyRelatedField):
diff --git a/tests/schemas/test_openapi.py b/tests/schemas/test_openapi.py
@@ -130,6 +130,36 @@ class View(generics.GenericAPIView):
         assert responses['200']['content']['application/json']['schema']['required'] == ['text']
         assert list(responses['200']['content']['application/json']['schema']['properties'].keys()) == ['text']
 
+    def test_response_body_nested_serializer(self):
+        path = '/'
+        method = 'POST'
+
+        class NestedSerializer(serializers.Serializer):
+            number = serializers.IntegerField()
+
+        class Serializer(serializers.Serializer):
+            text = serializers.CharField()
+            nested = NestedSerializer()
+
+        class View(generics.GenericAPIView):
+            serializer_class = Serializer
+
+        view = create_view(
+            View,
+            method,
+            create_request(path),
+        )
+        inspector = AutoSchema()
+        inspector.view = view
+
+        responses = inspector._get_responses(path, method)
+        schema = responses['200']['content']['application/json']['schema']
+        assert sorted(schema['required']) == ['nested', 'text']
+        assert sorted(list(schema['properties'].keys())) == ['nested', 'text']
+        assert schema['properties']['nested']['type'] == 'object'
+        assert list(schema['properties']['nested']['properties'].keys()) == ['number']
+        assert schema['properties']['nested']['required'] == ['number']
+
 
 @pytest.mark.skipif(uritemplate is None, reason='uritemplate not installed.')
 @override_settings(REST_FRAMEWORK={'DEFAULT_SCHEMA_CLASS': 'rest_framework.schemas.openapi.AutoSchema'})
