Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix approvals counting #7757

Merged
merged 8 commits into from Aug 7, 2019
Merged

Fix approvals counting #7757

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d5070a0
fix approvals counting
lunny Aug 5, 2019
77a5c45
fix tests
lunny Aug 5, 2019
550c4ab
fmt
lunny Aug 5, 2019
47af47d
Merge branch 'master' into lunny/fix_approvals_counting
lafriks Aug 5, 2019
c4b82ea
Merge branch 'master' into lunny/fix_approvals_counting
lunny Aug 6, 2019
10b6c81
Merge branch 'master' into lunny/fix_approvals_counting
lunny Aug 6, 2019
a664b71
Merge branch 'master' into lunny/fix_approvals_counting
lafriks Aug 6, 2019
77ca1cd
Merge branch 'master' into lunny/fix_approvals_counting
lunny Aug 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 6 additions & 3 deletions models/org_team.go
View file
Open in desktop
Expand Up @@ -760,11 +760,14 @@ func IsUserInTeams(userID int64, teamIDs []int64) (bool, error) {
}

// UsersInTeamsCount counts the number of users which are in userIDs and teamIDs
func UsersInTeamsCount(userIDs []int64, teamIDs []int64) (count int64, err error) {
if count, err = x.In("uid", userIDs).In("team_id", teamIDs).Count(new(TeamUser)); err != nil {
func UsersInTeamsCount(userIDs []int64, teamIDs []int64) (int64, error) {
var ids []int64
if err := x.In("uid", userIDs).In("team_id", teamIDs).
Table("team_user").
Cols("uid").GroupBy("uid").Find(&ids); err != nil {
return 0, err
}
return
return int64(len(ids)), nil
}

// ___________ __________
Expand Down
6 changes: 3 additions & 3 deletions models/org_team_test.go
View file
Open in desktop
Expand Up @@ -370,7 +370,7 @@ func TestUsersInTeamsCount(t *testing.T) {
assert.Equal(t, expected, count)
}

test([]int64{2}, []int64{1, 2, 3, 4}, 2)
test([]int64{1, 2, 3, 4, 5}, []int64{2, 5}, 2)
test([]int64{1, 2, 3, 4, 5}, []int64{2, 3, 5}, 3)
test([]int64{2}, []int64{1, 2, 3, 4}, 1) // only userid 2
test([]int64{1, 2, 3, 4, 5}, []int64{2, 5}, 2) // userid 2,4
test([]int64{1, 2, 3, 4, 5}, []int64{2, 3, 5}, 3) // userid 2,4,5
}