From be3e1287f2447d08cee692bacc93741f06f1185d Mon Sep 17 00:00:00 2001
From: Carlton Gibson <carlton.gibson@noumenal.es>
Date: Tue, 26 Mar 2019 21:11:16 +0100
Subject: [PATCH] Corrected filtering of read/write-only fields.

Closes #6534.
---
 rest_framework/schemas/inspectors.py |  5 +--
 tests/schemas/test_openapi.py        | 48 +++++++++++++++++++++++++++-
 2 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/rest_framework/schemas/inspectors.py b/rest_framework/schemas/inspectors.py
index fec5f75bc..f96be7c8a 100644
--- a/rest_framework/schemas/inspectors.py
+++ b/rest_framework/schemas/inspectors.py
@@ -719,7 +719,7 @@ class OpenAPIAutoSchema(ViewInspector):
         # No read_only fields for request.
         for name, schema in content['properties'].copy().items():
             if 'readOnly' in schema:
-                del content['properties']['name']
+                del content['properties'][name]
 
         return {
             'content': {ct: content for ct in self.content_types}
@@ -744,7 +744,8 @@ class OpenAPIAutoSchema(ViewInspector):
                 # No write_only fields for response.
                 for name, schema in content['properties'].copy().items():
                     if 'writeOnly' in schema:
-                        del content['properties']['name']
+                        del content['properties'][name]
+                        content['required'] = [f for f in content['required'] if f != name]
 
         return {
             '200': {
diff --git a/tests/schemas/test_openapi.py b/tests/schemas/test_openapi.py
index 2585def44..3e9dd0322 100644
--- a/tests/schemas/test_openapi.py
+++ b/tests/schemas/test_openapi.py
@@ -2,7 +2,7 @@ import pytest
 from django.conf.urls import url
 from django.test import RequestFactory, TestCase, override_settings
 
-from rest_framework import filters, pagination
+from rest_framework import filters, generics, pagination, serializers
 from rest_framework.compat import uritemplate
 from rest_framework.request import Request
 from rest_framework.schemas.generators import OpenAPISchemaGenerator
@@ -84,6 +84,52 @@ class TestOperationIntrospection(TestCase):
             },
         }]
 
+    def test_request_body(self):
+        path = '/'
+        method = 'POST'
+
+        class Serializer(serializers.Serializer):
+            text = serializers.CharField()
+            read_only = serializers.CharField(read_only=True)
+
+        class View(generics.GenericAPIView):
+            serializer_class = Serializer
+
+        view = create_view(
+            View,
+            method,
+            create_request(path)
+        )
+        inspector = OpenAPIAutoSchema()
+        inspector.view = view
+
+        request_body = inspector._get_request_body(path, method)
+        assert request_body['content']['application/json']['required'] == ['text']
+        assert list(request_body['content']['application/json']['properties'].keys()) == ['text']
+
+    def test_response_body_generation(self):
+        path = '/'
+        method = 'POST'
+
+        class Serializer(serializers.Serializer):
+            text = serializers.CharField()
+            write_only = serializers.CharField(write_only=True)
+
+        class View(generics.GenericAPIView):
+            serializer_class = Serializer
+
+        view = create_view(
+            View,
+            method,
+            create_request(path)
+        )
+        inspector = OpenAPIAutoSchema()
+        inspector.view = view
+
+        responses = inspector._get_responses(path, method)
+        assert responses['200']['content']['application/json']['required'] == ['text']
+        assert list(responses['200']['content']['application/json']['properties'].keys()) == ['text']
+
 
 @pytest.mark.skipif(uritemplate is None, reason='uritemplate not installed.')
 @override_settings(REST_FRAMEWORK={'DEFAULT_SCHEMA_CLASS': 'rest_framework.schemas.inspectors.OpenAPIAutoSchema'})