Implemented NonNull if fields are marked as required in db for Generic Reference fields [Union Type]

Author: arunsureshkumar

graphene_mongo/converter.py

@@ -244,7 +244,7 @@ def reference_resolver(root, *args, **kwargs):
             if resolver_function and callable(resolver_function):
                 field_resolver = resolver_function
         return graphene.Field(_union, resolver=field_resolver if field_resolver else reference_resolver,
-                              description=get_field_description(field, registry))
+                              description=get_field_description(field, registry), required=required)
 
     return graphene.Field(_union)
 

graphene_mongo/fields.py

@@ -119,11 +119,13 @@ def is_filterable(k):
                     ),
             ):
                 return False
+            if getattr(converted, "type", None) and getattr(converted.type, "_of_type", None) and issubclass(
+                    (get_type(converted.type.of_type)), graphene.Union):
+                return False
             if isinstance(converted, (graphene.List)) and issubclass(
                     getattr(converted, "_of_type", None), graphene.Union
             ):
                 return False
-
             return True
 
         def get_filter_type(_type):
@@ -183,6 +185,7 @@ def get_reference_field(r, kv):
                             node.model, (mongoengine.EmbeddedDocument,)
                     ):
                         r.update({kv[0]: node.fields["id"]._type.of_type()})
+
             return r
 
         return reduce(get_reference_field, self.fields.items(), {})

graphene_mongo/tests/models.py

@@ -6,11 +6,12 @@
 mongoengine.connect(
     "graphene-mongo-test", host="mongomock://localhost", alias="default"
 )
+
+
 # mongoengine.connect('graphene-mongo-test', host='mongodb://localhost/graphene-mongo-dev')
 
 
 class Publisher(mongoengine.Document):
-
     meta = {"collection": "test_publisher"}
     name = mongoengine.StringField()
 
@@ -42,7 +43,6 @@ class Editor(mongoengine.Document):
 
 
 class Article(mongoengine.Document):
-
     meta = {"collection": "test_article"}
     headline = mongoengine.StringField(required=True, help_text="The article headline.")
     pub_date = mongoengine.DateTimeField(
@@ -58,7 +58,6 @@ class Article(mongoengine.Document):
 
 
 class EmbeddedArticle(mongoengine.EmbeddedDocument):
-
     meta = {"collection": "test_embedded_article"}
     headline = mongoengine.StringField(required=True)
     pub_date = mongoengine.DateTimeField(default=datetime.now)
@@ -72,7 +71,6 @@ class EmbeddedFoo(mongoengine.EmbeddedDocument):
 
 
 class Reporter(mongoengine.Document):
-
     meta = {"collection": "test_reporter"}
     id = mongoengine.StringField(primary_key=True)
     first_name = mongoengine.StringField(required=True)
@@ -84,7 +82,7 @@ class Reporter(mongoengine.Document):
         mongoengine.EmbeddedDocumentField(EmbeddedArticle)
     )
     embedded_list_articles = mongoengine.EmbeddedDocumentListField(EmbeddedArticle)
-    generic_reference = mongoengine.GenericReferenceField(choices=[Article, Editor])
+    generic_reference = mongoengine.GenericReferenceField(choices=[Article, Editor], required=True)
     generic_embedded_document = mongoengine.GenericEmbeddedDocumentField(
         choices=[EmbeddedArticle, EmbeddedFoo]
     )
@@ -94,7 +92,6 @@ class Reporter(mongoengine.Document):
 
 
 class Player(mongoengine.Document):
-
     meta = {"collection": "test_player"}
     first_name = mongoengine.StringField(required=True)
     last_name = mongoengine.StringField(required=True)
@@ -105,29 +102,25 @@ class Player(mongoengine.Document):
 
 
 class Parent(mongoengine.Document):
-
     meta = {"collection": "test_parent", "allow_inheritance": True}
     bar = mongoengine.StringField()
     loc = mongoengine.MultiPolygonField()
 
 
 class CellTower(mongoengine.Document):
-
     meta = {"collection": "test_cell_tower"}
     code = mongoengine.StringField()
     base = mongoengine.PolygonField()
     coverage_area = mongoengine.MultiPolygonField()
 
 
 class Child(Parent):
-
     meta = {"collection": "test_child"}
     baz = mongoengine.StringField()
     loc = mongoengine.PointField()
 
 
 class ProfessorMetadata(mongoengine.EmbeddedDocument):
-
     meta = {"collection": "test_professor_metadata"}
     id = mongoengine.StringField(primary_key=False)
     first_name = mongoengine.StringField()
@@ -136,14 +129,12 @@ class ProfessorMetadata(mongoengine.EmbeddedDocument):
 
 
 class ProfessorVector(mongoengine.Document):
-
     meta = {"collection": "test_professor_vector"}
     vec = mongoengine.ListField(mongoengine.FloatField())
     metadata = mongoengine.EmbeddedDocumentField(ProfessorMetadata)
 
 
 class ParentWithRelationship(mongoengine.Document):
-
     meta = {"collection": "test_parent_reference"}
     before_child = mongoengine.ListField(
         mongoengine.ReferenceField("ChildRegisteredBefore")
@@ -155,14 +146,12 @@ class ParentWithRelationship(mongoengine.Document):
 
 
 class ChildRegisteredBefore(mongoengine.Document):
-
     meta = {"collection": "test_child_before_reference"}
     parent = mongoengine.ReferenceField(ParentWithRelationship)
     name = mongoengine.StringField()
 
 
 class ChildRegisteredAfter(mongoengine.Document):
-
     meta = {"collection": "test_child_after_reference"}
     parent = mongoengine.ReferenceField(ParentWithRelationship)
     name = mongoengine.StringField()

graphene_mongo/tests/test_converter.py

@@ -305,8 +305,8 @@ class Meta:
         Article._fields["pub_date"], A._meta.registry
     )
     assert (
-        pubDate_field.kwargs["description"]
-        == "Publication Date\nThe date of first press."
+            pubDate_field.kwargs["description"]
+            == "Publication Date\nThe date of first press."
     )
 
     firstName_field = convert_mongoengine_field(
@@ -352,8 +352,12 @@ class Meta:
         Reporter._fields["generic_reference"], registry.get_global_registry()
     )
     assert isinstance(generic_reference_field, graphene.Field)
-    assert isinstance(generic_reference_field.type(), graphene.Union)
-    assert generic_reference_field.type()._meta.types == (A, E)
+    if not Reporter._fields["generic_reference"].required:
+        assert isinstance(generic_reference_field.type(), graphene.Union)
+        assert generic_reference_field.type()._meta.types == (A, E)
+    else:
+        assert issubclass(generic_reference_field.type.of_type, graphene.Union)
+        assert generic_reference_field.type.of_type._meta.types == (A, E)
 
 
 def test_should_generic_embedded_document_convert_union():

graphene_mongo/tests/test_relay_query.py

@@ -455,6 +455,7 @@ class Query(graphene.ObjectType):
         }
     }
     schema = graphene.Schema(query=Query)
+    print(schema)
     result = schema.execute(query)
     assert not result.errors
     assert result.data == expected