Merge pull request #7969 from guohelu/feat_return_notify

feat: 模板接口返回新增通知信息 --story=126257473

Author: dengyh

gcloud/apigw/views/get_common_template_info.py

@@ -33,6 +33,7 @@
 def get_common_template_info(request, template_id):
     include_subprocess = request.GET.get("include_subprocess", None)
     include_constants = request.GET.get("include_constants", None)
+    include_notify = request.GET.get("include_notify", None)
     try:
         tmpl = CommonTemplate.objects.select_related("pipeline_template").get(id=template_id, is_deleted=False)
     except CommonTemplate.DoesNotExist:
@@ -42,7 +43,7 @@ def get_common_template_info(request, template_id):
             "code": err_code.CONTENT_NOT_EXIST.code,
         }
         return result
-    data = format_template_data(template=tmpl, include_subprocess=include_subprocess)
+    data = format_template_data(template=tmpl, include_subprocess=include_subprocess, include_notify=include_notify)
     if include_constants:
         data["template_constants"] = process_pipeline_constants(data["pipeline_tree"])
 

gcloud/apigw/views/get_common_template_list.py

@@ -29,11 +29,16 @@
 @mark_request_whether_is_trust
 @timezone_inject
 def get_common_template_list(request):
+    include_notify = request.GET.get("include_notify", None)
     templates = CommonTemplate.objects.select_related("pipeline_template").filter(is_deleted=False)
-    templates_data, common_templates_id_list = format_template_list_data(templates, return_id_list=True, tz=request.tz)
+    templates_data, common_templates_id_list = format_template_list_data(
+        templates, return_id_list=True, tz=request.tz, include_notify=include_notify
+    )
     # 注入用户有权限的actions
     common_templates_allowed_actions = get_common_flow_allowed_actions_for_user(
-        request.user.username, COMMON_FLOW_ACTIONS, common_templates_id_list,
+        request.user.username,
+        COMMON_FLOW_ACTIONS,
+        common_templates_id_list,
     )
     for template in templates_data:
         template_id = template["id"]

gcloud/apigw/views/get_template_info.py

@@ -41,6 +41,7 @@ def get_template_info(request, template_id, project_id):
     include_subprocess = request.GET.get("include_subprocess", None)
     include_constants = request.GET.get("include_constants", None)
     include_executor_proxy = request.GET.get("include_executor_proxy", None)
+    include_notify = request.GET.get("include_notify", None)
     if template_source in NON_COMMON_TEMPLATE_TYPES:
         try:
             tmpl = TaskTemplate.objects.select_related("pipeline_template").get(
@@ -69,7 +70,9 @@ def get_template_info(request, template_id, project_id):
             }
             return result
 
-    data = format_template_data(tmpl, project, include_subprocess, include_executor_proxy=include_executor_proxy)
+    data = format_template_data(
+        tmpl, project, include_subprocess, include_executor_proxy=include_executor_proxy, include_notify=include_notify
+    )
     if include_constants:
         data["template_constants"] = process_pipeline_constants(data["pipeline_tree"])
 

gcloud/apigw/views/get_template_list.py

@@ -43,6 +43,7 @@ def get_template_list(request, project_id):
     name_keyword = request.GET.get("name_keyword", None)
     include_labels = request.GET.get("include_labels", None)
     include_executor_proxy = request.GET.get("include_executor_proxy", None)
+    include_notify = request.GET.get("include_notify", None)
 
     if id_in:
         try:
@@ -65,7 +66,12 @@ def get_template_list(request, project_id):
         templates = CommonTemplate.objects.select_related("pipeline_template").filter(**filter_kwargs)
 
     template_list, template_id_list = format_template_list_data(
-        templates, project, return_id_list=True, tz=request.tz, include_executor_proxy=include_executor_proxy
+        templates,
+        project,
+        return_id_list=True,
+        tz=request.tz,
+        include_executor_proxy=include_executor_proxy,
+        include_notify=include_notify,
     )
     template_labels = {}
     if include_labels:

gcloud/apigw/views/utils.py

@@ -11,6 +11,7 @@
 specific language governing permissions and limitations under the License.
 """
 
+import json
 import logging
 import traceback
 from copy import deepcopy
@@ -53,7 +54,9 @@ def info_data_from_period_task(task, detail=True, tz=None, include_edit_info=Non
     return info
 
 
-def format_template_data(template, project=None, include_subprocess=None, tz=None, include_executor_proxy=None):
+def format_template_data(
+    template, project=None, include_subprocess=None, tz=None, include_executor_proxy=None, include_notify=None
+):
     pipeline_tree = template.pipeline_tree
     pipeline_tree.pop("line")
     pipeline_tree.pop("location")
@@ -80,6 +83,10 @@ def format_template_data(template, project=None, include_subprocess=None, tz=Non
         )
     if include_executor_proxy and hasattr(template, "executor_proxy"):
         data.update({"executor_proxy": template.executor_proxy})
+    if include_notify:
+        data.update(
+            {"notify_type": json.loads(template.notify_type), "notify_receivers": json.loads(template.notify_receivers)}
+        )
 
     if include_subprocess:
         data.update(
@@ -92,7 +99,9 @@ def format_template_data(template, project=None, include_subprocess=None, tz=Non
     return data
 
 
-def format_template_list_data(templates, project=None, return_id_list=False, tz=None, include_executor_proxy=None):
+def format_template_list_data(
+    templates, project=None, return_id_list=False, tz=None, include_executor_proxy=None, include_notify=None
+):
     data = []
     ids = []
     for tmpl in templates:
@@ -119,6 +128,11 @@ def format_template_list_data(templates, project=None, return_id_list=False, tz=
         if return_id_list:
             ids.append(item["id"])
 
+        if include_notify:
+            item.update(
+                {"notify_type": json.loads(tmpl.notify_type), "notify_receivers": json.loads(tmpl.notify_receivers)}
+            )
+
         if include_executor_proxy and hasattr(tmpl, "executor_proxy"):
             item.update({"executor_proxy": tmpl.executor_proxy})