Fixed crash deleting required schema parameter key on PATCH requests. (#6944)

guimunarolo · carltongibson · commit 0fd72f17ee18 · 2019-10-10T08:50:20.000+02:00
Closes #6941
diff --git a/rest_framework/schemas/openapi.py b/rest_framework/schemas/openapi.py
@@ -387,7 +387,7 @@ def _map_serializer(self, serializer):
         result = {
             'properties': properties
         }
-        if len(required) > 0:
+        if required:
             result['required'] = required
 
         return result
@@ -463,7 +463,7 @@ def _get_request_body(self, path, method):
         content = self._map_serializer(serializer)
         # No required fields for PATCH
         if method == 'PATCH':
-            del content['required']
+            content.pop('required', None)
         # No read_only fields for request.
         for name, schema in content['properties'].copy().items():
             if 'readOnly' in schema:
diff --git a/tests/schemas/test_openapi.py b/tests/schemas/test_openapi.py
@@ -169,6 +169,31 @@ class View(generics.GenericAPIView):
         for response in inspector._get_responses(path, method).values():
             assert 'required' not in response['content']['application/json']['schema']
 
+    def test_empty_required_with_patch_method(self):
+        path = '/'
+        method = 'PATCH'
+
+        class Serializer(serializers.Serializer):
+            read_only = serializers.CharField(read_only=True)
+            write_only = serializers.CharField(write_only=True, required=False)
+
+        class View(generics.GenericAPIView):
+            serializer_class = Serializer
+
+        view = create_view(
+            View,
+            method,
+            create_request(path)
+        )
+        inspector = AutoSchema()
+        inspector.view = view
+
+        request_body = inspector._get_request_body(path, method)
+        # there should be no empty 'required' property, see #6834
+        assert 'required' not in request_body['content']['application/json']['schema']
+        for response in inspector._get_responses(path, method).values():
+            assert 'required' not in response['content']['application/json']['schema']
+
     def test_response_body_generation(self):
         path = '/'
         method = 'POST'
