mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

MM-43929: Ignore archived team memberships in GraphQL (#20130)

Просмотр исходного кода 
https://mattermost.atlassian.net/browse/MM-43929

```release-note
NONE
```
Этот коммит содержится в:
Agniva De Sarker
2022-05-04 19:43:02 +05:30
коммит произвёл GitHub
родитель 89fac9d485
Коммит 3c83187c5b
18 изменённых файлов: 59 добавлений и 34 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
api4/emoji.go
Просмотреть файл

@@ -53,7 +53,7 @@ func createEmoji(c *Context, w http.ResponseWriter, r *http.Request) {
defer c.LogAuditRec(auditRec) defer c.LogAuditRec(auditRec)
// Allow any user with CREATE_EMOJIS permission at Team level to create emojis at system level // Allow any user with CREATE_EMOJIS permission at Team level to create emojis at system level
memberships, err := c.App.GetTeamMembersForUser(c.AppContext.Session().UserId) memberships, err := c.App.GetTeamMembersForUser(c.AppContext.Session().UserId, true)
if err != nil { if err != nil {
c.Err = err c.Err = err
@@ -143,7 +143,7 @@ func deleteEmoji(c *Context, w http.ResponseWriter, r *http.Request) {
auditRec.AddMeta("emoji", emoji) auditRec.AddMeta("emoji", emoji)
// Allow any user with DELETE_EMOJIS permission at Team level to delete emojis at system level // Allow any user with DELETE_EMOJIS permission at Team level to delete emojis at system level
memberships, err := c.App.GetTeamMembersForUser(c.AppContext.Session().UserId) memberships, err := c.App.GetTeamMembersForUser(c.AppContext.Session().UserId, true)
if err != nil { if err != nil {
c.Err = err c.Err = err

3
api4/resolver.go
Просмотреть файл

@@ -172,7 +172,8 @@ func (r *resolver) TeamMembers(ctx context.Context, args struct {
return []*teamMember{{*tm}}, nil return []*teamMember{{*tm}}, nil
} }
members, appErr := c.App.GetTeamMembersForUser(args.UserID) // Do not return archived team members
members, appErr := c.App.GetTeamMembersForUser(args.UserID, false)
if appErr != nil { if appErr != nil {
return nil, appErr return nil, appErr
} }

8
api4/resolver_team_member_test.go
Просмотреть файл

@@ -248,5 +248,13 @@ func TestGraphQLTeamMembers(t *testing.T) {
expectedTeams[i].Id = tm.Team.ID expectedTeams[i].Id = tm.Team.ID
expectedTeams[i].DisplayName = tm.Team.DisplayName expectedTeams[i].DisplayName = tm.Team.DisplayName
} }
// Removing from a team and ensuring we get the right response.
th.UnlinkUserFromTeam(th.BasicUser, myTeam)
resp, err = th.MakeGraphQLRequest(&input)
require.NoError(t, err)
require.Len(t, resp.Errors, 0)
require.NoError(t, json.Unmarshal(resp.Data, &q))
assert.Len(t, q.TeamMembers, 1)
}) })
} }

2
api4/team.go
Просмотреть файл

@@ -554,7 +554,7 @@ func getTeamMembersForUser(c *Context, w http.ResponseWriter, r *http.Request) {
return return
} }
members, err := c.App.GetTeamMembersForUser(c.Params.UserId) members, err := c.App.GetTeamMembersForUser(c.Params.UserId, true)
if err != nil { if err != nil {
c.Err = err c.Err = err
return return

2
app/app_iface.go
Просмотреть файл

@@ -737,7 +737,7 @@ type AppIface interface {
GetTeamMember(teamID, userID string) (*model.TeamMember, *model.AppError) GetTeamMember(teamID, userID string) (*model.TeamMember, *model.AppError)
GetTeamMembers(teamID string, offset int, limit int, teamMembersGetOptions *model.TeamMembersGetOptions) ([]*model.TeamMember, *model.AppError) GetTeamMembers(teamID string, offset int, limit int, teamMembersGetOptions *model.TeamMembersGetOptions) ([]*model.TeamMember, *model.AppError)
GetTeamMembersByIds(teamID string, userIDs []string, restrictions *model.ViewUsersRestrictions) ([]*model.TeamMember, *model.AppError) GetTeamMembersByIds(teamID string, userIDs []string, restrictions *model.ViewUsersRestrictions) ([]*model.TeamMember, *model.AppError)
GetTeamMembersForUser(userID string) ([]*model.TeamMember, *model.AppError) GetTeamMembersForUser(userID string, includeDeleted bool) ([]*model.TeamMember, *model.AppError)
GetTeamMembersForUserWithPagination(userID string, page, perPage int) ([]*model.TeamMember, *model.AppError) GetTeamMembersForUserWithPagination(userID string, page, perPage int) ([]*model.TeamMember, *model.AppError)
GetTeamPoliciesForUser(userID string, offset, limit int) (*model.RetentionPolicyForTeamList, *model.AppError) GetTeamPoliciesForUser(userID string, offset, limit int) (*model.RetentionPolicyForTeamList, *model.AppError)
GetTeamStats(teamID string, restrictions *model.ViewUsersRestrictions) (*model.TeamStats, *model.AppError) GetTeamStats(teamID string, restrictions *model.ViewUsersRestrictions) (*model.TeamStats, *model.AppError)

2
app/import_functions.go
Просмотреть файл

@@ -737,7 +737,7 @@ func (a *App) importUserTeams(user *model.User, data *[]UserTeamImportData) *mod
isGuestByTeamId := map[string]bool{} isGuestByTeamId := map[string]bool{}
isUserByTeamId := map[string]bool{} isUserByTeamId := map[string]bool{}
isAdminByTeamId := map[string]bool{} isAdminByTeamId := map[string]bool{}
existingMemberships, nErr := a.Srv().Store.Team().GetTeamsForUser(context.Background(), user.Id) existingMemberships, nErr := a.Srv().Store.Team().GetTeamsForUser(context.Background(), user.Id, true)
if nErr != nil { if nErr != nil {
return model.NewAppError("importUserTeams", "app.team.get_members.app_error", nil, nErr.Error(), http.StatusInternalServerError) return model.NewAppError("importUserTeams", "app.team.get_members.app_error", nil, nErr.Error(), http.StatusInternalServerError)
} }

2
app/import_functions_test.go
Просмотреть файл

@@ -1717,7 +1717,7 @@ func TestImportUserTeams(t *testing.T) {
} else { } else {
require.Nil(t, err) require.Nil(t, err)
} }
teamMembers, nErr := th.App.Srv().Store.Team().GetTeamsForUser(context.Background(), user.Id) teamMembers, nErr := th.App.Srv().Store.Team().GetTeamsForUser(context.Background(), user.Id, true)
require.NoError(t, nErr) require.NoError(t, nErr)
require.Len(t, teamMembers, tc.expectedUserTeams) require.Len(t, teamMembers, tc.expectedUserTeams)
if tc.expectedUserTeams == 1 { if tc.expectedUserTeams == 1 {

4
app/opentracing/opentracing_layer.go
Просмотреть файл

@@ -9200,7 +9200,7 @@ func (a *OpenTracingAppLayer) GetTeamMembersByIds(teamID string, userIDs []strin
return resultVar0, resultVar1 return resultVar0, resultVar1
} }
func (a *OpenTracingAppLayer) GetTeamMembersForUser(userID string) ([]*model.TeamMember, *model.AppError) { func (a *OpenTracingAppLayer) GetTeamMembersForUser(userID string, includeDeleted bool) ([]*model.TeamMember, *model.AppError) {
origCtx := a.ctx origCtx := a.ctx
span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.GetTeamMembersForUser") span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.GetTeamMembersForUser")
@@ -9212,7 +9212,7 @@ func (a *OpenTracingAppLayer) GetTeamMembersForUser(userID string) ([]*model.Tea
}() }()
defer span.Finish() defer span.Finish()
resultVar0, resultVar1 := a.app.GetTeamMembersForUser(userID) resultVar0, resultVar1 := a.app.GetTeamMembersForUser(userID, includeDeleted)
if resultVar1 != nil { if resultVar1 != nil {
span.LogFields(spanlog.Error(resultVar1)) span.LogFields(spanlog.Error(resultVar1))

4
app/team.go
Просмотреть файл

@@ -893,8 +893,8 @@ func (a *App) GetTeamMember(teamID, userID string) (*model.TeamMember, *model.Ap
return teamMember, nil return teamMember, nil
} }
func (a *App) GetTeamMembersForUser(userID string) ([]*model.TeamMember, *model.AppError) { func (a *App) GetTeamMembersForUser(userID string, includeDeleted bool) ([]*model.TeamMember, *model.AppError) {
teamMembers, err := a.Srv().Store.Team().GetTeamsForUser(context.Background(), userID) teamMembers, err := a.Srv().Store.Team().GetTeamsForUser(context.Background(), userID, includeDeleted)
if err != nil { if err != nil {
return nil, model.NewAppError("GetTeamMembersForUser", "app.team.get_members.app_error", nil, err.Error(), http.StatusInternalServerError) return nil, model.NewAppError("GetTeamMembersForUser", "app.team.get_members.app_error", nil, err.Error(), http.StatusInternalServerError)
} }

4
app/user.go
Просмотреть файл

@@ -2136,7 +2136,7 @@ func (a *App) PromoteGuestToUser(c *request.Context, user *model.User, requestor
} }
} }
teamMembers, err := a.GetTeamMembersForUser(user.Id) teamMembers, err := a.GetTeamMembersForUser(user.Id, true)
if err != nil { if err != nil {
mlog.Warn("Failed to get team members for user on promote guest to user", mlog.Err(err)) mlog.Warn("Failed to get team members for user on promote guest to user", mlog.Err(err))
} }
@@ -2180,7 +2180,7 @@ func (a *App) DemoteUserToGuest(user *model.User) *model.AppError {
mlog.Warn("Unable to update user sessions", mlog.String("user_id", demotedUser.Id), mlog.Err(uErr)) mlog.Warn("Unable to update user sessions", mlog.String("user_id", demotedUser.Id), mlog.Err(uErr))
} }
teamMembers, err := a.GetTeamMembersForUser(user.Id) teamMembers, err := a.GetTeamMembersForUser(user.Id, true)
if err != nil { if err != nil {
mlog.Warn("Failed to get team members for users on demote user to guest", mlog.Err(err)) mlog.Warn("Failed to get team members for users on demote user to guest", mlog.Err(err))
} }

4
store/opentracinglayer/opentracinglayer.go
Просмотреть файл

@@ -8822,7 +8822,7 @@ func (s *OpenTracingLayerTeamStore) GetTeamsByUserId(userID string) ([]*model.Te
return result, err return result, err
} }
func (s *OpenTracingLayerTeamStore) GetTeamsForUser(ctx context.Context, userID string) ([]*model.TeamMember, error) { func (s *OpenTracingLayerTeamStore) GetTeamsForUser(ctx context.Context, userID string, includeDeleted bool) ([]*model.TeamMember, error) {
origCtx := s.Root.Store.Context() origCtx := s.Root.Store.Context()
span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "TeamStore.GetTeamsForUser") span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "TeamStore.GetTeamsForUser")
s.Root.Store.SetContext(newCtx) s.Root.Store.SetContext(newCtx)
@@ -8831,7 +8831,7 @@ func (s *OpenTracingLayerTeamStore) GetTeamsForUser(ctx context.Context, userID
}() }()
defer span.Finish() defer span.Finish()
result, err := s.TeamStore.GetTeamsForUser(ctx, userID) result, err := s.TeamStore.GetTeamsForUser(ctx, userID, includeDeleted)
if err != nil { if err != nil {
span.LogFields(spanlog.Error(err)) span.LogFields(spanlog.Error(err))
ext.Error.Set(span, true) ext.Error.Set(span, true)

4
store/retrylayer/retrylayer.go
Просмотреть файл

@@ -10072,11 +10072,11 @@ func (s *RetryLayerTeamStore) GetTeamsByUserId(userID string) ([]*model.Team, er
} }
func (s *RetryLayerTeamStore) GetTeamsForUser(ctx context.Context, userID string) ([]*model.TeamMember, error) { func (s *RetryLayerTeamStore) GetTeamsForUser(ctx context.Context, userID string, includeDeleted bool) ([]*model.TeamMember, error) {
tries := 0 tries := 0
for { for {
result, err := s.TeamStore.GetTeamsForUser(ctx, userID) result, err := s.TeamStore.GetTeamsForUser(ctx, userID, includeDeleted)
if err == nil { if err == nil {
return result, nil return result, nil
} }

6
store/sqlstore/session_store.go
Просмотреть файл

@@ -59,7 +59,7 @@ func (me SqlSessionStore) Save(session *model.Session) (*model.Session, error) {
return nil, errors.Wrapf(err, "failed to save Session with id=%s", session.Id) return nil, errors.Wrapf(err, "failed to save Session with id=%s", session.Id)
} }
teamMembers, err := me.Team().GetTeamsForUser(context.Background(), session.UserId) teamMembers, err := me.Team().GetTeamsForUser(context.Background(), session.UserId, true)
if err != nil { if err != nil {
return nil, errors.Wrapf(err, "failed to find TeamMembers for Session with userId=%s", session.UserId) return nil, errors.Wrapf(err, "failed to find TeamMembers for Session with userId=%s", session.UserId)
} }
@@ -87,7 +87,7 @@ func (me SqlSessionStore) Get(ctx context.Context, sessionIdOrToken string) (*mo
tempMembers, err := me.Team().GetTeamsForUser( tempMembers, err := me.Team().GetTeamsForUser(
WithMaster(context.Background()), WithMaster(context.Background()),
session.UserId) session.UserId, true)
if err != nil { if err != nil {
return nil, errors.Wrapf(err, "failed to find TeamMembers for Session with userId=%s", session.UserId) return nil, errors.Wrapf(err, "failed to find TeamMembers for Session with userId=%s", session.UserId)
} }
@@ -107,7 +107,7 @@ func (me SqlSessionStore) GetSessions(userId string) ([]*model.Session, error) {
return nil, errors.Wrapf(err, "failed to find Sessions with userId=%s", userId) return nil, errors.Wrapf(err, "failed to find Sessions with userId=%s", userId)
} }
teamMembers, err := me.Team().GetTeamsForUser(context.Background(), userId) teamMembers, err := me.Team().GetTeamsForUser(context.Background(), userId, true)
if err != nil { if err != nil {
return nil, errors.Wrapf(err, "failed to find TeamMembers for Session with userId=%s", userId) return nil, errors.Wrapf(err, "failed to find TeamMembers for Session with userId=%s", userId)
} }

6
store/sqlstore/team_store.go
Просмотреть файл

@@ -1081,10 +1081,14 @@ func (s SqlTeamStore) GetMembersByIds(teamId string, userIds []string, restricti
} }
// GetTeamsForUser returns a list of teams that the user is a member of. Expects userId to be passed as a parameter. // GetTeamsForUser returns a list of teams that the user is a member of. Expects userId to be passed as a parameter.
func (s SqlTeamStore) GetTeamsForUser(ctx context.Context, userId string) ([]*model.TeamMember, error) { func (s SqlTeamStore) GetTeamsForUser(ctx context.Context, userId string, includeDeleted bool) ([]*model.TeamMember, error) {
query := s.getTeamMembersWithSchemeSelectQuery(). query := s.getTeamMembersWithSchemeSelectQuery().
Where(sq.Eq{"TeamMembers.UserId": userId}) Where(sq.Eq{"TeamMembers.UserId": userId})
if !includeDeleted {
query = query.Where(sq.Eq{"TeamMembers.DeleteAt": 0})
}
queryString, args, err := query.ToSql() queryString, args, err := query.ToSql()
if err != nil { if err != nil {
return nil, errors.Wrap(err, "team_tosql") return nil, errors.Wrap(err, "team_tosql")

2
store/store.go
Просмотреть файл

@@ -126,7 +126,7 @@ type TeamStore interface {
GetMembersByIds(teamID string, userIds []string, restrictions *model.ViewUsersRestrictions) ([]*model.TeamMember, error) GetMembersByIds(teamID string, userIds []string, restrictions *model.ViewUsersRestrictions) ([]*model.TeamMember, error)
GetTotalMemberCount(teamID string, restrictions *model.ViewUsersRestrictions) (int64, error) GetTotalMemberCount(teamID string, restrictions *model.ViewUsersRestrictions) (int64, error)
GetActiveMemberCount(teamID string, restrictions *model.ViewUsersRestrictions) (int64, error) GetActiveMemberCount(teamID string, restrictions *model.ViewUsersRestrictions) (int64, error)
GetTeamsForUser(ctx context.Context, userID string) ([]*model.TeamMember, error) GetTeamsForUser(ctx context.Context, userID string, includeDeleted bool) ([]*model.TeamMember, error)
GetTeamsForUserWithPagination(userID string, page, perPage int) ([]*model.TeamMember, error) GetTeamsForUserWithPagination(userID string, page, perPage int) ([]*model.TeamMember, error)
GetChannelUnreadsForAllTeams(excludeTeamID, userID string) ([]*model.ChannelUnread, error) GetChannelUnreadsForAllTeams(excludeTeamID, userID string) ([]*model.ChannelUnread, error)
GetChannelUnreadsForTeam(teamID, userID string) ([]*model.ChannelUnread, error) GetChannelUnreadsForTeam(teamID, userID string) ([]*model.ChannelUnread, error)

14
store/storetest/mocks/TeamStore.go
Просмотреть файл

@@ -535,13 +535,13 @@ func (_m *TeamStore) GetTeamsByUserId(userID string) ([]*model.Team, error) {
return r0, r1 return r0, r1
} }
// GetTeamsForUser provides a mock function with given fields: ctx, userID // GetTeamsForUser provides a mock function with given fields: ctx, userID, includeDeleted
func (_m *TeamStore) GetTeamsForUser(ctx context.Context, userID string) ([]*model.TeamMember, error) { func (_m *TeamStore) GetTeamsForUser(ctx context.Context, userID string, includeDeleted bool) ([]*model.TeamMember, error) {
ret := _m.Called(ctx, userID) ret := _m.Called(ctx, userID, includeDeleted)
var r0 []*model.TeamMember var r0 []*model.TeamMember
if rf, ok := ret.Get(0).(func(context.Context, string) []*model.TeamMember); ok { if rf, ok := ret.Get(0).(func(context.Context, string, bool) []*model.TeamMember); ok {
r0 = rf(ctx, userID) r0 = rf(ctx, userID, includeDeleted)
} else { } else {
if ret.Get(0) != nil { if ret.Get(0) != nil {
r0 = ret.Get(0).([]*model.TeamMember) r0 = ret.Get(0).([]*model.TeamMember)
@@ -549,8 +549,8 @@ func (_m *TeamStore) GetTeamsForUser(ctx context.Context, userID string) ([]*mod
} }
var r1 error var r1 error
if rf, ok := ret.Get(1).(func(context.Context, string) error); ok { if rf, ok := ret.Get(1).(func(context.Context, string, bool) error); ok {
r1 = rf(ctx, userID) r1 = rf(ctx, userID, includeDeleted)
} else { } else {
r1 = ret.Error(1) r1 = ret.Error(1)
} }

18
store/storetest/team_store.go
Просмотреть файл

@@ -1318,7 +1318,7 @@ func testTeamMembers(t *testing.T, ss store.Store) {
require.Equal(t, m3.UserId, ms[0].UserId) require.Equal(t, m3.UserId, ms[0].UserId)
ctx := context.Background() 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.NoError(t, err)
require.Len(t, ms, 1) require.Len(t, ms, 1)
require.Equal(t, m1.TeamId, ms[0].TeamId) 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) _, nErr = ss.Team().SaveMultipleMembers([]*model.TeamMember{m4, m5}, -1)
require.NoError(t, nErr) require.NoError(t, nErr)
ms, err = ss.Team().GetTeamsForUser(ctx, uid) ms, err = ss.Team().GetTeamsForUser(ctx, uid, true)
require.NoError(t, err) require.NoError(t, err)
require.Len(t, ms, 2) 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) nErr = ss.Team().RemoveAllMembersByUser(uid)
require.NoError(t, nErr) 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.NoError(t, err)
require.Empty(t, ms) require.Empty(t, ms)
} }

4
store/timerlayer/timerlayer.go
Просмотреть файл

@@ -7944,10 +7944,10 @@ func (s *TimerLayerTeamStore) GetTeamsByUserId(userID string) ([]*model.Team, er
return result, err return result, err
} }
func (s *TimerLayerTeamStore) GetTeamsForUser(ctx context.Context, userID string) ([]*model.TeamMember, error) { func (s *TimerLayerTeamStore) GetTeamsForUser(ctx context.Context, userID string, includeDeleted bool) ([]*model.TeamMember, error) {
start := timemodule.Now() start := timemodule.Now()
result, err := s.TeamStore.GetTeamsForUser(ctx, userID) result, err := s.TeamStore.GetTeamsForUser(ctx, userID, includeDeleted)
elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second)
if s.Root.Metrics != nil { if s.Root.Metrics != nil {