Added basic custom query filters

Author: eduarde

graphene_mongo/fields.py

@@ -59,7 +59,7 @@ def registry(self):
     def args(self):
         return to_arguments(
             self._base_args or OrderedDict(),
-            dict(self.field_args, **self.reference_args)
+            dict(dict(self.field_args, **self.reference_args), **self.filter_args)
         )
 
     @args.setter
@@ -86,10 +86,9 @@ def is_filterable(k):
                 return False
             if isinstance(converted, (ConnectionField, Dynamic)):
                 return False
-            if callable(getattr(converted, 'type', None)) \
-                    and isinstance(
-                        converted.type(),
-                        (FileFieldType, PointFieldType, MultiPolygonFieldType, graphene.Union)):
+            if callable(getattr(converted, 'type', None)) and isinstance(converted.type(),
+                                                                         (FileFieldType, PointFieldType,
+                                                                          MultiPolygonFieldType, graphene.Union)):
                 return False
             return True
 
@@ -104,6 +103,17 @@ def get_type(v):
     def field_args(self):
         return self._field_args(self.fields.items())
 
+    @property
+    def filter_args(self):
+        filter_args = dict()
+        if self._type._meta.filter_fields:
+            for field, filter_collection in self._type._meta.filter_fields.items():
+                for each in filter_collection:
+                    filter_args[field + "__" + each] = graphene.Argument(
+                        type=getattr(graphene, str(self._type._meta.fields[field].type).replace("!", "")))
+
+        return filter_args
+
     @property
     def reference_args(self):
 
@@ -178,12 +188,10 @@ def default_resolver(self, _root, info, **args):
         connection.list_length = list_length
         return connection
 
-    def chained_resolver(self, resolver, is_partial, root, info, **args):
-        if not bool(args) or not is_partial:
-            # XXX: Filter nested args
-            resolved = resolver(root, info, **args)
-            if resolved is not None:
-                return resolved
+    def chained_resolver(self, resolver, root, info, **args):
+        resolved = resolver(root, info, **args)
+        if resolved is not None:
+            return resolved
         return self.default_resolver(root, info, **args)
 
     @classmethod
@@ -201,5 +209,5 @@ def connection_resolver(cls, resolver, connection_type, root, info, **args):
     def get_resolver(self, parent_resolver):
         super_resolver = self.resolver or parent_resolver
         resolver = partial(
-            self.chained_resolver, super_resolver, isinstance(super_resolver, partial))
+            self.chained_resolver, super_resolver)
         return partial(self.connection_resolver, resolver, self.type)

graphene_mongo/tests/nodes.py

@@ -42,6 +42,8 @@ class PlayerNode(MongoengineObjectType):
     class Meta:
         model = models.Player
         interfaces = (Node, )
+        filter_fields = {
+            'first_name': ['istartswith']}
 
 
 class ReporterNode(MongoengineObjectType):

graphene_mongo/tests/test_converter.py

@@ -330,3 +330,4 @@ 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)

graphene_mongo/tests/test_relay_query.py

@@ -1,7 +1,7 @@
-import base64
 import os
+import json
 import pytest
-
+import base64
 import graphene
 
 from graphene.relay import Node
@@ -1038,3 +1038,43 @@ class Query(graphene.ObjectType):
     result = schema.execute(query)
     assert not result.errors
     assert result.data == expected
+
+
+def test_should_filter_mongoengine_queryset(fixtures):
+
+    class Query(graphene.ObjectType):
+        players = MongoengineConnectionField(nodes.PlayerNode)
+
+    query = '''
+        query players {
+            players(firstName_Istartswith: "M") {
+                edges {
+                    node {
+                        firstName
+                    }
+                }
+            }
+        }
+    '''
+    expected = {
+        'players': {
+            'edges': [
+                {
+                    'node': {
+                        'firstName': 'Michael',
+                    }
+                },
+                {
+                    'node': {
+                        'firstName': 'Magic'
+                    }
+                }
+            ]
+        }
+    }
+    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)
+

requirements.txt

@@ -7,6 +7,6 @@ iso8601==0.1.12
 mongoengine==0.16.3
 mongomock==3.14.0
 pymongo==3.6.1
-pytest==3.3.2
+pytest==5.0.1
 pytest-cov==2.5.1
 singledispatch==3.4.0.3