MM-43929: Ignore archived team memberships in GraphQL (#20130)
https://mattermost.atlassian.net/browse/MM-43929 ```release-note NONE ```
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
89fac9d485
Коммит
3c83187c5b
@@ -535,13 +535,13 @@ func (_m *TeamStore) GetTeamsByUserId(userID string) ([]*model.Team, error) {
|
||||
return r0, r1
|
||||
}
|
||||
|
||||
// GetTeamsForUser provides a mock function with given fields: ctx, userID
|
||||
func (_m *TeamStore) GetTeamsForUser(ctx context.Context, userID string) ([]*model.TeamMember, error) {
|
||||
ret := _m.Called(ctx, userID)
|
||||
// GetTeamsForUser provides a mock function with given fields: ctx, userID, includeDeleted
|
||||
func (_m *TeamStore) GetTeamsForUser(ctx context.Context, userID string, includeDeleted bool) ([]*model.TeamMember, error) {
|
||||
ret := _m.Called(ctx, userID, includeDeleted)
|
||||
|
||||
var r0 []*model.TeamMember
|
||||
if rf, ok := ret.Get(0).(func(context.Context, string) []*model.TeamMember); ok {
|
||||
r0 = rf(ctx, userID)
|
||||
if rf, ok := ret.Get(0).(func(context.Context, string, bool) []*model.TeamMember); ok {
|
||||
r0 = rf(ctx, userID, includeDeleted)
|
||||
} else {
|
||||
if ret.Get(0) != nil {
|
||||
r0 = ret.Get(0).([]*model.TeamMember)
|
||||
@@ -549,8 +549,8 @@ func (_m *TeamStore) GetTeamsForUser(ctx context.Context, userID string) ([]*mod
|
||||
}
|
||||
|
||||
var r1 error
|
||||
if rf, ok := ret.Get(1).(func(context.Context, string) error); ok {
|
||||
r1 = rf(ctx, userID)
|
||||
if rf, ok := ret.Get(1).(func(context.Context, string, bool) error); ok {
|
||||
r1 = rf(ctx, userID, includeDeleted)
|
||||
} else {
|
||||
r1 = ret.Error(1)
|
||||
}
|
||||
|
||||
@@ -1318,7 +1318,7 @@ func testTeamMembers(t *testing.T, ss store.Store) {
|
||||
require.Equal(t, m3.UserId, ms[0].UserId)
|
||||
|
||||
ctx := context.Background()
|
||||
ms, err = ss.Team().GetTeamsForUser(ctx, m1.UserId)
|
||||
ms, err = ss.Team().GetTeamsForUser(ctx, m1.UserId, true)
|
||||
require.NoError(t, err)
|
||||
require.Len(t, ms, 1)
|
||||
require.Equal(t, m1.TeamId, ms[0].TeamId)
|
||||
@@ -1347,14 +1347,26 @@ func testTeamMembers(t *testing.T, ss store.Store) {
|
||||
_, nErr = ss.Team().SaveMultipleMembers([]*model.TeamMember{m4, m5}, -1)
|
||||
require.NoError(t, nErr)
|
||||
|
||||
ms, err = ss.Team().GetTeamsForUser(ctx, uid)
|
||||
ms, err = ss.Team().GetTeamsForUser(ctx, uid, true)
|
||||
require.NoError(t, err)
|
||||
require.Len(t, ms, 2)
|
||||
|
||||
m4.DeleteAt = model.GetMillis()
|
||||
_, err = ss.Team().UpdateMember(m4)
|
||||
require.NoError(t, err)
|
||||
|
||||
ms, err = ss.Team().GetTeamsForUser(ctx, uid, true)
|
||||
require.NoError(t, err)
|
||||
require.Len(t, ms, 2)
|
||||
|
||||
ms, err = ss.Team().GetTeamsForUser(ctx, uid, false)
|
||||
require.NoError(t, err)
|
||||
require.Len(t, ms, 1)
|
||||
|
||||
nErr = ss.Team().RemoveAllMembersByUser(uid)
|
||||
require.NoError(t, nErr)
|
||||
|
||||
ms, err = ss.Team().GetTeamsForUser(ctx, m1.UserId)
|
||||
ms, err = ss.Team().GetTeamsForUser(ctx, m1.UserId, true)
|
||||
require.NoError(t, err)
|
||||
require.Empty(t, ms)
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user