Skip to content

refactor: improve user role retrieval logic in user.py for clarity and accuracy #7080

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wxg0103 merged 1 commit into from
Sep 17, 2026
+9 −2
Merged

refactor: improve user role retrieval logic in user.py for clarity and accuracy #7080

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions apps/users/serializers/user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,9 +238,16 @@ def profile(user: User, auth: Auth):
role_name = [user.role]
if user_role_relation_model:
user_role_relations = (
user_role_relation_model.objects.filter(user_id=user.id).select_related("role").distinct("role_id")
user_role_relation_model.objects.filter(user_id=user.id, workspace_id="None")
.select_related("role")
.distinct("role_id")
)
role_name = [relation.role.role_name for relation in user_role_relations]
role_name = [
role.role_name
for role in sorted(
(relation.role for relation in user_role_relations), key=lambda role: not role.internal
)
]

return {
"id": user.id,
Expand Down
Loading