Fix display time of milestones

[schorsch13]

There is an issue with the displaying of milestone update times. Currently instead of displaying 2 days 5h 45min 3s it displays 63h 45min 3s.

See: https://try.gitea.io/schorsch/milestone/milestones

This PR fixes this behavior

Testing

I also tested the function with the following script

package main
import (
  "fmt"
  "math"
)

func main() {
  for i := 1.0; i < 7; i++ {
    fmt.Println(SecToTime(int64(math.Pow(10, i))))
  }
}

// SecToTime converts an amount of seconds to a human-readable string (example: 66s -> 1min 6s)
func SecToTime(duration int64) string {
	seconds := duration % 60
	minutes := (duration / (60)) % 60
	hours := duration / (60 * 60) % 24
	days := duration / (60 * 60) / 24

	var hrs string

	if days > 1 {
		hrs = fmt.Sprintf("%d days", days)
	} else {
		hrs = fmt.Sprintf("%d day", days)
	}
	if hours > 0 {
		if days == 0 {
			hrs = fmt.Sprintf("%dh", hours)
		} else {
			hrs = fmt.Sprintf("%s %dh", hrs, hours)
		}
	}
	if minutes > 0 {
		if days == 0 && hours == 0 {
			hrs = fmt.Sprintf("%dmin", minutes)
		} else {
			hrs = fmt.Sprintf("%s %dmin", hrs, minutes)
		}
	}
	if seconds > 0 {
		if days == 0 && hours == 0 && minutes == 0 {
			hrs = fmt.Sprintf("%ds", seconds)
		} else {
			hrs = fmt.Sprintf("%s %ds", hrs, seconds)
		}
	}

	return hrs
}

Output:

10s
1min 40s
16min 40s
2h 46min 40s
1 day 3h 46min 40s
11 days 13h 46min 40s

[silverwind]

I imagine this function would better be moved to modules/util so it's reusable across the codebase (maybe there are already duplicate implementations?). Also, some automated tests need to be added.

[schorsch13]

I imagine this function would better be moved to modules/util

I dont know how to do that xD

Also, some automated tests need to be added.

Why would you want to test this function?

[lunny]

Could you merge the test into the PR?

[schorsch13]

@lunny what do you mean with merging?

[Gusted]

I dont know how to do that xD

Ctrl + c the code, Ctrl + v the code into the new location. Build the new code and check where the errors are(so you know where to fix the code by adding to correct import to the new code).

Why would you want to test this function?

In order to know if the function works, and once in the future if we touch the function, we know that it didn't break.

[schorsch13]

I have moved the function to the modules/utils package and created a test for it

[Gusted]

Just a few more things.

[schorsch13]

Alright done. Please do a squash-merge, thx

[silverwind]

CI test failures are related:

--- FAIL: TestAddTime (0.03s)
    issue_tracked_time_test.go:37: 
        	Error Trace:	issue_tracked_time_test.go:37
        	Error:      	Not equal: 
        	            	expected: "1h 1m 1s"
        	            	actual  : "1h 1min 1s"
        	            	
        	            	Diff:
        	            	--- Expected
        	            	+++ Actual
        	            	@@ -1 +1 @@
        	            	-1h 1m 1s
        	            	+1h 1min 1s
        	Test:       	TestAddTime
--- FAIL: TestTotalTimes (0.02s)
    issue_tracked_time_test.go:89: 
        	Error Trace:	issue_tracked_time_test.go:89
        	Error:      	Not equal: 
        	            	expected: "6min 40s"
        	            	actual  : "6m 40s"
        	            	
        	            	Diff:
        	            	--- Expected
        	            	+++ Actual
        	            	@@ -1 +1 @@
        	            	-6min 40s
        	            	+6m 40s
        	Test:       	TestTotalTimes

    issue_tracked_time_test.go:97: 
        	Error Trace:	issue_tracked_time_test.go:97

        	Error:      	Not equal: 
        	            	expected: "1h 1min 2s"
        	            	actual  : "1h 1m 2s"
        	            	
        	            	Diff:
        	            	--- Expected
        	            	+++ Actual
        	            	@@ -1 +1 @@
        	            	-1h 1min 2s
        	            	+1h 1m 2s
        	Test:       	TestTotalTimes

[silverwind]

Great work, very easy to review!