feat: cancel workflow run

internal/domain/dtos/workflow.go

@@ -2,7 +2,12 @@
 
 import "github.com/usual2970/certimate/internal/domain"
 
-type WorkflowRunReq struct {
+type WorkflowStartRunReq struct {
 	WorkflowId string                     `json:"-"`
 	Trigger    domain.WorkflowTriggerType `json:"trigger"`
 }
+
+type WorkflowCancelRunReq struct {
+	WorkflowId string `json:"-"`
+	RunId      string `json:"-"`
+}

internal/rest/handlers/certificate.go

@@ -24,12 +24,12 @@ func NewCertificateHandler(router *router.RouterGroup[*core.RequestEvent], servi
 	}
 
 	group := router.Group("/certificates")
-	group.POST("/{id}/archive", handler.run)
+	group.POST("/{certificateId}/archive", handler.run)
 }
 
 func (handler *CertificateHandler) run(e *core.RequestEvent) error {
 	req := &dtos.CertificateArchiveFileReq{}
-	req.CertificateId = e.Request.PathValue("id")
+	req.CertificateId = e.Request.PathValue("certificateId")
 	if err := e.BindBody(req); err != nil {
 		return resp.Err(e, err)
 	}

internal/rest/handlers/workflow.go

@@ -11,7 +11,8 @@ import (
 )
 
 type workflowService interface {
-	Run(ctx context.Context, req *dtos.WorkflowRunReq) error
+	StartRun(ctx context.Context, req *dtos.WorkflowStartRunReq) error
+	CancelRun(ctx context.Context, req *dtos.WorkflowCancelRunReq) error
 	Stop(ctx context.Context)
 }
 
@@ -25,17 +26,30 @@ func NewWorkflowHandler(router *router.RouterGroup[*core.RequestEvent], service
 	}
 
 	group := router.Group("/workflows")
-	group.POST("/{id}/run", handler.run)
+	group.POST("/{workflowId}/runs", handler.run)
+	group.POST("/{workflowId}/runs/{runId}/cancel", handler.cancel)
 }
 
 func (handler *WorkflowHandler) run(e *core.RequestEvent) error {
-	req := &dtos.WorkflowRunReq{}
-	req.WorkflowId = e.Request.PathValue("id")
+	req := &dtos.WorkflowStartRunReq{}
+	req.WorkflowId = e.Request.PathValue("workflowId")
 	if err := e.BindBody(req); err != nil {
 		return resp.Err(e, err)
 	}
 
-	if err := handler.service.Run(e.Request.Context(), req); err != nil {
+	if err := handler.service.StartRun(e.Request.Context(), req); err != nil {
+		return resp.Err(e, err)
+	}
+
+	return resp.Ok(e, nil)
+}
+
+func (handler *WorkflowHandler) cancel(e *core.RequestEvent) error {
+	req := &dtos.WorkflowCancelRunReq{}
+	req.WorkflowId = e.Request.PathValue("workflowId")
+	req.RunId = e.Request.PathValue("runId")
+
+	if err := handler.service.CancelRun(e.Request.Context(), req); err != nil {
 		return resp.Err(e, err)
 	}
 

internal/workflow/event.go

@@ -65,7 +65,7 @@ func onWorkflowRecordCreateOrUpdate(ctx context.Context, record *core.Record) er
 
 	// 反之，重新添加定时任务
 	err := scheduler.Add(fmt.Sprintf("workflow#%s", workflowId), record.GetString("triggerCron"), func() {
-		NewWorkflowService(repository.NewWorkflowRepository()).Run(ctx, &dtos.WorkflowRunReq{
+		NewWorkflowService(repository.NewWorkflowRepository()).StartRun(ctx, &dtos.WorkflowStartRunReq{
 			WorkflowId: workflowId,
 			Trigger:    domain.WorkflowTriggerTypeAuto,
 		})

internal/workflow/service.go

@@ -60,7 +60,7 @@ func (s *WorkflowService) InitSchedule(ctx context.Context) error {
 	scheduler := app.GetScheduler()
 	for _, workflow := range workflows {
 		err := scheduler.Add(fmt.Sprintf("workflow#%s", workflow.Id), workflow.TriggerCron, func() {
-			s.Run(ctx, &dtos.WorkflowRunReq{
+			s.StartRun(ctx, &dtos.WorkflowStartRunReq{
 				WorkflowId: workflow.Id,
 				Trigger:    domain.WorkflowTriggerTypeAuto,
 			})
@@ -74,7 +74,7 @@ func (s *WorkflowService) InitSchedule(ctx context.Context) error {
 	return nil
 }
 
-func (s *WorkflowService) Run(ctx context.Context, req *dtos.WorkflowRunReq) error {
+func (s *WorkflowService) StartRun(ctx context.Context, req *dtos.WorkflowStartRunReq) error {
 	workflow, err := s.repo.GetById(ctx, req.WorkflowId)
 	if err != nil {
 		app.GetLogger().Error("failed to get workflow", "id", req.WorkflowId, "err", err)
@@ -102,6 +102,12 @@ func (s *WorkflowService) Run(ctx context.Context, req *dtos.WorkflowRunReq) err
 	return nil
 }
 
+func (s *WorkflowService) CancelRun(ctx context.Context, req *dtos.WorkflowCancelRunReq) error {
+	// TODO: 取消运行，防止因为某些原因意外挂起（如进程被杀死）导致工作流一直处于 running 状态无法重新运行
+
+	return nil
+}
+
 func (s *WorkflowService) Stop(ctx context.Context) {
 	s.cancel()
 	s.wg.Wait()