Skip to content

refactor: consolidate user resource permission queries to improve code maintainability #7919

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
Nov 13, 2026
Merged

refactor: consolidate user resource permission queries to improve code maintainability #7919

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
134 changes: 44 additions & 90 deletions apps/homepage/serializers/homepage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
from maxkb.conf import PROJECT_DIR
from models_provider.base_model_provider import ModelTypeConst
from models_provider.models import Model
from system_manage.models import WorkspaceUserResourcePermission
from system_manage.models import WorkspaceUserGroupResourcePermission, WorkspaceUserResourcePermission
from tools.models import Tool, ToolType

_PERM_WITH_ROLE = ["VIEW", "MANAGE", "ROLE"]
Expand Down Expand Up @@ -115,6 +115,35 @@ def is_extends_workspace_manage(auth, workspace_id):
return str(Role(RoleConstants.EXTENDS_WORKSPACE_MANAGE.value.name, workspace_id)) in auth.roles


def get_user_resource_permission_target_query(workspace_id, user_id, auth_target_type, permission_list):
"""Return accessible resource target ids, covering both direct and group grants."""
direct_targets = (
QuerySet(WorkspaceUserResourcePermission)
.filter(
workspace_id=workspace_id,
user_id=user_id,
auth_target_type=auth_target_type,
permission_list__overlap=permission_list,
)
.exclude(target="default")
.annotate(target_uuid=Cast("target", output_field=UUIDField()))
.values_list("target_uuid", flat=True)
)
group_targets = (
QuerySet(WorkspaceUserGroupResourcePermission)
.filter(
workspace_id=workspace_id,
auth_target_type=auth_target_type,
permission_list__overlap=permission_list,
user_group__user_relations__user_id=user_id,
)
.exclude(target="default")
.annotate(target_uuid=Cast("target", output_field=UUIDField()))
.values_list("target_uuid", flat=True)
)
return direct_targets.union(group_targets)


def get_start_time(date_time):
d = datetime.datetime.strptime(date_time, "%Y-%m-%d").date()
naive = datetime.datetime.combine(d, datetime.time.min)
Expand Down Expand Up @@ -161,16 +190,8 @@ def aggregation(self, auth, with_valid=True):
if hasPermission(auth, PermissionConstants.APPLICATION_READ.value)
else ["VIEW", "MANAGE"]
)
permission_subquery = (
WorkspaceUserResourcePermission.objects.filter(
workspace_id=workspace_id,
user_id=user_id,
auth_target_type="APPLICATION",
permission_list__overlap=permission_list,
)
.exclude(target="default")
.annotate(target_uuid=Cast("target", output_field=UUIDField()))
.values("target_uuid")
permission_subquery = get_user_resource_permission_target_query(
workspace_id, user_id, "APPLICATION", permission_list
)
query = query.filter(chat__application_id__in=permission_subquery)

Expand Down Expand Up @@ -207,16 +228,8 @@ def aggregation(self, auth, with_valid=True):
if hasPermission(auth, PermissionConstants.APPLICATION_READ.value)
else ["VIEW", "MANAGE"]
)
permission_subquery = (
WorkspaceUserResourcePermission.objects.filter(
workspace_id=workspace_id,
user_id=user_id,
auth_target_type="APPLICATION",
permission_list__overlap=permission_list,
)
.exclude(target="default")
.annotate(target_uuid=Cast("target", output_field=UUIDField()))
.values("target_uuid")
permission_subquery = get_user_resource_permission_target_query(
workspace_id, user_id, "APPLICATION", permission_list
)
query = query.filter(chat__application_id__in=permission_subquery)

Expand Down Expand Up @@ -349,17 +362,8 @@ def _apply_permission_filter(self, queryset, auth, workspace_id, user_id):
_PERM_WITH_ROLE if hasPermission(auth, PermissionConstants.APPLICATION_READ.value) else _PERM_DEFAULT
)

allowed_app_ids = (
QuerySet(WorkspaceUserResourcePermission)
.filter(
workspace_id=workspace_id,
user_id=user_id,
auth_target_type="APPLICATION",
permission_list__overlap=permission_list,
)
.exclude(target="default")
.annotate(target_uuid=Cast("target", output_field=UUIDField()))
.values_list("target_uuid", flat=True)
allowed_app_ids = get_user_resource_permission_target_query(
workspace_id, user_id, "APPLICATION", permission_list
)

return queryset.filter(application_id__in=allowed_app_ids)
Expand Down Expand Up @@ -421,16 +425,9 @@ def get_queryset(self, auth):
)

queryset = queryset.filter(
id__in=QuerySet(WorkspaceUserResourcePermission)
.filter(
workspace_id=workspace_id,
user_id=user_id,
auth_target_type="APPLICATION",
permission_list__overlap=permission_list,
id__in=get_user_resource_permission_target_query(
workspace_id, user_id, "APPLICATION", permission_list
)
.exclude(target="default")
.annotate(target_uuid=Cast("target", output_field=UUIDField()))
.values_list("target_uuid", flat=True)
)

record_time_filter = (
Expand Down Expand Up @@ -555,16 +552,9 @@ def get_queryset(self, auth):
)

queryset = queryset.filter(
id__in=QuerySet(WorkspaceUserResourcePermission)
.filter(
workspace_id=workspace_id,
user_id=user_id,
auth_target_type="APPLICATION",
permission_list__overlap=permission_list,
id__in=get_user_resource_permission_target_query(
workspace_id, user_id, "APPLICATION", permission_list
)
.exclude(target="default")
.annotate(target_uuid=Cast("target", output_field=UUIDField()))
.values_list("target_uuid", flat=True)
)

return queryset.annotate(
Expand Down Expand Up @@ -768,16 +758,7 @@ def get_aggregation_query_set(self, auth):
else ["VIEW", "MANAGE"]
)
return QuerySet(Application).filter(
id__in=QuerySet(WorkspaceUserResourcePermission)
.filter(
workspace_id=workspace_id,
user_id=user_id,
auth_target_type="APPLICATION",
permission_list__overlap=permission_list,
)
.exclude(target="default")
.annotate(target_uuid=Cast("target", output_field=UUIDField()))
.values_list("target_uuid", flat=True)
id__in=get_user_resource_permission_target_query(workspace_id, user_id, "APPLICATION", permission_list)
)

def aggregation(self, auth, with_valid=True):
Expand Down Expand Up @@ -817,16 +798,7 @@ def get_aggregation_query_set(self, auth):
else ["VIEW", "MANAGE"]
)
return QuerySet(Knowledge).filter(
id__in=QuerySet(WorkspaceUserResourcePermission)
.filter(
workspace_id=workspace_id,
user_id=user_id,
auth_target_type="KNOWLEDGE",
permission_list__overlap=permission_list,
)
.exclude(target="default")
.annotate(target_uuid=Cast("target", output_field=UUIDField()))
.values_list("target_uuid", flat=True)
id__in=get_user_resource_permission_target_query(workspace_id, user_id, "KNOWLEDGE", permission_list)
)

def aggregation(self, auth, with_valid=True):
Expand Down Expand Up @@ -873,16 +845,7 @@ def get_aggregation_query_set(self, auth):
else ["VIEW", "MANAGE"]
)
return QuerySet(Tool).filter(
id__in=QuerySet(WorkspaceUserResourcePermission)
.filter(
workspace_id=workspace_id,
user_id=user_id,
auth_target_type="TOOL",
permission_list__overlap=permission_list,
)
.exclude(target="default")
.annotate(target_uuid=Cast("target", output_field=UUIDField()))
.values_list("target_uuid", flat=True)
id__in=get_user_resource_permission_target_query(workspace_id, user_id, "TOOL", permission_list)
)

def aggregation(self, auth, with_valid=True):
Expand Down Expand Up @@ -926,16 +889,7 @@ def get_aggregation_query_set(self, auth):
else ["VIEW", "MANAGE"]
)
return QuerySet(Model).filter(
id__in=QuerySet(WorkspaceUserResourcePermission)
.filter(
workspace_id=workspace_id,
user_id=user_id,
auth_target_type="MODEL",
permission_list__overlap=permission_list,
)
.exclude(target="default")
.annotate(target_uuid=Cast("target", output_field=UUIDField()))
.values_list("target_uuid", flat=True)
id__in=get_user_resource_permission_target_query(workspace_id, user_id, "MODEL", permission_list)
)

def aggregation(self, auth, with_valid=True):
Expand Down
Loading