Merge pull request #2006 from kili-technology/lab-3967

fix(LAB-3967): fix project_users queries criteria

Author: josselinbuils

src/kili/core/graphql/operations/project_user/queries.py

@@ -17,13 +17,15 @@ def __init__(
         organization_id: Optional[str] = None,
         status: Optional[Literal["ACTIVATED", "ORG_ADMIN", "ORG_SUSPENDED"]] = None,
         active_in_project: Optional[bool] = None,
+        deleted: Optional[bool] = None,
     ) -> None:
         self.project_id = project_id
         self.email = email
         self._id = _id
         self.organization_id = organization_id
         self.status = status
         self.active_in_project = active_in_project  # user not deleted and nbr of labeled assets > 0
+        self.deleted = deleted
         super().__init__()
 
     def graphql_where_builder(self):
@@ -32,6 +34,7 @@ def graphql_where_builder(self):
             "id": self._id,
             "status": self.status,
             "activeInProject": self.active_in_project,
+            "deleted": self.deleted,
             "project": {
                 "id": self.project_id,
             },

src/kili/entrypoints/queries/project_user/__init__.py

@@ -94,6 +94,7 @@ def project_users(
         status_in: Optional[Sequence[Literal["ACTIVATED", "ORG_ADMIN", "ORG_SUSPENDED"]]] = (
             "ACTIVATED",
             "ORG_ADMIN",
+            "ORG_SUSPENDED",
         ),
         fields: ListOrTuple[str] = (
             "activated",
@@ -143,6 +144,7 @@ def project_users(
             fields = [*fields, "status"]
 
         where = ProjectUserWhere(
+            deleted=False,
             project_id=project_id,
             email=email,
             _id=id,
@@ -176,6 +178,7 @@ def count_project_users(
         status_in: Optional[Sequence[Literal["ACTIVATED", "ORG_ADMIN", "ORG_SUSPENDED"]]] = (
             "ACTIVATED",
             "ORG_ADMIN",
+            "ORG_SUSPENDED",
         ),
     ) -> int:
         """Count the number of projects and their users that match a set of criteria.
@@ -196,6 +199,7 @@ def count_project_users(
         """
         if status_in is None:
             where = ProjectUserWhere(
+                deleted=False,
                 project_id=project_id,
                 email=email,
                 _id=id,
@@ -206,6 +210,7 @@ def count_project_users(
         count = 0
         for status in set(status_in):
             where = ProjectUserWhere(
+                deleted=False,
                 project_id=project_id,
                 email=email,
                 _id=id,

tests/integration/entrypoints/client/queries/test_project_users_queries.py

@@ -15,6 +15,7 @@ def test_project_users_query(mocker: pytest_mock.MockFixture):
     assert "query projectUsers" in query
     assert variables == {
         "where": {
+            "deleted": False,
             "id": None,
             "status": None,
             "activeInProject": None,