Use PrimaryKeyRelatedField pkfield in openapi

wnd-ft · wnd-ft · commit cd65921fd228 · 2021-12-31T00:18:27.000+09:00
diff --git a/rest_framework/schemas/openapi.py b/rest_framework/schemas/openapi.py
@@ -385,6 +385,8 @@ def map_field(self, field):
                 'items': self.map_field(field.child_relation)
             }
         if isinstance(field, serializers.PrimaryKeyRelatedField):
+            if getattr(field, "pk_field", False):
+                return self.map_field(field=field.pk_field)
             model = getattr(field.queryset, 'model', None)
             if model is not None:
                 model_field = model._meta.pk
diff --git a/tests/schemas/test_openapi.py b/tests/schemas/test_openapi.py
@@ -19,6 +19,7 @@
 from rest_framework.schemas.openapi import AutoSchema, SchemaGenerator
 
 from . import views
+from ..models import BasicModel
 
 
 def create_request(path):
@@ -129,6 +130,22 @@ class Meta:
         assert data['properties']['ro_field']['nullable'], "ro_field nullable must be true"
         assert data['properties']['ro_field']['readOnly'], "ro_field read_only must be true"
 
+    def test_primary_key_related_field(self):
+        class PrimaryKeyRelatedFieldSerializer(serializers.Serializer):
+            basic = serializers.PrimaryKeyRelatedField(queryset=BasicModel.objects.all())
+            uuid = serializers.PrimaryKeyRelatedField(queryset=BasicModel.objects.all(),
+                                                      pk_field=serializers.UUIDField())
+            char = serializers.PrimaryKeyRelatedField(queryset=BasicModel.objects.all(),
+                                                      pk_field=serializers.CharField())
+
+        serializer = PrimaryKeyRelatedFieldSerializer()
+        inspector = AutoSchema()
+
+        data = inspector.map_serializer(serializer=serializer)
+        assert data['properties']['basic']['type'] == "integer"
+        assert data['properties']['uuid']['format'] == "uuid"
+        assert data['properties']['char']['type'] == "string"
+
 
 @pytest.mark.skipif(uritemplate is None, reason='uritemplate not installed.')
 class TestOperationIntrospection(TestCase):

Original file line number	Diff line number	Diff line change
`@@ -385,6 +385,8 @@ def map_field(self, field):`
`385`	`385`	`'items': self.map_field(field.child_relation)`
`386`	`386`	`}`
`387`	`387`	`if isinstance(field, serializers.PrimaryKeyRelatedField):`
	`388`	`+ if getattr(field, "pk_field", False):`
	`389`	`+ return self.map_field(field=field.pk_field)`
`388`	`390`	`model = getattr(field.queryset, 'model', None)`
`389`	`391`	`if model is not None:`
`390`	`392`	`model_field = model._meta.pk`