Skip to content

Commit a94d69f

Browse files
committed
refactor: improve user role retrieval logic in user.py for clarity and accuracy
1 parent a9b41f2 commit a94d69f

1 file changed

Lines changed: 9 additions & 2 deletions

File tree

‎apps/users/serializers/user.py‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,9 +238,16 @@ def profile(user: User, auth: Auth):
238238
role_name = [user.role]
239239
if user_role_relation_model:
240240
user_role_relations = (
241-
user_role_relation_model.objects.filter(user_id=user.id).select_related("role").distinct("role_id")
241+
user_role_relation_model.objects.filter(user_id=user.id, workspace_id="None")
242+
.select_related("role")
243+
.distinct("role_id")
242244
)
243-
role_name = [relation.role.role_name for relation in user_role_relations]
245+
role_name = [
246+
role.role_name
247+
for role in sorted(
248+
(relation.role for relation in user_role_relations), key=lambda role: not role.internal
249+
)
250+
]
244251

245252
return {
246253
"id": user.id,

0 commit comments

Comments
 (0)