rename TotalTimes() to TotalTimesForEachUser() (#27261)
make function name more descriptive as it would otherwise imply it could be used for e.g. #26672 too ... --- *Sponsored by Kithara Software GmbH*
This commit is contained in:
parent
cf0df023be
commit
2a2b0cb1d2
|
@ -198,8 +198,8 @@ func addTime(ctx context.Context, user *user_model.User, issue *Issue, amount in
|
||||||
return tt, db.Insert(ctx, tt)
|
return tt, db.Insert(ctx, tt)
|
||||||
}
|
}
|
||||||
|
|
||||||
// TotalTimes returns the spent time in seconds for each user by an issue
|
// TotalTimesForEachUser returns the spent time in seconds for each user by an issue
|
||||||
func TotalTimes(options *FindTrackedTimesOptions) (map[*user_model.User]int64, error) {
|
func TotalTimesForEachUser(options *FindTrackedTimesOptions) (map[*user_model.User]int64, error) {
|
||||||
trackedTimes, err := GetTrackedTimes(db.DefaultContext, options)
|
trackedTimes, err := GetTrackedTimes(db.DefaultContext, options)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
|
|
@ -79,10 +79,10 @@ func TestGetTrackedTimes(t *testing.T) {
|
||||||
assert.Len(t, times, 0)
|
assert.Len(t, times, 0)
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestTotalTimes(t *testing.T) {
|
func TestTotalTimesForEachUser(t *testing.T) {
|
||||||
assert.NoError(t, unittest.PrepareTestDatabase())
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
||||||
|
|
||||||
total, err := issues_model.TotalTimes(&issues_model.FindTrackedTimesOptions{IssueID: 1})
|
total, err := issues_model.TotalTimesForEachUser(&issues_model.FindTrackedTimesOptions{IssueID: 1})
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
assert.Len(t, total, 1)
|
assert.Len(t, total, 1)
|
||||||
for user, time := range total {
|
for user, time := range total {
|
||||||
|
@ -90,7 +90,7 @@ func TestTotalTimes(t *testing.T) {
|
||||||
assert.EqualValues(t, 400, time)
|
assert.EqualValues(t, 400, time)
|
||||||
}
|
}
|
||||||
|
|
||||||
total, err = issues_model.TotalTimes(&issues_model.FindTrackedTimesOptions{IssueID: 2})
|
total, err = issues_model.TotalTimesForEachUser(&issues_model.FindTrackedTimesOptions{IssueID: 2})
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
assert.Len(t, total, 2)
|
assert.Len(t, total, 2)
|
||||||
for user, time := range total {
|
for user, time := range total {
|
||||||
|
@ -103,7 +103,7 @@ func TestTotalTimes(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
total, err = issues_model.TotalTimes(&issues_model.FindTrackedTimesOptions{IssueID: 5})
|
total, err = issues_model.TotalTimesForEachUser(&issues_model.FindTrackedTimesOptions{IssueID: 5})
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
assert.Len(t, total, 1)
|
assert.Len(t, total, 1)
|
||||||
for user, time := range total {
|
for user, time := range total {
|
||||||
|
@ -111,7 +111,7 @@ func TestTotalTimes(t *testing.T) {
|
||||||
assert.EqualValues(t, 1, time)
|
assert.EqualValues(t, 1, time)
|
||||||
}
|
}
|
||||||
|
|
||||||
total, err = issues_model.TotalTimes(&issues_model.FindTrackedTimesOptions{IssueID: 4})
|
total, err = issues_model.TotalTimesForEachUser(&issues_model.FindTrackedTimesOptions{IssueID: 4})
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
assert.Len(t, total, 2)
|
assert.Len(t, total, 2)
|
||||||
}
|
}
|
||||||
|
|
|
@ -1549,8 +1549,8 @@ func ViewIssue(ctx *context.Context) {
|
||||||
} else {
|
} else {
|
||||||
ctx.Data["CanUseTimetracker"] = false
|
ctx.Data["CanUseTimetracker"] = false
|
||||||
}
|
}
|
||||||
if ctx.Data["WorkingUsers"], err = issues_model.TotalTimes(&issues_model.FindTrackedTimesOptions{IssueID: issue.ID}); err != nil {
|
if ctx.Data["WorkingUsers"], err = issues_model.TotalTimesForEachUser(&issues_model.FindTrackedTimesOptions{IssueID: issue.ID}); err != nil {
|
||||||
ctx.ServerError("TotalTimes", err)
|
ctx.ServerError("TotalTimesForEachUser", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue