fix: 导入业务优化 --story=121224121

TencentBlueKing · Jan 2, 2025 · 5354ee4 · 5354ee4
1 parent 156d014
commit 5354ee4
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/gcloud/apigw/validators/copy_template_across_project.py b/gcloud/apigw/validators/copy_template_across_project.py
@@ -23,7 +23,10 @@ def validate(self, request, *args, **kwargs):
             return valid, err
 
         data = json.loads(request.body)
-        if not data.get("new_project_id") or not data.get("template_id"):
-            return False, "new_project_id and template_id are required"
+        if not data.get("new_project_id") or not data.get("template_ids"):
+            return False, "new_project_id and template_ids are required"
+
+        if data.get("new_project_id") == request.project.id:
+            return False, "无法导入流程到到同一个项目"
 
         return True, ""
diff --git a/gcloud/apigw/views/copy_template_across_project.py b/gcloud/apigw/views/copy_template_across_project.py
@@ -51,10 +51,10 @@ def copy_template_across_project(request, project_id):
 
     params_data = json.loads(request.body)
     new_project_id = params_data["new_project_id"]
-    template_id = params_data["template_id"]
+    template_ids = params_data["template_ids"]
 
     try:
-        export_data = TaskTemplate.objects.export_templates([template_id], is_full=False, project_id=request.project.id)
+        export_data = TaskTemplate.objects.export_templates(template_ids, is_full=False, project_id=request.project.id)
         import_result = TaskTemplate.objects.import_templates(
             template_data=export_data,
             override=False,

diff --git a/gcloud/iam_auth/view_interceptors/apigw/copy_template_across_project.py b/gcloud/iam_auth/view_interceptors/apigw/copy_template_across_project.py
@@ -29,12 +29,16 @@ class CopyTemplateInterceptor(ViewInterceptor):
     def process(self, request, *args, **kwargs):
         data = json.loads(request.body)
         new_project_id = data.get("new_project_id")
-        template_id = data.get("template_id")
+        template_ids = data.get("template_ids")
         subject = Subject("user", request.user.username)
 
-        record = TemplateSharedRecord.objects.filter(project_id=request.project.id, template_id=template_id).first()
-        if record is None:
-            error_message = f"Unable to find template {template_id} in project {request.project.id}."
+        existing_records = TemplateSharedRecord.objects.filter(
+            project_id=request.project.id, template_id__in=template_ids
+        ).values_list("template_id", flat=True)
+
+        missing_template_ids = set(template_ids) - set(existing_records)
+        if missing_template_ids:
+            error_message = f"The following templates are not shared {missing_template_ids}"
             logging.error(error_message)
             raise ValueError(error_message)