Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions bkflow/apigw/serializers/label.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ def validate_order_by(self, value):

class LabelRefCountSerializer(serializers.Serializer):
label_ids = serializers.CharField(required=True, help_text=_("标签ID列表,逗号分隔"))
scope_type = serializers.CharField(help_text=_("流程范围类型,传入时仅统计该作用域下的引用"), required=False)
scope_value = serializers.CharField(help_text=_("流程范围值,需与 scope_type 同时传入"), required=False)

def validate_label_ids(self, value):
label_ids_str = str(value).strip()
Expand Down
12 changes: 9 additions & 3 deletions bkflow/apigw/views/get_label_ref_count.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ def get_label_ref_count(request, space_id):
ser.is_valid(raise_exception=True)

label_ids = ser.validated_data["label_ids"].split(",")
scope_type = ser.validated_data.get("scope_type")
scope_value = ser.validated_data.get("scope_value")

all_child = Label.objects.filter(space_id=int(space_id), parent_id__in=label_ids).values("id", "parent_id")
label_child_map = {}
Expand All @@ -35,13 +37,17 @@ def get_label_ref_count(request, space_id):
all_query_label_ids = list(set(label_ids + [cid for ids in label_child_map.values() for cid in ids]))

client = TaskComponentClient(space_id=int(space_id))
task_result = client.get_task_label_ref_count(int(space_id), ",".join(all_query_label_ids))
task_result = client.get_task_label_ref_count(int(space_id), ",".join(all_query_label_ids), scope_type, scope_value)
if not task_result.get("result"):
return task_result
label_task_ref_count_map = task_result.get("data") or {}

# 仅统计属于当前空间的模板,避免统计到其他空间的同名/共享模板
space_template_ids = Template.objects.filter(space_id=int(space_id)).values_list("id", flat=True)
# 仅统计属于当前空间、且流程作用域匹配的模板,避免统计到其他空间或作用域的引用
space_template_filter = {"space_id": int(space_id)}
if scope_type is not None and scope_value is not None:
space_template_filter["scope_type"] = scope_type
space_template_filter["scope_value"] = scope_value
space_template_ids = Template.objects.filter(**space_template_filter).values_list("id", flat=True)

aggregation_qs = (
TemplateLabelRelation.objects.filter(label_id__in=all_query_label_ids)
Expand Down
12 changes: 7 additions & 5 deletions bkflow/contrib/api/collections/task.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,15 @@ def task_list(self, data):
def update_labels(self, task_id, data):
return self._request(method="post", url=self._get_task_url("task/{}/update_labels/".format(task_id)), data=data)

def get_task_label_ref_count(self, space_id, label_ids):
def get_task_label_ref_count(self, space_id, label_ids, scope_type=None, scope_value=None):
data = {"space_id": space_id, "label_ids": label_ids}
if scope_type is not None and scope_value is not None:
data["scope_type"] = scope_type
data["scope_value"] = scope_value
return self._request(
method="get",
url=self._get_task_url(
"task/get_task_label_ref_count/?space_id={}&label_ids={}".format(space_id, label_ids)
),
data=None,
url=self._get_task_url("task/get_task_label_ref_count/"),
data=data,
)

def delete_task_label_relation(self, data):
Expand Down
2 changes: 2 additions & 0 deletions bkflow/task/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,8 @@ class BatchDeletePeriodicTaskSerializer(serializers.Serializer):
class LabelRefSerializer(serializers.Serializer):
label_ids = serializers.CharField(help_text="标签ID", required=True)
space_id = serializers.IntegerField(help_text="空间ID", required=True)
scope_type = serializers.CharField(help_text="流程范围类型", required=False)
scope_value = serializers.CharField(help_text="流程范围值", required=False)


class TaskUpdateLabelSerializer(serializers.Serializer):
Expand Down
12 changes: 9 additions & 3 deletions bkflow/task/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -250,9 +250,15 @@ def get_task_label_ref_count(self, request, *args, **kwargs):
validated_params = ser.validated_data
label_ids = validated_params["label_ids"].split(",")
space_id = validated_params["space_id"]

# 仅统计属于当前空间的任务,避免统计到其他空间的同名/共享任务
space_task_ids = TaskInstance.objects.filter(space_id=space_id).values_list("id", flat=True)
scope_type = validated_params.get("scope_type")
scope_value = validated_params.get("scope_value")

# 仅统计属于当前空间、且流程作用域匹配的任务,避免统计到其他空间或作用域的引用
space_task_filter = {"space_id": space_id}
if scope_type is not None and scope_value is not None:
space_task_filter["scope_type"] = scope_type
space_task_filter["scope_value"] = scope_value
space_task_ids = TaskInstance.objects.filter(**space_task_filter).values_list("id", flat=True)

# 获取任务引用数量
aggregation_qs = (
Expand Down
4 changes: 2 additions & 2 deletions tests/engine/utils/test_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,8 @@ class DoesNotExist(Exception):
client.get_task_label_ref_count(1, "1,2")
client._request.assert_called_with(
method="get",
url="http://task.space1/task/get_task_label_ref_count/?space_id=1&label_ids=1,2",
data=None,
url="http://task.space1/task/get_task_label_ref_count/",
data={"space_id": 1, "label_ids": "1,2"},
)

client.delete_task_label_relation({"task_id": 1, "label_ids": [1]})
Expand Down
Loading