IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

[MM-55737] Add Request Context to UserStore.Save (#26109)

Browse Source
This commit is contained in:
Trang 2024-02-16 23:12:49 +07:00 committed by GitHub
parent 9643a16408
commit f130615011
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
44 changed files with 553 additions and 552 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/channels/api4/ldap_test.go
View File

@ -303,7 +303,7 @@ func TestAddUserToGroupSyncables(t *testing.T) {
AuthData: &id, AuthData: &id,
AuthService: model.UserAuthServiceLdap, AuthService: model.UserAuthServiceLdap,
} }
user, err = th.App.Srv().Store().User().Save(user) user, err = th.App.Srv().Store().User().Save(th.Context, user)
require.NoError(t, err) require.NoError(t, err)
resp, err = th.SystemAdminClient.AddUserToGroupSyncables(context.Background(), user.Id) resp, err = th.SystemAdminClient.AddUserToGroupSyncables(context.Background(), user.Id)

6
server/channels/app/app_iface.go
View File

@ -475,7 +475,7 @@ type AppIface interface {
CheckIntegrity() <-chan model.IntegrityCheckResult CheckIntegrity() <-chan model.IntegrityCheckResult
CheckMandatoryS3Fields(settings *model.FileSettings) *model.AppError CheckMandatoryS3Fields(settings *model.FileSettings) *model.AppError
CheckPasswordAndAllCriteria(rctx request.CTX, user *model.User, password string, mfaToken string) *model.AppError CheckPasswordAndAllCriteria(rctx request.CTX, user *model.User, password string, mfaToken string) *model.AppError
CheckPostReminders() CheckPostReminders(rctx request.CTX)
CheckRolesExist(roleNames []string) *model.AppError CheckRolesExist(roleNames []string) *model.AppError
CheckUserAllAuthenticationCriteria(rctx request.CTX, user *model.User, mfaToken string) *model.AppError CheckUserAllAuthenticationCriteria(rctx request.CTX, user *model.User, mfaToken string) *model.AppError
CheckUserMfa(rctx request.CTX, user *model.User, token string) *model.AppError CheckUserMfa(rctx request.CTX, user *model.User, token string) *model.AppError
@ -811,7 +811,7 @@ type AppIface interface {
GetSiteURL() string GetSiteURL() string
GetStatus(userID string) (*model.Status, *model.AppError) GetStatus(userID string) (*model.Status, *model.AppError)
GetStatusFromCache(userID string) *model.Status GetStatusFromCache(userID string) *model.Status
GetSystemBot() (*model.Bot, *model.AppError) GetSystemBot(rctx request.CTX) (*model.Bot, *model.AppError)
GetTeam(teamID string) (*model.Team, *model.AppError) GetTeam(teamID string) (*model.Team, *model.AppError)
GetTeamByInviteId(inviteId string) (*model.Team, *model.AppError) GetTeamByInviteId(inviteId string) (*model.Team, *model.AppError)
GetTeamByName(name string) (*model.Team, *model.AppError) GetTeamByName(name string) (*model.Team, *model.AppError)
@ -883,7 +883,7 @@ type AppIface interface {
GetUsersWithoutTeamPage(options *model.UserGetOptions, asAdmin bool) ([]*model.User, *model.AppError) GetUsersWithoutTeamPage(options *model.UserGetOptions, asAdmin bool) ([]*model.User, *model.AppError)
GetVerifyEmailToken(token string) (*model.Token, *model.AppError) GetVerifyEmailToken(token string) (*model.Token, *model.AppError)
GetViewUsersRestrictions(c request.CTX, userID string) (*model.ViewUsersRestrictions, *model.AppError) GetViewUsersRestrictions(c request.CTX, userID string) (*model.ViewUsersRestrictions, *model.AppError)
GetWarnMetricsBot() (*model.Bot, *model.AppError) GetWarnMetricsBot(rctx request.CTX) (*model.Bot, *model.AppError)
GetWarnMetricsStatus(rctx request.CTX) (map[string]*model.WarnMetricStatus, *model.AppError) GetWarnMetricsStatus(rctx request.CTX) (map[string]*model.WarnMetricStatus, *model.AppError)
HTTPService() httpservice.HTTPService HTTPService() httpservice.HTTPService
HandleCommandResponse(c request.CTX, command *model.Command, args *model.CommandArgs, response *model.CommandResponse, builtIn bool) (*model.CommandResponse, *model.AppError) HandleCommandResponse(c request.CTX, command *model.Command, args *model.CommandArgs, response *model.CommandResponse, builtIn bool) (*model.CommandResponse, *model.AppError)

14
server/channels/app/bot.go
View File

@ -95,7 +95,7 @@ func (a *App) CreateBot(c request.CTX, bot *model.Bot) (*model.Bot, *model.AppEr
return nil, vErr return nil, vErr
} }
user, nErr := a.Srv().Store().User().Save(model.UserFromBot(bot)) user, nErr := a.Srv().Store().User().Save(c, model.UserFromBot(bot))
if nErr != nil { if nErr != nil {
var appErr *model.AppError var appErr *model.AppError
var invErr *store.ErrInvalidInput var invErr *store.ErrInvalidInput
@ -160,7 +160,7 @@ func (a *App) CreateBot(c request.CTX, bot *model.Bot) (*model.Bot, *model.AppEr
return savedBot, nil return savedBot, nil
} }
func (a *App) GetWarnMetricsBot() (*model.Bot, *model.AppError) { func (a *App) GetWarnMetricsBot(rctx request.CTX) (*model.Bot, *model.AppError) {
perPage := 1 perPage := 1
userOptions := &model.UserGetOptions{ userOptions := &model.UserGetOptions{
Page: 0, Page: 0,
@ -186,10 +186,10 @@ func (a *App) GetWarnMetricsBot() (*model.Bot, *model.AppError) {
OwnerId: sysAdminList[0].Id, OwnerId: sysAdminList[0].Id,
} }
return a.getOrCreateBot(warnMetricsBot) return a.getOrCreateBot(rctx, warnMetricsBot)
} }
func (a *App) GetSystemBot() (*model.Bot, *model.AppError) { func (a *App) GetSystemBot(rctx request.CTX) (*model.Bot, *model.AppError) {
perPage := 1 perPage := 1
userOptions := &model.UserGetOptions{ userOptions := &model.UserGetOptions{
Page: 0, Page: 0,
@ -215,10 +215,10 @@ func (a *App) GetSystemBot() (*model.Bot, *model.AppError) {
OwnerId: sysAdminList[0].Id, OwnerId: sysAdminList[0].Id,
} }
return a.getOrCreateBot(systemBot) return a.getOrCreateBot(rctx, systemBot)
} }
func (a *App) getOrCreateBot(botDef *model.Bot) (*model.Bot, *model.AppError) { func (a *App) getOrCreateBot(rctx request.CTX, botDef *model.Bot) (*model.Bot, *model.AppError) {
botUser, appErr := a.GetUserByUsername(botDef.Username) botUser, appErr := a.GetUserByUsername(botDef.Username)
if appErr != nil { if appErr != nil {
if appErr.StatusCode != http.StatusNotFound { if appErr.StatusCode != http.StatusNotFound {
@ -226,7 +226,7 @@ func (a *App) getOrCreateBot(botDef *model.Bot) (*model.Bot, *model.AppError) {
} }
// cannot find this bot user, save the user // cannot find this bot user, save the user
user, nErr := a.Srv().Store().User().Save(model.UserFromBot(botDef)) user, nErr := a.Srv().Store().User().Save(rctx, model.UserFromBot(botDef))
if nErr != nil { if nErr != nil {
var appError *model.AppError var appError *model.AppError
var invErr *store.ErrInvalidInput var invErr *store.ErrInvalidInput

6
server/channels/app/bot_test.go
View File

@ -768,7 +768,7 @@ func TestGetSystemBot(t *testing.T) {
require.Nil(t, th.App.PermanentDeleteAllUsers(th.Context)) require.Nil(t, th.App.PermanentDeleteAllUsers(th.Context))
_, err := th.App.GetSystemBot() _, err := th.App.GetSystemBot(th.Context)
require.NotNil(t, err) require.NotNil(t, err)
require.Equal(t, "app.bot.get_system_bot.empty_admin_list.app_error", err.Id) require.Equal(t, "app.bot.get_system_bot.empty_admin_list.app_error", err.Id)
}) })
@ -781,7 +781,7 @@ func TestGetSystemBot(t *testing.T) {
_, err := th.App.GetUserByUsername(model.BotSystemBotUsername) _, err := th.App.GetUserByUsername(model.BotSystemBotUsername)
require.NotNil(t, err) require.NotNil(t, err)
bot, err := th.App.GetSystemBot() bot, err := th.App.GetSystemBot(th.Context)
require.Nil(t, err) require.Nil(t, err)
require.Equal(t, bot.Username, model.BotSystemBotUsername) require.Equal(t, bot.Username, model.BotSystemBotUsername)
}) })
@ -792,7 +792,7 @@ func TestGetSystemBot(t *testing.T) {
require.Nil(t, err) require.Nil(t, err)
require.True(t, botUser.IsBot) require.True(t, botUser.IsBot)
bot, err := th.App.GetSystemBot() bot, err := th.App.GetSystemBot(th.Context)
require.Nil(t, err) require.Nil(t, err)
require.Equal(t, bot.Username, model.BotSystemBotUsername) require.Equal(t, bot.Username, model.BotSystemBotUsername)
require.Equal(t, bot.UserId, botUser.Id) require.Equal(t, bot.UserId, botUser.Id)

8
server/channels/app/channel.go
View File

@ -723,7 +723,7 @@ func (a *App) postChannelPrivacyMessage(c request.CTX, user *model.User, channel
authorId = user.Id authorId = user.Id
authorUsername = user.Username authorUsername = user.Username
} else { } else {
systemBot, err := a.GetSystemBot() systemBot, err := a.GetSystemBot(c)
if err != nil { if err != nil {
return model.NewAppError("postChannelPrivacyMessage", "api.channel.post_channel_privacy_message.error", nil, "", http.StatusInternalServerError).Wrap(err) return model.NewAppError("postChannelPrivacyMessage", "api.channel.post_channel_privacy_message.error", nil, "", http.StatusInternalServerError).Wrap(err)
} }
@ -801,7 +801,7 @@ func (a *App) RestoreChannel(c request.CTX, channel *model.Channel, userID strin
} }
} else { } else {
a.Srv().Go(func() { a.Srv().Go(func() {
systemBot, err := a.GetSystemBot() systemBot, err := a.GetSystemBot(c)
if err != nil { if err != nil {
c.Logger().Error("Failed to post unarchive message", mlog.Err(err)) c.Logger().Error("Failed to post unarchive message", mlog.Err(err))
return return
@ -1447,7 +1447,7 @@ func (a *App) DeleteChannel(c request.CTX, channel *model.Channel, userID string
c.Logger().Warn("Failed to post archive message", mlog.Err(err)) c.Logger().Warn("Failed to post archive message", mlog.Err(err))
} }
} else { } else {
systemBot, err := a.GetSystemBot() systemBot, err := a.GetSystemBot(c)
if err != nil { if err != nil {
c.Logger().Warn("Failed to post archive message", mlog.Err(err)) c.Logger().Warn("Failed to post archive message", mlog.Err(err))
} else { } else {
@ -2446,7 +2446,7 @@ func (a *App) postAddToTeamMessage(c request.CTX, user *model.User, addedUser *m
func (a *App) postRemoveFromChannelMessage(c request.CTX, removerUserId string, removedUser *model.User, channel *model.Channel) *model.AppError { func (a *App) postRemoveFromChannelMessage(c request.CTX, removerUserId string, removedUser *model.User, channel *model.Channel) *model.AppError {
messageUserId := removerUserId messageUserId := removerUserId
if messageUserId == "" { if messageUserId == "" {
systemBot, err := a.GetSystemBot() systemBot, err := a.GetSystemBot(c)
if err != nil { if err != nil {
return model.NewAppError("postRemoveFromChannelMessage", "api.channel.post_user_add_remove_message_and_forget.error", nil, "", http.StatusInternalServerError).Wrap(err) return model.NewAppError("postRemoveFromChannelMessage", "api.channel.post_user_add_remove_message_and_forget.error", nil, "", http.StatusInternalServerError).Wrap(err)
} }

4
server/channels/app/email/helper_test.go
View File

@ -252,11 +252,11 @@ func (th *TestHelper) CreateUserOrGuest(guest bool) *model.User {
var err error var err error
if guest { if guest {
if user, err = th.service.userService.CreateUser(user, users.UserCreateOptions{Guest: true}); err != nil { if user, err = th.service.userService.CreateUser(th.Context, user, users.UserCreateOptions{Guest: true}); err != nil {
panic(err) panic(err)
} }
} else { } else {
if user, err = th.service.userService.CreateUser(user, users.UserCreateOptions{}); err != nil { if user, err = th.service.userService.CreateUser(th.Context, user, users.UserCreateOptions{}); err != nil {
panic(err) panic(err)
} }
} }

2
server/channels/app/import_functions.go
View File

@ -540,7 +540,7 @@ func (a *App) importUser(rctx request.CTX, data *imports.UserImportData, dryRun
var savedUser *model.User var savedUser *model.User
var err error var err error
if user.Id == "" { if user.Id == "" {
if savedUser, err = a.ch.srv.userService.CreateUser(user, users.UserCreateOptions{FromImport: true}); err != nil { if savedUser, err = a.ch.srv.userService.CreateUser(rctx, user, users.UserCreateOptions{FromImport: true}); err != nil {
var appErr *model.AppError var appErr *model.AppError
var invErr *store.ErrInvalidInput var invErr *store.ErrInvalidInput
switch { switch {

2
server/channels/app/notify_admin.go
View File

@ -98,7 +98,7 @@ func (a *App) SendNotifyAdminPosts(c request.CTX, workspaceName string, currentS
return appErr return appErr
} }
systemBot, appErr := a.GetSystemBot() systemBot, appErr := a.GetSystemBot(c)
if appErr != nil { if appErr != nil {
return appErr return appErr
} }

12
server/channels/app/notify_admin_test.go
View File

@ -61,7 +61,7 @@ func Test_SendNotifyAdminPosts(t *testing.T) {
appErr = th.App.SendNotifyAdminPosts(th.Context, "test", "", false) appErr = th.App.SendNotifyAdminPosts(th.Context, "test", "", false)
require.Nil(t, appErr) require.Nil(t, appErr)
bot, appErr := th.App.GetSystemBot() bot, appErr := th.App.GetSystemBot(th.Context)
require.Nil(t, appErr) require.Nil(t, appErr)
// message sending is async, wait time for it // message sending is async, wait time for it
@ -108,7 +108,7 @@ func Test_SendNotifyAdminPosts(t *testing.T) {
appErr = th.App.SendNotifyAdminPosts(th.Context, "test", "", true) appErr = th.App.SendNotifyAdminPosts(th.Context, "test", "", true)
require.Nil(t, appErr) require.Nil(t, appErr)
bot, appErr := th.App.GetSystemBot() bot, appErr := th.App.GetSystemBot(th.Context)
require.Nil(t, appErr) require.Nil(t, appErr)
// message sending is async, wait time for it // message sending is async, wait time for it
@ -153,7 +153,7 @@ func Test_SendNotifyAdminPosts(t *testing.T) {
appErr = th.App.SendNotifyAdminPosts(th.Context, "", "", false) appErr = th.App.SendNotifyAdminPosts(th.Context, "", "", false)
require.Nil(t, appErr) require.Nil(t, appErr)
bot, appErr := th.App.GetSystemBot() bot, appErr := th.App.GetSystemBot(th.Context)
require.Nil(t, appErr) require.Nil(t, appErr)
var channel *model.Channel var channel *model.Channel
@ -197,7 +197,7 @@ func Test_SendNotifyAdminPosts(t *testing.T) {
appErr = th.App.SendNotifyAdminPosts(th.Context, "", "", false) appErr = th.App.SendNotifyAdminPosts(th.Context, "", "", false)
require.Nil(t, appErr) require.Nil(t, appErr)
bot, appErr := th.App.GetSystemBot() bot, appErr := th.App.GetSystemBot(th.Context)
require.Nil(t, appErr) require.Nil(t, appErr)
var channel *model.Channel var channel *model.Channel
@ -342,7 +342,7 @@ func Test_SendNotifyAdminPosts(t *testing.T) {
appErr = th.App.SendNotifyAdminPosts(th.Context, "test", model.LicenseShortSkuProfessional, false) // try and send notification but workspace currentSKU has since changed to cloud-professional appErr = th.App.SendNotifyAdminPosts(th.Context, "test", model.LicenseShortSkuProfessional, false) // try and send notification but workspace currentSKU has since changed to cloud-professional
require.Nil(t, appErr) require.Nil(t, appErr)
bot, appErr := th.App.GetSystemBot() bot, appErr := th.App.GetSystemBot(th.Context)
require.Nil(t, appErr) require.Nil(t, appErr)
// message sending is async, wait time for it // message sending is async, wait time for it
@ -402,7 +402,7 @@ func Test_SendNotifyAdminPosts(t *testing.T) {
appErr = th.App.SendNotifyAdminPosts(th.Context, "test", "", false) appErr = th.App.SendNotifyAdminPosts(th.Context, "test", "", false)
require.Nil(t, appErr) require.Nil(t, appErr)
bot, appErr := th.App.GetSystemBot() bot, appErr := th.App.GetSystemBot(th.Context)
require.Nil(t, appErr) require.Nil(t, appErr)
var channel *model.Channel var channel *model.Channel

12
server/channels/app/opentracing/opentracing_layer.go
View File

@ -1279,7 +1279,7 @@ func (a *OpenTracingAppLayer) CheckPasswordAndAllCriteria(rctx request.CTX, user
return resultVar0 return resultVar0
} }
func (a *OpenTracingAppLayer) CheckPostReminders() { func (a *OpenTracingAppLayer) CheckPostReminders(rctx request.CTX) {
origCtx := a.ctx origCtx := a.ctx
span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.CheckPostReminders") span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.CheckPostReminders")
@ -1291,7 +1291,7 @@ func (a *OpenTracingAppLayer) CheckPostReminders() {
}() }()
defer span.Finish() defer span.Finish()
a.app.CheckPostReminders() a.app.CheckPostReminders(rctx)
} }
func (a *OpenTracingAppLayer) CheckProviderAttributes(c request.CTX, user *model.User, patch *model.UserPatch) string { func (a *OpenTracingAppLayer) CheckProviderAttributes(c request.CTX, user *model.User, patch *model.UserPatch) string {
@ -9734,7 +9734,7 @@ func (a *OpenTracingAppLayer) GetSuggestions(c request.CTX, commandArgs *model.C
return resultVar0 return resultVar0
} }
func (a *OpenTracingAppLayer) GetSystemBot() (*model.Bot, *model.AppError) { func (a *OpenTracingAppLayer) GetSystemBot(rctx request.CTX) (*model.Bot, *model.AppError) {
origCtx := a.ctx origCtx := a.ctx
span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.GetSystemBot") span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.GetSystemBot")
@ -9746,7 +9746,7 @@ func (a *OpenTracingAppLayer) GetSystemBot() (*model.Bot, *model.AppError) {
}() }()
defer span.Finish() defer span.Finish()
resultVar0, resultVar1 := a.app.GetSystemBot() resultVar0, resultVar1 := a.app.GetSystemBot(rctx)
if resultVar1 != nil { if resultVar1 != nil {
span.LogFields(spanlog.Error(resultVar1)) span.LogFields(spanlog.Error(resultVar1))
@ -11391,7 +11391,7 @@ func (a *OpenTracingAppLayer) GetViewUsersRestrictions(c request.CTX, userID str
return resultVar0, resultVar1 return resultVar0, resultVar1
} }
func (a *OpenTracingAppLayer) GetWarnMetricsBot() (*model.Bot, *model.AppError) { func (a *OpenTracingAppLayer) GetWarnMetricsBot(rctx request.CTX) (*model.Bot, *model.AppError) {
origCtx := a.ctx origCtx := a.ctx
span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.GetWarnMetricsBot") span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.GetWarnMetricsBot")
@ -11403,7 +11403,7 @@ func (a *OpenTracingAppLayer) GetWarnMetricsBot() (*model.Bot, *model.AppError)
}() }()
defer span.Finish() defer span.Finish()
resultVar0, resultVar1 := a.app.GetWarnMetricsBot() resultVar0, resultVar1 := a.app.GetWarnMetricsBot(rctx)
if resultVar1 != nil { if resultVar1 != nil {
span.LogFields(spanlog.Error(resultVar1)) span.LogFields(spanlog.Error(resultVar1))

4
server/channels/app/platform/helper_test.go
View File

@ -231,7 +231,7 @@ func (th *TestHelper) CreateUserOrGuest(guest bool) *model.User {
} }
var err error var err error
user, err = th.Service.Store.User().Save(user) user, err = th.Service.Store.User().Save(th.Context, user)
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -252,7 +252,7 @@ func (th *TestHelper) CreateAdmin() *model.User {
} }
var err error var err error
user, err = th.Service.Store.User().Save(user) user, err = th.Service.Store.User().Save(th.Context, user)
if err != nil { if err != nil {
panic(err) panic(err)
} }

4
server/channels/app/post.go
View File

@ -2157,8 +2157,8 @@ func (a *App) SetPostReminder(postID, userID string, targetTime int64) *model.Ap
return nil return nil
} }
func (a *App) CheckPostReminders() { func (a *App) CheckPostReminders(rctx request.CTX) {
systemBot, appErr := a.GetSystemBot() systemBot, appErr := a.GetSystemBot(rctx)
if appErr != nil { if appErr != nil {
mlog.Error("Failed to get system bot", mlog.Err(appErr)) mlog.Error("Failed to get system bot", mlog.Err(appErr))
return return

4
server/channels/app/report.go
View File

@ -95,7 +95,7 @@ func (a *App) SendReportToUser(rctx request.CTX, job *model.Job, format string)
return model.NewAppError("SendReportToUser", "app.report.send_report_to_user.missing_date_range", nil, "", http.StatusInternalServerError) return model.NewAppError("SendReportToUser", "app.report.send_report_to_user.missing_date_range", nil, "", http.StatusInternalServerError)
} }
systemBot, err := a.GetSystemBot() systemBot, err := a.GetSystemBot(rctx)
if err != nil { if err != nil {
return err return err
} }
@ -238,7 +238,7 @@ func (a *App) StartUsersBatchExport(rctx request.CTX, dateRange string, startAt
} }
a.Srv().Go(func() { a.Srv().Go(func() {
systemBot, err := a.GetSystemBot() systemBot, err := a.GetSystemBot(rctx)
if err != nil { if err != nil {
rctx.Logger().Error("Failed to get the system bot", mlog.Err(err)) rctx.Logger().Error("Failed to get the system bot", mlog.Err(err))
return return

8
server/channels/app/server.go
View File

@ -1786,15 +1786,19 @@ func runDNDStatusExpireJob(a *App) {
func runPostReminderJob(a *App) { func runPostReminderJob(a *App) {
if a.IsLeader() { if a.IsLeader() {
rctx := request.EmptyContext(a.Log())
withMut(&a.ch.postReminderMut, func() { withMut(&a.ch.postReminderMut, func() {
a.ch.postReminderTask = model.CreateRecurringTaskFromNextIntervalTime("Check Post reminders", a.CheckPostReminders, 5*time.Minute) fn := func() { a.CheckPostReminders(rctx) }
a.ch.postReminderTask = model.CreateRecurringTaskFromNextIntervalTime("Check Post reminders", fn, 5*time.Minute)
}) })
} }
a.ch.srv.AddClusterLeaderChangedListener(func() { a.ch.srv.AddClusterLeaderChangedListener(func() {
mlog.Info("Cluster leader changed. Determining if post reminder task should be running", mlog.Bool("isLeader", a.IsLeader())) mlog.Info("Cluster leader changed. Determining if post reminder task should be running", mlog.Bool("isLeader", a.IsLeader()))
if a.IsLeader() { if a.IsLeader() {
rctx := request.EmptyContext(a.Log())
withMut(&a.ch.postReminderMut, func() { withMut(&a.ch.postReminderMut, func() {
a.ch.postReminderTask = model.CreateRecurringTaskFromNextIntervalTime("Check Post reminders", a.CheckPostReminders, 5*time.Minute) fn := func() { a.CheckPostReminders(rctx) }
a.ch.postReminderTask = model.CreateRecurringTaskFromNextIntervalTime("Check Post reminders", fn, 5*time.Minute)
}) })
} else { } else {
cancelTask(&a.ch.postReminderMut, &a.ch.postReminderTask) cancelTask(&a.ch.postReminderMut, &a.ch.postReminderTask)

2
server/channels/app/teams/helper_test.go
View File

@ -113,7 +113,7 @@ func (th *TestHelper) UpdateConfig(f func(*model.Config)) {
func (th *TestHelper) CreateUser(u *model.User) *model.User { func (th *TestHelper) CreateUser(u *model.User) *model.User {
u.EmailVerified = true u.EmailVerified = true
user, err := th.dbStore.User().Save(u) user, err := th.dbStore.User().Save(th.Context, u)
if err != nil { if err != nil {
panic(err) panic(err)
} }

2
server/channels/app/user.go
View File

@ -235,7 +235,7 @@ func (a *App) createUserOrGuest(c request.CTX, user *model.User, guest bool) (*m
return nil, err return nil, err
} }
ruser, nErr := a.ch.srv.userService.CreateUser(user, users.UserCreateOptions{Guest: guest}) ruser, nErr := a.ch.srv.userService.CreateUser(c, user, users.UserCreateOptions{Guest: guest})
if nErr != nil { if nErr != nil {
var appErr *model.AppError var appErr *model.AppError
var invErr *store.ErrInvalidInput var invErr *store.ErrInvalidInput

12
server/channels/app/user_test.go
View File

@ -499,13 +499,13 @@ func TestCreateUserConflict(t *testing.T) {
Email: "test@localhost", Email: "test@localhost",
Username: model.NewId(), Username: model.NewId(),
} }
user, err := th.App.Srv().Store().User().Save(user) user, err := th.App.Srv().Store().User().Save(th.Context, user)
require.NoError(t, err) require.NoError(t, err)
username := user.Username username := user.Username
var invErr *store.ErrInvalidInput var invErr *store.ErrInvalidInput
// Same id // Same id
_, err = th.App.Srv().Store().User().Save(user) _, err = th.App.Srv().Store().User().Save(th.Context, user)
require.Error(t, err) require.Error(t, err)
require.True(t, errors.As(err, &invErr)) require.True(t, errors.As(err, &invErr))
assert.Equal(t, "id", invErr.Field) assert.Equal(t, "id", invErr.Field)
@ -515,7 +515,7 @@ func TestCreateUserConflict(t *testing.T) {
Email: "test@localhost", Email: "test@localhost",
Username: model.NewId(), Username: model.NewId(),
} }
_, err = th.App.Srv().Store().User().Save(user) _, err = th.App.Srv().Store().User().Save(th.Context, user)
require.Error(t, err) require.Error(t, err)
require.True(t, errors.As(err, &invErr)) require.True(t, errors.As(err, &invErr))
assert.Equal(t, "email", invErr.Field) assert.Equal(t, "email", invErr.Field)
@ -525,7 +525,7 @@ func TestCreateUserConflict(t *testing.T) {
Email: "test2@localhost", Email: "test2@localhost",
Username: username, Username: username,
} }
_, err = th.App.Srv().Store().User().Save(user) _, err = th.App.Srv().Store().User().Save(th.Context, user)
require.Error(t, err) require.Error(t, err)
require.True(t, errors.As(err, &invErr)) require.True(t, errors.As(err, &invErr))
assert.Equal(t, "username", invErr.Field) assert.Equal(t, "username", invErr.Field)
@ -568,7 +568,7 @@ func TestUpdateUserEmail(t *testing.T) {
Username: model.NewId(), Username: model.NewId(),
IsBot: true, IsBot: true,
} }
_, nErr := th.App.Srv().Store().User().Save(&botuser) _, nErr := th.App.Srv().Store().User().Save(th.Context, &botuser)
assert.NoError(t, nErr) assert.NoError(t, nErr)
newBotEmail := th.MakeEmail() newBotEmail := th.MakeEmail()
@ -611,7 +611,7 @@ func TestUpdateUserEmail(t *testing.T) {
Username: model.NewId(), Username: model.NewId(),
IsBot: true, IsBot: true,
} }
_, nErr := th.App.Srv().Store().User().Save(&botuser) _, nErr := th.App.Srv().Store().User().Save(th.Context, &botuser)
assert.NoError(t, nErr) assert.NoError(t, nErr)
newBotEmail := th.MakeEmail() newBotEmail := th.MakeEmail()

4
server/channels/app/users/helper_test.go
View File

@ -124,11 +124,11 @@ func (th *TestHelper) CreateUserOrGuest(guest bool) *model.User {
var err error var err error
if guest { if guest {
if user, err = th.service.CreateUser(user, UserCreateOptions{Guest: true}); err != nil { if user, err = th.service.CreateUser(th.Context, user, UserCreateOptions{Guest: true}); err != nil {
panic(err) panic(err)
} }
} else { } else {
if user, err = th.service.CreateUser(user, UserCreateOptions{}); err != nil { if user, err = th.service.CreateUser(th.Context, user, UserCreateOptions{}); err != nil {
panic(err) panic(err)
} }
} }

10
server/channels/app/users/users.go
View File

@ -24,9 +24,9 @@ type UserCreateOptions struct {
} }
// CreateUser creates a user // CreateUser creates a user
func (us *UserService) CreateUser(user *model.User, opts UserCreateOptions) (*model.User, error) { func (us *UserService) CreateUser(rctx request.CTX, user *model.User, opts UserCreateOptions) (*model.User, error) {
if opts.FromImport { if opts.FromImport {
return us.createUser(user) return us.createUser(rctx, user)
} }
user.Roles = model.SystemUserRoleId user.Roles = model.SystemUserRoleId
@ -54,17 +54,17 @@ func (us *UserService) CreateUser(user *model.User, opts UserCreateOptions) (*mo
user.Locale = *us.config().LocalizationSettings.DefaultClientLocale user.Locale = *us.config().LocalizationSettings.DefaultClientLocale
} }
return us.createUser(user) return us.createUser(rctx, user)
} }
func (us *UserService) createUser(user *model.User) (*model.User, error) { func (us *UserService) createUser(rctx request.CTX, user *model.User) (*model.User, error) {
user.MakeNonNil() user.MakeNonNil()
if err := us.isPasswordValid(user.Password); user.AuthService == "" && err != nil { if err := us.isPasswordValid(user.Password); user.AuthService == "" && err != nil {
return nil, err return nil, err
} }
ruser, err := us.store.Save(user) ruser, err := us.store.Save(rctx, user)
if err != nil { if err != nil {
return nil, err return nil, err
} }

8
server/channels/app/users/users_test.go
View File

@ -36,7 +36,7 @@ func TestFirstUserPromoted(t *testing.T) {
th := Setup(t) th := Setup(t)
defer th.TearDown() defer th.TearDown()
user, err := th.service.CreateUser(&model.User{ user, err := th.service.CreateUser(th.Context, &model.User{
Username: model.NewId(), Username: model.NewId(),
Password: model.NewId(), Password: model.NewId(),
Email: "user@example.com", Email: "user@example.com",
@ -46,7 +46,7 @@ func TestFirstUserPromoted(t *testing.T) {
require.Equal(t, model.SystemAdminRoleId+" "+model.SystemUserRoleId, user.Roles) require.Equal(t, model.SystemAdminRoleId+" "+model.SystemUserRoleId, user.Roles)
user2, err := th.service.CreateUser(&model.User{ user2, err := th.service.CreateUser(th.Context, &model.User{
Username: model.NewId(), Username: model.NewId(),
Password: model.NewId(), Password: model.NewId(),
Email: "user2@example.com", Email: "user2@example.com",
@ -67,7 +67,7 @@ func TestFirstUserPromoted(t *testing.T) {
_, err = th.dbStore.Bot().Save(b) _, err = th.dbStore.Bot().Save(b)
require.NoError(t, err) require.NoError(t, err)
user3, err := th.service.CreateUser(&model.User{ user3, err := th.service.CreateUser(th.Context, &model.User{
Username: model.NewId(), Username: model.NewId(),
Password: model.NewId(), Password: model.NewId(),
Email: "user3@example.com", Email: "user3@example.com",
@ -77,7 +77,7 @@ func TestFirstUserPromoted(t *testing.T) {
require.Equal(t, model.SystemAdminRoleId+" "+model.SystemUserRoleId, user3.Roles) require.Equal(t, model.SystemAdminRoleId+" "+model.SystemUserRoleId, user3.Roles)
user4, err := th.service.CreateUser(&model.User{ user4, err := th.service.CreateUser(th.Context, &model.User{
Username: model.NewId(), Username: model.NewId(),
Password: model.NewId(), Password: model.NewId(),
Email: "user4@example.com", Email: "user4@example.com",

4
server/channels/store/opentracinglayer/opentracinglayer.go
View File

@ -12206,7 +12206,7 @@ func (s *OpenTracingLayerUserStore) ResetLastPictureUpdate(userID string) error
return err return err
} }
func (s *OpenTracingLayerUserStore) Save(user *model.User) (*model.User, error) { func (s *OpenTracingLayerUserStore) Save(rctx request.CTX, user *model.User) (*model.User, error) {
origCtx := s.Root.Store.Context() origCtx := s.Root.Store.Context()
span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "UserStore.Save") span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "UserStore.Save")
s.Root.Store.SetContext(newCtx) s.Root.Store.SetContext(newCtx)
@ -12215,7 +12215,7 @@ func (s *OpenTracingLayerUserStore) Save(user *model.User) (*model.User, error)
}() }()
defer span.Finish() defer span.Finish()
result, err := s.UserStore.Save(user) result, err := s.UserStore.Save(rctx, user)
if err != nil { if err != nil {
span.LogFields(spanlog.Error(err)) span.LogFields(spanlog.Error(err))
ext.Error.Set(span, true) ext.Error.Set(span, true)

4
server/channels/store/retrylayer/retrylayer.go
View File

@ -13925,11 +13925,11 @@ func (s *RetryLayerUserStore) ResetLastPictureUpdate(userID string) error {
} }
func (s *RetryLayerUserStore) Save(user *model.User) (*model.User, error) { func (s *RetryLayerUserStore) Save(rctx request.CTX, user *model.User) (*model.User, error) {
tries := 0 tries := 0
for { for {
result, err := s.UserStore.Save(user) result, err := s.UserStore.Save(rctx, user)
if err == nil { if err == nil {
return result, nil return result, nil
} }

7
server/channels/store/searchlayer/user_layer.go
View File

@ -81,11 +81,8 @@ func (s *SearchUserStore) Update(rctx request.CTX, user *model.User, trustedUpda
return userUpdate, err return userUpdate, err
} }
func (s *SearchUserStore) Save(user *model.User) (*model.User, error) { func (s *SearchUserStore) Save(rctx request.CTX, user *model.User) (*model.User, error) {
// TODO: Use the actuall request context from the App layer nuser, err := s.UserStore.Save(rctx, user)
// https://mattermost.atlassian.net/browse/MM-55737
rctx := request.EmptyContext(s.rootStore.Logger())
nuser, err := s.UserStore.Save(user)
if err == nil { if err == nil {
s.rootStore.indexUser(rctx, nuser) s.rootStore.indexUser(rctx, nuser)

6
server/channels/store/searchtest/helper.go
View File

@ -169,7 +169,7 @@ func (th *SearchTestHelper) makeEmail() string {
} }
func (th *SearchTestHelper) createUser(username, nickname, firstName, lastName string) (*model.User, error) { func (th *SearchTestHelper) createUser(username, nickname, firstName, lastName string) (*model.User, error) {
return th.Store.User().Save(&model.User{ return th.Store.User().Save(th.Context, &model.User{
Username: username, Username: username,
Password: username, Password: username,
Nickname: nickname, Nickname: nickname,
@ -180,7 +180,7 @@ func (th *SearchTestHelper) createUser(username, nickname, firstName, lastName s
} }
func (th *SearchTestHelper) createGuest(username, nickname, firstName, lastName string) (*model.User, error) { func (th *SearchTestHelper) createGuest(username, nickname, firstName, lastName string) (*model.User, error) {
return th.Store.User().Save(&model.User{ return th.Store.User().Save(th.Context, &model.User{
Username: username, Username: username,
Password: username, Password: username,
Nickname: nickname, Nickname: nickname,
@ -225,7 +225,7 @@ func (th *SearchTestHelper) createBot(username, displayName, ownerID string) (*m
OwnerId: ownerID, OwnerId: ownerID,
} }
user, err := th.Store.User().Save(model.UserFromBot(botModel)) user, err := th.Store.User().Save(th.Context, model.UserFromBot(botModel))
if err != nil { if err != nil {
return nil, errors.New(err.Error()) return nil, errors.New(err.Error())
} }

44
server/channels/store/sqlstore/integrity_test.go
View File

@ -361,11 +361,11 @@ func createTeamWithSchemeId(ss store.Store, schemeId *string) *model.Team {
return t return t
} }
func createUser(ss store.Store) *model.User { func createUser(rctx request.CTX, ss store.Store) *model.User {
m := model.User{} m := model.User{}
m.Username = model.NewId() m.Username = model.NewId()
m.Email = m.Username + "@example.com" m.Email = m.Username + "@example.com"
user, _ := ss.User().Save(&m) user, _ := ss.User().Save(rctx, &m)
return user return user
} }
@ -453,7 +453,7 @@ func TestCheckChannelsChannelMemberHistoryIntegrity(t *testing.T) {
t.Run("should generate a report with one record", func(t *testing.T) { t.Run("should generate a report with one record", func(t *testing.T) {
channel := createChannel(ss, model.NewId(), model.NewId()) channel := createChannel(ss, model.NewId(), model.NewId())
user := createUser(ss) user := createUser(rctx, ss)
cmh := createChannelMemberHistory(ss, channel.Id, user.Id) cmh := createChannelMemberHistory(ss, channel.Id, user.Id)
dbmap.Exec(`DELETE FROM Channels Where Id=?`, channel.Id) dbmap.Exec(`DELETE FROM Channels Where Id=?`, channel.Id)
@ -819,8 +819,8 @@ func TestCheckTeamsChannelsIntegrity(t *testing.T) {
t.Run("should not include direct channel with empty teamid", func(t *testing.T) { t.Run("should not include direct channel with empty teamid", func(t *testing.T) {
channel := createChannelWithTeamId(ss, model.NewId()) channel := createChannelWithTeamId(ss, model.NewId())
userA := createUser(ss) userA := createUser(rctx, ss)
userB := createUser(ss) userB := createUser(rctx, ss)
direct, err := ss.Channel().CreateDirectChannel(rctx, userA, userB) direct, err := ss.Channel().CreateDirectChannel(rctx, userA, userB)
require.NoError(t, err) require.NoError(t, err)
require.NotNil(t, direct) require.NotNil(t, direct)
@ -840,8 +840,8 @@ func TestCheckTeamsChannelsIntegrity(t *testing.T) {
t.Run("should include direct channel with non empty teamid", func(t *testing.T) { t.Run("should include direct channel with non empty teamid", func(t *testing.T) {
channel := createChannelWithTeamId(ss, model.NewId()) channel := createChannelWithTeamId(ss, model.NewId())
userA := createUser(ss) userA := createUser(rctx, ss)
userB := createUser(ss) userB := createUser(rctx, ss)
direct, err := ss.Channel().CreateDirectChannel(rctx, userA, userB) direct, err := ss.Channel().CreateDirectChannel(rctx, userA, userB)
require.NoError(t, err) require.NoError(t, err)
require.NotNil(t, direct) require.NotNil(t, direct)
@ -993,7 +993,7 @@ func TestCheckUsersAuditsIntegrity(t *testing.T) {
}) })
t.Run("should generate a report with one record", func(t *testing.T) { t.Run("should generate a report with one record", func(t *testing.T) {
user := createUser(ss) user := createUser(rctx, ss)
userId := user.Id userId := user.Id
audit := createAudit(ss, userId, model.NewId()) audit := createAudit(ss, userId, model.NewId())
dbmap.Exec(`DELETE FROM Users WHERE Id=?`, user.Id) dbmap.Exec(`DELETE FROM Users WHERE Id=?`, user.Id)
@ -1078,7 +1078,7 @@ func TestCheckUsersChannelMemberHistoryIntegrity(t *testing.T) {
}) })
t.Run("should generate a report with one record", func(t *testing.T) { t.Run("should generate a report with one record", func(t *testing.T) {
user := createUser(ss) user := createUser(rctx, ss)
channel := createChannel(ss, model.NewId(), model.NewId()) channel := createChannel(ss, model.NewId(), model.NewId())
cmh := createChannelMemberHistory(ss, channel.Id, user.Id) cmh := createChannelMemberHistory(ss, channel.Id, user.Id)
dbmap.Exec(`DELETE FROM Users WHERE Id=?`, user.Id) dbmap.Exec(`DELETE FROM Users WHERE Id=?`, user.Id)
@ -1108,7 +1108,7 @@ func TestCheckUsersChannelMembersIntegrity(t *testing.T) {
}) })
t.Run("should generate a report with one record", func(t *testing.T) { t.Run("should generate a report with one record", func(t *testing.T) {
user := createUser(ss) user := createUser(rctx, ss)
channel := createChannelWithCreatorId(ss, user.Id) channel := createChannelWithCreatorId(ss, user.Id)
member := createChannelMember(rctx, ss, channel.Id, user.Id) member := createChannelMember(rctx, ss, channel.Id, user.Id)
dbmap.Exec(`DELETE FROM Users WHERE Id=?`, user.Id) dbmap.Exec(`DELETE FROM Users WHERE Id=?`, user.Id)
@ -1166,7 +1166,7 @@ func TestCheckUsersCompliancesIntegrity(t *testing.T) {
}) })
t.Run("should generate a report with one record", func(t *testing.T) { t.Run("should generate a report with one record", func(t *testing.T) {
user := createUser(ss) user := createUser(rctx, ss)
userId := user.Id userId := user.Id
compliance := createCompliance(ss, userId) compliance := createCompliance(ss, userId)
dbmap.Exec(`DELETE FROM Users WHERE Id=?`, user.Id) dbmap.Exec(`DELETE FROM Users WHERE Id=?`, user.Id)
@ -1196,7 +1196,7 @@ func TestCheckUsersEmojiIntegrity(t *testing.T) {
}) })
t.Run("should generate a report with one record", func(t *testing.T) { t.Run("should generate a report with one record", func(t *testing.T) {
user := createUser(ss) user := createUser(rctx, ss)
userId := user.Id userId := user.Id
emoji := createEmoji(ss, userId) emoji := createEmoji(ss, userId)
dbmap.Exec(`DELETE FROM Users WHERE Id=?`, user.Id) dbmap.Exec(`DELETE FROM Users WHERE Id=?`, user.Id)
@ -1226,7 +1226,7 @@ func TestCheckUsersFileInfoIntegrity(t *testing.T) {
}) })
t.Run("should generate a report with one record", func(t *testing.T) { t.Run("should generate a report with one record", func(t *testing.T) {
user := createUser(ss) user := createUser(rctx, ss)
userId := user.Id userId := user.Id
info := createFileInfo(rctx, ss, model.NewId(), model.NewId(), userId) info := createFileInfo(rctx, ss, model.NewId(), model.NewId(), userId)
dbmap.Exec(`DELETE FROM Users WHERE Id=?`, user.Id) dbmap.Exec(`DELETE FROM Users WHERE Id=?`, user.Id)
@ -1284,7 +1284,7 @@ func TestCheckUsersOAuthAccessDataIntegrity(t *testing.T) {
}) })
t.Run("should generate a report with one record", func(t *testing.T) { t.Run("should generate a report with one record", func(t *testing.T) {
user := createUser(ss) user := createUser(rctx, ss)
userId := user.Id userId := user.Id
ad := createOAuthAccessData(ss, userId) ad := createOAuthAccessData(ss, userId)
dbmap.Exec(`DELETE FROM Users WHERE Id=?`, user.Id) dbmap.Exec(`DELETE FROM Users WHERE Id=?`, user.Id)
@ -1314,7 +1314,7 @@ func TestCheckUsersOAuthAppsIntegrity(t *testing.T) {
}) })
t.Run("should generate a report with one record", func(t *testing.T) { t.Run("should generate a report with one record", func(t *testing.T) {
user := createUser(ss) user := createUser(rctx, ss)
userId := user.Id userId := user.Id
app := createOAuthApp(ss, userId) app := createOAuthApp(ss, userId)
dbmap.Exec(`DELETE FROM Users WHERE Id=?`, user.Id) dbmap.Exec(`DELETE FROM Users WHERE Id=?`, user.Id)
@ -1344,7 +1344,7 @@ func TestCheckUsersOAuthAuthDataIntegrity(t *testing.T) {
}) })
t.Run("should generate a report with one record", func(t *testing.T) { t.Run("should generate a report with one record", func(t *testing.T) {
user := createUser(ss) user := createUser(rctx, ss)
userId := user.Id userId := user.Id
ad := createOAuthAuthData(ss, userId) ad := createOAuthAuthData(ss, userId)
dbmap.Exec(`DELETE FROM Users WHERE Id=?`, user.Id) dbmap.Exec(`DELETE FROM Users WHERE Id=?`, user.Id)
@ -1429,7 +1429,7 @@ func TestCheckUsersPreferencesIntegrity(t *testing.T) {
}) })
t.Run("should generate a report with no records", func(t *testing.T) { t.Run("should generate a report with no records", func(t *testing.T) {
user := createUser(ss) user := createUser(rctx, ss)
require.NotNil(t, user) require.NotNil(t, user)
userId := user.Id userId := user.Id
preferences := createPreferences(ss, userId) preferences := createPreferences(ss, userId)
@ -1443,7 +1443,7 @@ func TestCheckUsersPreferencesIntegrity(t *testing.T) {
}) })
t.Run("should generate a report with one record", func(t *testing.T) { t.Run("should generate a report with one record", func(t *testing.T) {
user := createUser(ss) user := createUser(rctx, ss)
require.NotNil(t, user) require.NotNil(t, user)
userId := user.Id userId := user.Id
preferences := createPreferences(ss, userId) preferences := createPreferences(ss, userId)
@ -1475,7 +1475,7 @@ func TestCheckUsersReactionsIntegrity(t *testing.T) {
}) })
t.Run("should generate a report with one record", func(t *testing.T) { t.Run("should generate a report with one record", func(t *testing.T) {
user := createUser(ss) user := createUser(rctx, ss)
userId := user.Id userId := user.Id
reaction := createReaction(ss, user.Id, model.NewId()) reaction := createReaction(ss, user.Id, model.NewId())
dbmap.Exec(`DELETE FROM Users WHERE Id=?`, user.Id) dbmap.Exec(`DELETE FROM Users WHERE Id=?`, user.Id)
@ -1532,7 +1532,7 @@ func TestCheckUsersStatusIntegrity(t *testing.T) {
}) })
t.Run("should generate a report with one record", func(t *testing.T) { t.Run("should generate a report with one record", func(t *testing.T) {
user := createUser(ss) user := createUser(rctx, ss)
userId := user.Id userId := user.Id
status := createStatus(ss, user.Id) status := createStatus(ss, user.Id)
dbmap.Exec(`DELETE FROM Users WHERE Id=?`, user.Id) dbmap.Exec(`DELETE FROM Users WHERE Id=?`, user.Id)
@ -1561,7 +1561,7 @@ func TestCheckUsersTeamMembersIntegrity(t *testing.T) {
}) })
t.Run("should generate a report with one record", func(t *testing.T) { t.Run("should generate a report with one record", func(t *testing.T) {
user := createUser(ss) user := createUser(rctx, ss)
team := createTeam(ss) team := createTeam(ss)
member := createTeamMember(rctx, ss, team.Id, user.Id) member := createTeamMember(rctx, ss, team.Id, user.Id)
dbmap.Exec(`DELETE FROM Users WHERE Id=?`, user.Id) dbmap.Exec(`DELETE FROM Users WHERE Id=?`, user.Id)
@ -1591,7 +1591,7 @@ func TestCheckUsersUserAccessTokensIntegrity(t *testing.T) {
}) })
t.Run("should generate a report with one record", func(t *testing.T) { t.Run("should generate a report with one record", func(t *testing.T) {
user := createUser(ss) user := createUser(rctx, ss)
userId := user.Id userId := user.Id
uat := createUserAccessToken(ss, user.Id) uat := createUserAccessToken(ss, user.Id)
dbmap.Exec(`DELETE FROM Users WHERE Id=?`, user.Id) dbmap.Exec(`DELETE FROM Users WHERE Id=?`, user.Id)

2
server/channels/store/sqlstore/user_store.go
View File

@ -107,7 +107,7 @@ func (us SqlUserStore) InsertUsers(users []*model.User) error {
return nil return nil
} }
func (us SqlUserStore) Save(user *model.User) (*model.User, error) { func (us SqlUserStore) Save(rctx request.CTX, user *model.User) (*model.User, error) {
if user.Id != "" && !user.IsRemote() { if user.Id != "" && !user.IsRemote() {
return nil, store.NewErrInvalidInput("User", "id", user.Id) return nil, store.NewErrInvalidInput("User", "id", user.Id)
} }

2
server/channels/store/store.go
View File

@ -401,7 +401,7 @@ type PostStore interface {
} }
type UserStore interface { type UserStore interface {
Save(user *model.User) (*model.User, error) Save(rctx request.CTX, user *model.User) (*model.User, error)
Update(rctx request.CTX, user *model.User, allowRoleUpdate bool) (*model.UserUpdate, error) Update(rctx request.CTX, user *model.User, allowRoleUpdate bool) (*model.UserUpdate, error)
UpdateNotifyProps(userID string, props map[string]string) error UpdateNotifyProps(userID string, props map[string]string) error
UpdateLastPictureUpdate(userID string) error UpdateLastPictureUpdate(userID string) error

40
server/channels/store/storetest/bot_store.go
View File

@ -14,8 +14,8 @@ import (
"github.com/mattermost/mattermost/server/v8/channels/store" "github.com/mattermost/mattermost/server/v8/channels/store"
) )
func makeBotWithUser(t *testing.T, ss store.Store, bot *model.Bot) (*model.Bot, *model.User) { func makeBotWithUser(t *testing.T, rctx request.CTX, ss store.Store, bot *model.Bot) (*model.Bot, *model.User) {
user, err := ss.User().Save(model.UserFromBot(bot)) user, err := ss.User().Save(rctx, model.UserFromBot(bot))
require.NoError(t, err) require.NoError(t, err)
bot.UserId = user.Id bot.UserId = user.Id
@ -34,7 +34,7 @@ func TestBotStore(t *testing.T, rctx request.CTX, ss store.Store, s SqlStore) {
} }
func testBotStoreGet(t *testing.T, rctx request.CTX, ss store.Store, s SqlStore) { func testBotStoreGet(t *testing.T, rctx request.CTX, ss store.Store, s SqlStore) {
deletedBot, _ := makeBotWithUser(t, ss, &model.Bot{ deletedBot, _ := makeBotWithUser(t, rctx, ss, &model.Bot{
Username: "deleted_bot", Username: "deleted_bot",
Description: "A deleted bot", Description: "A deleted bot",
OwnerId: model.NewId(), OwnerId: model.NewId(),
@ -46,7 +46,7 @@ func testBotStoreGet(t *testing.T, rctx request.CTX, ss store.Store, s SqlStore)
defer func() { require.NoError(t, ss.Bot().PermanentDelete(deletedBot.UserId)) }() defer func() { require.NoError(t, ss.Bot().PermanentDelete(deletedBot.UserId)) }()
defer func() { require.NoError(t, ss.User().PermanentDelete(deletedBot.UserId)) }() defer func() { require.NoError(t, ss.User().PermanentDelete(deletedBot.UserId)) }()
permanentlyDeletedBot, _ := makeBotWithUser(t, ss, &model.Bot{ permanentlyDeletedBot, _ := makeBotWithUser(t, rctx, ss, &model.Bot{
Username: "permanently_deleted_bot", Username: "permanently_deleted_bot",
Description: "A permanently deleted bot", Description: "A permanently deleted bot",
OwnerId: model.NewId(), OwnerId: model.NewId(),
@ -56,7 +56,7 @@ func testBotStoreGet(t *testing.T, rctx request.CTX, ss store.Store, s SqlStore)
require.NoError(t, ss.Bot().PermanentDelete(permanentlyDeletedBot.UserId)) require.NoError(t, ss.Bot().PermanentDelete(permanentlyDeletedBot.UserId))
defer func() { require.NoError(t, ss.User().PermanentDelete(permanentlyDeletedBot.UserId)) }() defer func() { require.NoError(t, ss.User().PermanentDelete(permanentlyDeletedBot.UserId)) }()
b1, _ := makeBotWithUser(t, ss, &model.Bot{ b1, _ := makeBotWithUser(t, rctx, ss, &model.Bot{
Username: "b1", Username: "b1",
Description: "The first bot", Description: "The first bot",
OwnerId: model.NewId(), OwnerId: model.NewId(),
@ -65,7 +65,7 @@ func testBotStoreGet(t *testing.T, rctx request.CTX, ss store.Store, s SqlStore)
defer func() { require.NoError(t, ss.Bot().PermanentDelete(b1.UserId)) }() defer func() { require.NoError(t, ss.Bot().PermanentDelete(b1.UserId)) }()
defer func() { require.NoError(t, ss.User().PermanentDelete(b1.UserId)) }() defer func() { require.NoError(t, ss.User().PermanentDelete(b1.UserId)) }()
b2, _ := makeBotWithUser(t, ss, &model.Bot{ b2, _ := makeBotWithUser(t, rctx, ss, &model.Bot{
Username: "b2", Username: "b2",
Description: "The second bot", Description: "The second bot",
OwnerId: model.NewId(), OwnerId: model.NewId(),
@ -122,7 +122,7 @@ func testBotStoreGetAll(t *testing.T, rctx request.CTX, ss store.Store, s SqlSto
OwnerId1 := model.NewId() OwnerId1 := model.NewId()
OwnerId2 := model.NewId() OwnerId2 := model.NewId()
deletedBot, _ := makeBotWithUser(t, ss, &model.Bot{ deletedBot, _ := makeBotWithUser(t, rctx, ss, &model.Bot{
Username: "deleted_bot", Username: "deleted_bot",
Description: "A deleted bot", Description: "A deleted bot",
OwnerId: OwnerId1, OwnerId: OwnerId1,
@ -134,7 +134,7 @@ func testBotStoreGetAll(t *testing.T, rctx request.CTX, ss store.Store, s SqlSto
defer func() { require.NoError(t, ss.Bot().PermanentDelete(deletedBot.UserId)) }() defer func() { require.NoError(t, ss.Bot().PermanentDelete(deletedBot.UserId)) }()
defer func() { require.NoError(t, ss.User().PermanentDelete(deletedBot.UserId)) }() defer func() { require.NoError(t, ss.User().PermanentDelete(deletedBot.UserId)) }()
permanentlyDeletedBot, _ := makeBotWithUser(t, ss, &model.Bot{ permanentlyDeletedBot, _ := makeBotWithUser(t, rctx, ss, &model.Bot{
Username: "permanently_deleted_bot", Username: "permanently_deleted_bot",
Description: "A permanently deleted bot", Description: "A permanently deleted bot",
OwnerId: OwnerId1, OwnerId: OwnerId1,
@ -144,7 +144,7 @@ func testBotStoreGetAll(t *testing.T, rctx request.CTX, ss store.Store, s SqlSto
require.NoError(t, ss.Bot().PermanentDelete(permanentlyDeletedBot.UserId)) require.NoError(t, ss.Bot().PermanentDelete(permanentlyDeletedBot.UserId))
defer func() { require.NoError(t, ss.User().PermanentDelete(permanentlyDeletedBot.UserId)) }() defer func() { require.NoError(t, ss.User().PermanentDelete(permanentlyDeletedBot.UserId)) }()
b1, _ := makeBotWithUser(t, ss, &model.Bot{ b1, _ := makeBotWithUser(t, rctx, ss, &model.Bot{
Username: "b1", Username: "b1",
Description: "The first bot", Description: "The first bot",
OwnerId: OwnerId1, OwnerId: OwnerId1,
@ -153,7 +153,7 @@ func testBotStoreGetAll(t *testing.T, rctx request.CTX, ss store.Store, s SqlSto
defer func() { require.NoError(t, ss.Bot().PermanentDelete(b1.UserId)) }() defer func() { require.NoError(t, ss.Bot().PermanentDelete(b1.UserId)) }()
defer func() { require.NoError(t, ss.User().PermanentDelete(b1.UserId)) }() defer func() { require.NoError(t, ss.User().PermanentDelete(b1.UserId)) }()
b2, _ := makeBotWithUser(t, ss, &model.Bot{ b2, _ := makeBotWithUser(t, rctx, ss, &model.Bot{
Username: "b2", Username: "b2",
Description: "The second bot", Description: "The second bot",
OwnerId: OwnerId1, OwnerId: OwnerId1,
@ -175,7 +175,7 @@ func testBotStoreGetAll(t *testing.T, rctx request.CTX, ss store.Store, s SqlSto
}, bot) }, bot)
}) })
b3, _ := makeBotWithUser(t, ss, &model.Bot{ b3, _ := makeBotWithUser(t, rctx, ss, &model.Bot{
Username: "b3", Username: "b3",
Description: "The third bot", Description: "The third bot",
OwnerId: OwnerId1, OwnerId: OwnerId1,
@ -183,7 +183,7 @@ func testBotStoreGetAll(t *testing.T, rctx request.CTX, ss store.Store, s SqlSto
defer func() { require.NoError(t, ss.Bot().PermanentDelete(b3.UserId)) }() defer func() { require.NoError(t, ss.Bot().PermanentDelete(b3.UserId)) }()
defer func() { require.NoError(t, ss.User().PermanentDelete(b3.UserId)) }() defer func() { require.NoError(t, ss.User().PermanentDelete(b3.UserId)) }()
b4, _ := makeBotWithUser(t, ss, &model.Bot{ b4, _ := makeBotWithUser(t, rctx, ss, &model.Bot{
Username: "b4", Username: "b4",
Description: "The fourth bot", Description: "The fourth bot",
OwnerId: OwnerId2, OwnerId: OwnerId2,
@ -195,7 +195,7 @@ func testBotStoreGetAll(t *testing.T, rctx request.CTX, ss store.Store, s SqlSto
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
_, err1 := ss.User().Save(&deletedUser) _, err1 := ss.User().Save(rctx, &deletedUser)
require.NoError(t, err1, "couldn't save user") require.NoError(t, err1, "couldn't save user")
deletedUser.DeleteAt = model.GetMillis() deletedUser.DeleteAt = model.GetMillis()
@ -203,7 +203,7 @@ func testBotStoreGetAll(t *testing.T, rctx request.CTX, ss store.Store, s SqlSto
require.NoError(t, err2, "couldn't delete user") require.NoError(t, err2, "couldn't delete user")
defer func() { require.NoError(t, ss.User().PermanentDelete(deletedUser.Id)) }() defer func() { require.NoError(t, ss.User().PermanentDelete(deletedUser.Id)) }()
ob5, _ := makeBotWithUser(t, ss, &model.Bot{ ob5, _ := makeBotWithUser(t, rctx, ss, &model.Bot{
Username: "ob5", Username: "ob5",
Description: "Orphaned bot 5", Description: "Orphaned bot 5",
OwnerId: deletedUser.Id, OwnerId: deletedUser.Id,
@ -333,7 +333,7 @@ func testBotStoreSave(t *testing.T, rctx request.CTX, ss store.Store) {
OwnerId: model.NewId(), OwnerId: model.NewId(),
} }
user, err := ss.User().Save(model.UserFromBot(bot)) user, err := ss.User().Save(rctx, model.UserFromBot(bot))
require.NoError(t, err) require.NoError(t, err)
defer func() { require.NoError(t, ss.User().PermanentDelete(user.Id)) }() defer func() { require.NoError(t, ss.User().PermanentDelete(user.Id)) }()
bot.UserId = user.Id bot.UserId = user.Id
@ -361,7 +361,7 @@ func testBotStoreSave(t *testing.T, rctx request.CTX, ss store.Store) {
func testBotStoreUpdate(t *testing.T, rctx request.CTX, ss store.Store) { func testBotStoreUpdate(t *testing.T, rctx request.CTX, ss store.Store) {
t.Run("invalid bot should fail to update", func(t *testing.T) { t.Run("invalid bot should fail to update", func(t *testing.T) {
existingBot, _ := makeBotWithUser(t, ss, &model.Bot{ existingBot, _ := makeBotWithUser(t, rctx, ss, &model.Bot{
Username: "existing_bot", Username: "existing_bot",
OwnerId: model.NewId(), OwnerId: model.NewId(),
}) })
@ -378,7 +378,7 @@ func testBotStoreUpdate(t *testing.T, rctx request.CTX, ss store.Store) {
}) })
t.Run("existing bot should update", func(t *testing.T) { t.Run("existing bot should update", func(t *testing.T) {
existingBot, _ := makeBotWithUser(t, ss, &model.Bot{ existingBot, _ := makeBotWithUser(t, rctx, ss, &model.Bot{
Username: "existing_bot", Username: "existing_bot",
OwnerId: model.NewId(), OwnerId: model.NewId(),
}) })
@ -413,7 +413,7 @@ func testBotStoreUpdate(t *testing.T, rctx request.CTX, ss store.Store) {
}) })
t.Run("deleted bot should update, restoring", func(t *testing.T) { t.Run("deleted bot should update, restoring", func(t *testing.T) {
existingBot, _ := makeBotWithUser(t, ss, &model.Bot{ existingBot, _ := makeBotWithUser(t, rctx, ss, &model.Bot{
Username: "existing_bot", Username: "existing_bot",
OwnerId: model.NewId(), OwnerId: model.NewId(),
}) })
@ -442,14 +442,14 @@ func testBotStoreUpdate(t *testing.T, rctx request.CTX, ss store.Store) {
} }
func testBotStorePermanentDelete(t *testing.T, rctx request.CTX, ss store.Store) { func testBotStorePermanentDelete(t *testing.T, rctx request.CTX, ss store.Store) {
b1, _ := makeBotWithUser(t, ss, &model.Bot{ b1, _ := makeBotWithUser(t, rctx, ss, &model.Bot{
Username: "b1", Username: "b1",
OwnerId: model.NewId(), OwnerId: model.NewId(),
}) })
defer func() { require.NoError(t, ss.Bot().PermanentDelete(b1.UserId)) }() defer func() { require.NoError(t, ss.Bot().PermanentDelete(b1.UserId)) }()
defer func() { require.NoError(t, ss.User().PermanentDelete(b1.UserId)) }() defer func() { require.NoError(t, ss.User().PermanentDelete(b1.UserId)) }()
b2, _ := makeBotWithUser(t, ss, &model.Bot{ b2, _ := makeBotWithUser(t, rctx, ss, &model.Bot{
Username: "b2", Username: "b2",
OwnerId: model.NewId(), OwnerId: model.NewId(),
}) })

12
server/channels/store/storetest/channel_member_history_store.go
View File

@ -43,7 +43,7 @@ func testLogJoinEvent(t *testing.T, rctx request.CTX, ss store.Store) {
Nickname: model.NewId(), Nickname: model.NewId(),
Username: model.NewId(), Username: model.NewId(),
} }
userPtr, err := ss.User().Save(&user) userPtr, err := ss.User().Save(rctx, &user)
require.NoError(t, err) require.NoError(t, err)
user = *userPtr user = *userPtr
@ -69,7 +69,7 @@ func testLogLeaveEvent(t *testing.T, rctx request.CTX, ss store.Store) {
Nickname: model.NewId(), Nickname: model.NewId(),
Username: model.NewId(), Username: model.NewId(),
} }
userPtr, err := ss.User().Save(&user) userPtr, err := ss.User().Save(rctx, &user)
require.NoError(t, err) require.NoError(t, err)
user = *userPtr user = *userPtr
@ -98,7 +98,7 @@ func testGetUsersInChannelAtChannelMemberHistory(t *testing.T, rctx request.CTX,
Nickname: model.NewId(), Nickname: model.NewId(),
Username: model.NewId(), Username: model.NewId(),
} }
userPtr, err := ss.User().Save(&user) userPtr, err := ss.User().Save(rctx, &user)
require.NoError(t, err) require.NoError(t, err)
user = *userPtr user = *userPtr
@ -194,7 +194,7 @@ func testGetUsersInChannelAtChannelMembers(t *testing.T, rctx request.CTX, ss st
Nickname: model.NewId(), Nickname: model.NewId(),
Username: model.NewId(), Username: model.NewId(),
} }
userPtr, err := ss.User().Save(&user) userPtr, err := ss.User().Save(rctx, &user)
require.NoError(t, err) require.NoError(t, err)
user = *userPtr user = *userPtr
@ -306,7 +306,7 @@ func testPermanentDeleteBatch(t *testing.T, rctx request.CTX, ss store.Store) {
Nickname: model.NewId(), Nickname: model.NewId(),
Username: model.NewId(), Username: model.NewId(),
} }
userPtr, err := ss.User().Save(&user) userPtr, err := ss.User().Save(rctx, &user)
require.NoError(t, err) require.NoError(t, err)
user = *userPtr user = *userPtr
@ -315,7 +315,7 @@ func testPermanentDeleteBatch(t *testing.T, rctx request.CTX, ss store.Store) {
Nickname: model.NewId(), Nickname: model.NewId(),
Username: model.NewId(), Username: model.NewId(),
} }
user2Ptr, err := ss.User().Save(&user2) user2Ptr, err := ss.User().Save(rctx, &user2)
require.NoError(t, err) require.NoError(t, err)
user2 = *user2Ptr user2 = *user2Ptr

120
server/channels/store/storetest/channel_store.go
View File

@ -218,7 +218,7 @@ func testChannelStoreSaveDirectChannel(t *testing.T, rctx request.CTX, ss store.
u1 := &model.User{} u1 := &model.User{}
u1.Email = MakeEmail() u1.Email = MakeEmail()
u1.Nickname = model.NewId() u1.Nickname = model.NewId()
_, err := ss.User().Save(u1) _, err := ss.User().Save(rctx, u1)
require.NoError(t, err) require.NoError(t, err)
_, nErr := ss.Team().SaveMember(rctx, &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) require.NoError(t, nErr)
@ -226,7 +226,7 @@ func testChannelStoreSaveDirectChannel(t *testing.T, rctx request.CTX, ss store.
u2 := &model.User{} u2 := &model.User{}
u2.Email = MakeEmail() u2.Email = MakeEmail()
u2.Nickname = model.NewId() u2.Nickname = model.NewId()
_, err = ss.User().Save(u2) _, err = ss.User().Save(rctx, u2)
require.NoError(t, err) require.NoError(t, err)
_, nErr = ss.Team().SaveMember(rctx, &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) require.NoError(t, nErr)
@ -300,7 +300,7 @@ func testChannelStoreCreateDirectChannel(t *testing.T, rctx request.CTX, ss stor
u1 := &model.User{} u1 := &model.User{}
u1.Email = MakeEmail() u1.Email = MakeEmail()
u1.Nickname = model.NewId() u1.Nickname = model.NewId()
_, err := ss.User().Save(u1) _, err := ss.User().Save(rctx, u1)
require.NoError(t, err) require.NoError(t, err)
_, nErr := ss.Team().SaveMember(rctx, &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) require.NoError(t, nErr)
@ -308,7 +308,7 @@ func testChannelStoreCreateDirectChannel(t *testing.T, rctx request.CTX, ss stor
u2 := &model.User{} u2 := &model.User{}
u2.Email = MakeEmail() u2.Email = MakeEmail()
u2.Nickname = model.NewId() u2.Nickname = model.NewId()
_, err = ss.User().Save(u2) _, err = ss.User().Save(rctx, u2)
require.NoError(t, err) require.NoError(t, err)
_, nErr = ss.Team().SaveMember(rctx, &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) require.NoError(t, nErr)
@ -441,7 +441,7 @@ func testChannelStoreGet(t *testing.T, rctx request.CTX, ss store.Store, s SqlSt
u1 := &model.User{} u1 := &model.User{}
u1.Email = MakeEmail() u1.Email = MakeEmail()
u1.Nickname = model.NewId() u1.Nickname = model.NewId()
_, err = ss.User().Save(u1) _, err = ss.User().Save(rctx, u1)
require.NoError(t, err) require.NoError(t, err)
_, nErr = ss.Team().SaveMember(rctx, &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) require.NoError(t, nErr)
@ -449,7 +449,7 @@ func testChannelStoreGet(t *testing.T, rctx request.CTX, ss store.Store, s SqlSt
u2 := model.User{} u2 := model.User{}
u2.Email = MakeEmail() u2.Email = MakeEmail()
u2.Nickname = model.NewId() u2.Nickname = model.NewId()
_, err = ss.User().Save(&u2) _, err = ss.User().Save(rctx, &u2)
require.NoError(t, err) require.NoError(t, err)
_, nErr = ss.Team().SaveMember(rctx, &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) require.NoError(t, nErr)
@ -543,7 +543,7 @@ func testChannelStoreGetChannelsByIds(t *testing.T, rctx request.CTX, ss store.S
u1 := &model.User{} u1 := &model.User{}
u1.Email = MakeEmail() u1.Email = MakeEmail()
u1.Nickname = model.NewId() u1.Nickname = model.NewId()
_, err := ss.User().Save(u1) _, err := ss.User().Save(rctx, u1)
require.NoError(t, err) require.NoError(t, err)
_, nErr = ss.Team().SaveMember(rctx, &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) require.NoError(t, nErr)
@ -551,7 +551,7 @@ func testChannelStoreGetChannelsByIds(t *testing.T, rctx request.CTX, ss store.S
u2 := model.User{} u2 := model.User{}
u2.Email = MakeEmail() u2.Email = MakeEmail()
u2.Nickname = model.NewId() u2.Nickname = model.NewId()
_, err = ss.User().Save(&u2) _, err = ss.User().Save(rctx, &u2)
require.NoError(t, err) require.NoError(t, err)
_, nErr = ss.Team().SaveMember(rctx, &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) require.NoError(t, nErr)
@ -632,7 +632,7 @@ func testGetChannelsWithTeamDataByIds(t *testing.T, rctx request.CTX, ss store.S
u1 := &model.User{} u1 := &model.User{}
u1.Email = MakeEmail() u1.Email = MakeEmail()
u1.Nickname = model.NewId() u1.Nickname = model.NewId()
_, err = ss.User().Save(u1) _, err = ss.User().Save(rctx, u1)
require.NoError(t, err) require.NoError(t, err)
_, nErr = ss.Team().SaveMember(rctx, &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) require.NoError(t, nErr)
@ -640,7 +640,7 @@ func testGetChannelsWithTeamDataByIds(t *testing.T, rctx request.CTX, ss store.S
u2 := model.User{} u2 := model.User{}
u2.Email = MakeEmail() u2.Email = MakeEmail()
u2.Nickname = model.NewId() u2.Nickname = model.NewId()
_, err = ss.User().Save(&u2) _, err = ss.User().Save(rctx, &u2)
require.NoError(t, err) require.NoError(t, err)
_, nErr = ss.Team().SaveMember(rctx, &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) require.NoError(t, nErr)
@ -1064,7 +1064,7 @@ func testChannelMemberStore(t *testing.T, rctx request.CTX, ss store.Store) {
u1 := model.User{} u1 := model.User{}
u1.Email = MakeEmail() u1.Email = MakeEmail()
u1.Nickname = model.NewId() u1.Nickname = model.NewId()
_, err := ss.User().Save(&u1) _, err := ss.User().Save(rctx, &u1)
require.NoError(t, err) require.NoError(t, err)
_, nErr = ss.Team().SaveMember(rctx, &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) require.NoError(t, nErr)
@ -1072,7 +1072,7 @@ func testChannelMemberStore(t *testing.T, rctx request.CTX, ss store.Store) {
u2 := model.User{} u2 := model.User{}
u2.Email = MakeEmail() u2.Email = MakeEmail()
u2.Nickname = model.NewId() u2.Nickname = model.NewId()
_, err = ss.User().Save(&u2) _, err = ss.User().Save(rctx, &u2)
require.NoError(t, err) require.NoError(t, err)
_, nErr = ss.Team().SaveMember(rctx, &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) require.NoError(t, nErr)
@ -1138,7 +1138,7 @@ func testChannelMemberStore(t *testing.T, rctx request.CTX, ss store.Store) {
} }
func testChannelSaveMember(t *testing.T, rctx request.CTX, ss store.Store) { func testChannelSaveMember(t *testing.T, rctx request.CTX, ss store.Store) {
u1, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) u1, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
require.NoError(t, err) require.NoError(t, err)
defaultNotifyProps := model.GetDefaultChannelNotifyProps() defaultNotifyProps := model.GetDefaultChannelNotifyProps()
@ -1645,9 +1645,9 @@ func testChannelSaveMember(t *testing.T, rctx request.CTX, ss store.Store) {
} }
func testChannelSaveMultipleMembers(t *testing.T, rctx request.CTX, ss store.Store) { func testChannelSaveMultipleMembers(t *testing.T, rctx request.CTX, ss store.Store) {
u1, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) u1, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
require.NoError(t, err) require.NoError(t, err)
u2, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) u2, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
require.NoError(t, err) require.NoError(t, err)
defaultNotifyProps := model.GetDefaultChannelNotifyProps() defaultNotifyProps := model.GetDefaultChannelNotifyProps()
@ -2194,7 +2194,7 @@ func testChannelSaveMultipleMembers(t *testing.T, rctx request.CTX, ss store.Sto
} }
func testChannelUpdateMember(t *testing.T, rctx request.CTX, ss store.Store) { func testChannelUpdateMember(t *testing.T, rctx request.CTX, ss store.Store) {
u1, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) u1, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
require.NoError(t, err) require.NoError(t, err)
defaultNotifyProps := model.GetDefaultChannelNotifyProps() defaultNotifyProps := model.GetDefaultChannelNotifyProps()
@ -2699,9 +2699,9 @@ func testChannelUpdateMember(t *testing.T, rctx request.CTX, ss store.Store) {
} }
func testChannelUpdateMultipleMembers(t *testing.T, rctx request.CTX, ss store.Store) { func testChannelUpdateMultipleMembers(t *testing.T, rctx request.CTX, ss store.Store) {
u1, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) u1, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
require.NoError(t, err) require.NoError(t, err)
u2, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) u2, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
require.NoError(t, err) require.NoError(t, err)
defaultNotifyProps := model.GetDefaultChannelNotifyProps() defaultNotifyProps := model.GetDefaultChannelNotifyProps()
@ -3235,7 +3235,7 @@ func testChannelUpdateMultipleMembers(t *testing.T, rctx request.CTX, ss store.S
} }
func testChannelUpdateMemberNotifyProps(t *testing.T, rctx request.CTX, ss store.Store) { func testChannelUpdateMemberNotifyProps(t *testing.T, rctx request.CTX, ss store.Store) {
u1, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) u1, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
require.NoError(t, err) require.NoError(t, err)
defaultNotifyProps := model.GetDefaultChannelNotifyProps() defaultNotifyProps := model.GetDefaultChannelNotifyProps()
@ -3302,9 +3302,9 @@ func testChannelPatchMultipleMembersNotifyProps(t *testing.T, rctx request.CTX,
}, -1) }, -1)
require.NoError(t, err) require.NoError(t, err)
user1, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) user1, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
require.NoError(t, err) require.NoError(t, err)
user2, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) user2, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
require.NoError(t, err) require.NoError(t, err)
original1, err := ss.Channel().SaveMember(rctx, &model.ChannelMember{ original1, err := ss.Channel().SaveMember(rctx, &model.ChannelMember{
ChannelId: channel1.Id, ChannelId: channel1.Id,
@ -3390,7 +3390,7 @@ func testChannelPatchMultipleMembersNotifyProps(t *testing.T, rctx request.CTX,
}, -1) }, -1)
require.NoError(t, err) require.NoError(t, err)
user, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) user, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
require.NoError(t, err) require.NoError(t, err)
_, err = ss.Channel().SaveMember(rctx, &model.ChannelMember{ _, err = ss.Channel().SaveMember(rctx, &model.ChannelMember{
ChannelId: channel.Id, ChannelId: channel.Id,
@ -3417,13 +3417,13 @@ func testChannelPatchMultipleMembersNotifyProps(t *testing.T, rctx request.CTX,
} }
func testChannelRemoveMember(t *testing.T, rctx request.CTX, ss store.Store) { func testChannelRemoveMember(t *testing.T, rctx request.CTX, ss store.Store) {
u1, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) u1, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
require.NoError(t, err) require.NoError(t, err)
u2, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) u2, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
require.NoError(t, err) require.NoError(t, err)
u3, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) u3, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
require.NoError(t, err) require.NoError(t, err)
u4, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) u4, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
require.NoError(t, err) require.NoError(t, err)
channelID := model.NewId() channelID := model.NewId()
defaultNotifyProps := model.GetDefaultChannelNotifyProps() defaultNotifyProps := model.GetDefaultChannelNotifyProps()
@ -3464,13 +3464,13 @@ func testChannelRemoveMember(t *testing.T, rctx request.CTX, ss store.Store) {
} }
func testChannelRemoveMembers(t *testing.T, rctx request.CTX, ss store.Store) { func testChannelRemoveMembers(t *testing.T, rctx request.CTX, ss store.Store) {
u1, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) u1, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
require.NoError(t, err) require.NoError(t, err)
u2, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) u2, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
require.NoError(t, err) require.NoError(t, err)
u3, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) u3, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
require.NoError(t, err) require.NoError(t, err)
u4, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) u4, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
require.NoError(t, err) require.NoError(t, err)
channelID := model.NewId() channelID := model.NewId()
defaultNotifyProps := model.GetDefaultChannelNotifyProps() defaultNotifyProps := model.GetDefaultChannelNotifyProps()
@ -3533,7 +3533,7 @@ func testChannelDeleteMemberStore(t *testing.T, rctx request.CTX, ss store.Store
u1 := model.User{} u1 := model.User{}
u1.Email = MakeEmail() u1.Email = MakeEmail()
u1.Nickname = model.NewId() u1.Nickname = model.NewId()
_, err := ss.User().Save(&u1) _, err := ss.User().Save(rctx, &u1)
require.NoError(t, err) require.NoError(t, err)
_, nErr = ss.Team().SaveMember(rctx, &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) require.NoError(t, nErr)
@ -3541,7 +3541,7 @@ func testChannelDeleteMemberStore(t *testing.T, rctx request.CTX, ss store.Store
u2 := model.User{} u2 := model.User{}
u2.Email = MakeEmail() u2.Email = MakeEmail()
u2.Nickname = model.NewId() u2.Nickname = model.NewId()
_, err = ss.User().Save(&u2) _, err = ss.User().Save(rctx, &u2)
require.NoError(t, err) require.NoError(t, err)
_, nErr = ss.Team().SaveMember(rctx, &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) require.NoError(t, nErr)
@ -5129,7 +5129,7 @@ func testGetMemberCount(t *testing.T, rctx request.CTX, ss store.Store) {
Email: MakeEmail(), Email: MakeEmail(),
DeleteAt: 0, DeleteAt: 0,
} }
_, err := ss.User().Save(u1) _, err := ss.User().Save(rctx, u1)
require.NoError(t, err) require.NoError(t, err)
_, nErr = ss.Team().SaveMember(rctx, &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) require.NoError(t, nErr)
@ -5150,7 +5150,7 @@ func testGetMemberCount(t *testing.T, rctx request.CTX, ss store.Store) {
Email: MakeEmail(), Email: MakeEmail(),
DeleteAt: 0, DeleteAt: 0,
} }
_, err = ss.User().Save(&u2) _, err = ss.User().Save(rctx, &u2)
require.NoError(t, err) require.NoError(t, err)
_, nErr = ss.Team().SaveMember(rctx, &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) require.NoError(t, nErr)
@ -5172,7 +5172,7 @@ func testGetMemberCount(t *testing.T, rctx request.CTX, ss store.Store) {
Email: MakeEmail(), Email: MakeEmail(),
DeleteAt: 0, DeleteAt: 0,
} }
_, err = ss.User().Save(&u3) _, err = ss.User().Save(rctx, &u3)
require.NoError(t, err) require.NoError(t, err)
_, nErr = ss.Team().SaveMember(rctx, &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) require.NoError(t, nErr)
@ -5194,7 +5194,7 @@ func testGetMemberCount(t *testing.T, rctx request.CTX, ss store.Store) {
Email: MakeEmail(), Email: MakeEmail(),
DeleteAt: 10000, DeleteAt: 10000,
} }
_, err = ss.User().Save(u4) _, err = ss.User().Save(rctx, u4)
require.NoError(t, err) require.NoError(t, err)
_, nErr = ss.Team().SaveMember(rctx, &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) require.NoError(t, nErr)
@ -5238,7 +5238,7 @@ func testGetMemberCountsByGroup(t *testing.T, rctx request.CTX, ss store.Store)
Email: MakeEmail(), Email: MakeEmail(),
DeleteAt: 0, DeleteAt: 0,
} }
_, nErr = ss.User().Save(u1) _, nErr = ss.User().Save(rctx, u1)
require.NoError(t, nErr) require.NoError(t, nErr)
_, nErr = ss.Team().SaveMember(rctx, &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) require.NoError(t, nErr)
@ -5309,7 +5309,7 @@ func testGetMemberCountsByGroup(t *testing.T, rctx request.CTX, ss store.Store)
Email: MakeEmail(), Email: MakeEmail(),
DeleteAt: 0, DeleteAt: 0,
} }
_, nErr = ss.User().Save(u) _, nErr = ss.User().Save(rctx, u)
require.NoError(t, nErr) require.NoError(t, nErr)
_, nErr = ss.Team().SaveMember(rctx, &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) require.NoError(t, nErr)
@ -5363,7 +5363,7 @@ func testGetMemberCountsByGroup(t *testing.T, rctx request.CTX, ss store.Store)
Email: MakeEmail(), Email: MakeEmail(),
DeleteAt: 0, DeleteAt: 0,
} }
_, nErr = ss.User().Save(u) _, nErr = ss.User().Save(rctx, u)
require.NoError(t, nErr) require.NoError(t, nErr)
_, nErr = ss.Team().SaveMember(rctx, &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) require.NoError(t, nErr)
@ -5454,7 +5454,7 @@ func testGetGuestCount(t *testing.T, rctx request.CTX, ss store.Store) {
DeleteAt: 0, DeleteAt: 0,
Roles: model.SystemUserRoleId, Roles: model.SystemUserRoleId,
} }
_, err := ss.User().Save(u1) _, err := ss.User().Save(rctx, u1)
require.NoError(t, err) require.NoError(t, err)
_, nErr = ss.Team().SaveMember(rctx, &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) require.NoError(t, nErr)
@ -5479,7 +5479,7 @@ func testGetGuestCount(t *testing.T, rctx request.CTX, ss store.Store) {
DeleteAt: 0, DeleteAt: 0,
Roles: model.SystemGuestRoleId, Roles: model.SystemGuestRoleId,
} }
_, err := ss.User().Save(&u2) _, err := ss.User().Save(rctx, &u2)
require.NoError(t, err) require.NoError(t, err)
_, nErr = ss.Team().SaveMember(rctx, &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) require.NoError(t, nErr)
@ -5504,7 +5504,7 @@ func testGetGuestCount(t *testing.T, rctx request.CTX, ss store.Store) {
DeleteAt: 0, DeleteAt: 0,
Roles: model.SystemGuestRoleId, Roles: model.SystemGuestRoleId,
} }
_, err := ss.User().Save(&u3) _, err := ss.User().Save(rctx, &u3)
require.NoError(t, err) require.NoError(t, err)
_, nErr = ss.Team().SaveMember(rctx, &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) require.NoError(t, nErr)
@ -5529,7 +5529,7 @@ func testGetGuestCount(t *testing.T, rctx request.CTX, ss store.Store) {
DeleteAt: 10000, DeleteAt: 10000,
Roles: model.SystemGuestRoleId, Roles: model.SystemGuestRoleId,
} }
_, err := ss.User().Save(u4) _, err := ss.User().Save(rctx, u4)
require.NoError(t, err) require.NoError(t, err)
_, nErr = ss.Team().SaveMember(rctx, &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) require.NoError(t, nErr)
@ -6647,7 +6647,7 @@ func testChannelStoreGetMembersByChannelIds(t *testing.T, rctx request.CTX, ss s
} }
func testChannelStoreGetMembersInfoByChannelIds(t *testing.T, rctx request.CTX, ss store.Store) { func testChannelStoreGetMembersInfoByChannelIds(t *testing.T, rctx request.CTX, ss store.Store) {
u, err := ss.User().Save(&model.User{ u, err := ss.User().Save(rctx, &model.User{
Username: "user.test", Username: "user.test",
Email: MakeEmail(), Email: MakeEmail(),
Nickname: model.NewId(), Nickname: model.NewId(),
@ -6708,28 +6708,28 @@ func testChannelStoreSearchGroupChannels(t *testing.T, rctx request.CTX, ss stor
u1.Username = "user.one" u1.Username = "user.one"
u1.Email = MakeEmail() u1.Email = MakeEmail()
u1.Nickname = model.NewId() u1.Nickname = model.NewId()
_, err := ss.User().Save(u1) _, err := ss.User().Save(rctx, u1)
require.NoError(t, err) require.NoError(t, err)
u2 := &model.User{} u2 := &model.User{}
u2.Username = "user.two" u2.Username = "user.two"
u2.Email = MakeEmail() u2.Email = MakeEmail()
u2.Nickname = model.NewId() u2.Nickname = model.NewId()
_, err = ss.User().Save(u2) _, err = ss.User().Save(rctx, u2)
require.NoError(t, err) require.NoError(t, err)
u3 := &model.User{} u3 := &model.User{}
u3.Username = "user.three" u3.Username = "user.three"
u3.Email = MakeEmail() u3.Email = MakeEmail()
u3.Nickname = model.NewId() u3.Nickname = model.NewId()
_, err = ss.User().Save(u3) _, err = ss.User().Save(rctx, u3)
require.NoError(t, err) require.NoError(t, err)
u4 := &model.User{} u4 := &model.User{}
u4.Username = "user.four" u4.Username = "user.four"
u4.Email = MakeEmail() u4.Email = MakeEmail()
u4.Nickname = model.NewId() u4.Nickname = model.NewId()
_, err = ss.User().Save(u4) _, err = ss.User().Save(rctx, u4)
require.NoError(t, err) require.NoError(t, err)
// Group channels // Group channels
@ -6884,13 +6884,13 @@ func testChannelStoreAnalyticsDeletedTypeCount(t *testing.T, rctx request.CTX, s
u1 := &model.User{} u1 := &model.User{}
u1.Email = MakeEmail() u1.Email = MakeEmail()
u1.Nickname = model.NewId() u1.Nickname = model.NewId()
_, err := ss.User().Save(u1) _, err := ss.User().Save(rctx, u1)
require.NoError(t, err) require.NoError(t, err)
u2 := &model.User{} u2 := &model.User{}
u2.Email = MakeEmail() u2.Email = MakeEmail()
u2.Nickname = model.NewId() u2.Nickname = model.NewId()
_, err = ss.User().Save(u2) _, err = ss.User().Save(rctx, u2)
require.NoError(t, err) require.NoError(t, err)
d4, nErr := ss.Channel().CreateDirectChannel(rctx, u1, u2) d4, nErr := ss.Channel().CreateDirectChannel(rctx, u1, u2)
@ -7566,7 +7566,7 @@ func testChannelStoreGetChannelMembersForExport(t *testing.T, rctx request.CTX,
u1 := model.User{} u1 := model.User{}
u1.Email = MakeEmail() u1.Email = MakeEmail()
u1.Nickname = model.NewId() u1.Nickname = model.NewId()
_, err = ss.User().Save(&u1) _, err = ss.User().Save(rctx, &u1)
require.NoError(t, err) require.NoError(t, err)
m1 := model.ChannelMember{} m1 := model.ChannelMember{}
@ -7615,19 +7615,19 @@ func testChannelStoreRemoveAllDeactivatedMembers(t *testing.T, rctx request.CTX,
u1 := model.User{} u1 := model.User{}
u1.Email = MakeEmail() u1.Email = MakeEmail()
u1.Nickname = model.NewId() u1.Nickname = model.NewId()
_, err = ss.User().Save(&u1) _, err = ss.User().Save(rctx, &u1)
require.NoError(t, err) require.NoError(t, err)
u2 := model.User{} u2 := model.User{}
u2.Email = MakeEmail() u2.Email = MakeEmail()
u2.Nickname = model.NewId() u2.Nickname = model.NewId()
_, err = ss.User().Save(&u2) _, err = ss.User().Save(rctx, &u2)
require.NoError(t, err) require.NoError(t, err)
u3 := model.User{} u3 := model.User{}
u3.Email = MakeEmail() u3.Email = MakeEmail()
u3.Nickname = model.NewId() u3.Nickname = model.NewId()
_, err = ss.User().Save(&u3) _, err = ss.User().Save(rctx, &u3)
require.NoError(t, err) require.NoError(t, err)
m1 := model.ChannelMember{} m1 := model.ChannelMember{}
@ -7707,7 +7707,7 @@ func testChannelStoreExportAllDirectChannels(t *testing.T, rctx request.CTX, ss
u1 := &model.User{} u1 := &model.User{}
u1.Email = MakeEmail() u1.Email = MakeEmail()
u1.Nickname = model.NewId() u1.Nickname = model.NewId()
_, err := ss.User().Save(u1) _, err := ss.User().Save(rctx, u1)
require.NoError(t, err) require.NoError(t, err)
_, nErr = ss.Team().SaveMember(rctx, &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) require.NoError(t, nErr)
@ -7715,7 +7715,7 @@ func testChannelStoreExportAllDirectChannels(t *testing.T, rctx request.CTX, ss
u2 := &model.User{} u2 := &model.User{}
u2.Email = MakeEmail() u2.Email = MakeEmail()
u2.Nickname = model.NewId() u2.Nickname = model.NewId()
_, err = ss.User().Save(u2) _, err = ss.User().Save(rctx, u2)
require.NoError(t, err) require.NoError(t, err)
_, nErr = ss.Team().SaveMember(rctx, &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) require.NoError(t, nErr)
@ -7770,7 +7770,7 @@ func testChannelStoreExportAllDirectChannelsExcludePrivateAndPublic(t *testing.T
u1 := &model.User{} u1 := &model.User{}
u1.Email = MakeEmail() u1.Email = MakeEmail()
u1.Nickname = model.NewId() u1.Nickname = model.NewId()
_, err := ss.User().Save(u1) _, err := ss.User().Save(rctx, u1)
require.NoError(t, err) require.NoError(t, err)
_, nErr = ss.Team().SaveMember(rctx, &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) require.NoError(t, nErr)
@ -7778,7 +7778,7 @@ func testChannelStoreExportAllDirectChannelsExcludePrivateAndPublic(t *testing.T
u2 := &model.User{} u2 := &model.User{}
u2.Email = MakeEmail() u2.Email = MakeEmail()
u2.Nickname = model.NewId() u2.Nickname = model.NewId()
_, err = ss.User().Save(u2) _, err = ss.User().Save(rctx, u2)
require.NoError(t, err) require.NoError(t, err)
_, nErr = ss.Team().SaveMember(rctx, &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) require.NoError(t, nErr)
@ -7816,7 +7816,7 @@ func testChannelStoreExportAllDirectChannelsDeletedChannel(t *testing.T, rctx re
u1 := &model.User{} u1 := &model.User{}
u1.Email = MakeEmail() u1.Email = MakeEmail()
u1.Nickname = model.NewId() u1.Nickname = model.NewId()
_, err := ss.User().Save(u1) _, err := ss.User().Save(rctx, u1)
require.NoError(t, err) require.NoError(t, err)
_, nErr := ss.Team().SaveMember(rctx, &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) require.NoError(t, nErr)
@ -7825,7 +7825,7 @@ func testChannelStoreExportAllDirectChannelsDeletedChannel(t *testing.T, rctx re
u2.Email = MakeEmail() u2.Email = MakeEmail()
u2.DeleteAt = 123000 u2.DeleteAt = 123000
u2.Nickname = model.NewId() u2.Nickname = model.NewId()
_, err = ss.User().Save(u2) _, err = ss.User().Save(rctx, u2)
require.NoError(t, err) require.NoError(t, err)
_, nErr = ss.Team().SaveMember(rctx, &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) require.NoError(t, nErr)

34
server/channels/store/storetest/compliance_store.go
View File

@ -114,7 +114,7 @@ func testComplianceExport(t *testing.T, rctx request.CTX, ss store.Store) {
u1 := &model.User{} u1 := &model.User{}
u1.Email = MakeEmail() u1.Email = MakeEmail()
u1.Username = model.NewId() u1.Username = model.NewId()
u1, err = ss.User().Save(u1) u1, err = ss.User().Save(rctx, u1)
require.NoError(t, err) require.NoError(t, err)
_, nErr := ss.Team().SaveMember(rctx, &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) require.NoError(t, nErr)
@ -122,7 +122,7 @@ func testComplianceExport(t *testing.T, rctx request.CTX, ss store.Store) {
u2 := &model.User{} u2 := &model.User{}
u2.Email = MakeEmail() u2.Email = MakeEmail()
u2.Username = model.NewId() u2.Username = model.NewId()
u2, err = ss.User().Save(u2) u2, err = ss.User().Save(rctx, u2)
require.NoError(t, err) require.NoError(t, err)
_, nErr = ss.Team().SaveMember(rctx, &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) require.NoError(t, nErr)
@ -248,7 +248,7 @@ func testComplianceExportDirectMessages(t *testing.T, rctx request.CTX, ss store
u1 := &model.User{} u1 := &model.User{}
u1.Email = MakeEmail() u1.Email = MakeEmail()
u1.Username = model.NewId() u1.Username = model.NewId()
u1, err = ss.User().Save(u1) u1, err = ss.User().Save(rctx, u1)
require.NoError(t, err) require.NoError(t, err)
_, nErr := ss.Team().SaveMember(rctx, &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) require.NoError(t, nErr)
@ -256,7 +256,7 @@ func testComplianceExportDirectMessages(t *testing.T, rctx request.CTX, ss store
u2 := &model.User{} u2 := &model.User{}
u2.Email = MakeEmail() u2.Email = MakeEmail()
u2.Username = model.NewId() u2.Username = model.NewId()
u2, err = ss.User().Save(u2) u2, err = ss.User().Save(rctx, u2)
require.NoError(t, err) require.NoError(t, err)
_, nErr = ss.Team().SaveMember(rctx, &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) require.NoError(t, nErr)
@ -419,7 +419,7 @@ func testMessageExportPublicChannel(t *testing.T, rctx request.CTX, ss store.Sto
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user1, err = ss.User().Save(user1) user1, err = ss.User().Save(rctx, user1)
require.NoError(t, err) require.NoError(t, err)
_, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{ _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{
TeamId: team.Id, TeamId: team.Id,
@ -431,7 +431,7 @@ func testMessageExportPublicChannel(t *testing.T, rctx request.CTX, ss store.Sto
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user2, err = ss.User().Save(user2) user2, err = ss.User().Save(rctx, user2)
require.NoError(t, err) require.NoError(t, err)
_, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{ _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{
TeamId: team.Id, TeamId: team.Id,
@ -523,7 +523,7 @@ func testMessageExportPrivateChannel(t *testing.T, rctx request.CTX, ss store.St
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user1, err = ss.User().Save(user1) user1, err = ss.User().Save(rctx, user1)
require.NoError(t, err) require.NoError(t, err)
_, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{ _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{
TeamId: team.Id, TeamId: team.Id,
@ -535,7 +535,7 @@ func testMessageExportPrivateChannel(t *testing.T, rctx request.CTX, ss store.St
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user2, err = ss.User().Save(user2) user2, err = ss.User().Save(rctx, user2)
require.NoError(t, err) require.NoError(t, err)
_, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{ _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{
TeamId: team.Id, TeamId: team.Id,
@ -629,7 +629,7 @@ func testMessageExportDirectMessageChannel(t *testing.T, rctx request.CTX, ss st
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user1, err = ss.User().Save(user1) user1, err = ss.User().Save(rctx, user1)
require.NoError(t, err) require.NoError(t, err)
_, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{ _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{
TeamId: team.Id, TeamId: team.Id,
@ -641,7 +641,7 @@ func testMessageExportDirectMessageChannel(t *testing.T, rctx request.CTX, ss st
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user2, err = ss.User().Save(user2) user2, err = ss.User().Save(rctx, user2)
require.NoError(t, err) require.NoError(t, err)
_, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{ _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{
TeamId: team.Id, TeamId: team.Id,
@ -710,7 +710,7 @@ func testMessageExportGroupMessageChannel(t *testing.T, rctx request.CTX, ss sto
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user1, err = ss.User().Save(user1) user1, err = ss.User().Save(rctx, user1)
require.NoError(t, err) require.NoError(t, err)
_, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{ _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{
TeamId: team.Id, TeamId: team.Id,
@ -722,7 +722,7 @@ func testMessageExportGroupMessageChannel(t *testing.T, rctx request.CTX, ss sto
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user2, err = ss.User().Save(user2) user2, err = ss.User().Save(rctx, user2)
require.NoError(t, err) require.NoError(t, err)
_, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{ _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{
TeamId: team.Id, TeamId: team.Id,
@ -734,7 +734,7 @@ func testMessageExportGroupMessageChannel(t *testing.T, rctx request.CTX, ss sto
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user3, err = ss.User().Save(user3) user3, err = ss.User().Save(rctx, user3)
require.NoError(t, err) require.NoError(t, err)
_, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{ _, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{
TeamId: team.Id, TeamId: team.Id,
@ -808,7 +808,7 @@ func testEditExportMessage(t *testing.T, rctx request.CTX, ss store.Store) {
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user1, err = ss.User().Save(user1) user1, err = ss.User().Save(rctx, user1)
require.NoError(t, err) require.NoError(t, err)
_, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{ _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{
TeamId: team.Id, TeamId: team.Id,
@ -900,7 +900,7 @@ func testEditAfterExportMessage(t *testing.T, rctx request.CTX, ss store.Store)
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user1, err = ss.User().Save(user1) user1, err = ss.User().Save(rctx, user1)
require.NoError(t, err) require.NoError(t, err)
_, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{ _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{
TeamId: team.Id, TeamId: team.Id,
@ -1011,7 +1011,7 @@ func testDeleteExportMessage(t *testing.T, rctx request.CTX, ss store.Store) {
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user1, err = ss.User().Save(user1) user1, err = ss.User().Save(rctx, user1)
require.NoError(t, err) require.NoError(t, err)
_, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{ _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{
TeamId: team.Id, TeamId: team.Id,
@ -1096,7 +1096,7 @@ func testDeleteAfterExportMessage(t *testing.T, rctx request.CTX, ss store.Store
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user1, err = ss.User().Save(user1) user1, err = ss.User().Save(rctx, user1)
require.NoError(t, err) require.NoError(t, err)
_, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{ _, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{
TeamId: team.Id, TeamId: team.Id,

162
server/channels/store/storetest/group_store.go
View File

@ -205,7 +205,7 @@ func testGroupCreateWithUserIds(t *testing.T, rctx request.CTX, ss store.Store)
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user1, nErr := ss.User().Save(u1) user1, nErr := ss.User().Save(rctx, u1)
require.NoError(t, nErr) require.NoError(t, nErr)
// Create user 2 // Create user 2
@ -213,7 +213,7 @@ func testGroupCreateWithUserIds(t *testing.T, rctx request.CTX, ss store.Store)
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user2, nErr := ss.User().Save(u2) user2, nErr := ss.User().Save(rctx, u2)
require.NoError(t, nErr) require.NoError(t, nErr)
g1 := &model.Group{ g1 := &model.Group{
@ -558,7 +558,7 @@ func testGroupStoreGetByUser(t *testing.T, rctx request.CTX, ss store.Store) {
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
u1, nErr := ss.User().Save(u1) u1, nErr := ss.User().Save(rctx, u1)
require.NoError(t, nErr) require.NoError(t, nErr)
_, err = ss.Group().UpsertMember(g1.Id, u1.Id) _, err = ss.Group().UpsertMember(g1.Id, u1.Id)
@ -570,7 +570,7 @@ func testGroupStoreGetByUser(t *testing.T, rctx request.CTX, ss store.Store) {
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
u2, nErr = ss.User().Save(u2) u2, nErr = ss.User().Save(rctx, u2)
require.NoError(t, nErr) require.NoError(t, nErr)
_, err = ss.Group().UpsertMember(g2.Id, u2.Id) _, err = ss.Group().UpsertMember(g2.Id, u2.Id)
@ -813,7 +813,7 @@ func testGroupGetMemberUsers(t *testing.T, rctx request.CTX, ss store.Store) {
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user1, nErr := ss.User().Save(u1) user1, nErr := ss.User().Save(rctx, u1)
require.NoError(t, nErr) require.NoError(t, nErr)
_, err = ss.Group().UpsertMember(group.Id, user1.Id) _, err = ss.Group().UpsertMember(group.Id, user1.Id)
@ -823,7 +823,7 @@ func testGroupGetMemberUsers(t *testing.T, rctx request.CTX, ss store.Store) {
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user2, nErr := ss.User().Save(u2) user2, nErr := ss.User().Save(rctx, u2)
require.NoError(t, nErr) require.NoError(t, nErr)
_, err = ss.Group().UpsertMember(group.Id, user2.Id) _, err = ss.Group().UpsertMember(group.Id, user2.Id)
@ -865,7 +865,7 @@ func testGroupGetMemberUsersPage(t *testing.T, rctx request.CTX, ss store.Store)
Email: MakeEmail(), Email: MakeEmail(),
Username: "user1" + model.NewId(), Username: "user1" + model.NewId(),
} }
user1, nErr := ss.User().Save(u1) user1, nErr := ss.User().Save(rctx, u1)
require.NoError(t, nErr) require.NoError(t, nErr)
_, err = ss.Group().UpsertMember(group.Id, user1.Id) _, err = ss.Group().UpsertMember(group.Id, user1.Id)
@ -875,7 +875,7 @@ func testGroupGetMemberUsersPage(t *testing.T, rctx request.CTX, ss store.Store)
Email: MakeEmail(), Email: MakeEmail(),
Username: "user2" + model.NewId(), Username: "user2" + model.NewId(),
} }
user2, nErr := ss.User().Save(u2) user2, nErr := ss.User().Save(rctx, u2)
require.NoError(t, nErr) require.NoError(t, nErr)
_, err = ss.Group().UpsertMember(group.Id, user2.Id) _, err = ss.Group().UpsertMember(group.Id, user2.Id)
@ -885,7 +885,7 @@ func testGroupGetMemberUsersPage(t *testing.T, rctx request.CTX, ss store.Store)
Email: MakeEmail(), Email: MakeEmail(),
Username: "user3" + model.NewId(), Username: "user3" + model.NewId(),
} }
user3, nErr := ss.User().Save(u3) user3, nErr := ss.User().Save(rctx, u3)
require.NoError(t, nErr) require.NoError(t, nErr)
_, err = ss.Group().UpsertMember(group.Id, user3.Id) _, err = ss.Group().UpsertMember(group.Id, user3.Id)
@ -943,7 +943,7 @@ func testGroupGetMemberUsersSortedPage(t *testing.T, rctx request.CTX, ss store.
FirstName: "z" + model.NewId(), FirstName: "z" + model.NewId(),
LastName: "z" + model.NewId(), LastName: "z" + model.NewId(),
} }
user1, nErr := ss.User().Save(u1) user1, nErr := ss.User().Save(rctx, u1)
require.NoError(t, nErr) require.NoError(t, nErr)
_, err = ss.Group().UpsertMember(group.Id, user1.Id) _, err = ss.Group().UpsertMember(group.Id, user1.Id)
@ -956,7 +956,7 @@ func testGroupGetMemberUsersSortedPage(t *testing.T, rctx request.CTX, ss store.
FirstName: "b" + model.NewId(), FirstName: "b" + model.NewId(),
LastName: "b" + model.NewId(), LastName: "b" + model.NewId(),
} }
user2, nErr := ss.User().Save(u2) user2, nErr := ss.User().Save(rctx, u2)
require.NoError(t, nErr) require.NoError(t, nErr)
_, err = ss.Group().UpsertMember(group.Id, user2.Id) _, err = ss.Group().UpsertMember(group.Id, user2.Id)
@ -967,7 +967,7 @@ func testGroupGetMemberUsersSortedPage(t *testing.T, rctx request.CTX, ss store.
Email: MakeEmail(), Email: MakeEmail(),
Username: "d" + model.NewId(), Username: "d" + model.NewId(),
} }
user3, nErr := ss.User().Save(u3) user3, nErr := ss.User().Save(rctx, u3)
require.NoError(t, nErr) require.NoError(t, nErr)
_, err = ss.Group().UpsertMember(group.Id, user3.Id) _, err = ss.Group().UpsertMember(group.Id, user3.Id)
@ -1032,7 +1032,7 @@ func testGroupGetMemberUsersInTeam(t *testing.T, rctx request.CTX, ss store.Stor
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user1, err := ss.User().Save(u1) user1, err := ss.User().Save(rctx, u1)
require.NoError(t, err) require.NoError(t, err)
_, err = ss.Group().UpsertMember(group.Id, user1.Id) _, err = ss.Group().UpsertMember(group.Id, user1.Id)
@ -1042,7 +1042,7 @@ func testGroupGetMemberUsersInTeam(t *testing.T, rctx request.CTX, ss store.Stor
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user2, err := ss.User().Save(u2) user2, err := ss.User().Save(rctx, u2)
require.NoError(t, err) require.NoError(t, err)
_, err = ss.Group().UpsertMember(group.Id, user2.Id) _, err = ss.Group().UpsertMember(group.Id, user2.Id)
@ -1052,7 +1052,7 @@ func testGroupGetMemberUsersInTeam(t *testing.T, rctx request.CTX, ss store.Stor
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user3, err := ss.User().Save(u3) user3, err := ss.User().Save(rctx, u3)
require.NoError(t, err) require.NoError(t, err)
_, err = ss.Group().UpsertMember(group.Id, user3.Id) _, err = ss.Group().UpsertMember(group.Id, user3.Id)
@ -1118,7 +1118,7 @@ func testGroupGetMemberUsersNotInChannel(t *testing.T, rctx request.CTX, ss stor
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user1, err := ss.User().Save(u1) user1, err := ss.User().Save(rctx, u1)
require.NoError(t, err) require.NoError(t, err)
_, err = ss.Group().UpsertMember(group.Id, user1.Id) _, err = ss.Group().UpsertMember(group.Id, user1.Id)
@ -1128,7 +1128,7 @@ func testGroupGetMemberUsersNotInChannel(t *testing.T, rctx request.CTX, ss stor
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user2, err := ss.User().Save(u2) user2, err := ss.User().Save(rctx, u2)
require.NoError(t, err) require.NoError(t, err)
_, err = ss.Group().UpsertMember(group.Id, user2.Id) _, err = ss.Group().UpsertMember(group.Id, user2.Id)
@ -1138,7 +1138,7 @@ func testGroupGetMemberUsersNotInChannel(t *testing.T, rctx request.CTX, ss stor
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user3, err := ss.User().Save(u3) user3, err := ss.User().Save(rctx, u3)
require.NoError(t, err) require.NoError(t, err)
_, err = ss.Group().UpsertMember(group.Id, user3.Id) _, err = ss.Group().UpsertMember(group.Id, user3.Id)
@ -1245,7 +1245,7 @@ func testUpsertMember(t *testing.T, rctx request.CTX, ss store.Store) {
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user, nErr := ss.User().Save(u1) user, nErr := ss.User().Save(rctx, u1)
require.NoError(t, nErr) require.NoError(t, nErr)
// Happy path // Happy path
@ -1306,7 +1306,7 @@ func testUpsertMembers(t *testing.T, rctx request.CTX, ss store.Store) {
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user, nErr := ss.User().Save(u1) user, nErr := ss.User().Save(rctx, u1)
require.NoError(t, nErr) require.NoError(t, nErr)
// Create user // Create user
@ -1314,7 +1314,7 @@ func testUpsertMembers(t *testing.T, rctx request.CTX, ss store.Store) {
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user2, nErr := ss.User().Save(u2) user2, nErr := ss.User().Save(rctx, u2)
require.NoError(t, nErr) require.NoError(t, nErr)
// Happy path // Happy path
@ -1372,7 +1372,7 @@ func testGroupDeleteMember(t *testing.T, rctx request.CTX, ss store.Store) {
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user, nErr := ss.User().Save(u1) user, nErr := ss.User().Save(rctx, u1)
require.NoError(t, nErr) require.NoError(t, nErr)
// Create member // Create member
@ -1407,7 +1407,7 @@ func testGroupDeleteMembers(t *testing.T, rctx request.CTX, ss store.Store) {
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user, nErr := ss.User().Save(u1) user, nErr := ss.User().Save(rctx, u1)
require.NoError(t, nErr) require.NoError(t, nErr)
// Create group // Create group
g1 := &model.Group{ g1 := &model.Group{
@ -1466,7 +1466,7 @@ func testGroupPermanentDeleteMembersByUser(t *testing.T, rctx request.CTX, ss st
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user, err := ss.User().Save(u1) user, err := ss.User().Save(rctx, u1)
require.NoError(t, err) require.NoError(t, err)
// Create members // Create members
@ -1762,7 +1762,7 @@ func testTeamMembersToAdd(t *testing.T, rctx request.CTX, ss store.Store) {
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user, nErr := ss.User().Save(user) user, nErr := ss.User().Save(rctx, user)
require.NoError(t, nErr) require.NoError(t, nErr)
// Create GroupMember // Create GroupMember
@ -1947,21 +1947,21 @@ func testTeamMembersToAddSingleTeam(t *testing.T, rctx request.CTX, ss store.Sto
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user1, nErr := ss.User().Save(user1) user1, nErr := ss.User().Save(rctx, user1)
require.NoError(t, nErr) require.NoError(t, nErr)
user2 := &model.User{ user2 := &model.User{
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user2, nErr = ss.User().Save(user2) user2, nErr = ss.User().Save(rctx, user2)
require.NoError(t, nErr) require.NoError(t, nErr)
user3 := &model.User{ user3 := &model.User{
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user3, nErr = ss.User().Save(user3) user3, nErr = ss.User().Save(rctx, user3)
require.NoError(t, nErr) require.NoError(t, nErr)
for _, user := range []*model.User{user1, user2} { for _, user := range []*model.User{user1, user2} {
@ -2031,7 +2031,7 @@ func testChannelMembersToAdd(t *testing.T, rctx request.CTX, ss store.Store) {
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user, nErr := ss.User().Save(user) user, nErr := ss.User().Save(rctx, user)
require.NoError(t, nErr) require.NoError(t, nErr)
// Create GroupMember // Create GroupMember
@ -2214,21 +2214,21 @@ func testChannelMembersToAddSingleChannel(t *testing.T, rctx request.CTX, ss sto
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user1, nErr := ss.User().Save(user1) user1, nErr := ss.User().Save(rctx, user1)
require.NoError(t, nErr) require.NoError(t, nErr)
user2 := &model.User{ user2 := &model.User{
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user2, nErr = ss.User().Save(user2) user2, nErr = ss.User().Save(rctx, user2)
require.NoError(t, nErr) require.NoError(t, nErr)
user3 := &model.User{ user3 := &model.User{
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user3, nErr = ss.User().Save(user3) user3, nErr = ss.User().Save(rctx, user3)
require.NoError(t, nErr) require.NoError(t, nErr)
for _, user := range []*model.User{user1, user2} { for _, user := range []*model.User{user1, user2} {
@ -2353,21 +2353,21 @@ func testTeamMembersToRemoveSingleTeam(t *testing.T, rctx request.CTX, ss store.
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user1, err := ss.User().Save(user1) user1, err := ss.User().Save(rctx, user1)
require.NoError(t, err) require.NoError(t, err)
user2 := &model.User{ user2 := &model.User{
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user2, err = ss.User().Save(user2) user2, err = ss.User().Save(rctx, user2)
require.NoError(t, err) require.NoError(t, err)
user3 := &model.User{ user3 := &model.User{
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user3, err = ss.User().Save(user3) user3, err = ss.User().Save(rctx, user3)
require.NoError(t, err) require.NoError(t, err)
team1 := &model.Team{ team1 := &model.Team{
@ -2505,21 +2505,21 @@ func testChannelMembersToRemoveSingleChannel(t *testing.T, rctx request.CTX, ss
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user1, err := ss.User().Save(user1) user1, err := ss.User().Save(rctx, user1)
require.NoError(t, err) require.NoError(t, err)
user2 := &model.User{ user2 := &model.User{
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user2, err = ss.User().Save(user2) user2, err = ss.User().Save(rctx, user2)
require.NoError(t, err) require.NoError(t, err)
user3 := &model.User{ user3 := &model.User{
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user3, err = ss.User().Save(user3) user3, err = ss.User().Save(rctx, user3)
require.NoError(t, err) require.NoError(t, err)
channel1 := &model.Channel{ channel1 := &model.Channel{
@ -2596,7 +2596,7 @@ func pendingMemberRemovalsDataSetup(t *testing.T, rctx request.CTX, ss store.Sto
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
userA, nErr := ss.User().Save(userA) userA, nErr := ss.User().Save(rctx, userA)
require.NoError(t, nErr) require.NoError(t, nErr)
// userB will not get removed from the group // userB will not get removed from the group
@ -2604,7 +2604,7 @@ func pendingMemberRemovalsDataSetup(t *testing.T, rctx request.CTX, ss store.Sto
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
userB, nErr = ss.User().Save(userB) userB, nErr = ss.User().Save(rctx, userB)
require.NoError(t, nErr) require.NoError(t, nErr)
// userC was never in the group // userC was never in the group
@ -2612,7 +2612,7 @@ func pendingMemberRemovalsDataSetup(t *testing.T, rctx request.CTX, ss store.Sto
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
userC, nErr = ss.User().Save(userC) userC, nErr = ss.User().Save(rctx, userC)
require.NoError(t, nErr) require.NoError(t, nErr)
// add users to group (but not userC) // add users to group (but not userC)
@ -2818,14 +2818,14 @@ func testGetGroupsByChannel(t *testing.T, rctx request.CTX, ss store.Store) {
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user1, err := ss.User().Save(u1) user1, err := ss.User().Save(rctx, u1)
require.NoError(t, err) require.NoError(t, err)
u2 := &model.User{ u2 := &model.User{
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user2, err := ss.User().Save(u2) user2, err := ss.User().Save(rctx, u2)
require.NoError(t, err) require.NoError(t, err)
_, err = ss.Group().UpsertMember(group1.Id, user1.Id) _, err = ss.Group().UpsertMember(group1.Id, user1.Id)
@ -3066,14 +3066,14 @@ func testGetGroupsAssociatedToChannelsByTeam(t *testing.T, rctx request.CTX, ss
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user1, err := ss.User().Save(u1) user1, err := ss.User().Save(rctx, u1)
require.NoError(t, err) require.NoError(t, err)
u2 := &model.User{ u2 := &model.User{
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user2, err := ss.User().Save(u2) user2, err := ss.User().Save(rctx, u2)
require.NoError(t, err) require.NoError(t, err)
_, err = ss.Group().UpsertMember(group1.Id, user1.Id) _, err = ss.Group().UpsertMember(group1.Id, user1.Id)
@ -3303,14 +3303,14 @@ func testGetGroupsByTeam(t *testing.T, rctx request.CTX, ss store.Store) {
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user1, err := ss.User().Save(u1) user1, err := ss.User().Save(rctx, u1)
require.NoError(t, err) require.NoError(t, err)
u2 := &model.User{ u2 := &model.User{
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user2, err := ss.User().Save(u2) user2, err := ss.User().Save(rctx, u2)
require.NoError(t, err) require.NoError(t, err)
_, err = ss.Group().UpsertMember(group1.Id, user1.Id) _, err = ss.Group().UpsertMember(group1.Id, user1.Id)
@ -3602,21 +3602,21 @@ func testGetGroups(t *testing.T, rctx request.CTX, ss store.Store) {
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user1, err := ss.User().Save(u1) user1, err := ss.User().Save(rctx, u1)
require.NoError(t, err) require.NoError(t, err)
u2 := &model.User{ u2 := &model.User{
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user2, err := ss.User().Save(u2) user2, err := ss.User().Save(rctx, u2)
require.NoError(t, err) require.NoError(t, err)
u3 := &model.User{ u3 := &model.User{
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user3, err := ss.User().Save(u3) user3, err := ss.User().Save(rctx, u3)
require.NoError(t, err) require.NoError(t, err)
_, err = ss.Group().UpsertMember(group1.Id, user1.Id) _, err = ss.Group().UpsertMember(group1.Id, user1.Id)
@ -4020,7 +4020,7 @@ func testTeamMembersMinusGroupMembers(t *testing.T, rctx request.CTX, ss store.S
Email: MakeEmail(), Email: MakeEmail(),
Username: fmt.Sprintf("%d_%s", i, model.NewId()), Username: fmt.Sprintf("%d_%s", i, model.NewId()),
} }
user, err = ss.User().Save(user) user, err = ss.User().Save(rctx, user)
require.NoError(t, err) require.NoError(t, err)
users = append(users, user) users = append(users, user)
@ -4034,7 +4034,7 @@ func testTeamMembersMinusGroupMembers(t *testing.T, rctx request.CTX, ss store.S
Email: MakeEmail(), Email: MakeEmail(),
Username: "99_" + model.NewId(), Username: "99_" + model.NewId(),
} }
user, err = ss.User().Save(user) user, err = ss.User().Save(rctx, user)
require.NoError(t, err) require.NoError(t, err)
users = append(users, user) users = append(users, user)
_, nErr := ss.Team().SaveMember(rctx, &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)
@ -4172,7 +4172,7 @@ func testChannelMembersMinusGroupMembers(t *testing.T, rctx request.CTX, ss stor
Email: MakeEmail(), Email: MakeEmail(),
Username: fmt.Sprintf("%d_%s", i, model.NewId()), Username: fmt.Sprintf("%d_%s", i, model.NewId()),
} }
user, err = ss.User().Save(user) user, err = ss.User().Save(rctx, user)
require.NoError(t, err) require.NoError(t, err)
users = append(users, user) users = append(users, user)
@ -4188,7 +4188,7 @@ func testChannelMembersMinusGroupMembers(t *testing.T, rctx request.CTX, ss stor
} }
// Extra user outside of the group member users. // Extra user outside of the group member users.
user, err := ss.User().Save(&model.User{ user, err := ss.User().Save(rctx, &model.User{
Email: MakeEmail(), Email: MakeEmail(),
Username: "99_" + model.NewId(), Username: "99_" + model.NewId(),
}) })
@ -4331,7 +4331,7 @@ func groupTestGetMemberCount(t *testing.T, rctx request.CTX, ss store.Store) {
Email: MakeEmail(), Email: MakeEmail(),
Username: fmt.Sprintf("%d_%s", i, model.NewId()), Username: fmt.Sprintf("%d_%s", i, model.NewId()),
} }
user, nErr = ss.User().Save(user) user, nErr = ss.User().Save(rctx, user)
require.NoError(t, nErr) require.NoError(t, nErr)
_, err = ss.Group().UpsertMember(group.Id, user.Id) _, err = ss.Group().UpsertMember(group.Id, user.Id)
@ -4356,7 +4356,7 @@ func groupTestAdminRoleGroupsForSyncableMemberChannel(t *testing.T, rctx request
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user, err := ss.User().Save(user) user, err := ss.User().Save(rctx, user)
require.NoError(t, err) require.NoError(t, err)
group1 := &model.Group{ group1 := &model.Group{
@ -4444,7 +4444,7 @@ func groupTestAdminRoleGroupsForSyncableMemberTeam(t *testing.T, rctx request.CT
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user, err := ss.User().Save(user) user, err := ss.User().Save(rctx, user)
require.NoError(t, err) require.NoError(t, err)
group1 := &model.Group{ group1 := &model.Group{
@ -4531,21 +4531,21 @@ func groupTestPermittedSyncableAdminsTeam(t *testing.T, rctx request.CTX, ss sto
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user1, err := ss.User().Save(user1) user1, err := ss.User().Save(rctx, user1)
require.NoError(t, err) require.NoError(t, err)
user2 := &model.User{ user2 := &model.User{
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user2, err = ss.User().Save(user2) user2, err = ss.User().Save(rctx, user2)
require.NoError(t, err) require.NoError(t, err)
user3 := &model.User{ user3 := &model.User{
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user3, err = ss.User().Save(user3) user3, err = ss.User().Save(rctx, user3)
require.NoError(t, err) require.NoError(t, err)
group1 := &model.Group{ group1 := &model.Group{
@ -4637,21 +4637,21 @@ func groupTestPermittedSyncableAdminsChannel(t *testing.T, rctx request.CTX, ss
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user1, err := ss.User().Save(user1) user1, err := ss.User().Save(rctx, user1)
require.NoError(t, err) require.NoError(t, err)
user2 := &model.User{ user2 := &model.User{
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user2, err = ss.User().Save(user2) user2, err = ss.User().Save(rctx, user2)
require.NoError(t, err) require.NoError(t, err)
user3 := &model.User{ user3 := &model.User{
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user3, err = ss.User().Save(user3) user3, err = ss.User().Save(rctx, user3)
require.NoError(t, err) require.NoError(t, err)
group1 := &model.Group{ group1 := &model.Group{
@ -4757,28 +4757,28 @@ func groupTestpUpdateMembersRoleTeam(t *testing.T, rctx request.CTX, ss store.St
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user1, err = ss.User().Save(user1) user1, err = ss.User().Save(rctx, user1)
require.NoError(t, err) require.NoError(t, err)
user2 := &model.User{ user2 := &model.User{
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user2, err = ss.User().Save(user2) user2, err = ss.User().Save(rctx, user2)
require.NoError(t, err) require.NoError(t, err)
user3 := &model.User{ user3 := &model.User{
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user3, err = ss.User().Save(user3) user3, err = ss.User().Save(rctx, user3)
require.NoError(t, err) require.NoError(t, err)
user4 := &model.User{ user4 := &model.User{
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user4, err = ss.User().Save(user4) user4, err = ss.User().Save(rctx, user4)
require.NoError(t, err) require.NoError(t, err)
for _, user := range []*model.User{user1, user2, user3} { for _, user := range []*model.User{user1, user2, user3} {
@ -4857,28 +4857,28 @@ func groupTestpUpdateMembersRoleChannel(t *testing.T, rctx request.CTX, ss store
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user1, err = ss.User().Save(user1) user1, err = ss.User().Save(rctx, user1)
require.NoError(t, err) require.NoError(t, err)
user2 := &model.User{ user2 := &model.User{
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user2, err = ss.User().Save(user2) user2, err = ss.User().Save(rctx, user2)
require.NoError(t, err) require.NoError(t, err)
user3 := &model.User{ user3 := &model.User{
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user3, err = ss.User().Save(user3) user3, err = ss.User().Save(rctx, user3)
require.NoError(t, err) require.NoError(t, err)
user4 := &model.User{ user4 := &model.User{
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user4, err = ss.User().Save(user4) user4, err = ss.User().Save(rctx, user4)
require.NoError(t, err) require.NoError(t, err)
for _, user := range []*model.User{user1, user2, user3} { for _, user := range []*model.User{user1, user2, user3} {
@ -5079,14 +5079,14 @@ func groupTestGroupMemberCount(t *testing.T, rctx request.CTX, ss store.Store) {
Email: fmt.Sprintf("test.%s@localhost", model.NewId()), Email: fmt.Sprintf("test.%s@localhost", model.NewId()),
Username: model.NewId(), Username: model.NewId(),
} }
user, err := ss.User().Save(user) user, err := ss.User().Save(rctx, user)
require.NoError(t, err) require.NoError(t, err)
user2 := &model.User{ user2 := &model.User{
Email: fmt.Sprintf("test.%s@localhost", model.NewId()), Email: fmt.Sprintf("test.%s@localhost", model.NewId()),
Username: model.NewId(), Username: model.NewId(),
} }
user2, err = ss.User().Save(user2) user2, err = ss.User().Save(rctx, user2)
require.NoError(t, err) require.NoError(t, err)
group, err := ss.Group().Create(&model.Group{ group, err := ss.Group().Create(&model.Group{
@ -5138,14 +5138,14 @@ func groupTestDistinctGroupMemberCount(t *testing.T, rctx request.CTX, ss store.
Email: fmt.Sprintf("test.%s@localhost", model.NewId()), Email: fmt.Sprintf("test.%s@localhost", model.NewId()),
Username: model.NewId(), Username: model.NewId(),
} }
user, err = ss.User().Save(user) user, err = ss.User().Save(rctx, user)
require.NoError(t, err) require.NoError(t, err)
user2 := &model.User{ user2 := &model.User{
Email: fmt.Sprintf("test.%s@localhost", model.NewId()), Email: fmt.Sprintf("test.%s@localhost", model.NewId()),
Username: model.NewId(), Username: model.NewId(),
} }
user2, err = ss.User().Save(user2) user2, err = ss.User().Save(rctx, user2)
require.NoError(t, err) require.NoError(t, err)
member1, err := ss.Group().UpsertMember(group1.Id, user.Id) member1, err := ss.Group().UpsertMember(group1.Id, user.Id)
@ -5220,14 +5220,14 @@ func groupTestGetMember(t *testing.T, rctx request.CTX, ss store.Store) {
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user1, nErr := ss.User().Save(u1) user1, nErr := ss.User().Save(rctx, u1)
require.NoError(t, nErr) require.NoError(t, nErr)
u2 := &model.User{ u2 := &model.User{
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user2, nErr := ss.User().Save(u2) user2, nErr := ss.User().Save(rctx, u2)
require.NoError(t, nErr) require.NoError(t, nErr)
_, err = ss.Group().UpsertMember(group.Id, user1.Id) _, err = ss.Group().UpsertMember(group.Id, user1.Id)
@ -5257,14 +5257,14 @@ func groupTestGetNonMemberUsersPage(t *testing.T, rctx request.CTX, ss store.Sto
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user1, nErr := ss.User().Save(u1) user1, nErr := ss.User().Save(rctx, u1)
require.NoError(t, nErr) require.NoError(t, nErr)
u2 := &model.User{ u2 := &model.User{
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
_, nErr = ss.User().Save(u2) _, nErr = ss.User().Save(rctx, u2)
require.NoError(t, nErr) require.NoError(t, nErr)
users, err := ss.Group().GetNonMemberUsersPage(group.Id, 0, 1000, nil) users, err := ss.Group().GetNonMemberUsersPage(group.Id, 0, 1000, nil)
@ -5317,14 +5317,14 @@ func groupTestDistinctGroupMemberCountForSource(t *testing.T, rctx request.CTX,
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user1, nErr := ss.User().Save(u1) user1, nErr := ss.User().Save(rctx, u1)
require.NoError(t, nErr) require.NoError(t, nErr)
u2 := &model.User{ u2 := &model.User{
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
} }
user2, nErr := ss.User().Save(u2) user2, nErr := ss.User().Save(rctx, u2)
require.NoError(t, nErr) require.NoError(t, nErr)
// add both new users to both new groups // add both new users to both new groups

18
server/channels/store/storetest/mocks/UserStore.go
View File

@ -1412,25 +1412,25 @@ func (_m *UserStore) ResetLastPictureUpdate(userID string) error {
return r0 return r0
} }
// Save provides a mock function with given fields: user // Save provides a mock function with given fields: rctx, user
func (_m *UserStore) Save(user *model.User) (*model.User, error) { func (_m *UserStore) Save(rctx request.CTX, user *model.User) (*model.User, error) {
ret := _m.Called(user) ret := _m.Called(rctx, user)
var r0 *model.User var r0 *model.User
var r1 error var r1 error
if rf, ok := ret.Get(0).(func(*model.User) (*model.User, error)); ok { if rf, ok := ret.Get(0).(func(request.CTX, *model.User) (*model.User, error)); ok {
return rf(user) return rf(rctx, user)
} }
if rf, ok := ret.Get(0).(func(*model.User) *model.User); ok { if rf, ok := ret.Get(0).(func(request.CTX, *model.User) *model.User); ok {
r0 = rf(user) r0 = rf(rctx, user)
} else { } else {
if ret.Get(0) != nil { if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.User) r0 = ret.Get(0).(*model.User)
} }
} }
if rf, ok := ret.Get(1).(func(*model.User) error); ok { if rf, ok := ret.Get(1).(func(request.CTX, *model.User) error); ok {
r1 = rf(user) r1 = rf(rctx, user)
} else { } else {
r1 = ret.Error(1) r1 = ret.Error(1)
} }

18
server/channels/store/storetest/post_store.go
View File

@ -4283,7 +4283,7 @@ func testPostStoreGetParentsForExportAfter(t *testing.T, rctx request.CTX, ss st
u1.Username = model.NewId() u1.Username = model.NewId()
u1.Email = MakeEmail() u1.Email = MakeEmail()
u1.Nickname = model.NewId() u1.Nickname = model.NewId()
_, err = ss.User().Save(&u1) _, err = ss.User().Save(rctx, &u1)
require.NoError(t, err) require.NoError(t, err)
p1 := &model.Post{} p1 := &model.Post{}
@ -4366,7 +4366,7 @@ func testPostStoreGetRepliesForExport(t *testing.T, rctx request.CTX, ss store.S
u1 := model.User{} u1 := model.User{}
u1.Email = MakeEmail() u1.Email = MakeEmail()
u1.Nickname = model.NewId() u1.Nickname = model.NewId()
_, err = ss.User().Save(&u1) _, err = ss.User().Save(rctx, &u1)
require.NoError(t, err) require.NoError(t, err)
p1 := &model.Post{} p1 := &model.Post{}
@ -4424,7 +4424,7 @@ func testPostStoreGetDirectPostParentsForExportAfter(t *testing.T, rctx request.
u1 := &model.User{} u1 := &model.User{}
u1.Email = MakeEmail() u1.Email = MakeEmail()
u1.Nickname = model.NewId() u1.Nickname = model.NewId()
_, err := ss.User().Save(u1) _, err := ss.User().Save(rctx, u1)
require.NoError(t, err) require.NoError(t, err)
_, nErr := ss.Team().SaveMember(rctx, &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) require.NoError(t, nErr)
@ -4432,7 +4432,7 @@ func testPostStoreGetDirectPostParentsForExportAfter(t *testing.T, rctx request.
u2 := &model.User{} u2 := &model.User{}
u2.Email = MakeEmail() u2.Email = MakeEmail()
u2.Nickname = model.NewId() u2.Nickname = model.NewId()
_, err = ss.User().Save(u2) _, err = ss.User().Save(rctx, u2)
require.NoError(t, err) require.NoError(t, err)
_, nErr = ss.Team().SaveMember(rctx, &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) require.NoError(t, nErr)
@ -4479,7 +4479,7 @@ func testPostStoreGetDirectPostParentsForExportAfterDeleted(t *testing.T, rctx r
u1.DeleteAt = 1 u1.DeleteAt = 1
u1.Email = MakeEmail() u1.Email = MakeEmail()
u1.Nickname = model.NewId() u1.Nickname = model.NewId()
_, err := ss.User().Save(u1) _, err := ss.User().Save(rctx, u1)
require.NoError(t, err) require.NoError(t, err)
_, nErr := ss.Team().SaveMember(rctx, &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) require.NoError(t, nErr)
@ -4488,7 +4488,7 @@ func testPostStoreGetDirectPostParentsForExportAfterDeleted(t *testing.T, rctx r
u2.DeleteAt = 1 u2.DeleteAt = 1
u2.Email = MakeEmail() u2.Email = MakeEmail()
u2.Nickname = model.NewId() u2.Nickname = model.NewId()
_, err = ss.User().Save(u2) _, err = ss.User().Save(rctx, u2)
require.NoError(t, err) require.NoError(t, err)
_, nErr = ss.Team().SaveMember(rctx, &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) require.NoError(t, nErr)
@ -4543,7 +4543,7 @@ func testPostStoreGetDirectPostParentsForExportAfterBatched(t *testing.T, rctx r
u1 := &model.User{} u1 := &model.User{}
u1.Email = MakeEmail() u1.Email = MakeEmail()
u1.Nickname = model.NewId() u1.Nickname = model.NewId()
_, err := ss.User().Save(u1) _, err := ss.User().Save(rctx, u1)
require.NoError(t, err) require.NoError(t, err)
_, nErr := ss.Team().SaveMember(rctx, &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) require.NoError(t, nErr)
@ -4551,7 +4551,7 @@ func testPostStoreGetDirectPostParentsForExportAfterBatched(t *testing.T, rctx r
u2 := &model.User{} u2 := &model.User{}
u2.Email = MakeEmail() u2.Email = MakeEmail()
u2.Nickname = model.NewId() u2.Nickname = model.NewId()
_, err = ss.User().Save(u2) _, err = ss.User().Save(rctx, u2)
require.NoError(t, err) require.NoError(t, err)
_, nErr = ss.Team().SaveMember(rctx, &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) require.NoError(t, nErr)
@ -4982,7 +4982,7 @@ func testGetPostReminderMetadata(t *testing.T, rctx request.CTX, ss store.Store,
Locale: "es", Locale: "es",
} }
u1, err = ss.User().Save(u1) u1, err = ss.User().Save(rctx, u1)
require.NoError(t, err) require.NoError(t, err)
p1 := &model.Post{ p1 := &model.Post{

2
server/channels/store/storetest/retention_policy_store.go
View File

@ -614,7 +614,7 @@ func testRetentionPolicyStoreGetPoliciesForUser(t *testing.T, rctx request.CTX,
defer deleteTeamsAndChannels(rctx, ss, teamIDs, channelIDs) defer deleteTeamsAndChannels(rctx, ss, teamIDs, channelIDs)
defer cleanupRetentionPolicyTest(s) defer cleanupRetentionPolicyTest(s)
user, userSaveErr := ss.User().Save(&model.User{ user, userSaveErr := ss.User().Save(rctx, &model.User{
Email: MakeEmail(), Email: MakeEmail(),
Username: model.NewId(), Username: model.NewId(),
}) })

12
server/channels/store/storetest/shared_channel_store.go
View File

@ -185,7 +185,7 @@ func testHasSharedChannel(t *testing.T, rctx request.CTX, ss store.Store) {
func testGetSharedChannels(t *testing.T, rctx request.CTX, ss store.Store) { func testGetSharedChannels(t *testing.T, rctx request.CTX, ss store.Store) {
require.NoError(t, clearSharedChannels(ss)) require.NoError(t, clearSharedChannels(ss))
user, err := createTestUser(ss, "gary.goodspeed") user, err := createTestUser(rctx, ss, "gary.goodspeed")
require.NoError(t, err) require.NoError(t, err)
creator := model.NewId() creator := model.NewId()
@ -843,12 +843,12 @@ func testDeleteSharedChannelRemote(t *testing.T, rctx request.CTX, ss store.Stor
}) })
} }
func createTestUser(ss store.Store, username string) (*model.User, error) { func createTestUser(rctx request.CTX, ss store.Store, username string) (*model.User, error) {
user := &model.User{ user := &model.User{
Username: username, Username: username,
Email: "gary@example.com", Email: "gary@example.com",
} }
return ss.User().Save(user) return ss.User().Save(rctx, user)
} }
func createTestChannel(ss store.Store, rctx request.CTX, name string) (*model.Channel, error) { func createTestChannel(ss store.Store, rctx request.CTX, name string) (*model.Channel, error) {
@ -1026,7 +1026,7 @@ func testGetSharedChannelUsersForSync(t *testing.T, rctx request.CTX, ss store.S
Email: model.NewId() + "@example.com", Email: model.NewId() + "@example.com",
LastPictureUpdate: model.GetMillis(), LastPictureUpdate: model.GetMillis(),
} }
u, err := ss.User().Save(u) u, err := ss.User().Save(rctx, u)
require.NoError(t, err) require.NoError(t, err)
users = append(users, u) users = append(users, u)
} }
@ -1098,7 +1098,7 @@ func testUpdateSharedChannelUserLastSyncAt(t *testing.T, rctx request.CTX, ss st
Email: model.NewId() + "@example.com", Email: model.NewId() + "@example.com",
LastPictureUpdate: model.GetMillis() - 300000, // 5 mins LastPictureUpdate: model.GetMillis() - 300000, // 5 mins
} }
u1, err := ss.User().Save(u1) u1, err := ss.User().Save(rctx, u1)
require.NoError(t, err) require.NoError(t, err)
u2 := &model.User{ u2 := &model.User{
@ -1106,7 +1106,7 @@ func testUpdateSharedChannelUserLastSyncAt(t *testing.T, rctx request.CTX, ss st
Email: model.NewId() + "@example.com", Email: model.NewId() + "@example.com",
LastPictureUpdate: model.GetMillis() + 300000, LastPictureUpdate: model.GetMillis() + 300000,
} }
u2, err = ss.User().Save(u2) u2, err = ss.User().Save(rctx, u2)
require.NoError(t, err) require.NoError(t, err)
channelID := model.NewId() channelID := model.NewId()

80
server/channels/store/storetest/team_store.go
View File

@ -1206,17 +1206,17 @@ func testGetMembers(t *testing.T, rctx request.CTX, ss store.Store) {
u5 := &model.User{Username: "e", Email: MakeEmail(), DeleteAt: int64(1)} u5 := &model.User{Username: "e", Email: MakeEmail(), DeleteAt: int64(1)}
u6 := &model.User{Username: "d", Email: MakeEmail()} u6 := &model.User{Username: "d", Email: MakeEmail()}
u1, err := ss.User().Save(u1) u1, err := ss.User().Save(rctx, u1)
require.NoError(t, err) require.NoError(t, err)
u2, err = ss.User().Save(u2) u2, err = ss.User().Save(rctx, u2)
require.NoError(t, err) require.NoError(t, err)
u3, err = ss.User().Save(u3) u3, err = ss.User().Save(rctx, u3)
require.NoError(t, err) require.NoError(t, err)
u4, err = ss.User().Save(u4) u4, err = ss.User().Save(rctx, u4)
require.NoError(t, err) require.NoError(t, err)
u5, err = ss.User().Save(u5) u5, err = ss.User().Save(rctx, u5)
require.NoError(t, err) require.NoError(t, err)
u6, err = ss.User().Save(u6) u6, err = ss.User().Save(rctx, u6)
require.NoError(t, err) require.NoError(t, err)
m1 := &model.TeamMember{TeamId: teamId1, UserId: u1.Id} m1 := &model.TeamMember{TeamId: teamId1, UserId: u1.Id}
@ -1258,17 +1258,17 @@ func testGetMembers(t *testing.T, rctx request.CTX, ss store.Store) {
u5 := &model.User{Email: MakeEmail()} u5 := &model.User{Email: MakeEmail()}
u6 := &model.User{Email: MakeEmail(), DeleteAt: int64(5)} u6 := &model.User{Email: MakeEmail(), DeleteAt: int64(5)}
u1, err := ss.User().Save(u1) u1, err := ss.User().Save(rctx, u1)
require.NoError(t, err) require.NoError(t, err)
u2, err = ss.User().Save(u2) u2, err = ss.User().Save(rctx, u2)
require.NoError(t, err) require.NoError(t, err)
u3, err = ss.User().Save(u3) u3, err = ss.User().Save(rctx, u3)
require.NoError(t, err) require.NoError(t, err)
u4, err = ss.User().Save(u4) u4, err = ss.User().Save(rctx, u4)
require.NoError(t, err) require.NoError(t, err)
u5, err = ss.User().Save(u5) u5, err = ss.User().Save(rctx, u5)
require.NoError(t, err) require.NoError(t, err)
u6, err = ss.User().Save(u6) u6, err = ss.User().Save(rctx, u6)
require.NoError(t, err) require.NoError(t, err)
m1 := &model.TeamMember{TeamId: teamId1, UserId: u1.Id} m1 := &model.TeamMember{TeamId: teamId1, UserId: u1.Id}
@ -1377,9 +1377,9 @@ func testTeamMembers(t *testing.T, rctx request.CTX, ss store.Store) {
} }
func testTeamSaveMember(t *testing.T, rctx request.CTX, ss store.Store) { func testTeamSaveMember(t *testing.T, rctx request.CTX, ss store.Store) {
u1, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) u1, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
require.NoError(t, err) require.NoError(t, err)
u2, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) u2, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
require.NoError(t, err) require.NoError(t, err)
t.Run("not valid team member", func(t *testing.T) { t.Run("not valid team member", func(t *testing.T) {
@ -1713,13 +1713,13 @@ func testTeamSaveMember(t *testing.T, rctx request.CTX, ss store.Store) {
} }
func testTeamSaveMultipleMembers(t *testing.T, rctx request.CTX, ss store.Store) { func testTeamSaveMultipleMembers(t *testing.T, rctx request.CTX, ss store.Store) {
u1, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) u1, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
require.NoError(t, err) require.NoError(t, err)
u2, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) u2, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
require.NoError(t, err) require.NoError(t, err)
u3, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) u3, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
require.NoError(t, err) require.NoError(t, err)
u4, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) u4, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
require.NoError(t, err) require.NoError(t, err)
t.Run("any not valid team member", func(t *testing.T) { t.Run("any not valid team member", func(t *testing.T) {
@ -2092,7 +2092,7 @@ func testTeamSaveMultipleMembers(t *testing.T, rctx request.CTX, ss store.Store)
} }
func testTeamUpdateMember(t *testing.T, rctx request.CTX, ss store.Store) { func testTeamUpdateMember(t *testing.T, rctx request.CTX, ss store.Store) {
u1, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) u1, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
require.NoError(t, err) require.NoError(t, err)
t.Run("not valid team member", func(t *testing.T) { t.Run("not valid team member", func(t *testing.T) {
@ -2398,9 +2398,9 @@ func testTeamUpdateMember(t *testing.T, rctx request.CTX, ss store.Store) {
} }
func testTeamUpdateMultipleMembers(t *testing.T, rctx request.CTX, ss store.Store) { func testTeamUpdateMultipleMembers(t *testing.T, rctx request.CTX, ss store.Store) {
u1, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) u1, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
require.NoError(t, err) require.NoError(t, err)
u2, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) u2, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
require.NoError(t, err) require.NoError(t, err)
t.Run("any not valid team member", func(t *testing.T) { t.Run("any not valid team member", func(t *testing.T) {
@ -2721,13 +2721,13 @@ func testTeamUpdateMultipleMembers(t *testing.T, rctx request.CTX, ss store.Stor
} }
func testTeamRemoveMember(t *testing.T, rctx request.CTX, ss store.Store) { func testTeamRemoveMember(t *testing.T, rctx request.CTX, ss store.Store) {
u1, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) u1, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
require.NoError(t, err) require.NoError(t, err)
u2, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) u2, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
require.NoError(t, err) require.NoError(t, err)
u3, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) u3, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
require.NoError(t, err) require.NoError(t, err)
u4, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) u4, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
require.NoError(t, err) require.NoError(t, err)
teamID := model.NewId() teamID := model.NewId()
m1 := &model.TeamMember{TeamId: teamID, UserId: u1.Id} m1 := &model.TeamMember{TeamId: teamID, UserId: u1.Id}
@ -2767,13 +2767,13 @@ func testTeamRemoveMember(t *testing.T, rctx request.CTX, ss store.Store) {
} }
func testTeamRemoveMembers(t *testing.T, rctx request.CTX, ss store.Store) { func testTeamRemoveMembers(t *testing.T, rctx request.CTX, ss store.Store) {
u1, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) u1, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
require.NoError(t, err) require.NoError(t, err)
u2, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) u2, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
require.NoError(t, err) require.NoError(t, err)
u3, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) u3, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
require.NoError(t, err) require.NoError(t, err)
u4, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) u4, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
require.NoError(t, err) require.NoError(t, err)
teamID := model.NewId() teamID := model.NewId()
m1 := &model.TeamMember{TeamId: teamID, UserId: u1.Id} m1 := &model.TeamMember{TeamId: teamID, UserId: u1.Id}
@ -2887,7 +2887,7 @@ func testSaveTeamMemberMaxMembers(t *testing.T, rctx request.CTX, ss store.Store
userIds := make([]string, maxUsersPerTeam) userIds := make([]string, maxUsersPerTeam)
for i := 0; i < maxUsersPerTeam; i++ { for i := 0; i < maxUsersPerTeam; i++ {
user, err := ss.User().Save(&model.User{ user, err := ss.User().Save(rctx, &model.User{
Username: NewTestId(), Username: NewTestId(),
Email: MakeEmail(), Email: MakeEmail(),
}) })
@ -2913,7 +2913,7 @@ func testSaveTeamMemberMaxMembers(t *testing.T, rctx request.CTX, ss store.Store
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, int(totalMemberCount), maxUsersPerTeam, "should start with 5 team members, had %v instead", totalMemberCount) require.Equal(t, int(totalMemberCount), maxUsersPerTeam, "should start with 5 team members, had %v instead", totalMemberCount)
user, nErr := ss.User().Save(&model.User{ user, nErr := ss.User().Save(rctx, &model.User{
Username: NewTestId(), Username: NewTestId(),
Email: MakeEmail(), Email: MakeEmail(),
}) })
@ -2961,7 +2961,7 @@ func testSaveTeamMemberMaxMembers(t *testing.T, rctx request.CTX, ss store.Store
_, nErr = ss.User().Update(rctx, user2, true) _, nErr = ss.User().Update(rctx, user2, true)
require.NoError(t, nErr) require.NoError(t, nErr)
user, nErr = ss.User().Save(&model.User{ user, nErr = ss.User().Save(rctx, &model.User{
Username: NewTestId(), Username: NewTestId(),
Email: MakeEmail(), Email: MakeEmail(),
}) })
@ -3068,13 +3068,13 @@ func testGetTeamMembersByIds(t *testing.T, rctx request.CTX, ss store.Store) {
func testTeamStoreMemberCount(t *testing.T, rctx request.CTX, ss store.Store) { func testTeamStoreMemberCount(t *testing.T, rctx request.CTX, ss store.Store) {
u1 := &model.User{} u1 := &model.User{}
u1.Email = MakeEmail() u1.Email = MakeEmail()
_, err := ss.User().Save(u1) _, err := ss.User().Save(rctx, u1)
require.NoError(t, err) require.NoError(t, err)
u2 := &model.User{} u2 := &model.User{}
u2.Email = MakeEmail() u2.Email = MakeEmail()
u2.DeleteAt = 1 u2.DeleteAt = 1
_, err = ss.User().Save(u2) _, err = ss.User().Save(rctx, u2)
require.NoError(t, err) require.NoError(t, err)
teamId1 := model.NewId() teamId1 := model.NewId()
@ -3558,13 +3558,13 @@ func testTeamStoreGetTeamMembersForExport(t *testing.T, rctx request.CTX, ss sto
u1 := model.User{} u1 := model.User{}
u1.Email = MakeEmail() u1.Email = MakeEmail()
u1.Nickname = NewTestId() u1.Nickname = NewTestId()
_, err = ss.User().Save(&u1) _, err = ss.User().Save(rctx, &u1)
require.NoError(t, err) require.NoError(t, err)
u2 := model.User{} u2 := model.User{}
u2.Email = MakeEmail() u2.Email = MakeEmail()
u2.Nickname = NewTestId() u2.Nickname = NewTestId()
_, err = ss.User().Save(&u2) _, err = ss.User().Save(rctx, &u2)
require.NoError(t, err) require.NoError(t, err)
m1 := &model.TeamMember{TeamId: t1.Id, UserId: u1.Id} m1 := &model.TeamMember{TeamId: t1.Id, UserId: u1.Id}
@ -3655,14 +3655,14 @@ func testGetCommonTeamIDsForMultipleUsers(t *testing.T, rctx request.CTX, ss sto
u1 := model.User{} u1 := model.User{}
u1.Email = MakeEmail() u1.Email = MakeEmail()
u1.Nickname = NewTestId() u1.Nickname = NewTestId()
_, err = ss.User().Save(&u1) _, err = ss.User().Save(rctx, &u1)
require.NoError(t, err) require.NoError(t, err)
// User 2 // User 2
u2 := model.User{} u2 := model.User{}
u2.Email = MakeEmail() u2.Email = MakeEmail()
u2.Nickname = NewTestId() u2.Nickname = NewTestId()
_, err = ss.User().Save(&u2) _, err = ss.User().Save(rctx, &u2)
require.NoError(t, err) require.NoError(t, err)
t.Run("multiple common teams exist", func(t *testing.T) { t.Run("multiple common teams exist", func(t *testing.T) {
@ -3772,14 +3772,14 @@ func testGetCommonTeamIDsForMultipleUsers(t *testing.T, rctx request.CTX, ss sto
u3 := model.User{} u3 := model.User{}
u3.Email = MakeEmail() u3.Email = MakeEmail()
u3.Nickname = NewTestId() u3.Nickname = NewTestId()
_, err = ss.User().Save(&u3) _, err = ss.User().Save(rctx, &u3)
require.NoError(t, err) require.NoError(t, err)
// User 4 // User 4
u4 := model.User{} u4 := model.User{}
u4.Email = MakeEmail() u4.Email = MakeEmail()
u4.Nickname = NewTestId() u4.Nickname = NewTestId()
_, err = ss.User().Save(&u4) _, err = ss.User().Save(rctx, &u4)
require.NoError(t, err) require.NoError(t, err)
// Add user 1 in team 1 and 2 // Add user 1 in team 1 and 2

6
server/channels/store/storetest/terms_of_service_store.go
View File

@ -37,7 +37,7 @@ func testSaveTermsOfService(t *testing.T, rctx request.CTX, ss store.Store) {
u1.Username = model.NewId() u1.Username = model.NewId()
u1.Email = MakeEmail() u1.Email = MakeEmail()
u1.Nickname = model.NewId() u1.Nickname = model.NewId()
_, err := ss.User().Save(&u1) _, err := ss.User().Save(rctx, &u1)
require.NoError(t, err) require.NoError(t, err)
termsOfService := &model.TermsOfService{Text: "terms of service", UserId: u1.Id} termsOfService := &model.TermsOfService{Text: "terms of service", UserId: u1.Id}
@ -56,7 +56,7 @@ func testGetLatestTermsOfService(t *testing.T, rctx request.CTX, ss store.Store)
u1.Username = model.NewId() u1.Username = model.NewId()
u1.Email = MakeEmail() u1.Email = MakeEmail()
u1.Nickname = model.NewId() u1.Nickname = model.NewId()
_, err := ss.User().Save(&u1) _, err := ss.User().Save(rctx, &u1)
require.NoError(t, err) require.NoError(t, err)
termsOfService := &model.TermsOfService{Text: "terms of service 2", UserId: u1.Id} termsOfService := &model.TermsOfService{Text: "terms of service 2", UserId: u1.Id}
@ -76,7 +76,7 @@ func testGetTermsOfService(t *testing.T, rctx request.CTX, ss store.Store) {
u1.Username = model.NewId() u1.Username = model.NewId()
u1.Email = MakeEmail() u1.Email = MakeEmail()
u1.Nickname = model.NewId() u1.Nickname = model.NewId()
_, err := ss.User().Save(&u1) _, err := ss.User().Save(rctx, &u1)
require.NoError(t, err) require.NoError(t, err)
termsOfService := &model.TermsOfService{Text: "terms of service", UserId: u1.Id} termsOfService := &model.TermsOfService{Text: "terms of service", UserId: u1.Id}

6
server/channels/store/storetest/thread_store.go
View File

@ -39,7 +39,7 @@ func testThreadStorePopulation(t *testing.T, rctx request.CTX, ss store.Store) {
Username: model.NewId(), Username: model.NewId(),
} }
u, err := ss.User().Save(&u1) u, err := ss.User().Save(rctx, &u1)
require.NoError(t, err) require.NoError(t, err)
c, err2 := ss.Channel().Save(&model.Channel{ c, err2 := ss.Channel().Save(&model.Channel{
@ -806,12 +806,12 @@ func testVarious(t *testing.T, rctx request.CTX, ss store.Store) {
require.NoError(t, err) require.NoError(t, err)
} }
user1, err := ss.User().Save(&model.User{ user1, err := ss.User().Save(rctx, &model.User{
Username: "user1" + model.NewId(), Username: "user1" + model.NewId(),
Email: MakeEmail(), Email: MakeEmail(),
}) })
require.NoError(t, err) require.NoError(t, err)
user2, err := ss.User().Save(&model.User{ user2, err := ss.User().Save(rctx, &model.User{
Username: "user2" + model.NewId(), Username: "user2" + model.NewId(),
Email: MakeEmail(), Email: MakeEmail(),
}) })

2
server/channels/store/storetest/user_access_token_store.go
View File

@ -123,7 +123,7 @@ func testUserAccessTokenSearch(t *testing.T, rctx request.CTX, ss store.Store) {
u1.Email = MakeEmail() u1.Email = MakeEmail()
u1.Username = model.NewId() u1.Username = model.NewId()
_, err := ss.User().Save(&u1) _, err := ss.User().Save(rctx, &u1)
require.NoError(t, err) require.NoError(t, err)
uat := &model.UserAccessToken{ uat := &model.UserAccessToken{

386
server/channels/store/storetest/user_store.go
View File

File diff suppressed because it is too large Load Diff

4
server/channels/store/timerlayer/timerlayer.go
View File

@ -10994,10 +10994,10 @@ func (s *TimerLayerUserStore) ResetLastPictureUpdate(userID string) error {
return err return err
} }
func (s *TimerLayerUserStore) Save(user *model.User) (*model.User, error) { func (s *TimerLayerUserStore) Save(rctx request.CTX, user *model.User) (*model.User, error) {
start := time.Now() start := time.Now()
result, err := s.UserStore.Save(user) result, err := s.UserStore.Save(rctx, user)
elapsed := float64(time.Since(start)) / float64(time.Second) elapsed := float64(time.Since(start)) / float64(time.Second)
if s.Root.Metrics != nil { if s.Root.Metrics != nil {

6
server/platform/services/sharedchannel/sync_recv.go
View File

@ -181,7 +181,7 @@ func (scs *Service) upsertSyncUser(c request.CTX, user *model.User, channel *mod
var userSaved *model.User var userSaved *model.User
if euser == nil { if euser == nil {
if userSaved, err = scs.insertSyncUser(user, channel, rc); err != nil { if userSaved, err = scs.insertSyncUser(c, user, channel, rc); err != nil {
return nil, err return nil, err
} }
} else { } else {
@ -219,7 +219,7 @@ func (scs *Service) upsertSyncUser(c request.CTX, user *model.User, channel *mod
return userSaved, nil return userSaved, nil
} }
func (scs *Service) insertSyncUser(user *model.User, channel *model.Channel, rc *model.RemoteCluster) (*model.User, error) { func (scs *Service) insertSyncUser(rctx request.CTX, user *model.User, channel *model.Channel, rc *model.RemoteCluster) (*model.User, error) {
var err error var err error
var userSaved *model.User var userSaved *model.User
var suffix string var suffix string
@ -247,7 +247,7 @@ func (scs *Service) insertSyncUser(user *model.User, channel *model.Channel, rc
user.Username = mungUsername(user.Username, rc.Name, suffix, model.UserNameMaxLength) user.Username = mungUsername(user.Username, rc.Name, suffix, model.UserNameMaxLength)
user.Email = mungEmail(rc.Name, model.UserEmailMaxLength) user.Email = mungEmail(rc.Name, model.UserEmailMaxLength)
if userSaved, err = scs.server.GetStore().User().Save(user); err != nil { if userSaved, err = scs.server.GetStore().User().Save(rctx, user); err != nil {
field, ok := isConflictError(err) field, ok := isConflictError(err)
if !ok { if !ok {
break break

2
server/platform/services/slackimport/slackimport.go
View File

@ -706,7 +706,7 @@ func (si *SlackImporter) oldImportUser(rctx request.CTX, team *model.Team, user
user.Roles = model.SystemUserRoleId user.Roles = model.SystemUserRoleId
ruser, nErr := si.store.User().Save(user) ruser, nErr := si.store.User().Save(rctx, user)
if nErr != nil { if nErr != nil {
rctx.Logger().Debug("Error saving user.", mlog.Err(nErr)) rctx.Logger().Debug("Error saving user.", mlog.Err(nErr))
return nil return nil