feat: rename , executionMethod/type to trigger, crontab to triggerCron
This commit is contained in:
@@ -15,19 +15,19 @@ const (
|
||||
)
|
||||
|
||||
const (
|
||||
WorkflowTypeAuto = "auto"
|
||||
WorkflowTypeManual = "manual"
|
||||
WorkflowTriggerAuto = "auto"
|
||||
WorkflowTriggerManual = "manual"
|
||||
)
|
||||
|
||||
type Workflow struct {
|
||||
Meta
|
||||
Name string `json:"name"`
|
||||
Description string `json:"description"`
|
||||
Type string `json:"type"`
|
||||
Crontab string `json:"crontab"`
|
||||
Trigger string `json:"trigger"`
|
||||
TriggerCron string `json:"triggerCron"`
|
||||
Enabled bool `json:"enabled"`
|
||||
Content *WorkflowNode `json:"content"`
|
||||
Draft *WorkflowNode `json:"draft"`
|
||||
Enabled bool `json:"enabled"`
|
||||
HasDraft bool `json:"hasDraft"`
|
||||
}
|
||||
|
||||
|
||||
@@ -20,8 +20,8 @@ func NewWorkflowRepository() *WorkflowRepository {
|
||||
func (w *WorkflowRepository) ListEnabledAuto(ctx context.Context) ([]domain.Workflow, error) {
|
||||
records, err := app.GetApp().Dao().FindRecordsByFilter(
|
||||
"workflow",
|
||||
"enabled={:enabled} && type={:type}",
|
||||
"-created", 1000, 0, dbx.Params{"enabled": true, "type": domain.WorkflowTypeAuto},
|
||||
"enabled={:enabled} && trigger={:trigger}",
|
||||
"-created", 1000, 0, dbx.Params{"enabled": true, "trigger": domain.WorkflowTriggerAuto},
|
||||
)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@@ -83,13 +83,12 @@ func record2Workflow(record *models.Record) (*domain.Workflow, error) {
|
||||
},
|
||||
Name: record.GetString("name"),
|
||||
Description: record.GetString("description"),
|
||||
Type: record.GetString("type"),
|
||||
Crontab: record.GetString("crontab"),
|
||||
Trigger: record.GetString("trigger"),
|
||||
TriggerCron: record.GetString("triggerCron"),
|
||||
Enabled: record.GetBool("enabled"),
|
||||
Content: content,
|
||||
Draft: draft,
|
||||
HasDraft: record.GetBool("hasDraft"),
|
||||
|
||||
Content: content,
|
||||
Draft: draft,
|
||||
}
|
||||
|
||||
return workflow, nil
|
||||
|
||||
@@ -46,16 +46,16 @@ func update(ctx context.Context, record *models.Record) error {
|
||||
|
||||
id := record.Id
|
||||
enabled := record.GetBool("enabled")
|
||||
executeMethod := record.GetString("type")
|
||||
trigger := record.GetString("trigger")
|
||||
|
||||
scheduler := app.GetScheduler()
|
||||
if !enabled || executeMethod == domain.WorkflowTypeManual {
|
||||
if !enabled || trigger == domain.WorkflowTriggerManual {
|
||||
scheduler.Remove(id)
|
||||
scheduler.Start()
|
||||
return nil
|
||||
}
|
||||
|
||||
err := scheduler.Add(id, record.GetString("crontab"), func() {
|
||||
err := scheduler.Add(id, record.GetString("triggerCron"), func() {
|
||||
NewWorkflowService(repository.NewWorkflowRepository()).Run(ctx, &domain.WorkflowRunReq{
|
||||
Id: id,
|
||||
})
|
||||
|
||||
@@ -33,7 +33,7 @@ func (s *WorkflowService) InitSchedule(ctx context.Context) error {
|
||||
}
|
||||
scheduler := app.GetScheduler()
|
||||
for _, workflow := range workflows {
|
||||
err := scheduler.Add(workflow.Id, workflow.Crontab, func() {
|
||||
err := scheduler.Add(workflow.Id, workflow.TriggerCron, func() {
|
||||
s.Run(ctx, &domain.WorkflowRunReq{
|
||||
Id: workflow.Id,
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user