Unifiy OneToOne Rel

Author: Sebastian Hernandez

graphene_django/converter.py

@@ -289,6 +289,7 @@ def dynamic_type():
 
 @convert_django_field.register(models.OneToOneField)
 @convert_django_field.register(models.ForeignKey)
+@convert_django_field.register(models.OneToOneRel)
 def convert_field_to_djangomodel(field, registry=None):
     model = field.related_model
 
@@ -297,9 +298,14 @@ def dynamic_type():
         if not _type:
             return
 
+        if isinstance(field, models.OneToOneRel):
+            description = get_django_field_description(field.field)
+        else:
+            description = get_django_field_description(field)
+
         return DjangoInstanceField(
             _type,
-            description=get_django_field_description(field),
+            description=description,
             required=not field.null,
             is_foreign_key=True,
         )

graphene_django/fields.py

@@ -297,7 +297,15 @@ def instance_resolver(
         queryset = None
         unique_filter = {}
         if is_foreign_key:
-            pk = getattr(root, "{}_id".format(info.field_name))
+            pk_name = "{}_id".format(info.field_name)
+            pk = None
+            if hasattr(root, pk_name):
+                pk = getattr(root, pk_name)
+            else:
+                fk_obj = getattr(root, info.field_name)
+                if fk_obj:
+                    pk = fk_obj.pk
+
             if pk is not None:
                 unique_filter["pk"] = pk
                 unique_fields = ()