feat(backend): 解决资源申请flow失败终止不了bug #15429

Author: teng00123

dbm-ui/backend/ticket/constants.py

@@ -724,7 +724,11 @@ class FlowType(StrStructuredEnum):
 
 
 # 任务流程类型合集
-FLOW_TASK_TYPES = [FlowType.INNER_FLOW, FlowType.HOST_RECYCLE, FlowType.RESOURCE_HCM_REPLENISH]
+FLOW_TASK_TYPES = [
+    FlowType.INNER_FLOW,
+    FlowType.HOST_RECYCLE,
+    FlowType.RESOURCE_HCM_REPLENISH,
+]
 
 
 class FlowContext(StrStructuredEnum):

dbm-ui/backend/ticket/flow_manager/resource.py

@@ -84,11 +84,8 @@ def _status(self) -> str:
             return self.update_flow_status(constants.TicketFlowStatus.SUCCEEDED)
 
         if self.flow_obj.err_msg:
-            # 如果是其他情况引起的错误，则直接返回fail
-            if not self.flow_obj.todo_of_flow.exists():
-                return self.update_flow_status(constants.TicketFlowStatus.FAILED)
-            # 如果是资源申请的todo状态，则判断todo是否完成
-            if self.ticket.todo_of_ticket.exist_unfinished():
+            # 如果是资源申请的todo状态，则判断todo是否完成并且是否资源不足
+            if self.ticket.todo_of_ticket.exist_lack_unfinished():
                 return self.update_flow_status(constants.TicketFlowStatus.RUNNING)
             else:
                 return self.flow_obj.status

dbm-ui/backend/ticket/models/todo.py

@@ -27,6 +27,9 @@ class TodoManager(models.Manager):
     def exist_unfinished(self):
         return self.filter(status__in=TODO_RUNNING_STATUS).exists()
 
+    def exist_lack_unfinished(self):
+        return self.filter(status__in=TODO_RUNNING_STATUS, type=TodoType.RESOURCE_REPLENISH).exists()
+
     def get_operators(self, todo_type, flow, ticket, operators):
         # 获得提单人，dba，协助人.
         creator = [ticket.creator]