[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>
Этот коммит содержится в:
@@ -1619,7 +1619,7 @@ func (s SqlChannelStore) SaveMultipleMembers(members []*model.ChannelMember) ([]
|
||||
return newMembers, nil
|
||||
}
|
||||
|
||||
func (s SqlChannelStore) SaveMember(member *model.ChannelMember) (*model.ChannelMember, error) {
|
||||
func (s SqlChannelStore) SaveMember(rctx request.CTX, member *model.ChannelMember) (*model.ChannelMember, error) {
|
||||
newMembers, err := s.SaveMultipleMembers([]*model.ChannelMember{member})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
||||
@@ -58,12 +58,12 @@ func createCommand(ss store.Store, userId, teamId string) *model.Command {
|
||||
return cmd
|
||||
}
|
||||
|
||||
func createChannelMember(ss store.Store, channelId, userId string) *model.ChannelMember {
|
||||
func createChannelMember(rctx request.CTX, ss store.Store, channelId, userId string) *model.ChannelMember {
|
||||
m := model.ChannelMember{}
|
||||
m.ChannelId = channelId
|
||||
m.UserId = userId
|
||||
m.NotifyProps = model.GetDefaultChannelNotifyProps()
|
||||
cm, _ := ss.Channel().SaveMember(&m)
|
||||
cm, _ := ss.Channel().SaveMember(rctx, &m)
|
||||
return cm
|
||||
}
|
||||
|
||||
@@ -83,8 +83,8 @@ func createChannelWithCreatorId(ss store.Store, id string) *model.Channel {
|
||||
return createChannel(ss, model.NewId(), id)
|
||||
}
|
||||
|
||||
func createChannelMemberWithChannelId(ss store.Store, id string) *model.ChannelMember {
|
||||
return createChannelMember(ss, id, model.NewId())
|
||||
func createChannelMemberWithChannelId(rctx request.CTX, ss store.Store, id string) *model.ChannelMember {
|
||||
return createChannelMember(rctx, ss, id, model.NewId())
|
||||
}
|
||||
|
||||
func createCommandWebhook(ss store.Store, commandId, userId, channelId string) *model.CommandWebhook {
|
||||
@@ -484,7 +484,7 @@ func TestCheckChannelsChannelMembersIntegrity(t *testing.T) {
|
||||
|
||||
t.Run("should generate a report with one record", func(t *testing.T) {
|
||||
channel := createChannel(ss, model.NewId(), model.NewId())
|
||||
member := createChannelMemberWithChannelId(ss, channel.Id)
|
||||
member := createChannelMemberWithChannelId(rctx, ss, channel.Id)
|
||||
dbmap.Exec(`DELETE FROM Channels Where Id=?`, channel.Id)
|
||||
result := checkChannelsChannelMembersIntegrity(store)
|
||||
require.NoError(t, result.Err)
|
||||
@@ -1110,7 +1110,7 @@ func TestCheckUsersChannelMembersIntegrity(t *testing.T) {
|
||||
t.Run("should generate a report with one record", func(t *testing.T) {
|
||||
user := createUser(ss)
|
||||
channel := createChannelWithCreatorId(ss, user.Id)
|
||||
member := createChannelMember(ss, channel.Id, user.Id)
|
||||
member := createChannelMember(rctx, ss, channel.Id, user.Id)
|
||||
dbmap.Exec(`DELETE FROM Users WHERE Id=?`, user.Id)
|
||||
result := checkUsersChannelMembersIntegrity(store)
|
||||
require.NoError(t, result.Err)
|
||||
|
||||
Ссылка в новой задаче
Block a user