Merge pull request #79 from graphql-python/fix-list-of-string

Support contains query of list at this moment
graphql-python · Apr 15, 2019 · f6a60e2 · f6a60e2
2 parents cb055a7 + 2e00773
commit f6a60e2
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 10 deletions.
diff --git a/graphene_mongo/fields.py b/graphene_mongo/fields.py
@@ -8,7 +8,7 @@
 from graphene.relay import ConnectionField
 from graphene.types.argument import to_arguments
 from graphene.types.dynamic import Dynamic
-from graphene.types.structures import Structure, List
+from graphene.types.structures import Structure
 from graphql_relay.connection.arrayconnection import connection_from_list_slice
 
 from .advanced_types import PointFieldType, MultiPolygonFieldType
@@ -73,7 +73,7 @@ def is_filterable(k):
                 converted = convert_mongoengine_field(getattr(self.model, k), self.registry)
             except MongoEngineConversionError:
                 return False
-            if isinstance(converted, (ConnectionField, Dynamic, List)):
+            if isinstance(converted, (ConnectionField, Dynamic)):
                 return False
             if callable(getattr(converted, 'type', None)) and isinstance(converted.type(),
                                                                          (PointFieldType, MultiPolygonFieldType)):

diff --git a/graphene_mongo/tests/models.py b/graphene_mongo/tests/models.py
@@ -65,10 +65,10 @@ class Reporter(Document):
     first_name = StringField(required=True)
     last_name = StringField(required=True)
     email = EmailField()
+    awards = ListField(StringField())
     articles = ListField(ReferenceField(Article))
     embedded_articles = ListField(EmbeddedDocumentField(EmbeddedArticle))
     embedded_list_articles = EmbeddedDocumentListField(EmbeddedArticle)
-    awards = ListField(StringField())
 
 
 class Player(Document):

diff --git a/graphene_mongo/tests/test_fields.py b/graphene_mongo/tests/test_fields.py
@@ -1,9 +1,9 @@
 from ..fields import MongoengineConnectionField
-from .types import ArticleNode, PublisherNode, ErroneousModelNode
+from .types import ArticleNode, PublisherNode, ReporterNode, ErroneousModelNode
 from .setup import fixtures
 
 
-def test_field_args():
+def test_article_field_args():
     field = MongoengineConnectionField(ArticleNode)
 
     field_args = ['id', 'headline', 'pub_date']
@@ -17,6 +17,13 @@ def test_field_args():
     assert set(field.args) == set(args)
 
 
+def test_reporter_field_args():
+    field = MongoengineConnectionField(ReporterNode)
+
+    field_args = ['id', 'first_name', 'last_name', 'email', 'awards']
+    assert set(field.field_args.keys()) == set(field_args)
+
+
 def test_field_args_with_property():
     field = MongoengineConnectionField(PublisherNode)
 

diff --git a/graphene_mongo/tests/test_relay_query.py b/graphene_mongo/tests/test_relay_query.py
@@ -36,6 +36,7 @@ def resolve_reporter(self, *args, **kwargs):
                 firstName,
                 lastName,
                 email,
+                awards,
                 articles {
                     edges {
                         node {
@@ -65,6 +66,7 @@ def resolve_reporter(self, *args, **kwargs):
             'firstName': 'Allen',
             'lastName': 'Iverson',
             'email': 'ai@gmail.com',
+            'awards': ['2010-mvp'],
             'articles': {
                 'edges': [
                     {
@@ -337,24 +339,62 @@ class Query(graphene.ObjectType):
         expected, sort_keys=True)
 
 
-def test_should_get_node_by_id(fixtures):
+def test_should_filter_by_list_contains(fixtures):
     # Notes: https://goo.gl/hMNRgs
     class Query(graphene.ObjectType):
-        reporter = Node.Field(ReporterNode)
         reporters = MongoengineConnectionField(ReporterNode)
 
     query = '''
         query ReportersQuery {
+            reporters (awards: "2010-mvp") {
+                edges {
+                    node {
+                        id,
+                        firstName,
+                        awards
+                    }
+                }
+            }
+        }
+    '''
+    expected = {
+        'reporters': {
+            'edges': [
+                {
+                    'node': {
+                        'id': 'UmVwb3J0ZXJOb2RlOjE=',
+                        'firstName': 'Allen',
+                        'awards': ['2010-mvp']
+                    }
+                }
+            ]
+        }
+    }
+    schema = graphene.Schema(query=Query)
+    result = schema.execute(query)
+    assert not result.errors
+    assert result.data == expected
+
+
+def test_should_filter_by_id(fixtures):
+    # Notes: https://goo.gl/hMNRgs
+    class Query(graphene.ObjectType):
+        reporter = Node.Field(ReporterNode)
+
+    query = '''
+        query ReporterQuery {
             reporter (id: "UmVwb3J0ZXJOb2RlOjE=") {
                 id,
-                firstName
+                firstName,
+                awards
             }
         }
     '''
     expected = {
         'reporter': {
             'id': 'UmVwb3J0ZXJOb2RlOjE=',
-            'firstName': 'Allen'
+            'firstName': 'Allen',
+            'awards': ['2010-mvp']
         }
     }
     schema = graphene.Schema(query=Query)

diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name='graphene-mongo',
-    version='0.2.1',
+    version='0.2.2',
 
     description='Graphene Mongoengine integration',
     long_description=open('README.rst').read(),