fix(coderd): humanize duration on notifications #14333
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| package duration | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "time" | ||
| ) | ||
|
|
||
| type Unit struct { | ||
| value int | ||
| unit string | ||
| } | ||
|
|
||
| func Humanize(d time.Duration) string { | ||
dannykopping marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| units := []Unit{ | ||
| {int(d.Hours() / 24), "day"}, | ||
| {int(d.Hours()) % 24, "hour"}, | ||
| {int(d.Minutes()) % 60, "minute"}, | ||
| {int(d.Seconds()) % 60, "second"}, | ||
| } | ||
| nonZeroUnits := []Unit{} | ||
| for _, unit := range units { | ||
| if unit.value > 0 { | ||
| nonZeroUnits = append(nonZeroUnits, unit) | ||
| } | ||
| } | ||
| if len(nonZeroUnits) == 0 { | ||
| return "0 seconds" | ||
| } | ||
| var result string | ||
| for i, unit := range nonZeroUnits { | ||
| if i > 0 { | ||
| if i == len(nonZeroUnits)-1 { | ||
| result += " and " | ||
| } else { | ||
| result += ", " | ||
| } | ||
| } | ||
| result += fmt.Sprintf("%d %s", unit.value, unit.unit) | ||
| if unit.value > 1 { | ||
| result += "s" | ||
| } | ||
| } | ||
| return result | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| package duration_test | ||
|
|
||
| import ( | ||
| "testing" | ||
| "time" | ||
|
|
||
| duration "github.com/coder/coder/v2/coderd/util/time" | ||
| ) | ||
|
|
||
| func TestHumanize(t *testing.T) { | ||
| t.Parallel() | ||
|
|
||
| testCases := []struct { | ||
| duration time.Duration | ||
| expected string | ||
| }{ | ||
| { | ||
| duration: time.Duration(0), | ||
| expected: "0 seconds", | ||
| }, | ||
| { | ||
| duration: time.Duration(1 * time.Second), | ||
| expected: "1 second", | ||
| }, | ||
| { | ||
| duration: time.Duration(45 * time.Second), | ||
| expected: "45 seconds", | ||
| }, | ||
| { | ||
| duration: time.Duration(30 * time.Minute), | ||
| expected: "30 minutes", | ||
| }, | ||
| { | ||
| duration: time.Duration(30*time.Minute + 10*time.Second), | ||
| expected: "30 minutes and 10 seconds", | ||
| }, | ||
| { | ||
| duration: time.Duration(2*time.Hour + 25*time.Minute + 10*time.Second), | ||
| expected: "2 hours, 25 minutes and 10 seconds", | ||
| }, | ||
| { | ||
| duration: time.Duration(2400 * time.Hour), | ||
| expected: "100 days", | ||
| }, | ||
| } | ||
|
|
||
| for _, tc := range testCases { | ||
| t.Run(tc.expected, func(t *testing.T) { | ||
| t.Parallel() | ||
|
|
||
| actual := duration.Humanize(tc.duration) | ||
| if actual != tc.expected { | ||
| t.Errorf("expected: %s, got: %s", tc.expected, actual) | ||
| } | ||
| }) | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A test which includes not such a round number would also be helpful for illustrative purposes.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added