Merge pull request #29 from noodlespace/master

Fix: Update hasNextPage, was always false before

Author: abawchen

graphene_mongo/fields.py

@@ -104,9 +104,10 @@ def fields(self):
     def get_query(cls, model, info, **args):
 
         if not callable(getattr(model, 'objects', None)):
-            return []
+            return [], 0
 
         objs = model.objects()
+
         if args:
             reference_fields = get_model_reference_fields(model)
             reference_args = {}
@@ -138,14 +139,18 @@ def get_query(cls, model, info, **args):
             if before is not None:
                 _before = int(from_global_id(before)[-1])
                 objs = objs[:_before]
+            # Not sure if this is in the correct place yet
+            list_length = objs.count()
 
             if first is not None:
                 objs = objs[:first]
             if last is not None:
                 # https://github.com/graphql-python/graphene-mongo/issues/20
                 objs = objs[-(last+1):]
+        else:
+            list_length = objs.count()
 
-        return objs
+        return objs, list_length
 
     # noqa
     @classmethod
@@ -159,8 +164,9 @@ def merge_querysets(cls, default_queryset, queryset):
     def connection_resolver(cls, resolver, connection, model, root, info, **args):
         iterable = resolver(root, info, **args)
         if not iterable:
-            iterable = cls.get_query(model, info, **args)
-        _len = len(iterable)
+            iterable, _len = cls.get_query(model, info, **args)
+        else:
+            _len = len(iterable)
         connection = connection_from_list_slice(
             iterable,
             args,

graphene_mongo/tests/test_relay_query.py

@@ -413,6 +413,12 @@ class Query(graphene.ObjectType):
                         firstName
                     }
                 }
+                pageInfo {
+                    hasNextPage
+                    hasPreviousPage
+                    startCursor
+                    endCursor
+                }
             }
         }
     '''
@@ -431,7 +437,13 @@ class Query(graphene.ObjectType):
                         'firstName': 'Grant'
                     }
                 }
-            ]
+            ],
+            'pageInfo': {
+                'hasNextPage': True,
+                'hasPreviousPage': False,
+                'startCursor': 'xxx',
+                'endCursor': 'xxx'
+            }
         }
     }
     schema = graphene.Schema(query=Query)