Skip to content

Fixes filter type of NonNull List #122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 14, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions graphene_mongo/fields.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
8 changes: 8 additions & 0 deletions graphene_mongo/tests/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
12 changes: 12 additions & 0 deletions graphene_mongo/tests/nodes.py
Original file line number Diff line number Diff line change
Expand Up @@ -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, )
31 changes: 31 additions & 0 deletions graphene_mongo/tests/test_relay_query.py
Original file line number Diff line number Diff line change
Expand Up @@ -1077,3 +1077,34 @@ class Query(graphene.ObjectType):

assert not result.errors
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