Handle err from gronx NextTickAfter

go-vela · May 16, 2024 · 62f84c5 · 62f84c5
1 parent 2bf0b13
commit 62f84c5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/api/types/schedule.go b/api/types/schedule.go
@@ -354,13 +354,13 @@ func (s *Schedule) SetError(err string) {
 //
 // When the provided Schedule type is nil, it
 // will set nothing and immediately return.
-func (s *Schedule) SetNextRun(err int64) {
+func (s *Schedule) SetNextRun(nextRun int64) {
 	// return if Schedule type is nil
 	if s == nil {
 		return
 	}
 
-	s.NextRun = &err
+	s.NextRun = &nextRun
 }
 
 // String implements the Stringer interface for the Schedule type.

diff --git a/database/types/schedule.go b/database/types/schedule.go
@@ -89,7 +89,7 @@ func (s *Schedule) ToAPI() *api.Schedule {
 	schedule := new(api.Schedule)
 
 	t := time.Now().UTC()
-	nextTime, _ := gronx.NextTickAfter(s.Entry.String, t, false)
+	nextTime, err := gronx.NextTickAfter(s.Entry.String, t, false)
 
 	schedule.SetID(s.ID.Int64)
 	schedule.SetRepo(s.Repo.ToAPI())
@@ -103,7 +103,12 @@ func (s *Schedule) ToAPI() *api.Schedule {
 	schedule.SetScheduledAt(s.ScheduledAt.Int64)
 	schedule.SetBranch(s.Branch.String)
 	schedule.SetError(s.Error.String)
-	schedule.SetNextRun(nextTime.Unix())
+
+	if err != nil {
+		schedule.SetNextRun(nextTime.Unix())
+	} else {
+		schedule.SetNextRun(0)
+	}
 
 	return schedule
 }