[MM-55734] Add Request Context to ChannelStore.SaveMember (#26039)
* added rctx to reuired files * added more file changes after issues on startup * added context to draft_store --------- Co-authored-by: Mattermost Build <build@mattermost.com>
Этот коммит содержится в:
@@ -175,7 +175,7 @@ func (a *App) JoinDefaultChannels(c request.CTX, teamID string, user *model.User
|
||||
NotifyProps: model.GetDefaultChannelNotifyProps(),
|
||||
}
|
||||
|
||||
_, nErr = a.Srv().Store().Channel().SaveMember(cm)
|
||||
_, nErr = a.Srv().Store().Channel().SaveMember(c, cm)
|
||||
if histErr := a.Srv().Store().ChannelMemberHistory().LogJoinEvent(user.Id, channel.Id, model.GetMillis()); histErr != nil {
|
||||
return model.NewAppError("JoinDefaultChannels", "app.channel_member_history.log_join_event.internal_error", nil, "", http.StatusInternalServerError).Wrap(histErr)
|
||||
}
|
||||
@@ -352,7 +352,7 @@ func (a *App) CreateChannel(c request.CTX, channel *model.Channel, addMember boo
|
||||
NotifyProps: model.GetDefaultChannelNotifyProps(),
|
||||
}
|
||||
|
||||
if _, nErr := a.Srv().Store().Channel().SaveMember(cm); nErr != nil {
|
||||
if _, nErr := a.Srv().Store().Channel().SaveMember(c, cm); nErr != nil {
|
||||
var appErr *model.AppError
|
||||
var cErr *store.ErrConflict
|
||||
switch {
|
||||
@@ -648,7 +648,7 @@ func (a *App) createGroupChannel(c request.CTX, userIDs []string) (*model.Channe
|
||||
SchemeUser: !user.IsGuest(),
|
||||
}
|
||||
|
||||
if _, nErr = a.Srv().Store().Channel().SaveMember(cm); nErr != nil {
|
||||
if _, nErr = a.Srv().Store().Channel().SaveMember(c, cm); nErr != nil {
|
||||
var appErr *model.AppError
|
||||
var cErr *store.ErrConflict
|
||||
switch {
|
||||
@@ -1619,7 +1619,7 @@ func (a *App) addUserToChannel(c request.CTX, user *model.User, channel *model.C
|
||||
newMember.SchemeAdmin = userShouldBeAdmin
|
||||
}
|
||||
|
||||
newMember, nErr = a.Srv().Store().Channel().SaveMember(newMember)
|
||||
newMember, nErr = a.Srv().Store().Channel().SaveMember(c, newMember)
|
||||
if nErr != nil {
|
||||
return nil, model.NewAppError("AddUserToChannel", "api.channel.add_user.to.channel.failed.app_error", nil,
|
||||
fmt.Sprintf("failed to add member: %v, user_id: %s, channel_id: %s", nErr, user.Id, channel.Id), http.StatusInternalServerError)
|
||||
|
||||
@@ -206,7 +206,7 @@ func (th *TestHelper) addUserToChannel(channel *model.Channel, user *model.User)
|
||||
}
|
||||
|
||||
var err error
|
||||
newMember, err = th.store.Channel().SaveMember(newMember)
|
||||
newMember, err = th.store.Channel().SaveMember(th.Context, newMember)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user