Long-winded intersection using sets

Author: Niall

graphene_django/fields.py

@@ -4,7 +4,7 @@
 
 from graphene.types import Field, List
 from graphene.relay import ConnectionField, PageInfo
-from graphql_relay.connection.arrayconnection import connection_from_list_slice
+from graphql_relay.connection.arrayconnection import connection_from_list_slice, connection_from_list
 
 from .utils import DJANGO_FILTER_INSTALLED, maybe_queryset
 
@@ -53,9 +53,11 @@ def connection_resolver(resolver, connection, default_manager, root, args, conte
             iterable = default_manager
         iterable = maybe_queryset(iterable)
         if isinstance(iterable, QuerySet):
-            if default_manager is not None and iterable is not default_manager:
-                iterable &= maybe_queryset(default_manager)
-            _len = iterable.count()
+            if iterable is not default_manager:
+                iterable = list(set(iterable).intersection(maybe_queryset(default_manager)))
+                _len = len(iterable)
+            else:
+                _len = iterable.count()
         else:
             _len = len(iterable)
         connection = connection_from_list_slice(

graphene_django/filter/fields.py

@@ -46,30 +46,15 @@ def filterset_class(self):
     def filtering_args(self):
         return get_filtering_args_from_filterset(self.filterset_class, self.node_type)
 
-    # @staticmethod
-    # def connection_resolver(resolver, connection, default_manager, filterset_class, filtering_args,
-    #                         root, args, context, info):
-    #     filter_kwargs = {k: v for k, v in args.items() if k in filtering_args}
-    #     qs = filterset_class(
-    #         data=filter_kwargs,
-    #         queryset=default_manager.get_queryset()
-    #     ).qs
-    #     return DjangoConnectionField.connection_resolver(resolver, connection, qs, root, args, context, info)
-
     @staticmethod
     def connection_resolver(resolver, connection, default_manager, filterset_class, filtering_args,
                             root, args, context, info):
         filter_kwargs = {k: v for k, v in args.items() if k in filtering_args}
-
-        def new_resolver(root, args, context, info):
-            qs = resolver(root, args, context, info)
-            if qs is None or not isinstance(qs, QuerySet):
-                qs = default_manager.get_queryset()
-            qs = filterset_class(data=filter_kwargs, queryset=qs).qs
-
-            return qs
-
-        return DjangoConnectionField.connection_resolver(new_resolver, connection, None, root, args, context, info)
+        qs = filterset_class(
+            data=filter_kwargs,
+            queryset=default_manager.get_queryset()
+        ).qs
+        return DjangoConnectionField.connection_resolver(resolver, connection, qs, root, args, context, info)
 
     def get_resolver(self, parent_resolver):
         return partial(self.connection_resolver, parent_resolver, self.type, self.get_manager(),