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

Bug fixed in queryset reference args

Author: arunsureshkumar

graphene_mongo/converter.py

@@ -237,12 +237,14 @@ def reference_resolver(root, *args, **kwargs):
 
     if isinstance(field, mongoengine.GenericReferenceField):
         field_resolver = None
+        required = False
         if field.db_field is not None:
+            required = field.required
             resolver_function = getattr(_union, "resolve_" + field.db_field, None)
             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)
 
@@ -281,16 +283,18 @@ def dynamic_type():
             return graphene.Field(_type,
                                   description=get_field_description(field, registry))
         field_resolver = None
+        required = False
         if field.db_field is not None:
+            required = field.required
             resolver_function = getattr(_type, "resolve_" + field.db_field, None)
             if resolver_function and callable(resolver_function):
                 field_resolver = resolver_function
         if isinstance(field, mongoengine.ReferenceField):
             return graphene.Field(_type, resolver=field_resolver if field_resolver else reference_resolver,
-                                  description=get_field_description(field, registry))
+                                  description=get_field_description(field, registry), required=required)
         else:
-            return graphene.Field(_type, resolver=field_resolver if field_resolver else cached_reference_resolver(),
-                                  description=get_field_description(field, registry))
+            return graphene.Field(_type, resolver=field_resolver if field_resolver else cached_reference_resolver,
+                                  description=get_field_description(field, registry), required=required)
 
     return graphene.Dynamic(dynamic_type)
 
@@ -314,14 +318,16 @@ def dynamic_type():
         if not _type:
             return None
         field_resolver = None
+        required = False
         if field.db_field is not None:
+            required = field.required
             resolver_function = getattr(_type, "resolve_" + field.db_field, None)
             if resolver_function and callable(resolver_function):
                 field_resolver = resolver_function
         return graphene.Field(
             _type,
             resolver=field_resolver if field_resolver else lazy_resolver,
-            description=get_field_description(field, registry),
+            description=get_field_description(field, registry), required=required,
         )
 
     return graphene.Dynamic(dynamic_type)

graphene_mongo/fields.py

@@ -117,6 +117,9 @@ 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
             ):
@@ -176,7 +179,7 @@ def get_reference_field(r, kv):
             if callable(getattr(field, "get_type", None)):
                 _type = field.get_type()
                 if _type:
-                    node = _type._type._meta
+                    node = _type.type._meta if hasattr(_type.type, "_meta") else _type.type._of_type._meta
                     if "id" in node.fields and not issubclass(
                             node.model, (mongoengine.EmbeddedDocument,)
                     ):
@@ -195,7 +198,7 @@ def get_queryset(self, model, info, required_fields=list(), **args):
             reference_fields = get_model_reference_fields(self.model)
             hydrated_references = {}
             for arg_name, arg in args.copy().items():
-                if arg_name in reference_fields:
+                if arg_name in reference_fields and isinstance(arg, str):
                     reference_obj = get_node_from_global_id(
                         reference_fields[arg_name], info, args.pop(arg_name)
                     )

graphene_mongo/tests/models.py

@@ -84,7 +84,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]
     )

graphene_mongo/tests/test_converter.py

@@ -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/types.py

@@ -13,7 +13,7 @@
 from .utils import get_model_fields, is_valid_mongoengine_model, get_query_fields
 
 
-def construct_fields(model, registry, required_fields, exclude_fields):
+def construct_fields(model, registry, only_fields, exclude_fields):
     """
     Args:
         model (mongoengine.Document):
@@ -29,7 +29,7 @@ def construct_fields(model, registry, required_fields, exclude_fields):
     fields = OrderedDict()
     self_referenced = OrderedDict()
     for name, field in _model_fields.items():
-        is_not_in_only = required_fields and name not in required_fields
+        is_not_in_only = only_fields and name not in only_fields
         is_excluded = name in exclude_fields
         if is_not_in_only or is_excluded:
             # We skip this field if we specify required_fields and is not