public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Team: Include user UID in GetTeamMembers() output" (#102519)

Browse Source 
Revert "Team: Include user UID in GetTeamMembers() output (#102373)"

This reverts commit e5b6b7b370.
This commit is contained in:
Mihai Doarna
2025-03-20 12:24:41 +02:00
committed by GitHub
parent 07bfa602f2
commit bf53d278b7
5 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/team/teamimpl/store_test.go
-6
View File
@@ -58,7 +58,6 @@ func TestIntegrationTeamCommandsAndQueries(t *testing.T) {
t.Run("Given saved users and two teams", func(t *testing.T) {
var userIds []int64
var userUIDs []string
const testOrgID int64 = 1
var team1, team2 team.Team
var usr *user.User
@@ -75,7 +74,6 @@ func TestIntegrationTeamCommandsAndQueries(t *testing.T) {
usr, err = userSvc.Create(context.Background(), &userCmd)
require.NoError(t, err)
userIds = append(userIds, usr.ID)
userUIDs = append(userUIDs, usr.UID)
}
team1, err = teamSvc.CreateTeam(context.Background(), "group1 name", "test1@test.com", testOrgID)
require.NoError(t, err)
@@ -110,13 +108,9 @@ func TestIntegrationTeamCommandsAndQueries(t *testing.T) {
require.NoError(t, err)
require.Equal(t, 2, len(q1Result))
require.Equal(t, q1Result[0].TeamID, team1.ID)
require.Contains(t, userIds[:2], q1Result[0].UserID)
require.Contains(t, userUIDs[:2], q1Result[0].UserUID)
require.Equal(t, q1Result[0].Login, "loginuser0")
require.Equal(t, q1Result[0].OrgID, testOrgID)
require.Equal(t, q1Result[1].TeamID, team1.ID)
require.Contains(t, userIds[:2], q1Result[1].UserID)
require.Contains(t, userUIDs[:2], q1Result[1].UserUID)
require.Equal(t, q1Result[1].Login, "loginuser1")
require.Equal(t, q1Result[1].OrgID, testOrgID)
require.Equal(t, q1Result[1].External, true)