From 1dcd2514189fe16e26cb36198c3928842229befa Mon Sep 17 00:00:00 2001 From: compiledsound <6175848+compiledsound@users.noreply.github.com> Date: Wed, 7 Feb 2024 03:00:13 -0500 Subject: [PATCH] MM-55736 Add Request Context to TeamStore.SaveMember (#26061) Co-authored-by: compiledsound <> --- server/channels/app/channel_category_test.go | 2 +- server/channels/app/email/helper_test.go | 2 +- .../channels/app/slashcommands/auto_users.go | 4 +- .../app/slashcommands/command_loadtest.go | 14 +- server/channels/app/teams/teams.go | 8 +- .../channels/manualtesting/manual_testing.go | 2 +- .../opentracinglayer/opentracinglayer.go | 4 +- .../channels/store/retrylayer/retrylayer.go | 4 +- .../channels/store/searchlayer/team_layer.go | 7 +- server/channels/store/searchtest/helper.go | 2 +- .../channels/store/sqlstore/integrity_test.go | 8 +- server/channels/store/sqlstore/team_store.go | 2 +- server/channels/store/store.go | 2 +- .../channels/store/storetest/channel_store.go | 76 +++--- .../store/storetest/compliance_store.go | 34 +-- .../channels/store/storetest/group_store.go | 28 +- .../store/storetest/mocks/TeamStore.go | 18 +- server/channels/store/storetest/post_store.go | 12 +- .../store/storetest/retention_policy_store.go | 2 +- server/channels/store/storetest/team_store.go | 70 ++--- server/channels/store/storetest/user_store.go | 242 +++++++++--------- .../channels/store/timerlayer/timerlayer.go | 4 +- 22 files changed, 272 insertions(+), 275 deletions(-) diff --git a/server/channels/app/channel_category_test.go b/server/channels/app/channel_category_test.go index 461e02ec75..ce20d8396d 100644 --- a/server/channels/app/channel_category_test.go +++ b/server/channels/app/channel_category_test.go @@ -105,7 +105,7 @@ func TestGetSidebarCategories(t *testing.T) { // Manually add the user to the team without going through the app layer to simulate a pre-existing user/team // relationship that hasn't been migrated yet team := th.CreateTeam() - _, err := th.App.Srv().Store().Team().SaveMember(&model.TeamMember{ + _, err := th.App.Srv().Store().Team().SaveMember(th.Context, &model.TeamMember{ TeamId: team.Id, UserId: th.BasicUser.Id, SchemeUser: true, diff --git a/server/channels/app/email/helper_test.go b/server/channels/app/email/helper_test.go index f55984f151..e0f7c8bc36 100644 --- a/server/channels/app/email/helper_test.go +++ b/server/channels/app/email/helper_test.go @@ -223,7 +223,7 @@ func (th *TestHelper) addUserToTeam(team *model.Team, user *model.User) *model.T } var err error - tm, err = th.store.Team().SaveMember(tm, *th.service.config().TeamSettings.MaxUsersPerTeam) + tm, err = th.store.Team().SaveMember(th.Context, tm, *th.service.config().TeamSettings.MaxUsersPerTeam) if err != nil { panic(err) } diff --git a/server/channels/app/slashcommands/auto_users.go b/server/channels/app/slashcommands/auto_users.go index 26acde0702..4a94b0c6dd 100644 --- a/server/channels/app/slashcommands/auto_users.go +++ b/server/channels/app/slashcommands/auto_users.go @@ -42,7 +42,7 @@ func NewAutoUserCreator(a *app.App, client *model.Client4, team *model.Team) *Au } // Basic test team and user so you always know one -func CreateBasicUser(a *app.App, client *model.Client4) error { +func CreateBasicUser(rctx request.CTX, a *app.App, client *model.Client4) error { found, _, _ := client.TeamExists(context.Background(), BTestTeamName, "") if found { return nil @@ -62,7 +62,7 @@ func CreateBasicUser(a *app.App, client *model.Client4) error { if err != nil { return model.NewAppError("CreateBasicUser", "app.user.verify_email.app_error", nil, "", http.StatusInternalServerError).Wrap(err) } - if _, nErr := a.Srv().Store().Team().SaveMember(&model.TeamMember{TeamId: basicteam.Id, UserId: ruser.Id, CreateAt: model.GetMillis()}, *a.Config().TeamSettings.MaxUsersPerTeam); nErr != nil { + if _, nErr := a.Srv().Store().Team().SaveMember(rctx, &model.TeamMember{TeamId: basicteam.Id, UserId: ruser.Id, CreateAt: model.GetMillis()}, *a.Config().TeamSettings.MaxUsersPerTeam); nErr != nil { var appErr *model.AppError var conflictErr *store.ErrConflict var limitExceededErr *store.ErrLimitExceeded diff --git a/server/channels/app/slashcommands/command_loadtest.go b/server/channels/app/slashcommands/command_loadtest.go index 818d9de13a..872dcb06ba 100644 --- a/server/channels/app/slashcommands/command_loadtest.go +++ b/server/channels/app/slashcommands/command_loadtest.go @@ -205,7 +205,7 @@ func (*LoadTestProvider) HelpCommand(args *model.CommandArgs, message string) *m return &model.CommandResponse{Text: usage, ResponseType: model.CommandResponseTypeEphemeral} } -func (*LoadTestProvider) SetupCommand(a *app.App, c request.CTX, args *model.CommandArgs, message string) (*model.CommandResponse, error) { +func (*LoadTestProvider) SetupCommand(a *app.App, rctx request.CTX, args *model.CommandArgs, message string) (*model.CommandResponse, error) { tokens := strings.Fields(strings.TrimPrefix(message, "setup")) doTeams := contains(tokens, "teams") doFuzz := contains(tokens, "fuzz") @@ -246,7 +246,7 @@ func (*LoadTestProvider) SetupCommand(a *app.App, c request.CTX, args *model.Com client := model.NewAPIv4Client(args.SiteURL) if doTeams { - if err := CreateBasicUser(a, client); err != nil { + if err := CreateBasicUser(rctx, a, client); err != nil { return &model.CommandResponse{Text: "Failed to create testing environment", ResponseType: model.CommandResponseTypeEphemeral}, err } _, _, err := client.Login(context.Background(), BTestUserEmail, BTestUserPassword) @@ -255,7 +255,7 @@ func (*LoadTestProvider) SetupCommand(a *app.App, c request.CTX, args *model.Com } environment, err := CreateTestEnvironmentWithTeams( a, - c, + rctx, client, utils.Range{Begin: numTeams, End: numTeams}, utils.Range{Begin: numChannels, End: numChannels}, @@ -266,10 +266,10 @@ func (*LoadTestProvider) SetupCommand(a *app.App, c request.CTX, args *model.Com return &model.CommandResponse{Text: "Failed to create testing environment", ResponseType: model.CommandResponseTypeEphemeral}, err } - c.Logger().Info("Testing environment created") + rctx.Logger().Info("Testing environment created") for i := 0; i < len(environment.Teams); i++ { - c.Logger().Info("Team Created: " + environment.Teams[i].Name) - c.Logger().Info("\t User to login: " + environment.Environments[i].Users[0].Email + ", " + UserPassword) + rctx.Logger().Info("Team Created: " + environment.Teams[i].Name) + rctx.Logger().Info("\t User to login: " + environment.Environments[i].Users[0].Email + ", " + UserPassword) } } else { team, err := a.Srv().Store().Team().Get(args.TeamId) @@ -279,7 +279,7 @@ func (*LoadTestProvider) SetupCommand(a *app.App, c request.CTX, args *model.Com CreateTestEnvironmentInTeam( a, - c, + rctx, client, team, utils.Range{Begin: numChannels, End: numChannels}, diff --git a/server/channels/app/teams/teams.go b/server/channels/app/teams/teams.go index 9447c1870d..ac61206944 100644 --- a/server/channels/app/teams/teams.go +++ b/server/channels/app/teams/teams.go @@ -129,7 +129,7 @@ func (ts *TeamService) PatchTeam(teamID string, patch *model.TeamPatch) (*model. // 1. a pointer to the team member, if successful // 2. a boolean: true if the user has a non-deleted team member for that team already, otherwise false. // 3. a pointer to an AppError if something went wrong. -func (ts *TeamService) JoinUserToTeam(c request.CTX, team *model.Team, user *model.User) (*model.TeamMember, bool, error) { +func (ts *TeamService) JoinUserToTeam(rctx request.CTX, team *model.Team, user *model.User) (*model.TeamMember, bool, error) { if !ts.IsTeamEmailAllowed(user, team) { return nil, false, AcceptedDomainError } @@ -154,10 +154,10 @@ func (ts *TeamService) JoinUserToTeam(c request.CTX, team *model.Team, user *mod tm.SchemeAdmin = true } - rtm, err := ts.store.GetMember(c, team.Id, user.Id) + rtm, err := ts.store.GetMember(rctx, team.Id, user.Id) if err != nil { // Membership appears to be missing. Lets try to add. - tmr, nErr := ts.store.SaveMember(tm, *ts.config().TeamSettings.MaxUsersPerTeam) + tmr, nErr := ts.store.SaveMember(rctx, tm, *ts.config().TeamSettings.MaxUsersPerTeam) if nErr != nil { return nil, false, nErr } @@ -179,7 +179,7 @@ func (ts *TeamService) JoinUserToTeam(c request.CTX, team *model.Team, user *mod return nil, false, MaxMemberCountError } - member, nErr := ts.store.UpdateMember(c, tm) + member, nErr := ts.store.UpdateMember(rctx, tm) if nErr != nil { return nil, false, nErr } diff --git a/server/channels/manualtesting/manual_testing.go b/server/channels/manualtesting/manual_testing.go index 9c2a7f562f..ee7107fe45 100644 --- a/server/channels/manualtesting/manual_testing.go +++ b/server/channels/manualtesting/manual_testing.go @@ -122,7 +122,7 @@ func manualTest(c *web.Context, w http.ResponseWriter, r *http.Request) { } c.App.Srv().Store().User().VerifyEmail(user.Id, user.Email) - c.App.Srv().Store().Team().SaveMember(&model.TeamMember{TeamId: teamID, UserId: user.Id}, *c.App.Config().TeamSettings.MaxUsersPerTeam) + c.App.Srv().Store().Team().SaveMember(c.AppContext, &model.TeamMember{TeamId: teamID, UserId: user.Id}, *c.App.Config().TeamSettings.MaxUsersPerTeam) userID = user.Id diff --git a/server/channels/store/opentracinglayer/opentracinglayer.go b/server/channels/store/opentracinglayer/opentracinglayer.go index 131a81e845..c33100c110 100644 --- a/server/channels/store/opentracinglayer/opentracinglayer.go +++ b/server/channels/store/opentracinglayer/opentracinglayer.go @@ -10207,7 +10207,7 @@ func (s *OpenTracingLayerTeamStore) Save(team *model.Team) (*model.Team, error) return result, err } -func (s *OpenTracingLayerTeamStore) SaveMember(member *model.TeamMember, maxUsersPerTeam int) (*model.TeamMember, error) { +func (s *OpenTracingLayerTeamStore) SaveMember(rctx request.CTX, member *model.TeamMember, maxUsersPerTeam int) (*model.TeamMember, error) { origCtx := s.Root.Store.Context() span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "TeamStore.SaveMember") s.Root.Store.SetContext(newCtx) @@ -10216,7 +10216,7 @@ func (s *OpenTracingLayerTeamStore) SaveMember(member *model.TeamMember, maxUser }() defer span.Finish() - result, err := s.TeamStore.SaveMember(member, maxUsersPerTeam) + result, err := s.TeamStore.SaveMember(rctx, member, maxUsersPerTeam) if err != nil { span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) diff --git a/server/channels/store/retrylayer/retrylayer.go b/server/channels/store/retrylayer/retrylayer.go index 4a650873cd..89587f1f24 100644 --- a/server/channels/store/retrylayer/retrylayer.go +++ b/server/channels/store/retrylayer/retrylayer.go @@ -11657,11 +11657,11 @@ func (s *RetryLayerTeamStore) Save(team *model.Team) (*model.Team, error) { } -func (s *RetryLayerTeamStore) SaveMember(member *model.TeamMember, maxUsersPerTeam int) (*model.TeamMember, error) { +func (s *RetryLayerTeamStore) SaveMember(rctx request.CTX, member *model.TeamMember, maxUsersPerTeam int) (*model.TeamMember, error) { tries := 0 for { - result, err := s.TeamStore.SaveMember(member, maxUsersPerTeam) + result, err := s.TeamStore.SaveMember(rctx, member, maxUsersPerTeam) if err == nil { return result, nil } diff --git a/server/channels/store/searchlayer/team_layer.go b/server/channels/store/searchlayer/team_layer.go index 74db0cfe08..46601e1dbb 100644 --- a/server/channels/store/searchlayer/team_layer.go +++ b/server/channels/store/searchlayer/team_layer.go @@ -14,11 +14,8 @@ type SearchTeamStore struct { rootStore *SearchStore } -func (s SearchTeamStore) SaveMember(teamMember *model.TeamMember, maxUsersPerTeam int) (*model.TeamMember, error) { - // TODO: Use the actuall request context from the App layer - // https://mattermost.atlassian.net/browse/MM-55736 - rctx := request.EmptyContext(s.rootStore.Logger()) - member, err := s.TeamStore.SaveMember(teamMember, maxUsersPerTeam) +func (s SearchTeamStore) SaveMember(rctx request.CTX, teamMember *model.TeamMember, maxUsersPerTeam int) (*model.TeamMember, error) { + member, err := s.TeamStore.SaveMember(rctx, teamMember, maxUsersPerTeam) if err == nil { s.rootStore.indexUserFromID(rctx, member.UserId) } diff --git a/server/channels/store/searchtest/helper.go b/server/channels/store/searchtest/helper.go index ef71e46015..d0f88af496 100644 --- a/server/channels/store/searchtest/helper.go +++ b/server/channels/store/searchtest/helper.go @@ -421,7 +421,7 @@ func (th *SearchTestHelper) deleteUserFileInfos(userID string) error { func (th *SearchTestHelper) addUserToTeams(user *model.User, teamIDS []string) error { for _, teamID := range teamIDS { - _, err := th.Store.Team().SaveMember(&model.TeamMember{TeamId: teamID, UserId: user.Id}, -1) + _, err := th.Store.Team().SaveMember(th.Context, &model.TeamMember{TeamId: teamID, UserId: user.Id}, -1) if err != nil { return errors.New(err.Error()) } diff --git a/server/channels/store/sqlstore/integrity_test.go b/server/channels/store/sqlstore/integrity_test.go index f9b5095027..57620016b1 100644 --- a/server/channels/store/sqlstore/integrity_test.go +++ b/server/channels/store/sqlstore/integrity_test.go @@ -342,11 +342,11 @@ func createTeam(ss store.Store) *model.Team { return t } -func createTeamMember(ss store.Store, teamId, userId string) *model.TeamMember { +func createTeamMember(rctx request.CTX, ss store.Store, teamId, userId string) *model.TeamMember { m := model.TeamMember{} m.TeamId = teamId m.UserId = userId - tm, _ := ss.Team().SaveMember(&m, -1) + tm, _ := ss.Team().SaveMember(rctx, &m, -1) return tm } @@ -966,7 +966,7 @@ func TestCheckTeamsTeamMembersIntegrity(t *testing.T) { t.Run("should generate a report with one record", func(t *testing.T) { team := createTeam(ss) - member := createTeamMember(ss, team.Id, model.NewId()) + member := createTeamMember(rctx, ss, team.Id, model.NewId()) dbmap.Exec(`DELETE FROM Teams WHERE Id=?`, team.Id) result := checkTeamsTeamMembersIntegrity(store) require.NoError(t, result.Err) @@ -1563,7 +1563,7 @@ func TestCheckUsersTeamMembersIntegrity(t *testing.T) { t.Run("should generate a report with one record", func(t *testing.T) { user := createUser(ss) team := createTeam(ss) - member := createTeamMember(ss, team.Id, user.Id) + member := createTeamMember(rctx, ss, team.Id, user.Id) dbmap.Exec(`DELETE FROM Users WHERE Id=?`, user.Id) result := checkUsersTeamMembersIntegrity(store) require.NoError(t, result.Err) diff --git a/server/channels/store/sqlstore/team_store.go b/server/channels/store/sqlstore/team_store.go index 08b8735667..6f7b88a9dc 100644 --- a/server/channels/store/sqlstore/team_store.go +++ b/server/channels/store/sqlstore/team_store.go @@ -853,7 +853,7 @@ func (s SqlTeamStore) SaveMultipleMembers(members []*model.TeamMember, maxUsersP return newMembers, nil } -func (s SqlTeamStore) SaveMember(member *model.TeamMember, maxUsersPerTeam int) (*model.TeamMember, error) { +func (s SqlTeamStore) SaveMember(rctx request.CTX, member *model.TeamMember, maxUsersPerTeam int) (*model.TeamMember, error) { members, err := s.SaveMultipleMembers([]*model.TeamMember{member}, maxUsersPerTeam) if err != nil { return nil, err diff --git a/server/channels/store/store.go b/server/channels/store/store.go index 7c3d8d7b90..ffba76942d 100644 --- a/server/channels/store/store.go +++ b/server/channels/store/store.go @@ -138,7 +138,7 @@ type TeamStore interface { PermanentDelete(teamID string) error AnalyticsTeamCount(opts *model.TeamSearch) (int64, error) SaveMultipleMembers(members []*model.TeamMember, maxUsersPerTeam int) ([]*model.TeamMember, error) - SaveMember(member *model.TeamMember, maxUsersPerTeam int) (*model.TeamMember, error) + SaveMember(rctx request.CTX, member *model.TeamMember, maxUsersPerTeam int) (*model.TeamMember, error) UpdateMember(rctx request.CTX, member *model.TeamMember) (*model.TeamMember, error) UpdateMultipleMembers(members []*model.TeamMember) ([]*model.TeamMember, error) GetMember(c request.CTX, teamID string, userID string) (*model.TeamMember, error) diff --git a/server/channels/store/storetest/channel_store.go b/server/channels/store/storetest/channel_store.go index 0db8563b85..d0477baca9 100644 --- a/server/channels/store/storetest/channel_store.go +++ b/server/channels/store/storetest/channel_store.go @@ -220,7 +220,7 @@ func testChannelStoreSaveDirectChannel(t *testing.T, rctx request.CTX, ss store. u1.Nickname = model.NewId() _, err := ss.User().Save(u1) require.NoError(t, err) - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) require.NoError(t, nErr) u2 := &model.User{} @@ -228,7 +228,7 @@ func testChannelStoreSaveDirectChannel(t *testing.T, rctx request.CTX, ss store. u2.Nickname = model.NewId() _, err = ss.User().Save(u2) require.NoError(t, err) - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) require.NoError(t, nErr) m1 := model.ChannelMember{} @@ -302,7 +302,7 @@ func testChannelStoreCreateDirectChannel(t *testing.T, rctx request.CTX, ss stor u1.Nickname = model.NewId() _, err := ss.User().Save(u1) require.NoError(t, err) - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) require.NoError(t, nErr) u2 := &model.User{} @@ -310,7 +310,7 @@ func testChannelStoreCreateDirectChannel(t *testing.T, rctx request.CTX, ss stor u2.Nickname = model.NewId() _, err = ss.User().Save(u2) require.NoError(t, err) - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) require.NoError(t, nErr) c1, nErr := ss.Channel().CreateDirectChannel(rctx, u1, u2) @@ -377,9 +377,9 @@ func testGetChannelUnread(t *testing.T, rctx request.CTX, ss store.Store) { uid := model.NewId() m1 := &model.TeamMember{TeamId: teamId1, UserId: uid} m2 := &model.TeamMember{TeamId: teamId2, UserId: uid} - _, nErr := ss.Team().SaveMember(m1, -1) + _, nErr := ss.Team().SaveMember(rctx, m1, -1) require.NoError(t, nErr) - _, nErr = ss.Team().SaveMember(m2, -1) + _, nErr = ss.Team().SaveMember(rctx, m2, -1) require.NoError(t, nErr) notifyPropsModel := model.GetDefaultChannelNotifyProps() @@ -443,7 +443,7 @@ func testChannelStoreGet(t *testing.T, rctx request.CTX, ss store.Store, s SqlSt u1.Nickname = model.NewId() _, err = ss.User().Save(u1) require.NoError(t, err) - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) require.NoError(t, nErr) u2 := model.User{} @@ -451,7 +451,7 @@ func testChannelStoreGet(t *testing.T, rctx request.CTX, ss store.Store, s SqlSt u2.Nickname = model.NewId() _, err = ss.User().Save(&u2) require.NoError(t, err) - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) require.NoError(t, nErr) o2 := model.Channel{} @@ -545,7 +545,7 @@ func testChannelStoreGetChannelsByIds(t *testing.T, rctx request.CTX, ss store.S u1.Nickname = model.NewId() _, err := ss.User().Save(u1) require.NoError(t, err) - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) require.NoError(t, nErr) u2 := model.User{} @@ -553,7 +553,7 @@ func testChannelStoreGetChannelsByIds(t *testing.T, rctx request.CTX, ss store.S u2.Nickname = model.NewId() _, err = ss.User().Save(&u2) require.NoError(t, err) - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) require.NoError(t, nErr) o2 := model.Channel{} @@ -634,7 +634,7 @@ func testGetChannelsWithTeamDataByIds(t *testing.T, rctx request.CTX, ss store.S u1.Nickname = model.NewId() _, err = ss.User().Save(u1) require.NoError(t, err) - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: t1.Id, UserId: u1.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: t1.Id, UserId: u1.Id}, -1) require.NoError(t, nErr) u2 := model.User{} @@ -642,7 +642,7 @@ func testGetChannelsWithTeamDataByIds(t *testing.T, rctx request.CTX, ss store.S u2.Nickname = model.NewId() _, err = ss.User().Save(&u2) require.NoError(t, err) - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: t1.Id, UserId: u2.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: t1.Id, UserId: u2.Id}, -1) require.NoError(t, nErr) c2 := model.Channel{} @@ -1066,7 +1066,7 @@ func testChannelMemberStore(t *testing.T, rctx request.CTX, ss store.Store) { u1.Nickname = model.NewId() _, err := ss.User().Save(&u1) require.NoError(t, err) - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) require.NoError(t, nErr) u2 := model.User{} @@ -1074,7 +1074,7 @@ func testChannelMemberStore(t *testing.T, rctx request.CTX, ss store.Store) { u2.Nickname = model.NewId() _, err = ss.User().Save(&u2) require.NoError(t, err) - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) require.NoError(t, nErr) o1 := model.ChannelMember{} @@ -3535,7 +3535,7 @@ func testChannelDeleteMemberStore(t *testing.T, rctx request.CTX, ss store.Store u1.Nickname = model.NewId() _, err := ss.User().Save(&u1) require.NoError(t, err) - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) require.NoError(t, nErr) u2 := model.User{} @@ -3543,7 +3543,7 @@ func testChannelDeleteMemberStore(t *testing.T, rctx request.CTX, ss store.Store u2.Nickname = model.NewId() _, err = ss.User().Save(&u2) require.NoError(t, err) - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) require.NoError(t, nErr) o1 := model.ChannelMember{} @@ -5150,7 +5150,7 @@ func testGetMemberCount(t *testing.T, rctx request.CTX, ss store.Store) { } _, err := ss.User().Save(u1) require.NoError(t, err) - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) require.NoError(t, nErr) m1 := model.ChannelMember{ @@ -5171,7 +5171,7 @@ func testGetMemberCount(t *testing.T, rctx request.CTX, ss store.Store) { } _, err = ss.User().Save(&u2) require.NoError(t, err) - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) require.NoError(t, nErr) m2 := model.ChannelMember{ @@ -5193,7 +5193,7 @@ func testGetMemberCount(t *testing.T, rctx request.CTX, ss store.Store) { } _, err = ss.User().Save(&u3) require.NoError(t, err) - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) require.NoError(t, nErr) m3 := model.ChannelMember{ @@ -5215,7 +5215,7 @@ func testGetMemberCount(t *testing.T, rctx request.CTX, ss store.Store) { } _, err = ss.User().Save(u4) require.NoError(t, err) - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u4.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u4.Id}, -1) require.NoError(t, nErr) m4 := model.ChannelMember{ @@ -5259,7 +5259,7 @@ func testGetMemberCountsByGroup(t *testing.T, rctx request.CTX, ss store.Store) } _, nErr = ss.User().Save(u1) require.NoError(t, nErr) - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) require.NoError(t, nErr) m1 := model.ChannelMember{ @@ -5330,7 +5330,7 @@ func testGetMemberCountsByGroup(t *testing.T, rctx request.CTX, ss store.Store) } _, nErr = ss.User().Save(u) require.NoError(t, nErr) - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u.Id}, -1) require.NoError(t, nErr) m := model.ChannelMember{ @@ -5384,7 +5384,7 @@ func testGetMemberCountsByGroup(t *testing.T, rctx request.CTX, ss store.Store) } _, nErr = ss.User().Save(u) require.NoError(t, nErr) - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u.Id}, -1) require.NoError(t, nErr) m := model.ChannelMember{ @@ -5475,7 +5475,7 @@ func testGetGuestCount(t *testing.T, rctx request.CTX, ss store.Store) { } _, err := ss.User().Save(u1) require.NoError(t, err) - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) require.NoError(t, nErr) m1 := model.ChannelMember{ @@ -5500,7 +5500,7 @@ func testGetGuestCount(t *testing.T, rctx request.CTX, ss store.Store) { } _, err := ss.User().Save(&u2) require.NoError(t, err) - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) require.NoError(t, nErr) m2 := model.ChannelMember{ @@ -5525,7 +5525,7 @@ func testGetGuestCount(t *testing.T, rctx request.CTX, ss store.Store) { } _, err := ss.User().Save(&u3) require.NoError(t, err) - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) require.NoError(t, nErr) m3 := model.ChannelMember{ @@ -5550,7 +5550,7 @@ func testGetGuestCount(t *testing.T, rctx request.CTX, ss store.Store) { } _, err := ss.User().Save(u4) require.NoError(t, err) - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u4.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u4.Id}, -1) require.NoError(t, nErr) m4 := model.ChannelMember{ @@ -6062,11 +6062,11 @@ func testAutocomplete(t *testing.T, rctx request.CTX, ss store.Store, s SqlStore require.NoError(t, err) tm1 := &model.TeamMember{TeamId: teamID, UserId: m1.UserId} - _, err = ss.Team().SaveMember(tm1, -1) + _, err = ss.Team().SaveMember(rctx, tm1, -1) require.NoError(t, err) tm2 := &model.TeamMember{TeamId: otherTeamID, UserId: m1.UserId} - _, err = ss.Team().SaveMember(tm2, -1) + _, err = ss.Team().SaveMember(rctx, tm2, -1) require.NoError(t, err) m3 := model.ChannelMember{ @@ -6078,11 +6078,11 @@ func testAutocomplete(t *testing.T, rctx request.CTX, ss store.Store, s SqlStore require.NoError(t, err) tm3 := &model.TeamMember{TeamId: otherTeamID, UserId: m3.UserId} - _, err = ss.Team().SaveMember(tm3, -1) + _, err = ss.Team().SaveMember(rctx, tm3, -1) require.NoError(t, err) tm4 := &model.TeamMember{TeamId: teamID, UserId: m3.UserId} - _, err = ss.Team().SaveMember(tm4, -1) + _, err = ss.Team().SaveMember(rctx, tm4, -1) require.NoError(t, err) o3 := model.Channel{ @@ -6147,7 +6147,7 @@ func testAutocomplete(t *testing.T, rctx request.CTX, ss store.Store, s SqlStore require.NoError(t, err) tm5 := &model.TeamMember{TeamId: leftTeamId, UserId: m1.UserId} - _, err = ss.Team().SaveMember(tm5, -1) + _, err = ss.Team().SaveMember(rctx, tm5, -1) require.NoError(t, err) err = ss.Channel().RemoveMember(rctx, o5.Id, m1.UserId) @@ -7728,7 +7728,7 @@ func testChannelStoreExportAllDirectChannels(t *testing.T, rctx request.CTX, ss u1.Nickname = model.NewId() _, err := ss.User().Save(u1) require.NoError(t, err) - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) require.NoError(t, nErr) u2 := &model.User{} @@ -7736,7 +7736,7 @@ func testChannelStoreExportAllDirectChannels(t *testing.T, rctx request.CTX, ss u2.Nickname = model.NewId() _, err = ss.User().Save(u2) require.NoError(t, err) - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) require.NoError(t, nErr) m1 := model.ChannelMember{} @@ -7791,7 +7791,7 @@ func testChannelStoreExportAllDirectChannelsExcludePrivateAndPublic(t *testing.T u1.Nickname = model.NewId() _, err := ss.User().Save(u1) require.NoError(t, err) - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) require.NoError(t, nErr) u2 := &model.User{} @@ -7799,7 +7799,7 @@ func testChannelStoreExportAllDirectChannelsExcludePrivateAndPublic(t *testing.T u2.Nickname = model.NewId() _, err = ss.User().Save(u2) require.NoError(t, err) - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) require.NoError(t, nErr) m1 := model.ChannelMember{} @@ -7837,7 +7837,7 @@ func testChannelStoreExportAllDirectChannelsDeletedChannel(t *testing.T, rctx re u1.Nickname = model.NewId() _, err := ss.User().Save(u1) require.NoError(t, err) - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) require.NoError(t, nErr) u2 := &model.User{} @@ -7846,7 +7846,7 @@ func testChannelStoreExportAllDirectChannelsDeletedChannel(t *testing.T, rctx re u2.Nickname = model.NewId() _, err = ss.User().Save(u2) require.NoError(t, err) - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) require.NoError(t, nErr) m1 := model.ChannelMember{} diff --git a/server/channels/store/storetest/compliance_store.go b/server/channels/store/storetest/compliance_store.go index d47a6a9bb3..e8594d280d 100644 --- a/server/channels/store/storetest/compliance_store.go +++ b/server/channels/store/storetest/compliance_store.go @@ -116,7 +116,7 @@ func testComplianceExport(t *testing.T, rctx request.CTX, ss store.Store) { u1.Username = model.NewId() u1, err = ss.User().Save(u1) require.NoError(t, err) - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: t1.Id, UserId: u1.Id}, -1) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: t1.Id, UserId: u1.Id}, -1) require.NoError(t, nErr) u2 := &model.User{} @@ -124,7 +124,7 @@ func testComplianceExport(t *testing.T, rctx request.CTX, ss store.Store) { u2.Username = model.NewId() u2, err = ss.User().Save(u2) require.NoError(t, err) - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: t1.Id, UserId: u2.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: t1.Id, UserId: u2.Id}, -1) require.NoError(t, nErr) c1 := &model.Channel{} @@ -250,7 +250,7 @@ func testComplianceExportDirectMessages(t *testing.T, rctx request.CTX, ss store u1.Username = model.NewId() u1, err = ss.User().Save(u1) require.NoError(t, err) - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: t1.Id, UserId: u1.Id}, -1) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: t1.Id, UserId: u1.Id}, -1) require.NoError(t, nErr) u2 := &model.User{} @@ -258,7 +258,7 @@ func testComplianceExportDirectMessages(t *testing.T, rctx request.CTX, ss store u2.Username = model.NewId() u2, err = ss.User().Save(u2) require.NoError(t, err) - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: t1.Id, UserId: u2.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: t1.Id, UserId: u2.Id}, -1) require.NoError(t, nErr) c1 := &model.Channel{} @@ -421,7 +421,7 @@ func testMessageExportPublicChannel(t *testing.T, rctx request.CTX, ss store.Sto } user1, err = ss.User().Save(user1) require.NoError(t, err) - _, nErr := ss.Team().SaveMember(&model.TeamMember{ + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{ TeamId: team.Id, UserId: user1.Id, }, -1) @@ -433,7 +433,7 @@ func testMessageExportPublicChannel(t *testing.T, rctx request.CTX, ss store.Sto } user2, err = ss.User().Save(user2) require.NoError(t, err) - _, nErr = ss.Team().SaveMember(&model.TeamMember{ + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{ TeamId: team.Id, UserId: user2.Id, }, -1) @@ -525,7 +525,7 @@ func testMessageExportPrivateChannel(t *testing.T, rctx request.CTX, ss store.St } user1, err = ss.User().Save(user1) require.NoError(t, err) - _, nErr := ss.Team().SaveMember(&model.TeamMember{ + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{ TeamId: team.Id, UserId: user1.Id, }, -1) @@ -537,7 +537,7 @@ func testMessageExportPrivateChannel(t *testing.T, rctx request.CTX, ss store.St } user2, err = ss.User().Save(user2) require.NoError(t, err) - _, nErr = ss.Team().SaveMember(&model.TeamMember{ + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{ TeamId: team.Id, UserId: user2.Id, }, -1) @@ -631,7 +631,7 @@ func testMessageExportDirectMessageChannel(t *testing.T, rctx request.CTX, ss st } user1, err = ss.User().Save(user1) require.NoError(t, err) - _, nErr := ss.Team().SaveMember(&model.TeamMember{ + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{ TeamId: team.Id, UserId: user1.Id, }, -1) @@ -643,7 +643,7 @@ func testMessageExportDirectMessageChannel(t *testing.T, rctx request.CTX, ss st } user2, err = ss.User().Save(user2) require.NoError(t, err) - _, nErr = ss.Team().SaveMember(&model.TeamMember{ + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{ TeamId: team.Id, UserId: user2.Id, }, -1) @@ -712,7 +712,7 @@ func testMessageExportGroupMessageChannel(t *testing.T, rctx request.CTX, ss sto } user1, err = ss.User().Save(user1) require.NoError(t, err) - _, nErr := ss.Team().SaveMember(&model.TeamMember{ + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{ TeamId: team.Id, UserId: user1.Id, }, -1) @@ -724,7 +724,7 @@ func testMessageExportGroupMessageChannel(t *testing.T, rctx request.CTX, ss sto } user2, err = ss.User().Save(user2) require.NoError(t, err) - _, nErr = ss.Team().SaveMember(&model.TeamMember{ + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{ TeamId: team.Id, UserId: user2.Id, }, -1) @@ -736,7 +736,7 @@ func testMessageExportGroupMessageChannel(t *testing.T, rctx request.CTX, ss sto } user3, err = ss.User().Save(user3) require.NoError(t, err) - _, nErr = ss.Team().SaveMember(&model.TeamMember{ + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{ TeamId: team.Id, UserId: user3.Id, }, -1) @@ -810,7 +810,7 @@ func testEditExportMessage(t *testing.T, rctx request.CTX, ss store.Store) { } user1, err = ss.User().Save(user1) require.NoError(t, err) - _, nErr := ss.Team().SaveMember(&model.TeamMember{ + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{ TeamId: team.Id, UserId: user1.Id, }, -1) @@ -902,7 +902,7 @@ func testEditAfterExportMessage(t *testing.T, rctx request.CTX, ss store.Store) } user1, err = ss.User().Save(user1) require.NoError(t, err) - _, nErr := ss.Team().SaveMember(&model.TeamMember{ + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{ TeamId: team.Id, UserId: user1.Id, }, -1) @@ -1013,7 +1013,7 @@ func testDeleteExportMessage(t *testing.T, rctx request.CTX, ss store.Store) { } user1, err = ss.User().Save(user1) require.NoError(t, err) - _, nErr := ss.Team().SaveMember(&model.TeamMember{ + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{ TeamId: team.Id, UserId: user1.Id, }, -1) @@ -1098,7 +1098,7 @@ func testDeleteAfterExportMessage(t *testing.T, rctx request.CTX, ss store.Store } user1, err = ss.User().Save(user1) require.NoError(t, err) - _, nErr := ss.Team().SaveMember(&model.TeamMember{ + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{ TeamId: team.Id, UserId: user1.Id, }, -1) diff --git a/server/channels/store/storetest/group_store.go b/server/channels/store/storetest/group_store.go index eeccaefb00..9c4ff18a22 100644 --- a/server/channels/store/storetest/group_store.go +++ b/server/channels/store/storetest/group_store.go @@ -1069,7 +1069,7 @@ func testGroupGetMemberUsersInTeam(t *testing.T, rctx request.CTX, ss store.Stor require.Equal(t, 0, len(groupMembers)) m1 := &model.TeamMember{TeamId: team.Id, UserId: user1.Id} - _, nErr := ss.Team().SaveMember(m1, -1) + _, nErr := ss.Team().SaveMember(rctx, m1, -1) require.NoError(t, nErr) // returns single member in team @@ -1079,9 +1079,9 @@ func testGroupGetMemberUsersInTeam(t *testing.T, rctx request.CTX, ss store.Stor m2 := &model.TeamMember{TeamId: team.Id, UserId: user2.Id} m3 := &model.TeamMember{TeamId: team.Id, UserId: user3.Id} - _, nErr = ss.Team().SaveMember(m2, -1) + _, nErr = ss.Team().SaveMember(rctx, m2, -1) require.NoError(t, nErr) - _, nErr = ss.Team().SaveMember(m3, -1) + _, nErr = ss.Team().SaveMember(rctx, m3, -1) require.NoError(t, nErr) // returns all members when all members are in team @@ -1165,7 +1165,7 @@ func testGroupGetMemberUsersNotInChannel(t *testing.T, rctx request.CTX, ss stor require.Equal(t, 0, len(groupMembers)) m1 := &model.TeamMember{TeamId: team.Id, UserId: user1.Id} - _, nErr = ss.Team().SaveMember(m1, -1) + _, nErr = ss.Team().SaveMember(rctx, m1, -1) require.NoError(t, nErr) // returns single member in team and not in channel @@ -1175,9 +1175,9 @@ func testGroupGetMemberUsersNotInChannel(t *testing.T, rctx request.CTX, ss stor m2 := &model.TeamMember{TeamId: team.Id, UserId: user2.Id} m3 := &model.TeamMember{TeamId: team.Id, UserId: user3.Id} - _, nErr = ss.Team().SaveMember(m2, -1) + _, nErr = ss.Team().SaveMember(rctx, m2, -1) require.NoError(t, nErr) - _, nErr = ss.Team().SaveMember(m3, -1) + _, nErr = ss.Team().SaveMember(rctx, m3, -1) require.NoError(t, nErr) // returns all members when all members are in team and not in channel @@ -1900,7 +1900,7 @@ func testTeamMembersToAdd(t *testing.T, rctx request.CTX, ss store.Store) { require.Len(t, teamMembers, 1) // adding team membership stops returning result - _, nErr = ss.Team().SaveMember(&model.TeamMember{ + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{ TeamId: team.Id, UserId: user.Id, }, 999) @@ -2399,14 +2399,14 @@ func testTeamMembersToRemoveSingleTeam(t *testing.T, rctx request.CTX, ss store. require.NoError(t, nErr) for _, user := range []*model.User{user1, user2} { - _, nErr = ss.Team().SaveMember(&model.TeamMember{ + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{ TeamId: team1.Id, UserId: user.Id, }, 999) require.NoError(t, nErr) } - _, nErr = ss.Team().SaveMember(&model.TeamMember{ + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{ TeamId: team2.Id, UserId: user3.Id, }, 999) @@ -2695,7 +2695,7 @@ func pendingMemberRemovalsDataSetup(t *testing.T, rctx request.CTX, ss store.Sto } for _, item := range userIDTeamIDs { - _, nErr = ss.Team().SaveMember(&model.TeamMember{ + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{ UserId: item[0], TeamId: item[1], }, 99) @@ -4025,7 +4025,7 @@ func testTeamMembersMinusGroupMembers(t *testing.T, rctx request.CTX, ss store.S users = append(users, user) trueOrFalse := int(math.Mod(float64(i), 2)) == 0 - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: team.Id, UserId: user.Id, SchemeUser: trueOrFalse, SchemeAdmin: !trueOrFalse}, 999) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: team.Id, UserId: user.Id, SchemeUser: trueOrFalse, SchemeAdmin: !trueOrFalse}, 999) require.NoError(t, nErr) } @@ -4037,7 +4037,7 @@ func testTeamMembersMinusGroupMembers(t *testing.T, rctx request.CTX, ss store.S user, err = ss.User().Save(user) require.NoError(t, err) users = append(users, user) - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: team.Id, UserId: user.Id, SchemeUser: true, SchemeAdmin: false}, 999) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: team.Id, UserId: user.Id, SchemeUser: true, SchemeAdmin: false}, 999) require.NoError(t, nErr) for i := 0; i < numberOfGroups; i++ { @@ -4782,11 +4782,11 @@ func groupTestpUpdateMembersRoleTeam(t *testing.T, rctx request.CTX, ss store.St require.NoError(t, err) for _, user := range []*model.User{user1, user2, user3} { - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: team.Id, UserId: user.Id}, 9999) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: team.Id, UserId: user.Id}, 9999) require.NoError(t, nErr) } - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: team.Id, UserId: user4.Id, SchemeGuest: true}, 9999) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: team.Id, UserId: user4.Id, SchemeGuest: true}, 9999) require.NoError(t, nErr) tests := []struct { diff --git a/server/channels/store/storetest/mocks/TeamStore.go b/server/channels/store/storetest/mocks/TeamStore.go index 52330e65ca..1fd55f01ab 100644 --- a/server/channels/store/storetest/mocks/TeamStore.go +++ b/server/channels/store/storetest/mocks/TeamStore.go @@ -919,25 +919,25 @@ func (_m *TeamStore) Save(team *model.Team) (*model.Team, error) { return r0, r1 } -// SaveMember provides a mock function with given fields: member, maxUsersPerTeam -func (_m *TeamStore) SaveMember(member *model.TeamMember, maxUsersPerTeam int) (*model.TeamMember, error) { - ret := _m.Called(member, maxUsersPerTeam) +// SaveMember provides a mock function with given fields: rctx, member, maxUsersPerTeam +func (_m *TeamStore) SaveMember(rctx request.CTX, member *model.TeamMember, maxUsersPerTeam int) (*model.TeamMember, error) { + ret := _m.Called(rctx, member, maxUsersPerTeam) var r0 *model.TeamMember var r1 error - if rf, ok := ret.Get(0).(func(*model.TeamMember, int) (*model.TeamMember, error)); ok { - return rf(member, maxUsersPerTeam) + if rf, ok := ret.Get(0).(func(request.CTX, *model.TeamMember, int) (*model.TeamMember, error)); ok { + return rf(rctx, member, maxUsersPerTeam) } - if rf, ok := ret.Get(0).(func(*model.TeamMember, int) *model.TeamMember); ok { - r0 = rf(member, maxUsersPerTeam) + if rf, ok := ret.Get(0).(func(request.CTX, *model.TeamMember, int) *model.TeamMember); ok { + r0 = rf(rctx, member, maxUsersPerTeam) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*model.TeamMember) } } - if rf, ok := ret.Get(1).(func(*model.TeamMember, int) error); ok { - r1 = rf(member, maxUsersPerTeam) + if rf, ok := ret.Get(1).(func(request.CTX, *model.TeamMember, int) error); ok { + r1 = rf(rctx, member, maxUsersPerTeam) } else { r1 = ret.Error(1) } diff --git a/server/channels/store/storetest/post_store.go b/server/channels/store/storetest/post_store.go index 43f9099f5f..4d4b364501 100644 --- a/server/channels/store/storetest/post_store.go +++ b/server/channels/store/storetest/post_store.go @@ -4426,7 +4426,7 @@ func testPostStoreGetDirectPostParentsForExportAfter(t *testing.T, rctx request. u1.Nickname = model.NewId() _, err := ss.User().Save(u1) require.NoError(t, err) - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) require.NoError(t, nErr) u2 := &model.User{} @@ -4434,7 +4434,7 @@ func testPostStoreGetDirectPostParentsForExportAfter(t *testing.T, rctx request. u2.Nickname = model.NewId() _, err = ss.User().Save(u2) require.NoError(t, err) - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) require.NoError(t, nErr) m1 := model.ChannelMember{} @@ -4481,7 +4481,7 @@ func testPostStoreGetDirectPostParentsForExportAfterDeleted(t *testing.T, rctx r u1.Nickname = model.NewId() _, err := ss.User().Save(u1) require.NoError(t, err) - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) require.NoError(t, nErr) u2 := &model.User{} @@ -4490,7 +4490,7 @@ func testPostStoreGetDirectPostParentsForExportAfterDeleted(t *testing.T, rctx r u2.Nickname = model.NewId() _, err = ss.User().Save(u2) require.NoError(t, err) - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) require.NoError(t, nErr) m1 := model.ChannelMember{} @@ -4548,7 +4548,7 @@ func testPostStoreGetDirectPostParentsForExportAfterBatched(t *testing.T, rctx r u1.Nickname = model.NewId() _, err := ss.User().Save(u1) require.NoError(t, err) - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) require.NoError(t, nErr) u2 := &model.User{} @@ -4556,7 +4556,7 @@ func testPostStoreGetDirectPostParentsForExportAfterBatched(t *testing.T, rctx r u2.Nickname = model.NewId() _, err = ss.User().Save(u2) require.NoError(t, err) - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) require.NoError(t, nErr) m1 := model.ChannelMember{} diff --git a/server/channels/store/storetest/retention_policy_store.go b/server/channels/store/storetest/retention_policy_store.go index 040fc04047..58f8f04fa2 100644 --- a/server/channels/store/storetest/retention_policy_store.go +++ b/server/channels/store/storetest/retention_policy_store.go @@ -639,7 +639,7 @@ func testRetentionPolicyStoreGetPoliciesForUser(t *testing.T, rctx request.CTX, t.Run("user has relevant policies", func(t *testing.T) { for _, teamID := range teamIDs { - _, err := ss.Team().SaveMember(&model.TeamMember{TeamId: teamID, UserId: user.Id}, -1) + _, err := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamID, UserId: user.Id}, -1) require.NoError(t, err) } for _, channelID := range channelIDs { diff --git a/server/channels/store/storetest/team_store.go b/server/channels/store/storetest/team_store.go index e9ada1f357..9dd49fb86b 100644 --- a/server/channels/store/storetest/team_store.go +++ b/server/channels/store/storetest/team_store.go @@ -678,7 +678,7 @@ func testTeamStoreByUserId(t *testing.T, rctx request.CTX, ss store.Store) { require.NoError(t, err) m1 := &model.TeamMember{TeamId: o1.Id, UserId: model.NewId()} - _, nErr := ss.Team().SaveMember(m1, -1) + _, nErr := ss.Team().SaveMember(rctx, m1, -1) require.NoError(t, nErr) teams, err := ss.Team().GetTeamsByUserId(m1.UserId) @@ -1278,17 +1278,17 @@ func testGetMembers(t *testing.T, rctx request.CTX, ss store.Store) { m5 := &model.TeamMember{TeamId: teamId1, UserId: u5.Id} m6 := &model.TeamMember{TeamId: teamId2, UserId: u6.Id} - t1, nErr := ss.Team().SaveMember(m1, -1) + t1, nErr := ss.Team().SaveMember(rctx, m1, -1) require.NoError(t, nErr) - _, nErr = ss.Team().SaveMember(m2, -1) + _, nErr = ss.Team().SaveMember(rctx, m2, -1) require.NoError(t, nErr) - t3, nErr := ss.Team().SaveMember(m3, -1) + t3, nErr := ss.Team().SaveMember(rctx, m3, -1) require.NoError(t, nErr) - _, nErr = ss.Team().SaveMember(m4, -1) + _, nErr = ss.Team().SaveMember(rctx, m4, -1) require.NoError(t, nErr) - t5, nErr := ss.Team().SaveMember(m5, -1) + t5, nErr := ss.Team().SaveMember(rctx, m5, -1) require.NoError(t, nErr) - _, nErr = ss.Team().SaveMember(m6, -1) + _, nErr = ss.Team().SaveMember(rctx, m6, -1) require.NoError(t, nErr) // Gets users ordered by UserName @@ -1332,7 +1332,7 @@ func testTeamMembers(t *testing.T, rctx request.CTX, ss store.Store) { require.Len(t, ms, 1) require.Equal(t, m2.UserId, ms[0].UserId) - _, nErr = ss.Team().SaveMember(m1, -1) + _, nErr = ss.Team().SaveMember(rctx, m1, -1) require.NoError(t, nErr) err = ss.Team().RemoveAllMembersByTeam(teamId1) @@ -1384,14 +1384,14 @@ func testTeamSaveMember(t *testing.T, rctx request.CTX, ss store.Store) { t.Run("not valid team member", func(t *testing.T) { member := &model.TeamMember{TeamId: "wrong", UserId: u1.Id} - _, nErr := ss.Team().SaveMember(member, -1) + _, nErr := ss.Team().SaveMember(rctx, member, -1) require.Error(t, nErr) require.Equal(t, "TeamMember.IsValid: model.team_member.is_valid.team_id.app_error", nErr.Error()) }) t.Run("too many members", func(t *testing.T) { member := &model.TeamMember{TeamId: model.NewId(), UserId: u1.Id} - _, nErr := ss.Team().SaveMember(member, 0) + _, nErr := ss.Team().SaveMember(rctx, member, 0) require.Error(t, nErr) require.Equal(t, "limit exceeded: what: TeamMember count: 1 metadata: team members limit exceeded", nErr.Error()) }) @@ -1400,10 +1400,10 @@ func testTeamSaveMember(t *testing.T, rctx request.CTX, ss store.Store) { teamID := model.NewId() m1 := &model.TeamMember{TeamId: teamID, UserId: u1.Id} - _, nErr := ss.Team().SaveMember(m1, 1) + _, nErr := ss.Team().SaveMember(rctx, m1, 1) require.NoError(t, nErr) m2 := &model.TeamMember{TeamId: teamID, UserId: u2.Id} - _, nErr = ss.Team().SaveMember(m2, 1) + _, nErr = ss.Team().SaveMember(rctx, m2, 1) require.Error(t, nErr) require.Equal(t, "limit exceeded: what: TeamMember count: 2 metadata: team members limit exceeded", nErr.Error()) }) @@ -1411,10 +1411,10 @@ func testTeamSaveMember(t *testing.T, rctx request.CTX, ss store.Store) { t.Run("duplicated entries should fail", func(t *testing.T) { teamID1 := model.NewId() m1 := &model.TeamMember{TeamId: teamID1, UserId: u1.Id} - _, nErr := ss.Team().SaveMember(m1, -1) + _, nErr := ss.Team().SaveMember(rctx, m1, -1) require.NoError(t, nErr) m2 := &model.TeamMember{TeamId: teamID1, UserId: u1.Id} - _, nErr = ss.Team().SaveMember(m2, -1) + _, nErr = ss.Team().SaveMember(rctx, m2, -1) require.Error(t, nErr) require.IsType(t, &store.ErrConflict{}, nErr) }) @@ -1547,7 +1547,7 @@ func testTeamSaveMember(t *testing.T, rctx request.CTX, ss store.Store) { SchemeAdmin: tc.SchemeAdmin, ExplicitRoles: tc.ExplicitRoles, } - member, nErr := ss.Team().SaveMember(member, -1) + member, nErr := ss.Team().SaveMember(rctx, member, -1) require.NoError(t, nErr) defer ss.Team().RemoveMember(rctx, team.Id, u1.Id) @@ -1698,7 +1698,7 @@ func testTeamSaveMember(t *testing.T, rctx request.CTX, ss store.Store) { SchemeAdmin: tc.SchemeAdmin, ExplicitRoles: tc.ExplicitRoles, } - member, nErr := ss.Team().SaveMember(member, -1) + member, nErr := ss.Team().SaveMember(rctx, member, -1) require.NoError(t, nErr) defer ss.Team().RemoveMember(rctx, team.Id, u1.Id) @@ -2116,7 +2116,7 @@ func testTeamUpdateMember(t *testing.T, rctx request.CTX, ss store.Store) { require.NoError(t, nErr) member := &model.TeamMember{TeamId: team.Id, UserId: u1.Id} - member, nErr = ss.Team().SaveMember(member, -1) + member, nErr = ss.Team().SaveMember(rctx, member, -1) require.NoError(t, nErr) testCases := []struct { @@ -2267,7 +2267,7 @@ func testTeamUpdateMember(t *testing.T, rctx request.CTX, ss store.Store) { require.NoError(t, nErr) member := &model.TeamMember{TeamId: team.Id, UserId: u1.Id} - member, nErr = ss.Team().SaveMember(member, -1) + member, nErr = ss.Team().SaveMember(rctx, member, -1) require.NoError(t, nErr) testCases := []struct { @@ -2758,7 +2758,7 @@ func testTeamRemoveMember(t *testing.T, rctx request.CTX, ss store.Store) { t.Run("remove existing member from an existing team", func(t *testing.T) { nErr = ss.Team().RemoveMember(rctx, teamID, u1.Id) require.NoError(t, nErr) - defer ss.Team().SaveMember(m1, -1) + defer ss.Team().SaveMember(rctx, m1, -1) var membersOtherTeam []*model.TeamMember membersOtherTeam, nErr = ss.Team().GetMembers(teamID, 0, 100, nil) require.NoError(t, nErr) @@ -2847,7 +2847,7 @@ func testTeamMembersWithPagination(t *testing.T, rctx request.CTX, ss store.Stor require.Len(t, ms, 1) require.Equal(t, m2.UserId, ms[0].UserId) - _, nErr = ss.Team().SaveMember(m1, -1) + _, nErr = ss.Team().SaveMember(rctx, m1, -1) require.NoError(t, nErr) err = ss.Team().RemoveAllMembersByTeam(teamId1) @@ -2898,7 +2898,7 @@ func testSaveTeamMemberMaxMembers(t *testing.T, rctx request.CTX, ss store.Store ss.User().PermanentDelete(userId) }(userIds[i]) - _, nErr := ss.Team().SaveMember(&model.TeamMember{ + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{ TeamId: team.Id, UserId: userIds[i], }, maxUsersPerTeam) @@ -2923,7 +2923,7 @@ func testSaveTeamMemberMaxMembers(t *testing.T, rctx request.CTX, ss store.Store ss.User().PermanentDelete(newUserId) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{ + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{ TeamId: team.Id, UserId: newUserId, }, maxUsersPerTeam) @@ -2945,7 +2945,7 @@ func testSaveTeamMemberMaxMembers(t *testing.T, rctx request.CTX, ss store.Store require.NoError(t, teamErr) require.Equal(t, maxUsersPerTeam-1, int(totalMemberCount), "should now only have 4 team members, had %v instead", totalMemberCount) - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: team.Id, UserId: newUserId}, maxUsersPerTeam) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: team.Id, UserId: newUserId}, maxUsersPerTeam) require.NoError(t, nErr, "should've been able to save new member after deleting one") defer ss.Team().RemoveMember(rctx, team.Id, newUserId) @@ -2967,7 +2967,7 @@ func testSaveTeamMemberMaxMembers(t *testing.T, rctx request.CTX, ss store.Store }) require.NoError(t, nErr) newUserId2 := user.Id - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: team.Id, UserId: newUserId2}, maxUsersPerTeam) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: team.Id, UserId: newUserId2}, maxUsersPerTeam) require.NoError(t, nErr, "should've been able to save new member after deleting one") defer ss.Team().RemoveMember(rctx, team.Id, newUserId2) @@ -2977,7 +2977,7 @@ func testGetTeamMember(t *testing.T, rctx request.CTX, ss store.Store) { teamId1 := model.NewId() m1 := &model.TeamMember{TeamId: teamId1, UserId: model.NewId()} - _, nErr := ss.Team().SaveMember(m1, -1) + _, nErr := ss.Team().SaveMember(rctx, m1, -1) require.NoError(t, nErr) var rm1 *model.TeamMember @@ -3018,7 +3018,7 @@ func testGetTeamMember(t *testing.T, rctx request.CTX, ss store.Store) { }() m2 := &model.TeamMember{TeamId: t2.Id, UserId: model.NewId(), SchemeUser: true} - _, nErr = ss.Team().SaveMember(m2, -1) + _, nErr = ss.Team().SaveMember(rctx, m2, -1) require.NoError(t, nErr) m3, err := ss.Team().GetMember(rctx, m2.TeamId, m2.UserId) @@ -3028,7 +3028,7 @@ func testGetTeamMember(t *testing.T, rctx request.CTX, ss store.Store) { assert.Equal(t, s2.DefaultTeamUserRole, m3.Roles) m4 := &model.TeamMember{TeamId: t2.Id, UserId: model.NewId(), SchemeGuest: true} - _, nErr = ss.Team().SaveMember(m4, -1) + _, nErr = ss.Team().SaveMember(rctx, m4, -1) require.NoError(t, nErr) m5, err := ss.Team().GetMember(rctx, m4.TeamId, m4.UserId) @@ -3041,7 +3041,7 @@ func testGetTeamMembersByIds(t *testing.T, rctx request.CTX, ss store.Store) { teamId1 := model.NewId() m1 := &model.TeamMember{TeamId: teamId1, UserId: model.NewId()} - _, nErr := ss.Team().SaveMember(m1, -1) + _, nErr := ss.Team().SaveMember(rctx, m1, -1) require.NoError(t, nErr) var r []*model.TeamMember @@ -3053,7 +3053,7 @@ func testGetTeamMembersByIds(t *testing.T, rctx request.CTX, ss store.Store) { require.Equal(t, rm1.UserId, m1.UserId, "bad user id") m2 := &model.TeamMember{TeamId: teamId1, UserId: model.NewId()} - _, nErr = ss.Team().SaveMember(m2, -1) + _, nErr = ss.Team().SaveMember(rctx, m2, -1) require.NoError(t, nErr) rm, err := ss.Team().GetMembersByIds(m1.TeamId, []string{m1.UserId, m2.UserId, model.NewId()}, nil) @@ -3079,11 +3079,11 @@ func testTeamStoreMemberCount(t *testing.T, rctx request.CTX, ss store.Store) { teamId1 := model.NewId() m1 := &model.TeamMember{TeamId: teamId1, UserId: u1.Id} - _, nErr := ss.Team().SaveMember(m1, -1) + _, nErr := ss.Team().SaveMember(rctx, m1, -1) require.NoError(t, nErr) m2 := &model.TeamMember{TeamId: teamId1, UserId: u2.Id} - _, nErr = ss.Team().SaveMember(m2, -1) + _, nErr = ss.Team().SaveMember(rctx, m2, -1) require.NoError(t, nErr) var totalMemberCount int64 @@ -3097,7 +3097,7 @@ func testTeamStoreMemberCount(t *testing.T, rctx request.CTX, ss store.Store) { require.Equal(t, 1, int(result), "wrong count") m3 := &model.TeamMember{TeamId: teamId1, UserId: model.NewId()} - _, nErr = ss.Team().SaveMember(m3, -1) + _, nErr = ss.Team().SaveMember(rctx, m3, -1) require.NoError(t, nErr) totalMemberCount, nErr = ss.Team().GetTotalMemberCount(teamId1, nil) @@ -3116,9 +3116,9 @@ func testGetChannelUnreadsForAllTeams(t *testing.T, rctx request.CTX, ss store.S uid := model.NewId() m1 := &model.TeamMember{TeamId: teamId1, UserId: uid} m2 := &model.TeamMember{TeamId: teamId2, UserId: uid} - _, nErr := ss.Team().SaveMember(m1, -1) + _, nErr := ss.Team().SaveMember(rctx, m1, -1) require.NoError(t, nErr) - _, nErr = ss.Team().SaveMember(m2, -1) + _, nErr = ss.Team().SaveMember(rctx, m2, -1) require.NoError(t, nErr) c1 := &model.Channel{TeamId: m1.TeamId, Name: model.NewId(), DisplayName: "Town Square", Type: model.ChannelTypeOpen, TotalMsgCount: 100} @@ -3172,7 +3172,7 @@ func testGetChannelUnreadsForTeam(t *testing.T, rctx request.CTX, ss store.Store uid := model.NewId() m1 := &model.TeamMember{TeamId: teamId1, UserId: uid} - _, nErr := ss.Team().SaveMember(m1, -1) + _, nErr := ss.Team().SaveMember(rctx, m1, -1) require.NoError(t, nErr) c1 := &model.Channel{TeamId: m1.TeamId, Name: model.NewId(), DisplayName: "Town Square", Type: model.ChannelTypeOpen, TotalMsgCount: 100} diff --git a/server/channels/store/storetest/user_store.go b/server/channels/store/storetest/user_store.go index b1e0e25de2..903e9522b2 100644 --- a/server/channels/store/storetest/user_store.go +++ b/server/channels/store/storetest/user_store.go @@ -115,7 +115,7 @@ func testUserStoreSave(t *testing.T, rctx request.CTX, ss store.Store) { defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, maxUsersPerTeam) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u1.Id}, maxUsersPerTeam) require.NoError(t, nErr) _, err = ss.User().Save(&u1) @@ -157,7 +157,7 @@ func testUserStoreSave(t *testing.T, rctx request.CTX, ss store.Store) { defer func() { require.NoError(t, ss.User().PermanentDelete(u.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u.Id}, maxUsersPerTeam) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u.Id}, maxUsersPerTeam) require.NoError(t, nErr) } @@ -169,7 +169,7 @@ func testUserStoreSave(t *testing.T, rctx request.CTX, ss store.Store) { defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, maxUsersPerTeam) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u1.Id}, maxUsersPerTeam) require.Error(t, nErr, "should be the limit") } @@ -180,7 +180,7 @@ func testUserStoreUpdate(t *testing.T, rctx request.CTX, ss store.Store) { _, err := ss.User().Save(u1) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) require.NoError(t, nErr) u2 := &model.User{ @@ -190,7 +190,7 @@ func testUserStoreUpdate(t *testing.T, rctx request.CTX, ss store.Store) { _, err = ss.User().Save(u2) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) require.NoError(t, nErr) _, err = ss.User().Update(rctx, u1, false) @@ -218,7 +218,7 @@ func testUserStoreUpdate(t *testing.T, rctx request.CTX, ss store.Store) { _, err = ss.User().Save(u3) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u3.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: model.NewId(), UserId: u3.Id}, -1) require.NoError(t, nErr) u3.Email = MakeEmail() @@ -269,7 +269,7 @@ func testUserStoreUpdateUpdateAt(t *testing.T, rctx request.CTX, ss store.Store) _, err := ss.User().Save(u1) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) require.NoError(t, nErr) // Ensure UpdateAt has a change to be different below. @@ -289,7 +289,7 @@ func testUserStoreUpdateFailedPasswordAttempts(t *testing.T, rctx request.CTX, s _, err := ss.User().Save(u1) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) require.NoError(t, nErr) err = ss.User().UpdateFailedPasswordAttempts(u1.Id, 3) @@ -324,7 +324,7 @@ func testUserStoreGet(t *testing.T, rctx request.CTX, ss store.Store) { defer func() { require.NoError(t, ss.Bot().PermanentDelete(u2.Id)) }() defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) require.NoError(t, nErr) t.Run("fetch empty id", func(t *testing.T) { @@ -358,7 +358,7 @@ func testGetAllUsingAuthService(t *testing.T, rctx request.CTX, ss store.Store) }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) require.NoError(t, nErr) u2, err := ss.User().Save(&model.User{ @@ -368,7 +368,7 @@ func testGetAllUsingAuthService(t *testing.T, rctx request.CTX, ss store.Store) }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) require.NoError(t, nErr) u3, err := ss.User().Save(&model.User{ @@ -378,7 +378,7 @@ func testGetAllUsingAuthService(t *testing.T, rctx request.CTX, ss store.Store) }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) require.NoError(t, nErr) _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, @@ -685,7 +685,7 @@ func testUserStoreGetProfiles(t *testing.T, rctx request.CTX, ss store.Store) { }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) require.NoError(t, nErr) u2, err := ss.User().Save(&model.User{ @@ -694,7 +694,7 @@ func testUserStoreGetProfiles(t *testing.T, rctx request.CTX, ss store.Store) { }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) require.NoError(t, nErr) u3, err := ss.User().Save(&model.User{ @@ -711,7 +711,7 @@ func testUserStoreGetProfiles(t *testing.T, rctx request.CTX, ss store.Store) { u3.IsBot = true defer func() { require.NoError(t, ss.Bot().PermanentDelete(u3.Id)) }() defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) require.NoError(t, nErr) u4, err := ss.User().Save(&model.User{ @@ -721,7 +721,7 @@ func testUserStoreGetProfiles(t *testing.T, rctx request.CTX, ss store.Store) { }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u4.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u4.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u4.Id}, -1) require.NoError(t, nErr) u5, err := ss.User().Save(&model.User{ @@ -731,7 +731,7 @@ func testUserStoreGetProfiles(t *testing.T, rctx request.CTX, ss store.Store) { }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u5.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u5.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u5.Id}, -1) require.NoError(t, nErr) t.Run("get page 0, perPage 100", func(t *testing.T) { @@ -781,7 +781,7 @@ func testUserStoreGetProfiles(t *testing.T, rctx request.CTX, ss store.Store) { _, err := ss.User().Save(uNew) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(uNew.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: uNew.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: uNew.Id}, -1) require.NoError(t, nErr) updatedEtag := ss.User().GetEtagForProfiles(teamId) @@ -854,7 +854,7 @@ func testUserStoreGetProfilesInChannel(t *testing.T, rctx request.CTX, ss store. }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) require.NoError(t, nErr) u2, err := ss.User().Save(&model.User{ @@ -863,7 +863,7 @@ func testUserStoreGetProfilesInChannel(t *testing.T, rctx request.CTX, ss store. }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) require.NoError(t, nErr) u3, err := ss.User().Save(&model.User{ @@ -872,7 +872,7 @@ func testUserStoreGetProfilesInChannel(t *testing.T, rctx request.CTX, ss store. }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) require.NoError(t, nErr) _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, @@ -889,7 +889,7 @@ func testUserStoreGetProfilesInChannel(t *testing.T, rctx request.CTX, ss store. }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u4.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u4.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u4.Id}, -1) require.NoError(t, nErr) ch1 := &model.Channel{ @@ -1016,7 +1016,7 @@ func testUserStoreGetProfilesInChannel(t *testing.T, rctx request.CTX, ss store. }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(user2Admin.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: user2Admin.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: user2Admin.Id}, -1) require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(rctx, &model.ChannelMember{ @@ -1050,7 +1050,7 @@ func testUserStoreGetProfilesInChannelByAdmin(t *testing.T, rctx request.CTX, ss }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(user1.Id)) }() - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: user1.Id}, -1) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: user1.Id}, -1) require.NoError(t, nErr) user2Admin, err := ss.User().Save(&model.User{ @@ -1059,7 +1059,7 @@ func testUserStoreGetProfilesInChannelByAdmin(t *testing.T, rctx request.CTX, ss }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(user2Admin.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: user2Admin.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: user2Admin.Id}, -1) require.NoError(t, nErr) user3, err := ss.User().Save(&model.User{ @@ -1068,7 +1068,7 @@ func testUserStoreGetProfilesInChannelByAdmin(t *testing.T, rctx request.CTX, ss }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(user3.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: user3.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: user3.Id}, -1) require.NoError(t, nErr) ch1 := &model.Channel{ @@ -1128,7 +1128,7 @@ func testUserStoreGetProfilesInChannelByStatus(t *testing.T, rctx request.CTX, s }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) require.NoError(t, nErr) u2, err := ss.User().Save(&model.User{ @@ -1137,7 +1137,7 @@ func testUserStoreGetProfilesInChannelByStatus(t *testing.T, rctx request.CTX, s }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) require.NoError(t, nErr) u3, err := ss.User().Save(&model.User{ @@ -1146,7 +1146,7 @@ func testUserStoreGetProfilesInChannelByStatus(t *testing.T, rctx request.CTX, s }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) require.NoError(t, nErr) _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, @@ -1163,7 +1163,7 @@ func testUserStoreGetProfilesInChannelByStatus(t *testing.T, rctx request.CTX, s }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u4.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u4.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u4.Id}, -1) require.NoError(t, nErr) ch1 := &model.Channel{ @@ -1287,7 +1287,7 @@ func testUserStoreGetProfilesWithoutTeam(t *testing.T, rctx request.CTX, ss stor }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) require.NoError(t, nErr) u2, err := ss.User().Save(&model.User{ @@ -1354,7 +1354,7 @@ func testUserStoreGetAllProfilesInChannel(t *testing.T, rctx request.CTX, ss sto }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) require.NoError(t, nErr) u2, err := ss.User().Save(&model.User{ @@ -1363,7 +1363,7 @@ func testUserStoreGetAllProfilesInChannel(t *testing.T, rctx request.CTX, ss sto }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) require.NoError(t, nErr) u3, err := ss.User().Save(&model.User{ @@ -1372,7 +1372,7 @@ func testUserStoreGetAllProfilesInChannel(t *testing.T, rctx request.CTX, ss sto }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) require.NoError(t, nErr) _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, @@ -1480,7 +1480,7 @@ func testUserStoreGetProfilesNotInChannel(t *testing.T, rctx request.CTX, ss sto }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) require.NoError(t, nErr) u2, err := ss.User().Save(&model.User{ @@ -1489,7 +1489,7 @@ func testUserStoreGetProfilesNotInChannel(t *testing.T, rctx request.CTX, ss sto }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) require.NoError(t, nErr) u3, err := ss.User().Save(&model.User{ @@ -1498,7 +1498,7 @@ func testUserStoreGetProfilesNotInChannel(t *testing.T, rctx request.CTX, ss sto }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) require.NoError(t, nErr) _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, @@ -1642,7 +1642,7 @@ func testUserStoreGetProfilesByIds(t *testing.T, rctx request.CTX, ss store.Stor }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) require.NoError(t, nErr) u2, err := ss.User().Save(&model.User{ @@ -1651,7 +1651,7 @@ func testUserStoreGetProfilesByIds(t *testing.T, rctx request.CTX, ss store.Stor }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) require.NoError(t, nErr) time.Sleep(time.Millisecond) @@ -1661,7 +1661,7 @@ func testUserStoreGetProfilesByIds(t *testing.T, rctx request.CTX, ss store.Stor }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) require.NoError(t, nErr) _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, @@ -1852,7 +1852,7 @@ func testUserStoreGetProfilesByUsernames(t *testing.T, rctx request.CTX, ss stor }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) require.NoError(t, nErr) u2, err := ss.User().Save(&model.User{ @@ -1861,7 +1861,7 @@ func testUserStoreGetProfilesByUsernames(t *testing.T, rctx request.CTX, ss stor }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) require.NoError(t, nErr) u3, err := ss.User().Save(&model.User{ @@ -1870,7 +1870,7 @@ func testUserStoreGetProfilesByUsernames(t *testing.T, rctx request.CTX, ss stor }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: team2Id, UserId: u3.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: team2Id, UserId: u3.Id}, -1) require.NoError(t, nErr) _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, @@ -1922,7 +1922,7 @@ func testUserStoreGetSystemAdminProfiles(t *testing.T, rctx request.CTX, ss stor }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) require.NoError(t, nErr) u2, err := ss.User().Save(&model.User{ @@ -1931,7 +1931,7 @@ func testUserStoreGetSystemAdminProfiles(t *testing.T, rctx request.CTX, ss stor }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) require.NoError(t, nErr) u3, err := ss.User().Save(&model.User{ @@ -1941,7 +1941,7 @@ func testUserStoreGetSystemAdminProfiles(t *testing.T, rctx request.CTX, ss stor }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) require.NoError(t, nErr) _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, @@ -1971,7 +1971,7 @@ func testUserStoreGetByEmail(t *testing.T, rctx request.CTX, ss store.Store) { }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) require.NoError(t, nErr) u2, err := ss.User().Save(&model.User{ @@ -1980,7 +1980,7 @@ func testUserStoreGetByEmail(t *testing.T, rctx request.CTX, ss store.Store) { }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) require.NoError(t, nErr) u3, err := ss.User().Save(&model.User{ @@ -1989,7 +1989,7 @@ func testUserStoreGetByEmail(t *testing.T, rctx request.CTX, ss store.Store) { }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) require.NoError(t, nErr) _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, @@ -2042,7 +2042,7 @@ func testUserStoreGetByAuthData(t *testing.T, rctx request.CTX, ss store.Store) }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) require.NoError(t, nErr) u2, err := ss.User().Save(&model.User{ @@ -2051,7 +2051,7 @@ func testUserStoreGetByAuthData(t *testing.T, rctx request.CTX, ss store.Store) }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) require.NoError(t, nErr) u3, err := ss.User().Save(&model.User{ @@ -2062,7 +2062,7 @@ func testUserStoreGetByAuthData(t *testing.T, rctx request.CTX, ss store.Store) }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) require.NoError(t, nErr) _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, @@ -2118,7 +2118,7 @@ func testUserStoreGetByUsername(t *testing.T, rctx request.CTX, ss store.Store) }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) require.NoError(t, nErr) u2, err := ss.User().Save(&model.User{ @@ -2127,7 +2127,7 @@ func testUserStoreGetByUsername(t *testing.T, rctx request.CTX, ss store.Store) }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) require.NoError(t, nErr) u3, err := ss.User().Save(&model.User{ @@ -2136,7 +2136,7 @@ func testUserStoreGetByUsername(t *testing.T, rctx request.CTX, ss store.Store) }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) require.NoError(t, nErr) _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, @@ -2195,7 +2195,7 @@ func testUserStoreGetForLogin(t *testing.T, rctx request.CTX, ss store.Store) { require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) require.NoError(t, nErr) u2, err := ss.User().Save(&model.User{ @@ -2206,7 +2206,7 @@ func testUserStoreGetForLogin(t *testing.T, rctx request.CTX, ss store.Store) { }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) require.NoError(t, nErr) u3, err := ss.User().Save(&model.User{ @@ -2217,7 +2217,7 @@ func testUserStoreGetForLogin(t *testing.T, rctx request.CTX, ss store.Store) { }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) require.NoError(t, nErr) _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, @@ -2291,7 +2291,7 @@ func testUserStoreUpdatePassword(t *testing.T, rctx request.CTX, ss store.Store) _, err := ss.User().Save(u1) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) require.NoError(t, nErr) hashedPassword := model.HashPassword("newpwd") @@ -2310,7 +2310,7 @@ func testUserStoreDelete(t *testing.T, rctx request.CTX, ss store.Store) { _, err := ss.User().Save(u1) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) require.NoError(t, nErr) err = ss.User().PermanentDelete(u1.Id) @@ -2325,7 +2325,7 @@ func testUserStoreUpdateAuthData(t *testing.T, rctx request.CTX, ss store.Store) _, err := ss.User().Save(u1) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) require.NoError(t, nErr) service := "someservice" @@ -2411,7 +2411,7 @@ func testUserUnreadCount(t *testing.T, rctx request.CTX, ss store.Store) { _, err := ss.User().Save(u1) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) require.NoError(t, nErr) u2 := &model.User{} @@ -2420,7 +2420,7 @@ func testUserUnreadCount(t *testing.T, rctx request.CTX, ss store.Store) { _, err = ss.User().Save(u2) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) require.NoError(t, nErr) u3 := &model.User{} @@ -2429,7 +2429,7 @@ func testUserUnreadCount(t *testing.T, rctx request.CTX, ss store.Store) { _, err = ss.User().Save(u3) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) require.NoError(t, nErr) _, nErr = ss.Channel().Save(&c1, -1) @@ -2566,7 +2566,7 @@ func testUserStoreGetRecentlyActiveUsersForTeam(t *testing.T, rctx request.CTX, }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) require.NoError(t, nErr) u2, err := ss.User().Save(&model.User{ @@ -2575,7 +2575,7 @@ func testUserStoreGetRecentlyActiveUsersForTeam(t *testing.T, rctx request.CTX, }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) require.NoError(t, nErr) u3, err := ss.User().Save(&model.User{ @@ -2584,7 +2584,7 @@ func testUserStoreGetRecentlyActiveUsersForTeam(t *testing.T, rctx request.CTX, }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) require.NoError(t, nErr) _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, @@ -2641,7 +2641,7 @@ func testUserStoreGetNewUsersForTeam(t *testing.T, rctx request.CTX, ss store.St }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) require.NoError(t, nErr) u2, err := ss.User().Save(&model.User{ @@ -2650,7 +2650,7 @@ func testUserStoreGetNewUsersForTeam(t *testing.T, rctx request.CTX, ss store.St }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) require.NoError(t, nErr) u3, err := ss.User().Save(&model.User{ @@ -2659,7 +2659,7 @@ func testUserStoreGetNewUsersForTeam(t *testing.T, rctx request.CTX, ss store.St }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) require.NoError(t, nErr) _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, @@ -2676,7 +2676,7 @@ func testUserStoreGetNewUsersForTeam(t *testing.T, rctx request.CTX, ss store.St }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u4.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId2, UserId: u4.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId2, UserId: u4.Id}, -1) require.NoError(t, nErr) t.Run("get team 1, offset 0, limit 100", func(t *testing.T) { @@ -2769,11 +2769,11 @@ func testUserStoreSearch(t *testing.T, rctx request.CTX, ss store.Store) { u3.AuthData = nilAuthData t1id := model.NewId() - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: t1id, UserId: u1.Id, SchemeAdmin: true, SchemeUser: true}, -1) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: t1id, UserId: u1.Id, SchemeAdmin: true, SchemeUser: true}, -1) require.NoError(t, nErr) - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: t1id, UserId: u2.Id, SchemeAdmin: true, SchemeUser: true}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: t1id, UserId: u2.Id, SchemeAdmin: true, SchemeUser: true}, -1) require.NoError(t, nErr) - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: t1id, UserId: u3.Id, SchemeAdmin: false, SchemeUser: false, SchemeGuest: true}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: t1id, UserId: u3.Id, SchemeAdmin: false, SchemeUser: false, SchemeGuest: true}, -1) require.NoError(t, nErr) testCases := []struct { @@ -2916,11 +2916,11 @@ func testUserStoreSearchNotInChannel(t *testing.T, rctx request.CTX, ss store.St defer func() { require.NoError(t, ss.Bot().PermanentDelete(u3.Id)) }() tid := model.NewId() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: tid, UserId: u1.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: tid, UserId: u1.Id}, -1) require.NoError(t, nErr) - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: tid, UserId: u2.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: tid, UserId: u2.Id}, -1) require.NoError(t, nErr) - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: tid, UserId: u3.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: tid, UserId: u3.Id}, -1) require.NoError(t, nErr) // The users returned from the database will have AuthData as an empty string. @@ -3145,11 +3145,11 @@ func testUserStoreSearchInChannel(t *testing.T, rctx request.CTX, ss store.Store defer func() { require.NoError(t, ss.Bot().PermanentDelete(u3.Id)) }() tid := model.NewId() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: tid, UserId: u1.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: tid, UserId: u1.Id}, -1) require.NoError(t, nErr) - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: tid, UserId: u2.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: tid, UserId: u2.Id}, -1) require.NoError(t, nErr) - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: tid, UserId: u3.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: tid, UserId: u3.Id}, -1) require.NoError(t, nErr) // The users returned from the database will have AuthData as an empty string. @@ -3407,20 +3407,20 @@ func testUserStoreSearchNotInTeam(t *testing.T, rctx request.CTX, ss store.Store defer func() { require.NoError(t, ss.User().PermanentDelete(u6.Id)) }() teamId1 := model.NewId() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId1, UserId: u1.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId1, UserId: u1.Id}, -1) require.NoError(t, nErr) - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId1, UserId: u2.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId1, UserId: u2.Id}, -1) require.NoError(t, nErr) - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId1, UserId: u3.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId1, UserId: u3.Id}, -1) require.NoError(t, nErr) // u4 is not in team 1 - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId1, UserId: u5.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId1, UserId: u5.Id}, -1) require.NoError(t, nErr) - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId1, UserId: u6.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId1, UserId: u6.Id}, -1) require.NoError(t, nErr) teamId2 := model.NewId() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId2, UserId: u4.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId2, UserId: u4.Id}, -1) require.NoError(t, nErr) // The users returned from the database will have AuthData as an empty string. @@ -3568,7 +3568,7 @@ func testUserStoreSearchWithoutTeam(t *testing.T, rctx request.CTX, ss store.Sto defer func() { require.NoError(t, ss.Bot().PermanentDelete(u3.Id)) }() tid := model.NewId() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: tid, UserId: u3.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: tid, UserId: u3.Id}, -1) require.NoError(t, nErr) // The users returned from the database will have AuthData as an empty string. @@ -3920,7 +3920,7 @@ func testCount(t *testing.T, rctx request.CTX, ss store.Store) { _, err := ss.User().Save(regularUser) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(regularUser.Id)) }() - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: regularUser.Id, SchemeAdmin: false, SchemeUser: true}, -1) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: regularUser.Id, SchemeAdmin: false, SchemeUser: true}, -1) require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(rctx, &model.ChannelMember{UserId: regularUser.Id, ChannelId: channelId, SchemeAdmin: false, SchemeUser: true, NotifyProps: model.GetDefaultChannelNotifyProps()}) require.NoError(t, nErr) @@ -3931,7 +3931,7 @@ func testCount(t *testing.T, rctx request.CTX, ss store.Store) { _, err = ss.User().Save(guestUser) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(guestUser.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: guestUser.Id, SchemeAdmin: false, SchemeUser: false, SchemeGuest: true}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: guestUser.Id, SchemeAdmin: false, SchemeUser: false, SchemeGuest: true}, -1) require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(rctx, &model.ChannelMember{UserId: guestUser.Id, ChannelId: channelId, SchemeAdmin: false, SchemeUser: false, SchemeGuest: true, NotifyProps: model.GetDefaultChannelNotifyProps()}) require.NoError(t, nErr) @@ -3942,7 +3942,7 @@ func testCount(t *testing.T, rctx request.CTX, ss store.Store) { _, err = ss.User().Save(teamAdmin) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(teamAdmin.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: teamAdmin.Id, SchemeAdmin: true, SchemeUser: true}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: teamAdmin.Id, SchemeAdmin: true, SchemeUser: true}, -1) require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(rctx, &model.ChannelMember{UserId: teamAdmin.Id, ChannelId: channelId, SchemeAdmin: true, SchemeUser: true, NotifyProps: model.GetDefaultChannelNotifyProps()}) require.NoError(t, nErr) @@ -3953,7 +3953,7 @@ func testCount(t *testing.T, rctx request.CTX, ss store.Store) { _, err = ss.User().Save(sysAdmin) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(sysAdmin.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: sysAdmin.Id, SchemeAdmin: false, SchemeUser: true}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: sysAdmin.Id, SchemeAdmin: false, SchemeUser: true}, -1) require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(rctx, &model.ChannelMember{UserId: sysAdmin.Id, ChannelId: channelId, SchemeAdmin: true, SchemeUser: true, NotifyProps: model.GetDefaultChannelNotifyProps()}) require.NoError(t, nErr) @@ -4576,7 +4576,7 @@ func testUserStoreGetProfilesNotInTeam(t *testing.T, rctx request.CTX, ss store. }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) require.NoError(t, nErr) // Ensure update at timestamp changes @@ -4588,7 +4588,7 @@ func testUserStoreGetProfilesNotInTeam(t *testing.T, rctx request.CTX, ss store. }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId2, UserId: u2.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId2, UserId: u2.Id}, -1) require.NoError(t, nErr) // Ensure update at timestamp changes @@ -4645,7 +4645,7 @@ func testUserStoreGetProfilesNotInTeam(t *testing.T, rctx request.CTX, ss store. time.Sleep(time.Millisecond) // Add u2 to team 1 - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) require.NoError(t, nErr) u2.UpdateAt, err = ss.User().UpdateUpdateAt(u2.Id) require.NoError(t, err) @@ -4701,7 +4701,7 @@ func testUserStoreGetProfilesNotInTeam(t *testing.T, rctx request.CTX, ss store. }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u4.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u4.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u4.Id}, -1) require.NoError(t, nErr) t.Run("etag for profiles not in team 1 after addition to team", func(t *testing.T) { @@ -4710,7 +4710,7 @@ func testUserStoreGetProfilesNotInTeam(t *testing.T, rctx request.CTX, ss store. }) // Add u3 to team 2 - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId2, UserId: u3.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId2, UserId: u3.Id}, -1) require.NoError(t, nErr) u3.UpdateAt, err = ss.User().UpdateUpdateAt(u3.Id) require.NoError(t, err) @@ -4918,7 +4918,7 @@ func testUserStoreGetUsersBatchForIndexing(t *testing.T, rctx request.CTX, ss st }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{ + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{ UserId: u2.Id, TeamId: t1.Id, }, 100) @@ -4945,7 +4945,7 @@ func testUserStoreGetUsersBatchForIndexing(t *testing.T, rctx request.CTX, ss st }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{ + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{ UserId: u3.Id, TeamId: t1.Id, DeleteAt: model.GetMillis(), @@ -5041,7 +5041,7 @@ func testUserStoreGetTeamGroupUsers(t *testing.T, rctx request.CTX, ss store.Sto userGroupA, userGroupB, userNoGroup := testUsers[0], testUsers[1], testUsers[2] // add non-group-member to the team (to prove that the query isn't just returning all members) - _, nErr := ss.Team().SaveMember(&model.TeamMember{ + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{ TeamId: team.Id, UserId: userNoGroup.Id, }, 999) @@ -5113,7 +5113,7 @@ func testUserStoreGetTeamGroupUsers(t *testing.T, rctx request.CTX, ss store.Sto requireNUsers(2) // add team membership of allowed user - _, nErr = ss.Team().SaveMember(&model.TeamMember{ + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{ TeamId: team.Id, UserId: userGroupA.Id, }, 999) @@ -5269,7 +5269,7 @@ func testUserStorePromoteGuestToUser(t *testing.T, rctx request.CTX, ss store.St defer func() { require.NoError(t, ss.User().PermanentDelete(user.Id)) }() teamId := model.NewId() - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: true, SchemeUser: false}, 999) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: true, SchemeUser: false}, 999) require.NoError(t, nErr) channel, nErr := ss.Channel().Save(&model.Channel{ @@ -5315,7 +5315,7 @@ func testUserStorePromoteGuestToUser(t *testing.T, rctx request.CTX, ss store.St defer func() { require.NoError(t, ss.User().PermanentDelete(user.Id)) }() teamId := model.NewId() - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: true, SchemeUser: false}, 999) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: true, SchemeUser: false}, 999) require.NoError(t, nErr) channel, nErr := ss.Channel().Save(&model.Channel{ @@ -5381,7 +5381,7 @@ func testUserStorePromoteGuestToUser(t *testing.T, rctx request.CTX, ss store.St defer func() { require.NoError(t, ss.User().PermanentDelete(user.Id)) }() teamId := model.NewId() - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: true, SchemeUser: false}, 999) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: true, SchemeUser: false}, 999) require.NoError(t, nErr) err = ss.User().PromoteGuestToUser(user.Id) @@ -5411,7 +5411,7 @@ func testUserStorePromoteGuestToUser(t *testing.T, rctx request.CTX, ss store.St defer func() { require.NoError(t, ss.User().PermanentDelete(user.Id)) }() teamId := model.NewId() - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: true, SchemeUser: false}, 999) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: true, SchemeUser: false}, 999) require.NoError(t, nErr) channel, nErr := ss.Channel().Save(&model.Channel{ @@ -5456,7 +5456,7 @@ func testUserStorePromoteGuestToUser(t *testing.T, rctx request.CTX, ss store.St defer func() { require.NoError(t, ss.User().PermanentDelete(user.Id)) }() teamId := model.NewId() - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: true, SchemeUser: false}, 999) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: true, SchemeUser: false}, 999) require.NoError(t, nErr) channel, nErr := ss.Channel().Save(&model.Channel{ @@ -5501,7 +5501,7 @@ func testUserStorePromoteGuestToUser(t *testing.T, rctx request.CTX, ss store.St defer func() { require.NoError(t, ss.User().PermanentDelete(user1.Id)) }() teamId1 := model.NewId() - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId1, UserId: user1.Id, SchemeGuest: true, SchemeUser: false}, 999) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId1, UserId: user1.Id, SchemeGuest: true, SchemeUser: false}, 999) require.NoError(t, nErr) channel, nErr := ss.Channel().Save(&model.Channel{ @@ -5529,7 +5529,7 @@ func testUserStorePromoteGuestToUser(t *testing.T, rctx request.CTX, ss store.St defer func() { require.NoError(t, ss.User().PermanentDelete(user2.Id)) }() teamId2 := model.NewId() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId2, UserId: user2.Id, SchemeGuest: true, SchemeUser: false}, 999) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId2, UserId: user2.Id, SchemeGuest: true, SchemeUser: false}, 999) require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(rctx, &model.ChannelMember{ChannelId: channel.Id, UserId: user2.Id, SchemeGuest: true, SchemeUser: false, NotifyProps: model.GetDefaultChannelNotifyProps()}) @@ -5584,7 +5584,7 @@ func testUserStoreDemoteUserToGuest(t *testing.T, rctx request.CTX, ss store.Sto defer func() { require.NoError(t, ss.User().PermanentDelete(user.Id)) }() teamId := model.NewId() - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: false, SchemeUser: true}, 999) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: false, SchemeUser: true}, 999) require.NoError(t, nErr) channel, nErr := ss.Channel().Save(&model.Channel{ @@ -5628,7 +5628,7 @@ func testUserStoreDemoteUserToGuest(t *testing.T, rctx request.CTX, ss store.Sto defer func() { require.NoError(t, ss.User().PermanentDelete(user.Id)) }() teamId := model.NewId() - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: true, SchemeUser: false}, 999) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: true, SchemeUser: false}, 999) require.NoError(t, nErr) channel, nErr := ss.Channel().Save(&model.Channel{ @@ -5690,7 +5690,7 @@ func testUserStoreDemoteUserToGuest(t *testing.T, rctx request.CTX, ss store.Sto defer func() { require.NoError(t, ss.User().PermanentDelete(user.Id)) }() teamId := model.NewId() - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: false, SchemeUser: true}, 999) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: false, SchemeUser: true}, 999) require.NoError(t, nErr) updatedUser, err := ss.User().DemoteUserToGuest(user.Id) @@ -5718,7 +5718,7 @@ func testUserStoreDemoteUserToGuest(t *testing.T, rctx request.CTX, ss store.Sto defer func() { require.NoError(t, ss.User().PermanentDelete(user.Id)) }() teamId := model.NewId() - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: false, SchemeUser: true}, 999) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: false, SchemeUser: true}, 999) require.NoError(t, nErr) channel, nErr := ss.Channel().Save(&model.Channel{ @@ -5761,7 +5761,7 @@ func testUserStoreDemoteUserToGuest(t *testing.T, rctx request.CTX, ss store.Sto defer func() { require.NoError(t, ss.User().PermanentDelete(user.Id)) }() teamId := model.NewId() - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: false, SchemeUser: true}, 999) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: false, SchemeUser: true}, 999) require.NoError(t, nErr) channel, nErr := ss.Channel().Save(&model.Channel{ @@ -5804,7 +5804,7 @@ func testUserStoreDemoteUserToGuest(t *testing.T, rctx request.CTX, ss store.Sto defer func() { require.NoError(t, ss.User().PermanentDelete(user1.Id)) }() teamId1 := model.NewId() - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId1, UserId: user1.Id, SchemeGuest: false, SchemeUser: true}, 999) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId1, UserId: user1.Id, SchemeGuest: false, SchemeUser: true}, 999) require.NoError(t, nErr) channel, nErr := ss.Channel().Save(&model.Channel{ @@ -5832,7 +5832,7 @@ func testUserStoreDemoteUserToGuest(t *testing.T, rctx request.CTX, ss store.Sto defer func() { require.NoError(t, ss.User().PermanentDelete(user2.Id)) }() teamId2 := model.NewId() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId2, UserId: user2.Id, SchemeGuest: false, SchemeUser: true}, 999) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId2, UserId: user2.Id, SchemeGuest: false, SchemeUser: true}, 999) require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(rctx, &model.ChannelMember{ChannelId: channel.Id, UserId: user2.Id, SchemeGuest: false, SchemeUser: true, NotifyProps: model.GetDefaultChannelNotifyProps()}) @@ -5953,7 +5953,7 @@ func testUserStoreResetLastPictureUpdate(t *testing.T, rctx request.CTX, ss stor _, err := ss.User().Save(u1) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) require.NoError(t, nErr) err = ss.User().UpdateLastPictureUpdate(u1.Id) @@ -5988,7 +5988,7 @@ func testGetKnownUsers(t *testing.T, rctx request.CTX, ss store.Store) { }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() - _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) + _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) require.NoError(t, nErr) u2, err := ss.User().Save(&model.User{ @@ -5997,7 +5997,7 @@ func testGetKnownUsers(t *testing.T, rctx request.CTX, ss store.Store) { }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) require.NoError(t, nErr) u3, err := ss.User().Save(&model.User{ @@ -6006,7 +6006,7 @@ func testGetKnownUsers(t *testing.T, rctx request.CTX, ss store.Store) { }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) require.NoError(t, nErr) _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, @@ -6024,7 +6024,7 @@ func testGetKnownUsers(t *testing.T, rctx request.CTX, ss store.Store) { }) require.NoError(t, err) defer func() { require.NoError(t, ss.User().PermanentDelete(u4.Id)) }() - _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u4.Id}, -1) + _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: teamId, UserId: u4.Id}, -1) require.NoError(t, nErr) ch1 := &model.Channel{ @@ -6244,10 +6244,10 @@ func testGetUserReport(t *testing.T, rctx request.CTX, ss store.Store, s SqlStor }) require.NoError(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{UserId: users[0].Id, TeamId: team.Id}, 100) + _, err = ss.Team().SaveMember(rctx, &model.TeamMember{UserId: users[0].Id, TeamId: team.Id}, 100) require.NoError(t, err) - _, err = ss.Team().SaveMember(&model.TeamMember{UserId: users[1].Id, TeamId: team.Id}, 100) + _, err = ss.Team().SaveMember(rctx, &model.TeamMember{UserId: users[1].Id, TeamId: team.Id}, 100) require.NoError(t, err) defer func() { diff --git a/server/channels/store/timerlayer/timerlayer.go b/server/channels/store/timerlayer/timerlayer.go index 64813895db..26034920b7 100644 --- a/server/channels/store/timerlayer/timerlayer.go +++ b/server/channels/store/timerlayer/timerlayer.go @@ -9191,10 +9191,10 @@ func (s *TimerLayerTeamStore) Save(team *model.Team) (*model.Team, error) { return result, err } -func (s *TimerLayerTeamStore) SaveMember(member *model.TeamMember, maxUsersPerTeam int) (*model.TeamMember, error) { +func (s *TimerLayerTeamStore) SaveMember(rctx request.CTX, member *model.TeamMember, maxUsersPerTeam int) (*model.TeamMember, error) { start := time.Now() - result, err := s.TeamStore.SaveMember(member, maxUsersPerTeam) + result, err := s.TeamStore.SaveMember(rctx, member, maxUsersPerTeam) elapsed := float64(time.Since(start)) / float64(time.Second) if s.Root.Metrics != nil {