event: Add String() to duration

* Add a String() method on duration to return a human friendly
  representation of the duration
* Update MarshalJSON to marshal the underying time.Duration instead.
  Though this is less human friendly, it's more friendly to computers
  on the other side

Author: daenney

event.go

@@ -1,6 +1,7 @@
 package gdq
 
 import (
+	"encoding/json"
 	"fmt"
 	"strings"
 	"time"
@@ -13,7 +14,37 @@ type duration struct {
 }
 
 func (d duration) MarshalJSON() (b []byte, err error) {
-	return []byte(fmt.Sprintf(`"%s"`, d.String())), nil
+	return json.Marshal(d.Duration)
+}
+
+func (d duration) String() string {
+	dur := d.Round(time.Minute)
+	h := dur / time.Hour
+	m := (dur - (h * time.Hour)) / time.Minute
+	if h == 0 {
+		if m == 1 {
+			return "1 minute"
+		}
+		return fmt.Sprintf("%d minutes", m)
+	}
+	b := strings.Builder{}
+	if h == 1 {
+		b.WriteString("1 hour")
+	} else {
+		b.WriteString(fmt.Sprintf("%d hours", h))
+	}
+
+	if m == 0 {
+		return b.String()
+	}
+
+	b.WriteString(" and ")
+	if m == 1 {
+		b.WriteString("1 minute")
+	} else {
+		b.WriteString(fmt.Sprintf("%d minutes", m))
+	}
+	return b.String()
 }
 
 // Event represents a single event at a GDQ

event_test.go

@@ -8,16 +8,37 @@ import (
 	"github.com/anaskhan96/soup"
 )
 
-func TestDurationMarhsal(t *testing.T) {
+func TestDurationMarshal(t *testing.T) {
 	d := duration{0}
 	j, err := d.MarshalJSON()
 	assertEqual(t, err, nil)
-	assertEqual(t, string(j), "\"0s\"")
+	assertEqual(t, string(j), "0")
 
 	dn := duration{1*time.Hour + 1*time.Minute + 1*time.Second}
 	jn, err := dn.MarshalJSON()
 	assertEqual(t, err, nil)
-	assertEqual(t, string(jn), "\"1h1m1s\"")
+	assertEqual(t, string(jn), "3661000000000")
+}
+
+func TestDurationString(t *testing.T) {
+	t.Run("no hours, no minutes", func(t *testing.T) {
+		assertEqual(t, duration{0}.String(), "0 minutes")
+	})
+	t.Run("one hour, no minutes", func(t *testing.T) {
+		assertEqual(t, duration{1 * time.Hour}.String(), "1 hour")
+	})
+	t.Run("one hour, one minute", func(t *testing.T) {
+		assertEqual(t, duration{1*time.Hour + 1*time.Minute}.String(), "1 hour and 1 minute")
+	})
+	t.Run("one hour, two minutes", func(t *testing.T) {
+		assertEqual(t, duration{1*time.Hour + 2*time.Minute}.String(), "1 hour and 2 minutes")
+	})
+	t.Run("one minute", func(t *testing.T) {
+		assertEqual(t, duration{1 * time.Minute}.String(), "1 minute")
+	})
+	t.Run(" two minutes", func(t *testing.T) {
+		assertEqual(t, duration{2 * time.Minute}.String(), "2 minutes")
+	})
 }
 
 func TestNicksToSlice(t *testing.T) {