Merge branch 'bug-fix-feat-retrieving-queried-fields-only' into support-point-field-in-args

Author: arunsureshkumar

graphene_mongo/converter.py

@@ -257,7 +257,7 @@ def reference_resolver(root, *args, **kwargs):
                 return document.objects().no_dereference().only(*list(
                     set(list(_type._meta.required_fields) + queried_fields))).get(
                     pk=de_referenced["_ref"].id)
-            return document
+            return document()
         return None
 
     def lazy_reference_resolver(root, *args, **kwargs):

graphene_mongo/fields.py

@@ -241,7 +241,6 @@ def get_queryset(self, model, info, required_fields=list(), skip=None, limit=Non
                 args.update(queryset_or_filters)
         if limit is not None:
             if reversed:
-                order_by = ""
                 if self.order_by:
                     order_by = self.order_by + ",-pk"
                 else:
@@ -253,7 +252,6 @@ def get_queryset(self, model, info, required_fields=list(), skip=None, limit=Non
                     skip if skip else 0).limit(limit)
         elif skip is not None:
             if reversed:
-                order_by = ""
                 if self.order_by:
                     order_by = self.order_by + ",-pk"
                 else:
@@ -269,10 +267,13 @@ def default_resolver(self, _root, info, required_fields=list(), **args):
         args = args or {}
         if _root is not None:
             field_name = to_snake_case(info.field_name)
-            if field_name in _root._fields_ordered and not (isinstance(_root._fields[field_name].field,
-                                                                       mongoengine.EmbeddedDocumentField) or
-                                                            isinstance(_root._fields[field_name].field,
-                                                                       mongoengine.GenericEmbeddedDocumentField)):
+            if not hasattr(_root, "_fields_ordered"):
+                if getattr(_root, field_name, []) is not None:
+                    args["pk__in"] = [r.id for r in getattr(_root, field_name, [])]
+            elif field_name in _root._fields_ordered and not (isinstance(_root._fields[field_name].field,
+                                                                         mongoengine.EmbeddedDocumentField) or
+                                                              isinstance(_root._fields[field_name].field,
+                                                                         mongoengine.GenericEmbeddedDocumentField)):
                 if getattr(_root, field_name, []) is not None:
                     args["pk__in"] = [r.id for r in getattr(_root, field_name, [])]