Merge pull request #22 from alqmy/master

feat: Added before and after and maybe fixed last pagination issue.

Author: abawchen

graphene_mongo/fields.py

@@ -15,7 +15,8 @@
 class MongoengineListField(Field):
 
     def __init__(self, _type, *args, **kwargs):
-        super(MongoengineListField, self).__init__(List(_type), *args, **kwargs)
+        super(MongoengineListField, self).__init__(
+            List(_type), *args, **kwargs)
 
     @property
     def model(self):
@@ -42,8 +43,10 @@ def __init__(self, type, *args, **kwargs):
     def type(self):
         from .types import MongoengineObjectType
         _type = super(ConnectionField, self).type
-        assert issubclass(_type, MongoengineObjectType), "MongoengineConnectionField only accepts MongoengineObjectType types"
-        assert _type._meta.connection, "The type {} doesn't have a connection".format(_type.__name__)
+        assert issubclass(
+            _type, MongoengineObjectType), "MongoengineConnectionField only accepts MongoengineObjectType types"
+        assert _type._meta.connection, "The type {} doesn't have a connection".format(
+            _type.__name__)
         return _type._meta.connection
 
     @property
@@ -68,10 +71,11 @@ def args(self, args):
     def default_filter_args(self):
         def is_filterable(kv):
             return hasattr(kv[1], '_type') \
-                    and callable(getattr(kv[1]._type, '_of_type', None))
+                and callable(getattr(kv[1]._type, '_of_type', None))
 
         return reduce(
-            lambda r, kv: r.update({kv[0]: kv[1]._type._of_type()}) or r if is_filterable(kv) else r,
+            lambda r, kv: r.update(
+                {kv[0]: kv[1]._type._of_type()}) or r if is_filterable(kv) else r,
             self.fields.items(),
             {}
         )
@@ -96,17 +100,29 @@ def get_query(cls, model, info, **args):
             first = args.pop('first', None)
             last = args.pop('last', None)
             id = args.pop('id', None)
+            before = args.pop('before', None)
+            after = args.pop('after', None)
 
             if id is not None:
                 # https://github.com/graphql-python/graphene/issues/124
                 args['pk'] = from_global_id(id)[-1]
 
             objs = objs.filter(**args)
 
+            # https://github.com/graphql-python/graphene-mongo/issues/21
+            if after is not None:
+                _after = int(from_global_id(after)[-1])
+                objs = objs[_after:]
+
+            if before is not None:
+                _before = int(from_global_id(before)[-1])
+                objs = objs[:_before]
+
             if first is not None:
                 objs = objs[:first]
             if last is not None:
-                objs = objs[:-last]
+                # fix for https://github.com/graphql-python/graphene-mongo/issues/20
+                objs = objs[-last:]
 
         return objs
 

graphene_mongo/tests/test_relay_query.py

@@ -364,6 +364,89 @@ class Query(graphene.ObjectType):
     assert all(item in get_nodes(result.data, 'editors') for item in get_nodes(expected, 'editors'))
 
 
+def test_should_after():
+    class Query(graphene.ObjectType):
+
+        players = MongoengineConnectionField(PlayerNode)
+
+    query = '''
+        query EditorQuery {
+            players(after: "YXJyYXljb25uZWN0aW9uOjA=") {
+                edges {
+                    cursor,
+                    node {
+                        firstName
+                    }
+                }
+            }
+        }
+    '''
+    expected = {
+        'players': {
+            'edges': [
+                {
+                    'cursor': 'YXJyYXljb25uZWN0aW9uOjE=',
+                    'node': {
+                        'firstName': 'Magic',
+                    }
+                },
+                {
+                    'cursor': 'YXJyYXljb25uZWN0aW9uOjI=',
+                    'node': {
+                        'firstName': 'Larry'
+                    }
+                }
+            ]
+        }
+    }
+    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)
+
+
+def test_should_before():
+    class Query(graphene.ObjectType):
+
+        players = MongoengineConnectionField(PlayerNode)
+
+    query = '''
+        query EditorQuery {
+            players(before: "YXJyYXljb25uZWN0aW9uOjI=") {
+                edges {
+                    cursor,
+                    node {
+                        firstName
+                    }
+                }
+            }
+        }
+    '''
+    expected = {
+        'players': {
+            'edges': [
+                {
+                    'cursor': "YXJyYXljb25uZWN0aW9uOjA=",
+                    'node': {
+                        'firstName': 'Michael',
+                    }
+                },
+                {
+                    'cursor': 'YXJyYXljb25uZWN0aW9uOjE=',
+                    '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)
+
 def test_should_self_reference():
 
     class Query(graphene.ObjectType):
@@ -463,6 +546,7 @@ class Query(graphene.ObjectType):
     assert not result.errors
     assert json.dumps(result.data, sort_keys=True) == json.dumps(expected, sort_keys=True)
 
+
 # TODO:
 def test_should_paging():
     pass