Merge pull request #149 from claradaia/filter-by-id

FIX Filtering by id and other fields with relay

Author: abawchen

graphene_mongo/fields.py

@@ -6,6 +6,7 @@
 import graphene
 import mongoengine
 from promise import Promise
+from graphql_relay import from_global_id
 from graphene.relay import ConnectionField
 from graphene.types.argument import to_arguments
 from graphene.types.dynamic import Dynamic
@@ -208,12 +209,12 @@ def default_resolver(self, _root, info, **args):
             "after": args.pop("after", None),
         }
 
-        _id = args.pop("id", None)
+        _id = args.pop('id', None)
 
         if _id is not None:
-            iterables = [get_node_from_global_id(self.node_type, info, _id)]
-            list_length = 1
-        elif callable(getattr(self.model, "objects", None)):
+            args['pk'] = from_global_id(_id)[-1]
+
+        if callable(getattr(self.model, "objects", None)):
             iterables = self.get_queryset(self.model, info, **args)
             list_length = iterables.count()
         else:

graphene_mongo/tests/test_relay_query.py

@@ -4,6 +4,7 @@
 import graphene
 
 from graphene.relay import Node
+from graphql_relay.node.node import to_global_id
 
 from . import models
 from . import nodes
@@ -1022,3 +1023,40 @@ class Query(graphene.ObjectType):
 
     assert not result.errors
     assert result.data == expected
+
+
+def test_should_filter_mongoengine_queryset_by_id_and_other_fields(fixtures):
+
+    class Query(graphene.ObjectType):
+        players = MongoengineConnectionField(nodes.PlayerNode)
+
+    larry = models.Player.objects.get(first_name="Larry")
+    larry_relay_id = to_global_id("PlayerNode", larry.id)
+
+    # "Larry" id && firstName == "Michael" should return nothing
+    query = """
+        query players {{
+            players(
+                id: "{larry_relay_id}",
+                firstName: "Michael"
+            ) {{
+                edges {{
+                    node {{
+                        id
+                        firstName
+                    }}
+                }}
+            }}
+        }}
+    """.format(larry_relay_id=larry_relay_id)
+
+    expected = {
+        'players': {
+            'edges': []
+        }
+    }
+    schema = graphene.Schema(query=Query)
+    result = schema.execute(query)
+
+    assert not result.errors
+    assert json.dumps(result.data, sort_keys=True) == json.dumps(expected, sort_keys=True)