Skip to content

Commit 2a2b0cb

Browse files
authored
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*
1 parent cf0df02 commit 2a2b0cb

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

models/issues/tracked_time.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,8 @@ func addTime(ctx context.Context, user *user_model.User, issue *Issue, amount in
198198
return tt, db.Insert(ctx, tt)
199199
}
200200

201-
// TotalTimes returns the spent time in seconds for each user by an issue
202-
func TotalTimes(options *FindTrackedTimesOptions) (map[*user_model.User]int64, error) {
201+
// TotalTimesForEachUser returns the spent time in seconds for each user by an issue
202+
func TotalTimesForEachUser(options *FindTrackedTimesOptions) (map[*user_model.User]int64, error) {
203203
trackedTimes, err := GetTrackedTimes(db.DefaultContext, options)
204204
if err != nil {
205205
return nil, err

models/issues/tracked_time_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,18 +79,18 @@ func TestGetTrackedTimes(t *testing.T) {
7979
assert.Len(t, times, 0)
8080
}
8181

82-
func TestTotalTimes(t *testing.T) {
82+
func TestTotalTimesForEachUser(t *testing.T) {
8383
assert.NoError(t, unittest.PrepareTestDatabase())
8484

85-
total, err := issues_model.TotalTimes(&issues_model.FindTrackedTimesOptions{IssueID: 1})
85+
total, err := issues_model.TotalTimesForEachUser(&issues_model.FindTrackedTimesOptions{IssueID: 1})
8686
assert.NoError(t, err)
8787
assert.Len(t, total, 1)
8888
for user, time := range total {
8989
assert.EqualValues(t, 1, user.ID)
9090
assert.EqualValues(t, 400, time)
9191
}
9292

93-
total, err = issues_model.TotalTimes(&issues_model.FindTrackedTimesOptions{IssueID: 2})
93+
total, err = issues_model.TotalTimesForEachUser(&issues_model.FindTrackedTimesOptions{IssueID: 2})
9494
assert.NoError(t, err)
9595
assert.Len(t, total, 2)
9696
for user, time := range total {
@@ -103,15 +103,15 @@ func TestTotalTimes(t *testing.T) {
103103
}
104104
}
105105

106-
total, err = issues_model.TotalTimes(&issues_model.FindTrackedTimesOptions{IssueID: 5})
106+
total, err = issues_model.TotalTimesForEachUser(&issues_model.FindTrackedTimesOptions{IssueID: 5})
107107
assert.NoError(t, err)
108108
assert.Len(t, total, 1)
109109
for user, time := range total {
110110
assert.EqualValues(t, 2, user.ID)
111111
assert.EqualValues(t, 1, time)
112112
}
113113

114-
total, err = issues_model.TotalTimes(&issues_model.FindTrackedTimesOptions{IssueID: 4})
114+
total, err = issues_model.TotalTimesForEachUser(&issues_model.FindTrackedTimesOptions{IssueID: 4})
115115
assert.NoError(t, err)
116116
assert.Len(t, total, 2)
117117
}

routers/web/repo/issue.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1549,8 +1549,8 @@ func ViewIssue(ctx *context.Context) {
15491549
} else {
15501550
ctx.Data["CanUseTimetracker"] = false
15511551
}
1552-
if ctx.Data["WorkingUsers"], err = issues_model.TotalTimes(&issues_model.FindTrackedTimesOptions{IssueID: issue.ID}); err != nil {
1553-
ctx.ServerError("TotalTimes", err)
1552+
if ctx.Data["WorkingUsers"], err = issues_model.TotalTimesForEachUser(&issues_model.FindTrackedTimesOptions{IssueID: issue.ID}); err != nil {
1553+
ctx.ServerError("TotalTimesForEachUser", err)
15541554
return
15551555
}
15561556
}

0 commit comments

Comments
 (0)