Merge branch 'fix-users-query' into 'main'

fix active and groups filter

See merge request inject/backend!201

user/schema/query.py

@@ -3,12 +3,12 @@ from typing import Optional, List
 import graphene
 from django.contrib.auth.models import Group
 
-from common_lib.schema_types import UserType, TagType, GroupType
-from common_lib.utils import get_model
-from user.models import User, Tag
 from aai.models import Perms
 from aai.utils import protected
+from common_lib.schema_types import UserType, TagType, GroupType
+from common_lib.utils import get_model
 from user.graphql_inputs import FilterUsersInput
+from user.models import User, Tag
 
 
 class Query(graphene.ObjectType):
@@ -44,10 +44,10 @@ class Query(graphene.ObjectType):
         users = User.objects.all()
 
         if filter_users_input.active is not None:
-            users = users.filter(active=filter_users_input.active)
+            users = users.filter(is_active=filter_users_input.active)
 
         if filter_users_input.group is not None:
-            users = users.filter(group__name=filter_users_input.group)
+            users = users.filter(group__name__in=filter_users_input.group)
 
         if filter_users_input.tags is not None:
             for tag in filter_users_input.tags: