core/oc-lib
5
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

workin exucution scheduler

Browse Source
This commit is contained in:
mr 2024-07-30 09:20:33 +02:00
parent 4730d5b4d4
commit 6ac855394b
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
models/workflow/workflow_mongo_accessor.go
View File

@ -28,20 +28,23 @@ func (wfa *WorkflowMongoAccessor) execution(realData *Workflow, delete bool) (in
} }
if realData.Schedule != nil { if realData.Schedule != nil {
accessor := (&workflow_execution.WorkflowExecution{}).GetAccessor() accessor := (&workflow_execution.WorkflowExecution{}).GetAccessor()
if realData.Schedule.Start.IsZero() { if realData.Schedule.Start == nil || realData.Schedule.Start.IsZero() {
return 422, errors.New("should get a start date on the scheduler.") return 422, errors.New("should get a start date on the scheduler.")
} }
if realData.Schedule.End != nil && realData.Schedule.End.IsZero() {
realData.Schedule.End = nil
}
if len(realData.Schedule.Cron) > 0 { if len(realData.Schedule.Cron) > 0 {
if realData.Schedule.End.IsZero() { if realData.Schedule.End == nil {
return 422, errors.New("a cron task should got a end date.") return 422, errors.New("a cron task should got a end date.")
} }
c, err := cron.Parse(realData.Schedule.Cron) c, err := cron.Parse(realData.Schedule.Cron)
if err != nil { if err != nil {
return 422, errors.New("Bad cron message: " + err.Error()) return 422, errors.New("Bad cron message: " + err.Error())
} }
for s := c.Next(realData.Schedule.Start); !s.IsZero() && s.Before(realData.Schedule.End); s = c.Next(s) { for s := c.Next(*realData.Schedule.Start); !s.IsZero() && s.Before(*realData.Schedule.End); s = c.Next(s) {
obj := &workflow_execution.WorkflowExecution{ obj := &workflow_execution.WorkflowExecution{
ExecDate: s, ExecDate: &s,
EndDate: realData.Schedule.End, EndDate: realData.Schedule.End,
State: workflow_execution.SCHEDULED, State: workflow_execution.SCHEDULED,
WorkflowID: realData.UUID, WorkflowID: realData.UUID,

8
models/workflow/workflow_schedule.go
View File

@ -3,10 +3,10 @@ package oclib
import "time" import "time"
type WorkflowSchedule struct { type WorkflowSchedule struct {
Id string `json:"id"` Id string `json:"id"`
Start time.Time `json:"start" bson:"start" validate:"required"` Start *time.Time `json:"start" bson:"start" validate:"required"`
End time.Time `json:"end,omitempty" bson:"end,omitempty"` End *time.Time `json:"end,omitempty" bson:"end,omitempty"`
Cron string `json:"cron,omitempty" bson:"cron,omitempty"` Cron string `json:"cron,omitempty" bson:"cron,omitempty"`
} }
func (ws *WorkflowSchedule) GetAllDates() (timetable []time.Time) { func (ws *WorkflowSchedule) GetAllDates() (timetable []time.Time) {

4
models/workflow_execution/workflow_execution.go
View File

@ -39,8 +39,8 @@ func (d ScheduledType) EnumIndex() int {
type WorkflowExecution struct { type WorkflowExecution struct {
UUID string `json:"id,omitempty" bson:"id,omitempty" validate:"required"` UUID string `json:"id,omitempty" bson:"id,omitempty" validate:"required"`
ExecDate time.Time `json:"execution_date,omitempty" bson:"execution_date,omitempty" validate:"required"` ExecDate *time.Time `json:"execution_date,omitempty" bson:"execution_date,omitempty" validate:"required"`
EndDate time.Time `json:"end_date,omitempty" bson:"end_date,omitempty"` EndDate *time.Time `json:"end_date,omitempty" bson:"end_date,omitempty"`
State ScheduledType `json:"state,omitempty" bson:"state,omitempty" ` State ScheduledType `json:"state,omitempty" bson:"state,omitempty" `
WorkflowID string `json:"workflow_id" bson:"workflow_id,omitempty"` WorkflowID string `json:"workflow_id" bson:"workflow_id,omitempty"`
} }