fix: remove status from watcha_user_list

synapse/handlers/watcha_administration.py

@@ -25,7 +25,6 @@ class AdministrationHandler(BaseHandler):
                     "email_address": user["email_address"],
                     "display_name": user["display_name"],
                     "role": role,
-                    "status": user["status"],
                     "last_seen": user["last_seen"],
                     "creation_ts": user["creation_ts"],
                 }

synapse/storage/databases/main/watcha_admin.py

@@ -314,7 +314,6 @@ class AdministrationStore(SQLBaseStore):
                 "display_name",
                 "is_partner",
                 "is_admin",
-                "status",
                 "last_seen",
                 "creation_ts",
             ]
@@ -326,7 +325,6 @@ class AdministrationStore(SQLBaseStore):
                     , profiles.displayname
                     , users.is_partner
                     , users.admin
-                    , users.deactivated
                     , users_last_seen.last_seen
                     , users.creation_ts * 1000
                 FROM users
@@ -357,14 +355,6 @@ class AdministrationStore(SQLBaseStore):
             "watcha_user_list", watcha_user_list_txn
         )
 
-        for user in users:
-            user["status"] = (
-                "inactive"
-                if user["status"] == 0
-                else "invited"
-                if user["user_id"] in users_with_pending_invitation
-                else "active"
-            )
         return users
 
     async def watcha_email_list(self):

tests/rest/client/v1/test_watcha_administration.py

@@ -59,7 +59,6 @@ class AdministrationTestCase(unittest.HomeserverTestCase):
                     "email_address": "admin@example.com",
                     "last_seen": None,
                     "role": "administrator",
-                    "status": "invited",
                     "user_id": "@admin:test",
                 },
                 {
@@ -68,7 +67,6 @@ class AdministrationTestCase(unittest.HomeserverTestCase):
                     "email_address": "collaborator@example.com",
                     "last_seen": None,
                     "role": "collaborator",
-                    "status": "invited",
                     "user_id": "@collaborator:test",
                 },
                 {
@@ -77,7 +75,6 @@ class AdministrationTestCase(unittest.HomeserverTestCase):
                     "email_address": "partner@example.com",
                     "last_seen": None,
                     "role": "partner",
-                    "status": "invited",
                     "user_id": "@partner:test",
                 },
             ],