Skip to content

Commit fdf1d98

Browse files
models: Rename GetUserTeams() to GetUserOrgTeams() in org_team model.
`GetUserTeams()` sounds a bit misnomer since it actually returns the teams that user belongs to in a given organization rather than all the teams across all the organization that the user has joined.
1 parent 15c2564 commit fdf1d98

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

models/org.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ func removeOrgUser(sess *xorm.Session, orgID, userID int64) error {
514514
}
515515

516516
// Delete member in his/her teams.
517-
teams, err := getUserTeams(sess, org.ID, userID)
517+
teams, err := getUserOrgTeams(sess, org.ID, userID)
518518
if err != nil {
519519
return err
520520
}

models/org_team.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,7 @@ func GetTeamMembers(teamID int64) ([]*User, error) {
543543
return getTeamMembers(x, teamID)
544544
}
545545

546-
func getUserTeams(e Engine, orgID, userID int64) (teams []*Team, err error) {
546+
func getUserOrgTeams(e Engine, orgID, userID int64) (teams []*Team, err error) {
547547
return teams, e.
548548
Join("INNER", "team_user", "team_user.team_id = team.id").
549549
Where("team.org_id = ?", orgID).
@@ -561,9 +561,9 @@ func getUserRepoTeams(e Engine, orgID, userID, repoID int64) (teams []*Team, err
561561
Find(&teams)
562562
}
563563

564-
// GetUserTeams returns all teams that user belongs to in given organization.
565-
func GetUserTeams(orgID, userID int64) ([]*Team, error) {
566-
return getUserTeams(x, orgID, userID)
564+
// GetUserOrgTeams returns all teams that user belongs to in given organization.
565+
func GetUserOrgTeams(orgID, userID int64) ([]*Team, error) {
566+
return getUserOrgTeams(x, orgID, userID)
567567
}
568568

569569
// AddTeamMember adds new membership of given team to given organization,

models/org_team_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,10 +283,10 @@ func TestGetTeamMembers(t *testing.T) {
283283
test(3)
284284
}
285285

286-
func TestGetUserTeams(t *testing.T) {
286+
func TestGetUserOrgTeams(t *testing.T) {
287287
assert.NoError(t, PrepareTestDatabase())
288288
test := func(orgID, userID int64) {
289-
teams, err := GetUserTeams(orgID, userID)
289+
teams, err := GetUserOrgTeams(orgID, userID)
290290
assert.NoError(t, err)
291291
for _, team := range teams {
292292
assert.EqualValues(t, orgID, team.OrgID)

0 commit comments

Comments
 (0)