Extends Duration to support minutes

Author: vyzaldysanchez

pkg/config/duration.go

@@ -4,6 +4,9 @@ import (
 	"database/sql/driver"
 	"encoding/json"
 	"fmt"
+	"regexp"
+	"strconv"
+	"strings"
 	"time"
 )
 
@@ -59,25 +62,24 @@ func (d Duration) String() string {
 
 // MarshalJSON implements the json.Marshaler interface.
 func (d Duration) MarshalJSON() ([]byte, error) {
-	return json.Marshal(d.String())
+	// json.Marshal to get a proper JSON string with quotes/escaping
+	return json.Marshal(formatDuration(d.d))
 }
 
 // UnmarshalJSON implements the json.Unmarshaler interface.
 func (d *Duration) UnmarshalJSON(input []byte) error {
 	var txt string
-	err := json.Unmarshal(input, &txt)
-	if err != nil {
+	if err := json.Unmarshal(input, &txt); err != nil {
 		return err
 	}
-	v, err := time.ParseDuration(txt)
+
+	v, err := parseDuration(txt)
 	if err != nil {
 		return err
 	}
+
 	*d, err = NewDuration(v)
-	if err != nil {
-		return err
-	}
-	return nil
+	return err
 }
 
 func (d *Duration) Scan(v any) (err error) {
@@ -102,14 +104,81 @@ func (d Duration) MarshalText() ([]byte, error) {
 
 // UnmarshalText implements the text.Unmarshaler interface.
 func (d *Duration) UnmarshalText(input []byte) error {
-	v, err := time.ParseDuration(string(input))
+	v, err := parseDuration(string(input))
 	if err != nil {
 		return err
 	}
+
 	pd, err := NewDuration(v)
 	if err != nil {
 		return err
 	}
+
 	*d = pd
+
 	return nil
 }
+
+func formatDuration(dur time.Duration) string {
+	if dur == 0 {
+		return "0s"
+	}
+
+	var parts []string
+
+	days := dur / (24 * time.Hour)
+	if days > 0 {
+		parts = append(parts, fmt.Sprintf("%dd", days))
+		dur %= 24 * time.Hour
+	}
+
+	if days > 0 && dur == 0 {
+		return strings.Join(parts, "")
+	}
+
+	hours := dur / time.Hour
+	minutes := (dur % time.Hour) / time.Minute
+	seconds := (dur % time.Minute) / time.Second
+	nanos := dur % time.Second
+
+	if days > 0 {
+		return fmt.Sprintf("%dd%dh%dm%ds", days, hours, minutes, seconds)
+	}
+
+	if hours > 0 {
+		parts = append(parts, fmt.Sprintf("%dh", hours))
+	}
+	if minutes > 0 || (hours > 0) {
+		parts = append(parts, fmt.Sprintf("%dm", minutes))
+	}
+
+	if dur < time.Second {
+		return dur.String()
+	}
+
+	if nanos == 0 {
+		if seconds > 0 || (minutes > 0) || (hours > 0) {
+			parts = append(parts, fmt.Sprintf("%ds", seconds))
+		}
+	} else {
+		parts = append(parts, fmt.Sprintf("%g", float64(seconds)+float64(nanos)/1e9)+"s")
+	}
+
+	if len(parts) == 0 {
+		return dur.String()
+	}
+
+	return strings.Join(parts, "")
+}
+
+func parseDuration(s string) (time.Duration, error) {
+	if strings.ContainsAny(s, "dhms") {
+		// Replace "d" with "h" and multiply the number by 24
+		re := regexp.MustCompile(`(\d+)d`)
+		s = re.ReplaceAllStringFunc(s, func(match string) string {
+			val, _ := strconv.Atoi(strings.TrimSuffix(match, "d"))
+			return fmt.Sprintf("%dh", val*24)
+		})
+	}
+	return time.ParseDuration(s)
+}

pkg/config/duration_test.go

@@ -20,6 +20,13 @@ func TestDuration_MarshalJSON(t *testing.T) {
 		{"one minute", *MustNewDuration(time.Minute), `"1m0s"`},
 		{"one hour", *MustNewDuration(time.Hour), `"1h0m0s"`},
 		{"one hour thirty minutes", *MustNewDuration(time.Hour + 30*time.Minute), `"1h30m0s"`},
+		{"1 day", *MustNewDuration(24 * time.Hour), `"1d"`},
+		{"2 days", *MustNewDuration(48 * time.Hour), `"2d"`},
+		{"1 day 12 hours", *MustNewDuration(36 * time.Hour), `"1d12h0m0s"`},
+		{"3 days 6 hours 30 minutes", *MustNewDuration(78*time.Hour + 30*time.Minute), `"3d6h30m0s"`},
+		{"4 days 1 hour 0 minutes 10 seconds", *MustNewDuration(97*time.Hour + 10*time.Second), `"4d1h0m10s"`},
+		{"4 days 0 hours 0 minutes 10 seconds", *MustNewDuration(4*24*time.Hour + 10*time.Second), `"4d0h0m10s"`},
+		{"4 days 0 hours 22 minutes 10 seconds", *MustNewDuration(4*24*time.Hour + 22*time.Minute + 10*time.Second), `"4d0h22m10s"`},
 	}
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
@@ -30,6 +37,41 @@ func TestDuration_MarshalJSON(t *testing.T) {
 	}
 }
 
+func TestDuration_UnmarshalJSON(t *testing.T) {
+	tests := []struct {
+		name    string
+		input   string
+		want    Duration
+		wantErr bool
+	}{
+		{"zero", `"0s"`, *MustNewDuration(0), false},
+		{"one second", `"1s"`, *MustNewDuration(time.Second), false},
+		{"one minute", `"1m0s"`, *MustNewDuration(time.Minute), false},
+		{"one hour", `"1h0m0s"`, *MustNewDuration(time.Hour), false},
+		{"one hour thirty minutes", `"1h30m0s"`, *MustNewDuration(time.Hour + 30*time.Minute), false},
+		{"1 day", `"1d"`, *MustNewDuration(24 * time.Hour), false},
+		{"2 days", `"2d"`, *MustNewDuration(48 * time.Hour), false},
+		{"1 day 12 hours", `"1d12h0m0s"`, *MustNewDuration(36 * time.Hour), false},
+		{"3 days 6 hours 30 minutes", `"3d6h30m0s"`, *MustNewDuration(78*time.Hour + 30*time.Minute), false},
+		{"4 days 1 hour 0 minutes 10 seconds", `"4d1h0m10s"`, *MustNewDuration(97*time.Hour + 10*time.Second), false},
+		{"4 days 0 hours 0 minutes 10 seconds", `"4d0h0m10s"`, *MustNewDuration(4*24*time.Hour + 10*time.Second), false},
+		{"4 days 0 hours 22 minutes 10 seconds", `"4d0h22m10s"`, *MustNewDuration(4*24*time.Hour + 22*time.Minute + 10*time.Second), false},
+		{"invalid", `"invalid"`, Duration{}, true},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			var d Duration
+			err := json.Unmarshal([]byte(tt.input), &d)
+			if tt.wantErr {
+				assert.Error(t, err)
+			} else {
+				assert.NoError(t, err)
+				assert.Equal(t, tt.want, d)
+			}
+		})
+	}
+}
+
 func TestDuration_Scan_Value(t *testing.T) {
 	t.Parallel()