From ebe3c4083f3ce10cdca5d853c4e9a4580af9f4ba Mon Sep 17 00:00:00 2001
From: Ken Hibino <ken.hibino7@gmail.com>
Date: Sat, 5 Sep 2020 07:11:55 -0700
Subject: [PATCH] Rename NextEnqueueAt to NextProcessAt

---
 inspector.go            | 16 ++++++++--------
 inspector_test.go       |  8 ++++----
 tools/asynq/cmd/task.go |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/inspector.go b/inspector.go
index c097c61..e4f173e 100644
--- a/inspector.go
+++ b/inspector.go
@@ -138,7 +138,7 @@ type ScheduledTask struct {
 	*Task
 	ID            string
 	Queue         string
-	NextEnqueueAt time.Time
+	NextProcessAt time.Time
 
 	score int64
 }
@@ -148,7 +148,7 @@ type RetryTask struct {
 	*Task
 	ID            string
 	Queue         string
-	NextEnqueueAt time.Time
+	NextProcessAt time.Time
 	MaxRetry      int
 	Retried       int
 	ErrorMsg      string
@@ -318,7 +318,7 @@ func (i *Inspector) ListInProgressTasks(qname string, opts ...ListOption) ([]*In
 }
 
 // ListScheduledTasks retrieves scheduled tasks from the specified queue.
-// Tasks are sorted by NextEnqueueAt field in ascending order.
+// Tasks are sorted by NextProcessAt field in ascending order.
 //
 // By default, it retrieves the first 30 tasks.
 func (i *Inspector) ListScheduledTasks(qname string, opts ...ListOption) ([]*ScheduledTask, error) {
@@ -333,13 +333,13 @@ func (i *Inspector) ListScheduledTasks(qname string, opts ...ListOption) ([]*Sch
 	}
 	var tasks []*ScheduledTask
 	for _, z := range zs {
-		enqueueAt := time.Unix(z.Score, 0)
+		processAt := time.Unix(z.Score, 0)
 		t := NewTask(z.Message.Type, z.Message.Payload)
 		tasks = append(tasks, &ScheduledTask{
 			Task:          t,
 			ID:            z.Message.ID.String(),
 			Queue:         z.Message.Queue,
-			NextEnqueueAt: enqueueAt,
+			NextProcessAt: processAt,
 			score:         z.Score,
 		})
 	}
@@ -347,7 +347,7 @@ func (i *Inspector) ListScheduledTasks(qname string, opts ...ListOption) ([]*Sch
 }
 
 // ListRetryTasks retrieves retry tasks from the specified queue.
-// Tasks are sorted by NextEnqueueAt field in ascending order.
+// Tasks are sorted by NextProcessAt field in ascending order.
 //
 // By default, it retrieves the first 30 tasks.
 func (i *Inspector) ListRetryTasks(qname string, opts ...ListOption) ([]*RetryTask, error) {
@@ -362,13 +362,13 @@ func (i *Inspector) ListRetryTasks(qname string, opts ...ListOption) ([]*RetryTa
 	}
 	var tasks []*RetryTask
 	for _, z := range zs {
-		enqueueAt := time.Unix(z.Score, 0)
+		processAt := time.Unix(z.Score, 0)
 		t := NewTask(z.Message.Type, z.Message.Payload)
 		tasks = append(tasks, &RetryTask{
 			Task:          t,
 			ID:            z.Message.ID.String(),
 			Queue:         z.Message.Queue,
-			NextEnqueueAt: enqueueAt,
+			NextProcessAt: processAt,
 			MaxRetry:      z.Message.Retry,
 			Retried:       z.Message.Retried,
 			// TODO: LastFailedAt: z.Message.LastFailedAt
diff --git a/inspector_test.go b/inspector_test.go
index 2bfb1f2..53ae940 100644
--- a/inspector_test.go
+++ b/inspector_test.go
@@ -351,7 +351,7 @@ func createScheduledTask(z base.Z) *ScheduledTask {
 		Task:          NewTask(msg.Type, msg.Payload),
 		ID:            msg.ID.String(),
 		Queue:         msg.Queue,
-		NextEnqueueAt: time.Unix(z.Score, 0),
+		NextProcessAt: time.Unix(z.Score, 0),
 		score:         z.Score,
 	}
 }
@@ -383,7 +383,7 @@ func TestInspectorListScheduledTasks(t *testing.T) {
 				"custom":  {z4},
 			},
 			qname: "default",
-			// Should be sorted by NextEnqueuedAt.
+			// Should be sorted by NextProcessAt.
 			want: []*ScheduledTask{
 				createScheduledTask(z3),
 				createScheduledTask(z1),
@@ -423,7 +423,7 @@ func createRetryTask(z base.Z) *RetryTask {
 		Task:          NewTask(msg.Type, msg.Payload),
 		ID:            msg.ID.String(),
 		Queue:         msg.Queue,
-		NextEnqueueAt: time.Unix(z.Score, 0),
+		NextProcessAt: time.Unix(z.Score, 0),
 		MaxRetry:      msg.Retry,
 		Retried:       msg.Retried,
 		ErrorMsg:      msg.ErrorMsg,
@@ -458,7 +458,7 @@ func TestInspectorListRetryTasks(t *testing.T) {
 				"custom":  {z4},
 			},
 			qname: "default",
-			// Should be sorted by NextEnqueuedAt.
+			// Should be sorted by NextProcessAt.
 			want: []*RetryTask{
 				createRetryTask(z3),
 				createRetryTask(z1),
diff --git a/tools/asynq/cmd/task.go b/tools/asynq/cmd/task.go
index 69d0b91..4dcf5d0 100644
--- a/tools/asynq/cmd/task.go
+++ b/tools/asynq/cmd/task.go
@@ -239,7 +239,7 @@ func listScheduledTasks(qname string, pageNum, pageSize int) {
 		func(w io.Writer, tmpl string) {
 			for _, t := range tasks {
 				processIn := fmt.Sprintf("%.0f seconds",
-					t.NextEnqueueAt.Sub(time.Now()).Seconds())
+					t.NextProcessAt.Sub(time.Now()).Seconds())
 				fmt.Fprintf(w, tmpl, t.Key(), t.Type, t.Payload, processIn)
 			}
 		},
@@ -262,7 +262,7 @@ func listRetryTasks(qname string, pageNum, pageSize int) {
 		func(w io.Writer, tmpl string) {
 			for _, t := range tasks {
 				var nextRetry string
-				if d := t.NextEnqueueAt.Sub(time.Now()); d > 0 {
+				if d := t.NextProcessAt.Sub(time.Now()); d > 0 {
 					nextRetry = fmt.Sprintf("in %v", d.Round(time.Second))
 				} else {
 					nextRetry = "right now"