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

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

Просмотр исходного кода
Этот коммит содержится в:
Trang
2024-02-16 23:12:49 +07:00
коммит произвёл GitHub
родитель 9643a16408
Коммит f130615011
44 изменённых файлов: 553 добавлений и 552 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@@ -14,8 +14,8 @@ import (
"github.com/mattermost/mattermost/server/v8/channels/store"
)
func makeBotWithUser(t *testing.T, ss store.Store, bot *model.Bot) (*model.Bot, *model.User) {
user, err := ss.User().Save(model.UserFromBot(bot))
func makeBotWithUser(t *testing.T, rctx request.CTX, ss store.Store, bot *model.Bot) (*model.Bot, *model.User) {
user, err := ss.User().Save(rctx, model.UserFromBot(bot))
require.NoError(t, err)
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) {
deletedBot, _ := makeBotWithUser(t, ss, &model.Bot{
deletedBot, _ := makeBotWithUser(t, rctx, ss, &model.Bot{
Username: "deleted_bot",
Description: "A deleted bot",
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.User().PermanentDelete(deletedBot.UserId)) }()
permanentlyDeletedBot, _ := makeBotWithUser(t, ss, &model.Bot{
permanentlyDeletedBot, _ := makeBotWithUser(t, rctx, ss, &model.Bot{
Username: "permanently_deleted_bot",
Description: "A permanently deleted bot",
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))
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",
Description: "The first bot",
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.User().PermanentDelete(b1.UserId)) }()
b2, _ := makeBotWithUser(t, ss, &model.Bot{
b2, _ := makeBotWithUser(t, rctx, ss, &model.Bot{
Username: "b2",
Description: "The second bot",
OwnerId: model.NewId(),
@@ -122,7 +122,7 @@ func testBotStoreGetAll(t *testing.T, rctx request.CTX, ss store.Store, s SqlSto
OwnerId1 := model.NewId()
OwnerId2 := model.NewId()
deletedBot, _ := makeBotWithUser(t, ss, &model.Bot{
deletedBot, _ := makeBotWithUser(t, rctx, ss, &model.Bot{
Username: "deleted_bot",
Description: "A deleted bot",
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.User().PermanentDelete(deletedBot.UserId)) }()
permanentlyDeletedBot, _ := makeBotWithUser(t, ss, &model.Bot{
permanentlyDeletedBot, _ := makeBotWithUser(t, rctx, ss, &model.Bot{
Username: "permanently_deleted_bot",
Description: "A permanently deleted bot",
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))
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",
Description: "The first bot",
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.User().PermanentDelete(b1.UserId)) }()
b2, _ := makeBotWithUser(t, ss, &model.Bot{
b2, _ := makeBotWithUser(t, rctx, ss, &model.Bot{
Username: "b2",
Description: "The second bot",
OwnerId: OwnerId1,
@@ -175,7 +175,7 @@ func testBotStoreGetAll(t *testing.T, rctx request.CTX, ss store.Store, s SqlSto
}, bot)
})
b3, _ := makeBotWithUser(t, ss, &model.Bot{
b3, _ := makeBotWithUser(t, rctx, ss, &model.Bot{
Username: "b3",
Description: "The third bot",
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.User().PermanentDelete(b3.UserId)) }()
b4, _ := makeBotWithUser(t, ss, &model.Bot{
b4, _ := makeBotWithUser(t, rctx, ss, &model.Bot{
Username: "b4",
Description: "The fourth bot",
OwnerId: OwnerId2,
@@ -195,7 +195,7 @@ func testBotStoreGetAll(t *testing.T, rctx request.CTX, ss store.Store, s SqlSto
Email: MakeEmail(),
Username: model.NewId(),
}
_, err1 := ss.User().Save(&deletedUser)
_, err1 := ss.User().Save(rctx, &deletedUser)
require.NoError(t, err1, "couldn't save user")
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")
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",
Description: "Orphaned bot 5",
OwnerId: deletedUser.Id,
@@ -333,7 +333,7 @@ func testBotStoreSave(t *testing.T, rctx request.CTX, ss store.Store) {
OwnerId: model.NewId(),
}
user, err := ss.User().Save(model.UserFromBot(bot))
user, err := ss.User().Save(rctx, model.UserFromBot(bot))
require.NoError(t, err)
defer func() { require.NoError(t, ss.User().PermanentDelete(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) {
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",
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) {
existingBot, _ := makeBotWithUser(t, ss, &model.Bot{
existingBot, _ := makeBotWithUser(t, rctx, ss, &model.Bot{
Username: "existing_bot",
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) {
existingBot, _ := makeBotWithUser(t, ss, &model.Bot{
existingBot, _ := makeBotWithUser(t, rctx, ss, &model.Bot{
Username: "existing_bot",
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) {
b1, _ := makeBotWithUser(t, ss, &model.Bot{
b1, _ := makeBotWithUser(t, rctx, ss, &model.Bot{
Username: "b1",
OwnerId: model.NewId(),
})
defer func() { require.NoError(t, ss.Bot().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",
OwnerId: model.NewId(),
})

12
server/channels/store/storetest/channel_member_history_store.go
Просмотреть файл

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

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

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

34
server/channels/store/storetest/compliance_store.go
Просмотреть файл

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

162
server/channels/store/storetest/group_store.go
Просмотреть файл

@@ -205,7 +205,7 @@ func testGroupCreateWithUserIds(t *testing.T, rctx request.CTX, ss store.Store)
Email: MakeEmail(),
Username: model.NewId(),
}
user1, nErr := ss.User().Save(u1)
user1, nErr := ss.User().Save(rctx, u1)
require.NoError(t, nErr)
// Create user 2
@@ -213,7 +213,7 @@ func testGroupCreateWithUserIds(t *testing.T, rctx request.CTX, ss store.Store)
Email: MakeEmail(),
Username: model.NewId(),
}
user2, nErr := ss.User().Save(u2)
user2, nErr := ss.User().Save(rctx, u2)
require.NoError(t, nErr)
g1 := &model.Group{
@@ -558,7 +558,7 @@ func testGroupStoreGetByUser(t *testing.T, rctx request.CTX, ss store.Store) {
Email: MakeEmail(),
Username: model.NewId(),
}
u1, nErr := ss.User().Save(u1)
u1, nErr := ss.User().Save(rctx, u1)
require.NoError(t, nErr)
_, 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(),
Username: model.NewId(),
}
u2, nErr = ss.User().Save(u2)
u2, nErr = ss.User().Save(rctx, u2)
require.NoError(t, nErr)
_, 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(),
Username: model.NewId(),
}
user1, nErr := ss.User().Save(u1)
user1, nErr := ss.User().Save(rctx, u1)
require.NoError(t, nErr)
_, 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(),
Username: model.NewId(),
}
user2, nErr := ss.User().Save(u2)
user2, nErr := ss.User().Save(rctx, u2)
require.NoError(t, nErr)
_, 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(),
Username: "user1" + model.NewId(),
}
user1, nErr := ss.User().Save(u1)
user1, nErr := ss.User().Save(rctx, u1)
require.NoError(t, nErr)
_, 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(),
Username: "user2" + model.NewId(),
}
user2, nErr := ss.User().Save(u2)
user2, nErr := ss.User().Save(rctx, u2)
require.NoError(t, nErr)
_, 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(),
Username: "user3" + model.NewId(),
}
user3, nErr := ss.User().Save(u3)
user3, nErr := ss.User().Save(rctx, u3)
require.NoError(t, nErr)
_, 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(),
LastName: "z" + model.NewId(),
}
user1, nErr := ss.User().Save(u1)
user1, nErr := ss.User().Save(rctx, u1)
require.NoError(t, nErr)
_, 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(),
LastName: "b" + model.NewId(),
}
user2, nErr := ss.User().Save(u2)
user2, nErr := ss.User().Save(rctx, u2)
require.NoError(t, nErr)
_, err = ss.Group().UpsertMember(group.Id, user2.Id)
@@ -967,7 +967,7 @@ func testGroupGetMemberUsersSortedPage(t *testing.T, rctx request.CTX, ss store.
Email: MakeEmail(),
Username: "d" + model.NewId(),
}
user3, nErr := ss.User().Save(u3)
user3, nErr := ss.User().Save(rctx, u3)
require.NoError(t, nErr)
_, 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(),
Username: model.NewId(),
}
user1, err := ss.User().Save(u1)
user1, err := ss.User().Save(rctx, u1)
require.NoError(t, err)
_, 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(),
Username: model.NewId(),
}
user2, err := ss.User().Save(u2)
user2, err := ss.User().Save(rctx, u2)
require.NoError(t, err)
_, 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(),
Username: model.NewId(),
}
user3, err := ss.User().Save(u3)
user3, err := ss.User().Save(rctx, u3)
require.NoError(t, err)
_, err = ss.Group().UpsertMember(group.Id, user3.Id)
@@ -1118,7 +1118,7 @@ func testGroupGetMemberUsersNotInChannel(t *testing.T, rctx request.CTX, ss stor
Email: MakeEmail(),
Username: model.NewId(),
}
user1, err := ss.User().Save(u1)
user1, err := ss.User().Save(rctx, u1)
require.NoError(t, err)
_, err = ss.Group().UpsertMember(group.Id, user1.Id)
@@ -1128,7 +1128,7 @@ func testGroupGetMemberUsersNotInChannel(t *testing.T, rctx request.CTX, ss stor
Email: MakeEmail(),
Username: model.NewId(),
}
user2, err := ss.User().Save(u2)
user2, err := ss.User().Save(rctx, u2)
require.NoError(t, err)
_, err = ss.Group().UpsertMember(group.Id, user2.Id)
@@ -1138,7 +1138,7 @@ func testGroupGetMemberUsersNotInChannel(t *testing.T, rctx request.CTX, ss stor
Email: MakeEmail(),
Username: model.NewId(),
}
user3, err := ss.User().Save(u3)
user3, err := ss.User().Save(rctx, u3)
require.NoError(t, err)
_, 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(),
Username: model.NewId(),
}
user, nErr := ss.User().Save(u1)
user, nErr := ss.User().Save(rctx, u1)
require.NoError(t, nErr)
// Happy path
@@ -1306,7 +1306,7 @@ func testUpsertMembers(t *testing.T, rctx request.CTX, ss store.Store) {
Email: MakeEmail(),
Username: model.NewId(),
}
user, nErr := ss.User().Save(u1)
user, nErr := ss.User().Save(rctx, u1)
require.NoError(t, nErr)
// Create user
@@ -1314,7 +1314,7 @@ func testUpsertMembers(t *testing.T, rctx request.CTX, ss store.Store) {
Email: MakeEmail(),
Username: model.NewId(),
}
user2, nErr := ss.User().Save(u2)
user2, nErr := ss.User().Save(rctx, u2)
require.NoError(t, nErr)
// Happy path
@@ -1372,7 +1372,7 @@ func testGroupDeleteMember(t *testing.T, rctx request.CTX, ss store.Store) {
Email: MakeEmail(),
Username: model.NewId(),
}
user, nErr := ss.User().Save(u1)
user, nErr := ss.User().Save(rctx, u1)
require.NoError(t, nErr)
// Create member
@@ -1407,7 +1407,7 @@ func testGroupDeleteMembers(t *testing.T, rctx request.CTX, ss store.Store) {
Email: MakeEmail(),
Username: model.NewId(),
}
user, nErr := ss.User().Save(u1)
user, nErr := ss.User().Save(rctx, u1)
require.NoError(t, nErr)
// Create group
g1 := &model.Group{
@@ -1466,7 +1466,7 @@ func testGroupPermanentDeleteMembersByUser(t *testing.T, rctx request.CTX, ss st
Email: MakeEmail(),
Username: model.NewId(),
}
user, err := ss.User().Save(u1)
user, err := ss.User().Save(rctx, u1)
require.NoError(t, err)
// Create members
@@ -1762,7 +1762,7 @@ func testTeamMembersToAdd(t *testing.T, rctx request.CTX, ss store.Store) {
Email: MakeEmail(),
Username: model.NewId(),
}
user, nErr := ss.User().Save(user)
user, nErr := ss.User().Save(rctx, user)
require.NoError(t, nErr)
// Create GroupMember
@@ -1947,21 +1947,21 @@ func testTeamMembersToAddSingleTeam(t *testing.T, rctx request.CTX, ss store.Sto
Email: MakeEmail(),
Username: model.NewId(),
}
user1, nErr := ss.User().Save(user1)
user1, nErr := ss.User().Save(rctx, user1)
require.NoError(t, nErr)
user2 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
}
user2, nErr = ss.User().Save(user2)
user2, nErr = ss.User().Save(rctx, user2)
require.NoError(t, nErr)
user3 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
}
user3, nErr = ss.User().Save(user3)
user3, nErr = ss.User().Save(rctx, user3)
require.NoError(t, nErr)
for _, user := range []*model.User{user1, user2} {
@@ -2031,7 +2031,7 @@ func testChannelMembersToAdd(t *testing.T, rctx request.CTX, ss store.Store) {
Email: MakeEmail(),
Username: model.NewId(),
}
user, nErr := ss.User().Save(user)
user, nErr := ss.User().Save(rctx, user)
require.NoError(t, nErr)
// Create GroupMember
@@ -2214,21 +2214,21 @@ func testChannelMembersToAddSingleChannel(t *testing.T, rctx request.CTX, ss sto
Email: MakeEmail(),
Username: model.NewId(),
}
user1, nErr := ss.User().Save(user1)
user1, nErr := ss.User().Save(rctx, user1)
require.NoError(t, nErr)
user2 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
}
user2, nErr = ss.User().Save(user2)
user2, nErr = ss.User().Save(rctx, user2)
require.NoError(t, nErr)
user3 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
}
user3, nErr = ss.User().Save(user3)
user3, nErr = ss.User().Save(rctx, user3)
require.NoError(t, nErr)
for _, user := range []*model.User{user1, user2} {
@@ -2353,21 +2353,21 @@ func testTeamMembersToRemoveSingleTeam(t *testing.T, rctx request.CTX, ss store.
Email: MakeEmail(),
Username: model.NewId(),
}
user1, err := ss.User().Save(user1)
user1, err := ss.User().Save(rctx, user1)
require.NoError(t, err)
user2 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
}
user2, err = ss.User().Save(user2)
user2, err = ss.User().Save(rctx, user2)
require.NoError(t, err)
user3 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
}
user3, err = ss.User().Save(user3)
user3, err = ss.User().Save(rctx, user3)
require.NoError(t, err)
team1 := &model.Team{
@@ -2505,21 +2505,21 @@ func testChannelMembersToRemoveSingleChannel(t *testing.T, rctx request.CTX, ss
Email: MakeEmail(),
Username: model.NewId(),
}
user1, err := ss.User().Save(user1)
user1, err := ss.User().Save(rctx, user1)
require.NoError(t, err)
user2 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
}
user2, err = ss.User().Save(user2)
user2, err = ss.User().Save(rctx, user2)
require.NoError(t, err)
user3 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
}
user3, err = ss.User().Save(user3)
user3, err = ss.User().Save(rctx, user3)
require.NoError(t, err)
channel1 := &model.Channel{
@@ -2596,7 +2596,7 @@ func pendingMemberRemovalsDataSetup(t *testing.T, rctx request.CTX, ss store.Sto
Email: MakeEmail(),
Username: model.NewId(),
}
userA, nErr := ss.User().Save(userA)
userA, nErr := ss.User().Save(rctx, userA)
require.NoError(t, nErr)
// 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(),
Username: model.NewId(),
}
userB, nErr = ss.User().Save(userB)
userB, nErr = ss.User().Save(rctx, userB)
require.NoError(t, nErr)
// userC was never in the group
@@ -2612,7 +2612,7 @@ func pendingMemberRemovalsDataSetup(t *testing.T, rctx request.CTX, ss store.Sto
Email: MakeEmail(),
Username: model.NewId(),
}
userC, nErr = ss.User().Save(userC)
userC, nErr = ss.User().Save(rctx, userC)
require.NoError(t, nErr)
// add users to group (but not userC)
@@ -2818,14 +2818,14 @@ func testGetGroupsByChannel(t *testing.T, rctx request.CTX, ss store.Store) {
Email: MakeEmail(),
Username: model.NewId(),
}
user1, err := ss.User().Save(u1)
user1, err := ss.User().Save(rctx, u1)
require.NoError(t, err)
u2 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
}
user2, err := ss.User().Save(u2)
user2, err := ss.User().Save(rctx, u2)
require.NoError(t, err)
_, err = ss.Group().UpsertMember(group1.Id, user1.Id)
@@ -3066,14 +3066,14 @@ func testGetGroupsAssociatedToChannelsByTeam(t *testing.T, rctx request.CTX, ss
Email: MakeEmail(),
Username: model.NewId(),
}
user1, err := ss.User().Save(u1)
user1, err := ss.User().Save(rctx, u1)
require.NoError(t, err)
u2 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
}
user2, err := ss.User().Save(u2)
user2, err := ss.User().Save(rctx, u2)
require.NoError(t, err)
_, 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(),
Username: model.NewId(),
}
user1, err := ss.User().Save(u1)
user1, err := ss.User().Save(rctx, u1)
require.NoError(t, err)
u2 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
}
user2, err := ss.User().Save(u2)
user2, err := ss.User().Save(rctx, u2)
require.NoError(t, err)
_, 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(),
Username: model.NewId(),
}
user1, err := ss.User().Save(u1)
user1, err := ss.User().Save(rctx, u1)
require.NoError(t, err)
u2 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
}
user2, err := ss.User().Save(u2)
user2, err := ss.User().Save(rctx, u2)
require.NoError(t, err)
u3 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
}
user3, err := ss.User().Save(u3)
user3, err := ss.User().Save(rctx, u3)
require.NoError(t, err)
_, 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(),
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)
users = append(users, user)
@@ -4034,7 +4034,7 @@ func testTeamMembersMinusGroupMembers(t *testing.T, rctx request.CTX, ss store.S
Email: MakeEmail(),
Username: "99_" + model.NewId(),
}
user, err = ss.User().Save(user)
user, err = ss.User().Save(rctx, user)
require.NoError(t, err)
users = append(users, user)
_, 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(),
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)
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.
user, err := ss.User().Save(&model.User{
user, err := ss.User().Save(rctx, &model.User{
Email: MakeEmail(),
Username: "99_" + model.NewId(),
})
@@ -4331,7 +4331,7 @@ func groupTestGetMemberCount(t *testing.T, rctx request.CTX, ss store.Store) {
Email: MakeEmail(),
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)
_, err = ss.Group().UpsertMember(group.Id, user.Id)
@@ -4356,7 +4356,7 @@ func groupTestAdminRoleGroupsForSyncableMemberChannel(t *testing.T, rctx request
Email: MakeEmail(),
Username: model.NewId(),
}
user, err := ss.User().Save(user)
user, err := ss.User().Save(rctx, user)
require.NoError(t, err)
group1 := &model.Group{
@@ -4444,7 +4444,7 @@ func groupTestAdminRoleGroupsForSyncableMemberTeam(t *testing.T, rctx request.CT
Email: MakeEmail(),
Username: model.NewId(),
}
user, err := ss.User().Save(user)
user, err := ss.User().Save(rctx, user)
require.NoError(t, err)
group1 := &model.Group{
@@ -4531,21 +4531,21 @@ func groupTestPermittedSyncableAdminsTeam(t *testing.T, rctx request.CTX, ss sto
Email: MakeEmail(),
Username: model.NewId(),
}
user1, err := ss.User().Save(user1)
user1, err := ss.User().Save(rctx, user1)
require.NoError(t, err)
user2 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
}
user2, err = ss.User().Save(user2)
user2, err = ss.User().Save(rctx, user2)
require.NoError(t, err)
user3 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
}
user3, err = ss.User().Save(user3)
user3, err = ss.User().Save(rctx, user3)
require.NoError(t, err)
group1 := &model.Group{
@@ -4637,21 +4637,21 @@ func groupTestPermittedSyncableAdminsChannel(t *testing.T, rctx request.CTX, ss
Email: MakeEmail(),
Username: model.NewId(),
}
user1, err := ss.User().Save(user1)
user1, err := ss.User().Save(rctx, user1)
require.NoError(t, err)
user2 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
}
user2, err = ss.User().Save(user2)
user2, err = ss.User().Save(rctx, user2)
require.NoError(t, err)
user3 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
}
user3, err = ss.User().Save(user3)
user3, err = ss.User().Save(rctx, user3)
require.NoError(t, err)
group1 := &model.Group{
@@ -4757,28 +4757,28 @@ func groupTestpUpdateMembersRoleTeam(t *testing.T, rctx request.CTX, ss store.St
Email: MakeEmail(),
Username: model.NewId(),
}
user1, err = ss.User().Save(user1)
user1, err = ss.User().Save(rctx, user1)
require.NoError(t, err)
user2 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
}
user2, err = ss.User().Save(user2)
user2, err = ss.User().Save(rctx, user2)
require.NoError(t, err)
user3 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
}
user3, err = ss.User().Save(user3)
user3, err = ss.User().Save(rctx, user3)
require.NoError(t, err)
user4 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
}
user4, err = ss.User().Save(user4)
user4, err = ss.User().Save(rctx, user4)
require.NoError(t, err)
for _, user := range []*model.User{user1, user2, user3} {
@@ -4857,28 +4857,28 @@ func groupTestpUpdateMembersRoleChannel(t *testing.T, rctx request.CTX, ss store
Email: MakeEmail(),
Username: model.NewId(),
}
user1, err = ss.User().Save(user1)
user1, err = ss.User().Save(rctx, user1)
require.NoError(t, err)
user2 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
}
user2, err = ss.User().Save(user2)
user2, err = ss.User().Save(rctx, user2)
require.NoError(t, err)
user3 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
}
user3, err = ss.User().Save(user3)
user3, err = ss.User().Save(rctx, user3)
require.NoError(t, err)
user4 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
}
user4, err = ss.User().Save(user4)
user4, err = ss.User().Save(rctx, user4)
require.NoError(t, err)
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()),
Username: model.NewId(),
}
user, err := ss.User().Save(user)
user, err := ss.User().Save(rctx, user)
require.NoError(t, err)
user2 := &model.User{
Email: fmt.Sprintf("test.%s@localhost", model.NewId()),
Username: model.NewId(),
}
user2, err = ss.User().Save(user2)
user2, err = ss.User().Save(rctx, user2)
require.NoError(t, err)
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()),
Username: model.NewId(),
}
user, err = ss.User().Save(user)
user, err = ss.User().Save(rctx, user)
require.NoError(t, err)
user2 := &model.User{
Email: fmt.Sprintf("test.%s@localhost", model.NewId()),
Username: model.NewId(),
}
user2, err = ss.User().Save(user2)
user2, err = ss.User().Save(rctx, user2)
require.NoError(t, err)
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(),
Username: model.NewId(),
}
user1, nErr := ss.User().Save(u1)
user1, nErr := ss.User().Save(rctx, u1)
require.NoError(t, nErr)
u2 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
}
user2, nErr := ss.User().Save(u2)
user2, nErr := ss.User().Save(rctx, u2)
require.NoError(t, nErr)
_, 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(),
Username: model.NewId(),
}
user1, nErr := ss.User().Save(u1)
user1, nErr := ss.User().Save(rctx, u1)
require.NoError(t, nErr)
u2 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
}
_, nErr = ss.User().Save(u2)
_, nErr = ss.User().Save(rctx, u2)
require.NoError(t, nErr)
users, err := ss.Group().GetNonMemberUsersPage(group.Id, 0, 1000, nil)
@@ -5317,14 +5317,14 @@ func groupTestDistinctGroupMemberCountForSource(t *testing.T, rctx request.CTX,
Email: MakeEmail(),
Username: model.NewId(),
}
user1, nErr := ss.User().Save(u1)
user1, nErr := ss.User().Save(rctx, u1)
require.NoError(t, nErr)
u2 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
}
user2, nErr := ss.User().Save(u2)
user2, nErr := ss.User().Save(rctx, u2)
require.NoError(t, nErr)
// add both new users to both new groups

18
server/channels/store/storetest/mocks/UserStore.go
Просмотреть файл

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

18
server/channels/store/storetest/post_store.go
Просмотреть файл

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

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

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

12
server/channels/store/storetest/shared_channel_store.go
Просмотреть файл

@@ -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) {
require.NoError(t, clearSharedChannels(ss))
user, err := createTestUser(ss, "gary.goodspeed")
user, err := createTestUser(rctx, ss, "gary.goodspeed")
require.NoError(t, err)
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{
Username: username,
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) {
@@ -1026,7 +1026,7 @@ func testGetSharedChannelUsersForSync(t *testing.T, rctx request.CTX, ss store.S
Email: model.NewId() + "@example.com",
LastPictureUpdate: model.GetMillis(),
}
u, err := ss.User().Save(u)
u, err := ss.User().Save(rctx, u)
require.NoError(t, err)
users = append(users, u)
}
@@ -1098,7 +1098,7 @@ func testUpdateSharedChannelUserLastSyncAt(t *testing.T, rctx request.CTX, ss st
Email: model.NewId() + "@example.com",
LastPictureUpdate: model.GetMillis() - 300000, // 5 mins
}
u1, err := ss.User().Save(u1)
u1, err := ss.User().Save(rctx, u1)
require.NoError(t, err)
u2 := &model.User{
@@ -1106,7 +1106,7 @@ func testUpdateSharedChannelUserLastSyncAt(t *testing.T, rctx request.CTX, ss st
Email: model.NewId() + "@example.com",
LastPictureUpdate: model.GetMillis() + 300000,
}
u2, err = ss.User().Save(u2)
u2, err = ss.User().Save(rctx, u2)
require.NoError(t, err)
channelID := model.NewId()

80
server/channels/store/storetest/team_store.go
Просмотреть файл

@@ -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)}
u6 := &model.User{Username: "d", Email: MakeEmail()}
u1, err := ss.User().Save(u1)
u1, err := ss.User().Save(rctx, u1)
require.NoError(t, err)
u2, err = ss.User().Save(u2)
u2, err = ss.User().Save(rctx, u2)
require.NoError(t, err)
u3, err = ss.User().Save(u3)
u3, err = ss.User().Save(rctx, u3)
require.NoError(t, err)
u4, err = ss.User().Save(u4)
u4, err = ss.User().Save(rctx, u4)
require.NoError(t, err)
u5, err = ss.User().Save(u5)
u5, err = ss.User().Save(rctx, u5)
require.NoError(t, err)
u6, err = ss.User().Save(u6)
u6, err = ss.User().Save(rctx, u6)
require.NoError(t, err)
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()}
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)
u2, err = ss.User().Save(u2)
u2, err = ss.User().Save(rctx, u2)
require.NoError(t, err)
u3, err = ss.User().Save(u3)
u3, err = ss.User().Save(rctx, u3)
require.NoError(t, err)
u4, err = ss.User().Save(u4)
u4, err = ss.User().Save(rctx, u4)
require.NoError(t, err)
u5, err = ss.User().Save(u5)
u5, err = ss.User().Save(rctx, u5)
require.NoError(t, err)
u6, err = ss.User().Save(u6)
u6, err = ss.User().Save(rctx, u6)
require.NoError(t, err)
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) {
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)
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)
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) {
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)
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)
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)
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)
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) {
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)
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) {
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)
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)
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) {
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)
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)
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)
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)
teamID := model.NewId()
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) {
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)
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)
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)
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)
teamID := model.NewId()
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)
for i := 0; i < maxUsersPerTeam; i++ {
user, err := ss.User().Save(&model.User{
user, err := ss.User().Save(rctx, &model.User{
Username: NewTestId(),
Email: MakeEmail(),
})
@@ -2913,7 +2913,7 @@ func testSaveTeamMemberMaxMembers(t *testing.T, rctx request.CTX, ss store.Store
require.NoError(t, err)
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(),
Email: MakeEmail(),
})
@@ -2961,7 +2961,7 @@ func testSaveTeamMemberMaxMembers(t *testing.T, rctx request.CTX, ss store.Store
_, nErr = ss.User().Update(rctx, user2, true)
require.NoError(t, nErr)
user, nErr = ss.User().Save(&model.User{
user, nErr = ss.User().Save(rctx, &model.User{
Username: NewTestId(),
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) {
u1 := &model.User{}
u1.Email = MakeEmail()
_, err := ss.User().Save(u1)
_, err := ss.User().Save(rctx, u1)
require.NoError(t, err)
u2 := &model.User{}
u2.Email = MakeEmail()
u2.DeleteAt = 1
_, err = ss.User().Save(u2)
_, err = ss.User().Save(rctx, u2)
require.NoError(t, err)
teamId1 := model.NewId()
@@ -3558,13 +3558,13 @@ func testTeamStoreGetTeamMembersForExport(t *testing.T, rctx request.CTX, ss sto
u1 := model.User{}
u1.Email = MakeEmail()
u1.Nickname = NewTestId()
_, err = ss.User().Save(&u1)
_, err = ss.User().Save(rctx, &u1)
require.NoError(t, err)
u2 := model.User{}
u2.Email = MakeEmail()
u2.Nickname = NewTestId()
_, err = ss.User().Save(&u2)
_, err = ss.User().Save(rctx, &u2)
require.NoError(t, err)
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.Email = MakeEmail()
u1.Nickname = NewTestId()
_, err = ss.User().Save(&u1)
_, err = ss.User().Save(rctx, &u1)
require.NoError(t, err)
// User 2
u2 := model.User{}
u2.Email = MakeEmail()
u2.Nickname = NewTestId()
_, err = ss.User().Save(&u2)
_, err = ss.User().Save(rctx, &u2)
require.NoError(t, err)
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.Email = MakeEmail()
u3.Nickname = NewTestId()
_, err = ss.User().Save(&u3)
_, err = ss.User().Save(rctx, &u3)
require.NoError(t, err)
// User 4
u4 := model.User{}
u4.Email = MakeEmail()
u4.Nickname = NewTestId()
_, err = ss.User().Save(&u4)
_, err = ss.User().Save(rctx, &u4)
require.NoError(t, err)
// Add user 1 in team 1 and 2

6
server/channels/store/storetest/terms_of_service_store.go
Просмотреть файл

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

6
server/channels/store/storetest/thread_store.go
Просмотреть файл

@@ -39,7 +39,7 @@ func testThreadStorePopulation(t *testing.T, rctx request.CTX, ss store.Store) {
Username: model.NewId(),
}
u, err := ss.User().Save(&u1)
u, err := ss.User().Save(rctx, &u1)
require.NoError(t, err)
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)
}
user1, err := ss.User().Save(&model.User{
user1, err := ss.User().Save(rctx, &model.User{
Username: "user1" + model.NewId(),
Email: MakeEmail(),
})
require.NoError(t, err)
user2, err := ss.User().Save(&model.User{
user2, err := ss.User().Save(rctx, &model.User{
Username: "user2" + model.NewId(),
Email: MakeEmail(),
})

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

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

386
server/channels/store/storetest/user_store.go
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу