Skip to content
Snippets Groups Projects
Commit 645aefa0 authored by LouisGendron's avatar LouisGendron
Browse files

Merge branch '175-datasets-graphql-query-returns-duplicates' into 'master'

Resolve "Datasets GraphQL query returns duplicates"

Closes #175

See merge request !99
parents 30edbe24 6504eea8
1 merge request!99Resolve "Datasets GraphQL query returns duplicates"
......@@ -113,7 +113,6 @@ class Query(graphene.ObjectType):
def resolve_datafiles(self, info, **kwargs):
qs = DataFile.objects.accessible_to_profile(info.context.user.profile)
# qs = DataFile.objects
key_values = kwargs.get('key_values', None)
keys = kwargs.get('keys', None)
......@@ -151,9 +150,9 @@ class Query(graphene.ObjectType):
qs = DataSet.objects.accessible_to_profile(info.context.user.profile)
if id_list is not None:
return qs.filter(iric_data_id__in=id_list)
else:
return qs
qs = qs.filter(iric_data_id__in=id_list)
return qs.distinct()
def resolve_lab(self, info, **kwargs):
name = kwargs.get('name')
......@@ -169,24 +168,27 @@ class Query(graphene.ObjectType):
qs = Lab.objects.all()
if name_list is not None:
return qs.filter(name__in=name_list)
else:
return qs
qs = qs.filter(name__in=name_list)
return qs.distinct()
def resolve_profiles(self, info, **kwargs):
email_list = kwargs.get('in_email_list')
qs = Profile.objects.all()
if email_list is not None:
return Profile.objects.filter(user__email__in=email_list)
else:
return Profile.objects.all()
return qs.filter(user__email__in=email_list)
return qs.distinct()
def resolve_sharegroups(self, info, **kwargs):
name_list = kwargs.get('in_name_list')
qs = ShareGroup.objects.all()
if name_list is not None:
return ShareGroup.objects.filter(name__in=name_list)
else:
return ShareGroup.objects.all()
qs = qs.filter(name__in=name_list)
return qs.distinct()
class DataSetMutation(DjangoModelFormMutation):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment