Merge pull request #22 from strollby/fix/nested-connectionfield

Fix Issue of ConnectionField unnecessarily counting whole collection instead of subset

Author: abhinand-c

.github/workflows/ci.yml

@@ -7,7 +7,6 @@ on:
   push:
     branches: [ "master" ]
   pull_request:
-    branches: [ "master" ]
 
 permissions:
   contents: read
@@ -17,7 +16,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python: ["3.9", "3.10", "3.11","3.12"]
+        python: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3

.github/workflows/publish.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python: ["3.9", "3.10", "3.11", "3.12"]
+        python: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3

graphene_mongo/fields.py

@@ -424,7 +424,24 @@ def default_resolver(self, _root, info, required_fields=None, resolved=None, **a
             list_length = len(iterables)
 
         elif callable(getattr(self.model, "objects", None)):
-            if (
+            if "pk__in" in args and args["pk__in"]:
+                count = len(args["pk__in"])
+                skip, limit = find_skip_and_limit(
+                    first=first, last=last, after=after, before=before, count=count
+                )
+                if limit:
+                    args["pk__in"] = args["pk__in"][skip : skip + limit]
+                elif skip:
+                    args["pk__in"] = args["pk__in"][skip:]
+                iterables = self.get_queryset(self.model, info, required_fields, **args)
+                list_length = len(iterables)
+                if isinstance(info, GraphQLResolveInfo):
+                    if not info.context:
+                        info = info._replace(context=Context())
+                    info.context.queryset = self.get_queryset(
+                        self.model, info, required_fields, **args
+                    )
+            elif (
                 _root is None
                 or args
                 or isinstance(getattr(_root, field_name, []), MongoengineConnectionField)
@@ -486,24 +503,6 @@ def default_resolver(self, _root, info, required_fields=None, resolved=None, **a
                             self.model, info, required_fields, **args
                         )
 
-            elif "pk__in" in args and args["pk__in"]:
-                count = len(args["pk__in"])
-                skip, limit = find_skip_and_limit(
-                    first=first, last=last, after=after, before=before, count=count
-                )
-                if limit:
-                    args["pk__in"] = args["pk__in"][skip : skip + limit]
-                elif skip:
-                    args["pk__in"] = args["pk__in"][skip:]
-                iterables = self.get_queryset(self.model, info, required_fields, **args)
-                list_length = len(iterables)
-                if isinstance(info, GraphQLResolveInfo):
-                    if not info.context:
-                        info = info._replace(context=Context())
-                    info.context.queryset = self.get_queryset(
-                        self.model, info, required_fields, **args
-                    )
-
         elif _root is not None:
             field_name = to_snake_case(info.field_name)
             items = getattr(_root, field_name, [])

graphene_mongo/fields_async.py

@@ -150,7 +150,25 @@ async def default_resolver(self, _root, info, required_fields=None, resolved=Non
             list_length = len(iterables)
 
         elif callable(getattr(self.model, "objects", None)):
-            if (
+            if "pk__in" in args and args["pk__in"]:
+                count = len(args["pk__in"])
+                skip, limit = find_skip_and_limit(
+                    first=first, last=last, after=after, before=before, count=count
+                )
+                if limit:
+                    args["pk__in"] = args["pk__in"][skip : skip + limit]
+                elif skip:
+                    args["pk__in"] = args["pk__in"][skip:]
+                iterables = self.get_queryset(self.model, info, required_fields, **args)
+                iterables = await sync_to_async(list)(iterables)
+                list_length = len(iterables)
+                if isinstance(info, GraphQLResolveInfo):
+                    if not info.context:
+                        info = info._replace(context=Context())
+                    info.context.queryset = self.get_queryset(
+                        self.model, info, required_fields, **args
+                    )
+            elif (
                 _root is None
                 or args
                 or isinstance(getattr(_root, field_name, []), AsyncMongoengineConnectionField)
@@ -206,25 +224,6 @@ async def default_resolver(self, _root, info, required_fields=None, resolved=Non
                             self.model, info, required_fields, **args
                         )
 
-            elif "pk__in" in args and args["pk__in"]:
-                count = len(args["pk__in"])
-                skip, limit = find_skip_and_limit(
-                    first=first, last=last, after=after, before=before, count=count
-                )
-                if limit:
-                    args["pk__in"] = args["pk__in"][skip : skip + limit]
-                elif skip:
-                    args["pk__in"] = args["pk__in"][skip:]
-                iterables = self.get_queryset(self.model, info, required_fields, **args)
-                iterables = await sync_to_async(list)(iterables)
-                list_length = len(iterables)
-                if isinstance(info, GraphQLResolveInfo):
-                    if not info.context:
-                        info = info._replace(context=Context())
-                    info.context.queryset = self.get_queryset(
-                        self.model, info, required_fields, **args
-                    )
-
         elif _root is not None:
             field_name = to_snake_case(info.field_name)
             items = getattr(_root, field_name, [])

pyproject.toml

@@ -18,6 +18,8 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Programming Language :: Python :: Implementation :: PyPy",
     "License :: OSI Approved :: MIT License",
 ]