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

MM-55733 add request context to Channelstore.Save method (#26141)

Просмотр исходного кода
Этот коммит содержится в:
Aswath S
2024-02-24 17:38:51 +05:30
коммит произвёл GitHub
родитель 401de9b321
Коммит dc8fc773dc
34 изменённых файлов: 481 добавлений и 484 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@@ -579,7 +579,7 @@ func (s SqlChannelStore) upsertPublicChannelT(transaction *sqlxTxWrapper, channe
}
// Save writes the (non-direct) channel to the database.
func (s SqlChannelStore) Save(channel *model.Channel, maxChannelsPerTeam int64) (_ *model.Channel, err error) {
func (s SqlChannelStore) Save(rctx request.CTX, channel *model.Channel, maxChannelsPerTeam int64) (_ *model.Channel, err error) {
if channel.DeleteAt != 0 {
return nil, store.NewErrInvalidInput("Channel", "DeleteAt", channel.DeleteAt)
}

40
server/channels/store/sqlstore/integrity_test.go
Просмотреть файл

@@ -24,18 +24,18 @@ func createAudit(ss store.Store, userId, sessionId string) *model.Audit {
return &audit
}
func createChannel(ss store.Store, teamId, creatorId string) *model.Channel {
func createChannel(rctx request.CTX, ss store.Store, teamId, creatorId string) *model.Channel {
m := model.Channel{}
m.TeamId = teamId
m.CreatorId = creatorId
m.DisplayName = "Name"
m.Name = "zz" + model.NewId() + "b"
m.Type = model.ChannelTypeOpen
c, _ := ss.Channel().Save(&m, -1)
c, _ := ss.Channel().Save(rctx, &m, -1)
return c
}
func createChannelWithSchemeId(ss store.Store, schemeId *string) *model.Channel {
func createChannelWithSchemeId(rctx request.CTX, ss store.Store, schemeId *string) *model.Channel {
m := model.Channel{}
m.SchemeId = schemeId
m.TeamId = model.NewId()
@@ -43,7 +43,7 @@ func createChannelWithSchemeId(ss store.Store, schemeId *string) *model.Channel
m.DisplayName = "Name"
m.Name = "zz" + model.NewId() + "b"
m.Type = model.ChannelTypeOpen
c, _ := ss.Channel().Save(&m, -1)
c, _ := ss.Channel().Save(rctx, &m, -1)
return c
}
@@ -75,12 +75,12 @@ func createChannelMemberHistory(ss store.Store, channelId, userId string) *model
return &m
}
func createChannelWithTeamId(ss store.Store, id string) *model.Channel {
return createChannel(ss, id, model.NewId())
func createChannelWithTeamId(rctx request.CTX, ss store.Store, id string) *model.Channel {
return createChannel(rctx, ss, id, model.NewId())
}
func createChannelWithCreatorId(ss store.Store, id string) *model.Channel {
return createChannel(ss, model.NewId(), id)
func createChannelWithCreatorId(rctx request.CTX, ss store.Store, id string) *model.Channel {
return createChannel(rctx, ss, model.NewId(), id)
}
func createChannelMemberWithChannelId(rctx request.CTX, ss store.Store, id string) *model.ChannelMember {
@@ -452,8 +452,8 @@ func TestCheckChannelsChannelMemberHistoryIntegrity(t *testing.T) {
})
t.Run("should generate a report with one record", func(t *testing.T) {
channel := createChannel(ss, model.NewId(), model.NewId())
user := createUser(rctx, ss)
channel := createChannel(rctx, ss, model.NewId(), model.NewId())
cmh := createChannelMemberHistory(ss, channel.Id, user.Id)
dbmap.Exec(`DELETE FROM Channels Where Id=?`, channel.Id)
@@ -483,7 +483,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())
channel := createChannel(rctx, ss, model.NewId(), model.NewId())
member := createChannelMemberWithChannelId(rctx, ss, channel.Id)
dbmap.Exec(`DELETE FROM Channels Where Id=?`, channel.Id)
result := checkChannelsChannelMembersIntegrity(store)
@@ -539,7 +539,7 @@ func TestCheckChannelsOutgoingWebhooksIntegrity(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(rctx, ss, model.NewId(), model.NewId())
channelId := channel.Id
wh := createOutgoingWebhook(ss, model.NewId(), channelId, model.NewId())
dbmap.Exec(`DELETE FROM Channels Where Id=?`, channel.Id)
@@ -652,7 +652,7 @@ func TestCheckPostsPostsRootIdIntegrity(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(rctx, ss, model.NewId(), model.NewId())
root := createPost(rctx, ss, channel.Id, model.NewId(), "", "")
rootId := root.Id
post := createPost(rctx, ss, channel.Id, model.NewId(), root.Id, root.Id)
@@ -715,7 +715,7 @@ func TestCheckSchemesChannelsIntegrity(t *testing.T) {
createDefaultRoles(ss)
scheme := createScheme(ss)
schemeId := scheme.Id
channel := createChannelWithSchemeId(ss, &schemeId)
channel := createChannelWithSchemeId(rctx, ss, &schemeId)
dbmap.Exec(`DELETE FROM Schemes WHERE Id=?`, scheme.Id)
result := checkSchemesChannelsIntegrity(store)
require.NoError(t, result.Err)
@@ -805,7 +805,7 @@ func TestCheckTeamsChannelsIntegrity(t *testing.T) {
})
t.Run("should generate a report with one record", func(t *testing.T) {
channel := createChannelWithTeamId(ss, model.NewId())
channel := createChannelWithTeamId(rctx, ss, model.NewId())
result := checkTeamsChannelsIntegrity(store)
require.NoError(t, result.Err)
data := result.Data.(model.RelationalIntegrityCheckData)
@@ -818,7 +818,7 @@ func TestCheckTeamsChannelsIntegrity(t *testing.T) {
})
t.Run("should not include direct channel with empty teamid", func(t *testing.T) {
channel := createChannelWithTeamId(ss, model.NewId())
channel := createChannelWithTeamId(rctx, ss, model.NewId())
userA := createUser(rctx, ss)
userB := createUser(rctx, ss)
direct, err := ss.Channel().CreateDirectChannel(rctx, userA, userB)
@@ -839,7 +839,7 @@ func TestCheckTeamsChannelsIntegrity(t *testing.T) {
})
t.Run("should include direct channel with non empty teamid", func(t *testing.T) {
channel := createChannelWithTeamId(ss, model.NewId())
channel := createChannelWithTeamId(rctx, ss, model.NewId())
userA := createUser(rctx, ss)
userB := createUser(rctx, ss)
direct, err := ss.Channel().CreateDirectChannel(rctx, userA, userB)
@@ -1051,7 +1051,7 @@ func TestCheckUsersChannelsIntegrity(t *testing.T) {
})
t.Run("should generate a report with one record", func(t *testing.T) {
channel := createChannelWithCreatorId(ss, model.NewId())
channel := createChannelWithCreatorId(rctx, ss, model.NewId())
result := checkUsersChannelsIntegrity(store)
require.NoError(t, result.Err)
data := result.Data.(model.RelationalIntegrityCheckData)
@@ -1079,7 +1079,7 @@ func TestCheckUsersChannelMemberHistoryIntegrity(t *testing.T) {
t.Run("should generate a report with one record", func(t *testing.T) {
user := createUser(rctx, ss)
channel := createChannel(ss, model.NewId(), model.NewId())
channel := createChannel(rctx, ss, model.NewId(), model.NewId())
cmh := createChannelMemberHistory(ss, channel.Id, user.Id)
dbmap.Exec(`DELETE FROM Users WHERE Id=?`, user.Id)
result := checkUsersChannelMemberHistoryIntegrity(store)
@@ -1109,7 +1109,7 @@ func TestCheckUsersChannelMembersIntegrity(t *testing.T) {
t.Run("should generate a report with one record", func(t *testing.T) {
user := createUser(rctx, ss)
channel := createChannelWithCreatorId(ss, user.Id)
channel := createChannelWithCreatorId(rctx, ss, user.Id)
member := createChannelMember(rctx, ss, channel.Id, user.Id)
dbmap.Exec(`DELETE FROM Users WHERE Id=?`, user.Id)
result := checkUsersChannelMembersIntegrity(store)
@@ -1622,7 +1622,7 @@ func TestCheckThreadsTeamsIntegrity(t *testing.T) {
t.Run("should generate a report with one record", func(t *testing.T) {
team := createTeam(ss)
channel := createChannel(ss, team.Id, model.NewId())
channel := createChannel(rctx, ss, team.Id, model.NewId())
root := createPost(rctx, ss, channel.Id, model.NewId(), "", "")
post := createPost(rctx, ss, channel.Id, model.NewId(), root.Id, root.Id)