sql工单执行进度迁移至api

Author: hhyo

sql/sql_workflow.py

@@ -139,21 +139,6 @@ def cancel(request):
     return HttpResponseRedirect(reverse("sql:detail", args=(workflow_id,)))
 
 
-def get_workflow_status(request):
-    """
-    获取某个工单的当前状态
-    """
-    workflow_id = request.POST["workflow_id"]
-    if workflow_id == "" or workflow_id is None:
-        context = {"status": -1, "msg": "workflow_id参数为空.", "data": ""}
-        return HttpResponse(json.dumps(context), content_type="application/json")
-
-    workflow_id = int(workflow_id)
-    workflow_detail = get_object_or_404(SqlWorkflow, pk=workflow_id)
-    result = {"status": workflow_detail.status, "msg": "", "data": ""}
-    return JsonResponse(result)
-
-
 def osc_control(request):
     """用于mysql控制osc执行"""
     workflow_id = request.POST.get("workflow_id")

sql/templates/detail.html

@@ -527,7 +527,7 @@ <h4 class="modal-title text-danger">修改可执行时间</h4>
         }
 
         // 工单操作
-        function sqlWorkflowAction(http_method ,action, data, btnAttrId) {
+        function sqlWorkflowAction(http_method, action, data, btnAttrId) {
             $.ajax({
                 type: http_method,
                 url: "/api/v2/workflow/sql/{{ workflow_detail.id }}/" + action + "/",
@@ -942,13 +942,11 @@ <h4 class="modal-title text-danger">修改可执行时间</h4>
             if (workflow_id > 0) {
                 // console.log('get workflow status');
                 $.ajax({
-                    type: "post",
+                    type: "get",
                     async: false,
-                    url: "/getWorkflowStatus/",
+                    contentType: "application/json",
+                    url: "/api/v2/workflow/sql/" + workflow_id + "/progress/",
                     dataType: "json",
-                    data: {
-                        workflow_id: workflow_id
-                    },
                     complete: function () {
                         if (wfStatus !== -1 && wfStatus !== "workflow_executing") {
                             window.location.reload(true);

sql/tests.py

@@ -791,14 +791,6 @@ def tearDown(self):
         self.resource_group1.delete()
         SysConfig().purge()
 
-    def testWorkflowStatus(self):
-        """测试获取工单状态"""
-        c = Client(header={})
-        c.force_login(self.u1)
-        r = c.post("/getWorkflowStatus/", {"workflow_id": self.wf1.id})
-        r_json = r.json()
-        self.assertEqual(r_json["status"], "workflow_finish")
-
     @patch("sql.utils.workflow_audit.Audit.logs")
     @patch("sql.utils.workflow_audit.Audit.detail_by_workflow_id")
     @patch("sql.utils.workflow_audit.Audit.review_info")
@@ -873,7 +865,6 @@ def testWorkflowPassedView(self, mock_operate, _):
         self.wf2.refresh_from_db()
         self.assertEqual(self.wf2.status, "workflow_review_pass")
 
-
     @patch("sql.sql_workflow.Audit.add_log")
     @patch("sql.notify.auto_notify")
     @patch("sql.utils.workflow_audit.AuditV2.operate")

sql/urls.py

@@ -75,7 +75,6 @@
     path("audit_sqlquery/", views.audit_sqlquery),
     path("audit_sqlworkflow/", views.audit_sqlworkflow),
     path("authenticate/", auth.authenticate_entry),
-    path("getWorkflowStatus/", sql_workflow.get_workflow_status),
     path("del_sqlcronjob/", tasks.del_schedule),
     path("inception/osc_control/", sql_workflow.osc_control),
     path("sql_analyze/generate/", sql_analyze.generate),

sql_api/permissions/sql_workflow.py

@@ -32,7 +32,7 @@ def has_permission(self, request, view):
             [
                 request.user.has_perm("sql.menu_sqlworkflow"),
                 request.user.has_perm("sql.audit_user"),
-                request.user.has_perm("sql.sql_submit")
+                request.user.has_perm("sql.sql_submit"),
             ]
         )
 

sql_api/urls.py

@@ -53,7 +53,10 @@
     path("v1/instance/tunnel/", api_instance.TunnelList.as_view()),
     path("v1/instance/rds/", api_instance.AliyunRdsList.as_view()),
     path("v1/workflow/", api_workflow.WorkflowList.as_view()),
-    path("v1/workflow/sqlcheck/", api_sql_workflow.SqlWorkflowView.as_view({'post': 'check'})),
+    path(
+        "v1/workflow/sqlcheck/",
+        api_sql_workflow.SqlWorkflowView.as_view({"post": "check"}),
+    ),
     path("v1/workflow/audit/", api_workflow.AuditWorkflow.as_view()),
     path("v1/workflow/auditlist/", api_workflow.WorkflowAuditList.as_view()),
     path("v1/workflow/execute/", api_workflow.ExecuteWorkflow.as_view()),