From e2dfdcdabdeeecbdbab962f791f49a6a1039198e Mon Sep 17 00:00:00 2001 From: Gusted Date: Fri, 31 Jan 2025 14:00:16 +0100 Subject: [PATCH] chore: Remove `UsersInTeamsCount` - Introduced in 9681c8373426e8364760f033b9935b81b9276351 and removed in bac4b78e0908c0cb01a3842436950c7bcf793cf9. --- .deadcode-out | 1 - models/organization/team_test.go | 14 -------------- models/organization/team_user.go | 11 ----------- 3 files changed, 26 deletions(-) diff --git a/.deadcode-out b/.deadcode-out index e4f832d13d..a5246cb2a7 100644 --- a/.deadcode-out +++ b/.deadcode-out @@ -45,7 +45,6 @@ code.gitea.io/gitea/models/organization GetTeamNamesByID UpdateTeamUnits SearchMembersOptions.ToConds - UsersInTeamsCount code.gitea.io/gitea/models/perm/access GetRepoWriters diff --git a/models/organization/team_test.go b/models/organization/team_test.go index 601d136d87..64cc68b064 100644 --- a/models/organization/team_test.go +++ b/models/organization/team_test.go @@ -188,20 +188,6 @@ func TestHasTeamRepo(t *testing.T) { test(2, 5, false) } -func TestUsersInTeamsCount(t *testing.T) { - require.NoError(t, unittest.PrepareTestDatabase()) - - test := func(teamIDs, userIDs []int64, expected int64) { - count, err := organization.UsersInTeamsCount(db.DefaultContext, teamIDs, userIDs) - require.NoError(t, err) - assert.Equal(t, expected, count) - } - - 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 -} - func TestInconsistentOwnerTeam(t *testing.T) { defer unittest.OverrideFixtures( unittest.FixturesOptions{ diff --git a/models/organization/team_user.go b/models/organization/team_user.go index ab767db200..f7fa136498 100644 --- a/models/organization/team_user.go +++ b/models/organization/team_user.go @@ -76,14 +76,3 @@ func GetTeamMembers(ctx context.Context, opts *SearchMembersOptions) ([]*user_mo func IsUserInTeams(ctx context.Context, userID int64, teamIDs []int64) (bool, error) { return db.GetEngine(ctx).Where("uid=?", userID).In("team_id", teamIDs).Exist(new(TeamUser)) } - -// UsersInTeamsCount counts the number of users which are in userIDs and teamIDs -func UsersInTeamsCount(ctx context.Context, userIDs, teamIDs []int64) (int64, error) { - var ids []int64 - if err := db.GetEngine(ctx).In("uid", userIDs).In("team_id", teamIDs). - Table("team_user"). - Cols("uid").GroupBy("uid").Find(&ids); err != nil { - return 0, err - } - return int64(len(ids)), nil -}