due date can have time

kobtea · Sep 23, 2019 · 46d5dde · 46d5dde
1 parent 47c558c
commit 46d5dde
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/todoist/time.go b/todoist/time.go
@@ -7,7 +7,9 @@ import (
 )
 
 const (
-	localLayout = "2006-01-02(Mon) 15:04"
+	dateLayout     = "2006-01-02"
+	datetimeLayout = time.RFC3339
+	localLayout    = "2006-01-02(Mon) 15:04"
 )
 
 type Time struct {
@@ -27,7 +29,10 @@ func Next7Days() Time {
 }
 
 func Parse(value string) (Time, error) {
-	t, err := time.Parse(time.RFC3339, value)
+	t, err := time.Parse(datetimeLayout, value)
+	if err != nil {
+		t, err = time.Parse(dateLayout, value)
+	}
 	if err != nil {
 		return Time{}, err
 	}
@@ -54,7 +59,11 @@ func (t Time) MarshalJSON() ([]byte, error) {
 	if t.IsZero() {
 		return []byte("null"), nil
 	}
-	return []byte(strconv.Quote(t.Time.Format(time.RFC3339))), nil
+	layout := datetimeLayout
+	if t.Hour() == 0 && t.Minute() == 0 && t.Second() == 0 {
+		layout = dateLayout
+	}
+	return []byte(strconv.Quote(t.Time.Format(layout))), nil
 }
 
 func (t *Time) UnmarshalJSON(b []byte) (err error) {

diff --git a/todoist/time_test.go b/todoist/time_test.go
@@ -18,6 +18,11 @@ var testTimes = []struct {
 		v: Time{time.Date(2014, 9, 26, 8, 25, 5, 0, time.UTC)},
 		e: nil,
 	},
+	{
+		s: "2014-09-26",
+		v: Time{time.Date(2014, 9, 26, 0,0,0,0,time.UTC)},
+		e: nil,
+	},
 }
 
 func TestParse(t *testing.T) {