github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-24 21:08:30 +00:00
Code Issues Projects Releases Wiki Activity

perf: 优化标签搜索资产使用的关系

Browse Source
This commit is contained in:
ibuler
2024-02-29 19:01:38 +08:00
committed by Bryan
parent f0ffa2408d
commit 18707d365b
2 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
apps/common/drf/filters.py
View File

@@ -3,6 +3,7 @@
import base64
import json
import logging
from collections import defaultdict
from django.core.cache import cache
from django.core.exceptions import ImproperlyConfigured
@@ -180,7 +181,7 @@ class LabelFilterBackend(filters.BaseFilterBackend):
]
@staticmethod
def parse_label_ids(labels_id):
def parse_labels(labels_id):
from labels.models import Label
label_ids = [i.strip() for i in labels_id.split(',')]
cleaned = []
@@ -201,8 +202,8 @@ class LabelFilterBackend(filters.BaseFilterBackend):
q = Q()
for kwarg in args:
q |= Q(**kwarg)
ids = Label.objects.filter(q).values_list('id', flat=True)
cleaned.extend(list(ids))
labels = Label.objects.filter(q)
cleaned.extend(list(labels))
return cleaned
def filter_queryset(self, request, queryset, view):
@@ -221,13 +222,23 @@ class LabelFilterBackend(filters.BaseFilterBackend):
app_label = model._meta.app_label
model_name = model._meta.model_name
resources = labeled_resource_cls.objects.filter(
full_resources = labeled_resource_cls.objects.filter(
res_type__app_label=app_label, res_type__model=model_name,
)
label_ids = self.parse_label_ids(labels_id)
resources = model.filter_resources_by_labels(resources, label_ids)
res_ids = resources.values_list('res_id', flat=True)
queryset = queryset.filter(id__in=set(res_ids))
labels = self.parse_labels(labels_id)
grouped = defaultdict(set)
for label in labels:
grouped[label.name].add(label.id)
matched_ids = set()
for name, label_ids in grouped.items():
resources = model.filter_resources_by_labels(full_resources, label_ids, rel='any')
res_ids = resources.values_list('res_id', flat=True)
if not matched_ids:
matched_ids = set(res_ids)
else:
matched_ids &= set(res_ids)
queryset = queryset.filter(id__in=matched_ids)
return queryset