Merge branch 'master' of https://github.com/graphql-python/graphene-mongo into fix-in-filter

Author: claradaia

graphene_mongo/fields.py

@@ -93,12 +93,15 @@ def is_filterable(k):
                 return False
             return True
 
-        def get_type(v):
-            if isinstance(v.type, Structure):
-                return v.type.of_type()
-            return v.type()
+        def get_filter_type(_type):
+            """
+            Returns the scalar type.
+            """
+            if isinstance(_type, Structure):
+                return get_filter_type(_type.of_type)
+            return _type()
 
-        return {k: get_type(v) for k, v in items if is_filterable(k)}
+        return {k: get_filter_type(v.type) for k, v in items if is_filterable(k)}
 
     @property
     def field_args(self):

graphene_mongo/tests/models.py

@@ -156,3 +156,11 @@ class ErroneousModel(mongoengine.Document):
     meta = {'collection': 'test_colliding_objects_model'}
 
     objects = mongoengine.ListField(mongoengine.StringField())
+
+
+class Bar(mongoengine.EmbeddedDocument):
+    some_list_field = mongoengine.ListField(mongoengine.StringField(), required=True)
+
+
+class Foo(mongoengine.Document):
+    bars = mongoengine.EmbeddedDocumentListField(Bar)

graphene_mongo/tests/nodes.py

@@ -99,3 +99,15 @@ class ErroneousModelNode(MongoengineObjectType):
     class Meta:
         model = models.ErroneousModel
         interfaces = (Node, )
+
+
+class BarNode(MongoengineObjectType):
+    class Meta:
+        model = models.Bar
+        interfaces = (Node, )
+
+
+class FooNode(MongoengineObjectType):
+    class Meta:
+        model = models.Foo
+        interfaces = (Node, )

graphene_mongo/tests/test_relay_query.py

@@ -1079,6 +1079,37 @@ class Query(graphene.ObjectType):
     assert json.dumps(result.data, sort_keys=True) == json.dumps(expected, sort_keys=True)
 
 
+def test_should_query_document_with_embedded(fixtures):
+
+    class Query(graphene.ObjectType):
+        foos = MongoengineConnectionField(nodes.FooNode)
+
+        def resolve_multiple_foos(self, *args, **kwargs):
+            return list(models.Foo.objects.all())
+
+    query = '''
+        query {
+            foos {
+                edges {
+                    node {
+                        bars {
+                            edges {
+                                node {
+                                    someListField
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    '''
+
+    schema = graphene.Schema(query=Query)
+    result = schema.execute(query)
+    assert not result.errors
+
+
 def test_should_filter_mongoengine_queryset_with_list(fixtures):
 
     class Query(graphene.ObjectType):