diff --git a/status.go b/status.go index 4a79a9437f5957ed5e1074cc308b5634232618fe..a58fa915e6e71b056117a1b4eb86d94fefbbe482 100644 --- a/status.go +++ b/status.go @@ -17,15 +17,15 @@ var ( ) // ParseTaskStatus parses a string to a TaskStatus value (case-insensitive). -// Valid values: "later", "next", "started", "waiting", "completed". +// Valid values: "later", "next", "started", "in-progress", "waiting", "completed". func ParseTaskStatus(str string) (TaskStatus, error) { switch strings.ToLower(str) { case "later": return StatusLater, nil case "next": return StatusNext, nil - case "started": - return StatusStarted, nil + case "started", "in-progress": + return StatusInProgress, nil case "waiting": return StatusWaiting, nil case "completed": diff --git a/status_test.go b/status_test.go index 46aafffc3ba9075c17505ca70a81a80c0813f4fe..07629193389249c699c208ad601bbe228547fe09 100644 --- a/status_test.go +++ b/status_test.go @@ -24,8 +24,10 @@ func TestParseTaskStatus(t *testing.T) { {"later_mixed", "LaTeR", lunatask.StatusLater, false}, {"next_lower", "next", lunatask.StatusNext, false}, {"next_upper", "NEXT", lunatask.StatusNext, false}, - {"started_lower", "started", lunatask.StatusStarted, false}, - {"started_upper", "STARTED", lunatask.StatusStarted, false}, + {"started_lower", "started", lunatask.StatusInProgress, false}, + {"started_upper", "STARTED", lunatask.StatusInProgress, false}, + {"in_progress_lower", "in-progress", lunatask.StatusInProgress, false}, + {"in_progress_upper", "IN-PROGRESS", lunatask.StatusInProgress, false}, {"waiting_lower", "waiting", lunatask.StatusWaiting, false}, {"waiting_upper", "WAITING", lunatask.StatusWaiting, false}, {"completed_lower", "completed", lunatask.StatusCompleted, false}, diff --git a/tasks_test.go b/tasks_test.go index 8af902b305b770ea8123ad76d878cd379b5c6050..a18bb4829203963a8160abb1fee5d5d393dd452c 100644 --- a/tasks_test.go +++ b/tasks_test.go @@ -309,7 +309,7 @@ func TestUpdateTask_AllBuilderFields(t *testing.T) { InArea(areaID). InGoal("goal-id"). WithNote("Updated note"). - WithStatus(lunatask.StatusStarted). + WithStatus(lunatask.StatusInProgress). WithMotivation(lunatask.MotivationShould). WithEisenhower(2). WithEstimate(90). diff --git a/types.go b/types.go index 6668e607209de0e65439630e6df85d7a3290843b..ac1411adf029d0d91494ddb8f018a4e85ae2c46f 100644 --- a/types.go +++ b/types.go @@ -109,11 +109,11 @@ type TaskStatus string // Valid task status values. const ( // StatusLater is the default status for new tasks. - StatusLater TaskStatus = "later" - StatusNext TaskStatus = "next" - StatusStarted TaskStatus = "started" - StatusWaiting TaskStatus = "waiting" - StatusCompleted TaskStatus = "completed" + StatusLater TaskStatus = "later" + StatusNext TaskStatus = "next" + StatusInProgress TaskStatus = "started" + StatusWaiting TaskStatus = "waiting" + StatusCompleted TaskStatus = "completed" ) // Motivation represents why a task matters.