Fix filtering with a resolver and DjangoFilter filter.

Author: Niall

graphene_django/fields.py

@@ -54,7 +54,7 @@ def connection_resolver(resolver, connection, default_manager, root, args, conte
         iterable = maybe_queryset(iterable)
         if isinstance(iterable, QuerySet):
             if iterable is not default_manager:
-                iterable &= maybe_queryset(default_manager)
+                iterable = maybe_queryset(default_manager)
             _len = iterable.count()
         else:
             _len = len(iterable)

graphene_django/tests/test_query.py

@@ -5,12 +5,15 @@
 from django.utils.functional import SimpleLazyObject
 from py.test import raises
 
+from django_filters import FilterSet, NumberFilter
+
 import graphene
 from graphene.relay import Node
 
 from ..utils import DJANGO_FILTER_INSTALLED
 from ..compat import MissingType, JSONField
 from ..fields import DjangoConnectionField
+from ..filter.fields import DjangoFilterConnectionField
 from ..types import DjangoObjectType
 from .models import Article, Reporter
 
@@ -42,7 +45,6 @@ class Meta:
             model = Reporter
             only_fields = ('id', )
 
-
     class Query(graphene.ObjectType):
         reporter = graphene.Field(ReporterType)
 
@@ -360,7 +362,110 @@ class Query(graphene.ObjectType):
             }]
         }
     }
- 
+
+    result = schema.execute(query)
+    assert not result.errors
+    assert result.data == expected
+
+
+def test_should_query_filter_node_limit():
+    class ReporterFilter(FilterSet):
+        limit = NumberFilter(method='filter_limit')
+
+        def filter_limit(self, queryset, name, value):
+            return queryset[:value]
+
+        class Meta:
+            model = Reporter
+            fields = ['first_name', ]
+
+    class ReporterType(DjangoObjectType):
+
+        class Meta:
+            model = Reporter
+            interfaces = (Node, )
+
+    class ArticleType(DjangoObjectType):
+
+        class Meta:
+            model = Article
+            interfaces = (Node, )
+            filter_fields = ('lang', )
+
+    class Query(graphene.ObjectType):
+        all_reporters = DjangoFilterConnectionField(
+            ReporterType,
+            filterset_class=ReporterFilter
+        )
+
+        def resolve_all_reporters(self, args, context, info):
+            return Reporter.objects.all()
+
+    r = Reporter.objects.create(
+        first_name='John',
+        last_name='Doe',
+        email='[email protected]',
+        a_choice=1
+    )
+    Reporter.objects.create(
+        first_name='Bob',
+        last_name='Doe',
+        email='[email protected]',
+        a_choice=1
+    )
+
+    Article.objects.create(
+        headline='Article Node 1',
+        pub_date=datetime.date.today(),
+        reporter=r,
+        editor=r,
+        lang='es'
+    )
+    Article.objects.create(
+        headline='Article Node 2',
+        pub_date=datetime.date.today(),
+        reporter=r,
+        editor=r,
+        lang='en'
+    )
+
+    schema = graphene.Schema(query=Query)
+    query = '''
+        query NodeFilteringQuery {
+            allReporters(limit: 1) {
+                edges {
+                    node {
+                        id
+                        articles(lang: "es") {
+                            edges {
+                                node {
+                                    id
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    '''
+
+    expected = {
+        'allReporters': {
+            'edges': [{
+                'node': {
+                    'id': 'UmVwb3J0ZXJUeXBlOjE=',
+                    'articles': {
+                        'edges': [{
+                            'node': {
+                                'id': 'QXJ0aWNsZVR5cGU6MQ=='
+                            }
+                        }]
+                    }
+                }
+            }]
+        }
+    }
+
     result = schema.execute(query)
     assert not result.errors
     assert result.data == expected