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

[MM-55595] Use annotated logger in search layer (#25468)

Просмотр исходного кода
Этот коммит содержится в:
Ben Schumacher
2023-12-04 18:34:57 +01:00
коммит произвёл GitHub
родитель 5a4dba8809
Коммит b2ec1ff8ae
130 изменённых файлов: 2107 добавлений и 1930 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@@ -199,7 +199,7 @@ func testBotStoreGetAll(t *testing.T, rctx request.CTX, ss store.Store, s SqlSto
require.NoError(t, err1, "couldn't save user")
deletedUser.DeleteAt = model.GetMillis()
_, err2 := ss.User().Update(&deletedUser, true)
_, err2 := ss.User().Update(rctx, &deletedUser, true)
require.NoError(t, err2, "couldn't delete user")
defer func() { require.NoError(t, ss.User().PermanentDelete(deletedUser.Id)) }()

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

@@ -46,7 +46,7 @@ func cleanupChannels(t *testing.T, rctx request.CTX, ss store.Store) {
list, err := ss.Channel().GetAllChannels(0, 100000, store.ChannelSearchOpts{IncludeDeleted: true})
require.NoError(t, err, "error cleaning all channels", err)
for _, channel := range list {
err = ss.Channel().PermanentDelete(channel.Id)
err = ss.Channel().PermanentDelete(rctx, channel.Id)
assert.NoError(t, err)
}
}
@@ -239,7 +239,7 @@ func testChannelStoreSaveDirectChannel(t *testing.T, rctx request.CTX, ss store.
m2.UserId = u2.Id
m2.NotifyProps = model.GetDefaultChannelNotifyProps()
_, nErr = ss.Channel().SaveDirectChannel(&o1, &m1, &m2)
_, nErr = ss.Channel().SaveDirectChannel(rctx, &o1, &m1, &m2)
require.NoError(t, nErr, "couldn't save direct channel", nErr)
members, nErr := ss.Channel().GetMembers(o1.Id, 0, 100)
@@ -250,7 +250,7 @@ func testChannelStoreSaveDirectChannel(t *testing.T, rctx request.CTX, ss store.
require.NoError(t, nErr)
require.ElementsMatch(t, []string{u1.Id, u2.Id}, userIDs)
_, nErr = ss.Channel().SaveDirectChannel(&o1, &m1, &m2)
_, nErr = ss.Channel().SaveDirectChannel(rctx, &o1, &m1, &m2)
require.Error(t, nErr, "shouldn't be a able to update from save")
// Attempt to save a direct channel that already exists
@@ -261,7 +261,7 @@ func testChannelStoreSaveDirectChannel(t *testing.T, rctx request.CTX, ss store.
Type: o1.Type,
}
returnedChannel, nErr := ss.Channel().SaveDirectChannel(&o1a, &m1, &m2)
returnedChannel, nErr := ss.Channel().SaveDirectChannel(rctx, &o1a, &m1, &m2)
require.Error(t, nErr, "should've failed to save a duplicate direct channel")
var cErr *store.ErrConflict
require.Truef(t, errors.As(nErr, &cErr), "should've returned ChannelExistsError")
@@ -271,7 +271,7 @@ func testChannelStoreSaveDirectChannel(t *testing.T, rctx request.CTX, ss store.
o1.Id = ""
o1.Name = NewTestId()
o1.Type = model.ChannelTypeOpen
_, nErr = ss.Channel().SaveDirectChannel(&o1, &m1, &m2)
_, nErr = ss.Channel().SaveDirectChannel(rctx, &o1, &m1, &m2)
require.Error(t, nErr, "Should not be able to save non-direct channel")
// Save yourself Direct Message
@@ -279,7 +279,7 @@ func testChannelStoreSaveDirectChannel(t *testing.T, rctx request.CTX, ss store.
o1.DisplayName = "Myself"
o1.Name = model.GetDMNameFromIds(NewTestId(), NewTestId())
o1.Type = model.ChannelTypeDirect
_, nErr = ss.Channel().SaveDirectChannel(&o1, &m1, &m1)
_, nErr = ss.Channel().SaveDirectChannel(rctx, &o1, &m1, &m1)
require.NoError(t, nErr, "couldn't save direct channel", nErr)
members, nErr = ss.Channel().GetMembers(o1.Id, 0, 100)
@@ -311,11 +311,11 @@ func testChannelStoreCreateDirectChannel(t *testing.T, rctx request.CTX, ss stor
_, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1)
require.NoError(t, nErr)
c1, nErr := ss.Channel().CreateDirectChannel(u1, u2)
c1, nErr := ss.Channel().CreateDirectChannel(rctx, u1, u2)
require.NoError(t, nErr, "couldn't create direct channel", nErr)
defer func() {
ss.Channel().PermanentDeleteMembersByChannel(c1.Id)
ss.Channel().PermanentDelete(c1.Id)
ss.Channel().PermanentDeleteMembersByChannel(rctx, c1.Id)
ss.Channel().PermanentDelete(rctx, c1.Id)
}()
members, nErr := ss.Channel().GetMembers(c1.Id, 0, 100)
@@ -344,20 +344,20 @@ func testChannelStoreUpdate(t *testing.T, rctx request.CTX, ss store.Store) {
time.Sleep(100 * time.Millisecond)
_, err := ss.Channel().Update(&o1)
_, err := ss.Channel().Update(rctx, &o1)
require.NoError(t, err, err)
o1.DeleteAt = 100
_, err = ss.Channel().Update(&o1)
_, err = ss.Channel().Update(rctx, &o1)
require.Error(t, err, "update should have failed because channel is archived")
o1.DeleteAt = 0
o1.Id = "missing"
_, err = ss.Channel().Update(&o1)
_, err = ss.Channel().Update(rctx, &o1)
require.Error(t, err, "Update should have failed because of missing key")
o2.Name = o1.Name
_, err = ss.Channel().Update(&o2)
_, err = ss.Channel().Update(rctx, &o2)
require.Error(t, err, "update should have failed because of existing name")
// Make sure that the error correctly reports the wrong field to be Name
@@ -468,7 +468,7 @@ func testChannelStoreGet(t *testing.T, rctx request.CTX, ss store.Store, s SqlSt
m2.UserId = u2.Id
m2.NotifyProps = model.GetDefaultChannelNotifyProps()
_, nErr = ss.Channel().SaveDirectChannel(&o2, &m1, &m2)
_, nErr = ss.Channel().SaveDirectChannel(rctx, &o2, &m1, &m2)
require.NoError(t, nErr)
c2, err := ss.Channel().Get(o2.Id, false)
@@ -582,7 +582,7 @@ func testChannelStoreGetChannelsByIds(t *testing.T, rctx request.CTX, ss store.S
m2.UserId = u2.Id
m2.NotifyProps = model.GetDefaultChannelNotifyProps()
_, nErr = ss.Channel().SaveDirectChannel(&o2, &m1, &m2)
_, nErr = ss.Channel().SaveDirectChannel(rctx, &o2, &m1, &m2)
require.NoError(t, nErr)
t.Run("Get 2 existing channels", func(t *testing.T) {
@@ -671,7 +671,7 @@ func testGetChannelsWithTeamDataByIds(t *testing.T, rctx request.CTX, ss store.S
m2.UserId = u2.Id
m2.NotifyProps = model.GetDefaultChannelNotifyProps()
_, nErr = ss.Channel().SaveDirectChannel(&c2, &m1, &m2)
_, nErr = ss.Channel().SaveDirectChannel(rctx, &c2, &m1, &m2)
require.NoError(t, nErr)
res, err := ss.Channel().GetChannelsWithTeamDataByIds([]string{c1.Id, c2.Id}, false)
@@ -804,7 +804,7 @@ func testChannelStoreDelete(t *testing.T, rctx request.CTX, ss store.Store) {
require.NoError(t, nErr)
require.Len(t, list, 1, "invalid number of channels")
cresult := ss.Channel().PermanentDelete(o2.Id)
cresult := ss.Channel().PermanentDelete(rctx, o2.Id)
require.NoError(t, cresult)
list, nErr = ss.Channel().GetChannels(o1.TeamId, m1.UserId, &model.ChannelSearchOpts{
@@ -1115,7 +1115,7 @@ func testChannelMemberStore(t *testing.T, rctx request.CTX, ss store.Store) {
require.NoError(t, nErr)
require.EqualValues(t, 2, count, "should have saved 2 members")
nErr = ss.Channel().RemoveMember(o2.ChannelId, o2.UserId)
nErr = ss.Channel().RemoveMember(rctx, o2.ChannelId, o2.UserId)
require.NoError(t, nErr)
count, nErr = ss.Channel().GetMemberCount(o1.ChannelId, false)
@@ -1188,7 +1188,7 @@ func testChannelSaveMember(t *testing.T, rctx request.CTX, ss store.Store) {
}
channel, nErr = ss.Channel().Save(channel, -1)
require.NoError(t, nErr)
defer func() { ss.Channel().PermanentDelete(channel.Id) }()
defer func() { ss.Channel().PermanentDelete(rctx, channel.Id) }()
testCases := []struct {
Name string
@@ -1310,7 +1310,7 @@ func testChannelSaveMember(t *testing.T, rctx request.CTX, ss store.Store) {
}
member, nErr = ss.Channel().SaveMember(member)
require.NoError(t, nErr)
defer ss.Channel().RemoveMember(channel.Id, u1.Id)
defer ss.Channel().RemoveMember(rctx, channel.Id, u1.Id)
assert.Equal(t, tc.ExpectedRoles, member.Roles)
assert.Equal(t, tc.ExpectedExplicitRoles, member.ExplicitRoles)
assert.Equal(t, tc.ExpectedSchemeGuest, member.SchemeGuest)
@@ -1349,7 +1349,7 @@ func testChannelSaveMember(t *testing.T, rctx request.CTX, ss store.Store) {
}
channel, nErr = ss.Channel().Save(channel, -1)
require.NoError(t, nErr)
defer func() { ss.Channel().PermanentDelete(channel.Id) }()
defer func() { ss.Channel().PermanentDelete(rctx, channel.Id) }()
testCases := []struct {
Name string
@@ -1471,7 +1471,7 @@ func testChannelSaveMember(t *testing.T, rctx request.CTX, ss store.Store) {
}
member, nErr = ss.Channel().SaveMember(member)
require.NoError(t, nErr)
defer ss.Channel().RemoveMember(channel.Id, u1.Id)
defer ss.Channel().RemoveMember(rctx, channel.Id, u1.Id)
assert.Equal(t, tc.ExpectedRoles, member.Roles)
assert.Equal(t, tc.ExpectedExplicitRoles, member.ExplicitRoles)
assert.Equal(t, tc.ExpectedSchemeGuest, member.SchemeGuest)
@@ -1509,7 +1509,7 @@ func testChannelSaveMember(t *testing.T, rctx request.CTX, ss store.Store) {
SchemeId: &cs.Id,
}, -1)
require.NoError(t, nErr)
defer func() { ss.Channel().PermanentDelete(channel.Id) }()
defer func() { ss.Channel().PermanentDelete(rctx, channel.Id) }()
testCases := []struct {
Name string
@@ -1631,7 +1631,7 @@ func testChannelSaveMember(t *testing.T, rctx request.CTX, ss store.Store) {
}
member, nErr = ss.Channel().SaveMember(member)
require.NoError(t, nErr)
defer ss.Channel().RemoveMember(channel.Id, u1.Id)
defer ss.Channel().RemoveMember(rctx, channel.Id, u1.Id)
assert.Equal(t, tc.ExpectedRoles, member.Roles)
assert.Equal(t, tc.ExpectedExplicitRoles, member.ExplicitRoles)
assert.Equal(t, tc.ExpectedSchemeGuest, member.SchemeGuest)
@@ -1696,7 +1696,7 @@ func testChannelSaveMultipleMembers(t *testing.T, rctx request.CTX, ss store.Sto
}
channel, nErr = ss.Channel().Save(channel, -1)
require.NoError(t, nErr)
defer func() { ss.Channel().PermanentDelete(channel.Id) }()
defer func() { ss.Channel().PermanentDelete(rctx, channel.Id) }()
testCases := []struct {
Name string
@@ -1830,8 +1830,8 @@ func testChannelSaveMultipleMembers(t *testing.T, rctx request.CTX, ss store.Sto
require.NoError(t, nErr)
require.Len(t, members, 2)
member = members[0]
defer ss.Channel().RemoveMember(channel.Id, u1.Id)
defer ss.Channel().RemoveMember(channel.Id, u2.Id)
defer ss.Channel().RemoveMember(rctx, channel.Id, u1.Id)
defer ss.Channel().RemoveMember(rctx, channel.Id, u2.Id)
assert.Equal(t, tc.ExpectedRoles, member.Roles)
assert.Equal(t, tc.ExpectedExplicitRoles, member.ExplicitRoles)
@@ -1871,7 +1871,7 @@ func testChannelSaveMultipleMembers(t *testing.T, rctx request.CTX, ss store.Sto
}
channel, nErr = ss.Channel().Save(channel, -1)
require.NoError(t, nErr)
defer func() { ss.Channel().PermanentDelete(channel.Id) }()
defer func() { ss.Channel().PermanentDelete(rctx, channel.Id) }()
testCases := []struct {
Name string
@@ -2005,8 +2005,8 @@ func testChannelSaveMultipleMembers(t *testing.T, rctx request.CTX, ss store.Sto
require.NoError(t, nErr)
require.Len(t, members, 2)
member = members[0]
defer ss.Channel().RemoveMember(channel.Id, u1.Id)
defer ss.Channel().RemoveMember(channel.Id, u2.Id)
defer ss.Channel().RemoveMember(rctx, channel.Id, u1.Id)
defer ss.Channel().RemoveMember(rctx, channel.Id, u2.Id)
assert.Equal(t, tc.ExpectedRoles, member.Roles)
assert.Equal(t, tc.ExpectedExplicitRoles, member.ExplicitRoles)
@@ -2045,7 +2045,7 @@ func testChannelSaveMultipleMembers(t *testing.T, rctx request.CTX, ss store.Sto
SchemeId: &cs.Id,
}, -1)
require.NoError(t, nErr)
defer func() { ss.Channel().PermanentDelete(channel.Id) }()
defer func() { ss.Channel().PermanentDelete(rctx, channel.Id) }()
testCases := []struct {
Name string
@@ -2178,8 +2178,8 @@ func testChannelSaveMultipleMembers(t *testing.T, rctx request.CTX, ss store.Sto
require.NoError(t, err)
require.Len(t, members, 2)
member = members[0]
defer ss.Channel().RemoveMember(channel.Id, u1.Id)
defer ss.Channel().RemoveMember(channel.Id, u2.Id)
defer ss.Channel().RemoveMember(rctx, channel.Id, u1.Id)
defer ss.Channel().RemoveMember(rctx, channel.Id, u2.Id)
assert.Equal(t, tc.ExpectedRoles, member.Roles)
assert.Equal(t, tc.ExpectedExplicitRoles, member.ExplicitRoles)
@@ -2198,7 +2198,7 @@ func testChannelUpdateMember(t *testing.T, rctx request.CTX, ss store.Store) {
t.Run("not valid channel member", func(t *testing.T) {
member := &model.ChannelMember{ChannelId: "wrong", UserId: u1.Id, NotifyProps: defaultNotifyProps}
_, nErr := ss.Channel().UpdateMember(member)
_, nErr := ss.Channel().UpdateMember(rctx, member)
require.Error(t, nErr)
var appErr *model.AppError
require.True(t, errors.As(nErr, &appErr))
@@ -2210,7 +2210,7 @@ func testChannelUpdateMember(t *testing.T, rctx request.CTX, ss store.Store) {
props["property"] = strings.Repeat("Z", model.ChannelMemberNotifyPropsMaxRunes)
member := &model.ChannelMember{ChannelId: model.NewId(), UserId: u1.Id, NotifyProps: props}
_, nErr := ss.Channel().UpdateMember(member)
_, nErr := ss.Channel().UpdateMember(rctx, member)
require.Error(t, nErr)
var appErr *model.AppError
require.ErrorAs(t, nErr, &appErr)
@@ -2236,7 +2236,7 @@ func testChannelUpdateMember(t *testing.T, rctx request.CTX, ss store.Store) {
}
channel, nErr = ss.Channel().Save(channel, -1)
require.NoError(t, nErr)
defer func() { ss.Channel().PermanentDelete(channel.Id) }()
defer func() { ss.Channel().PermanentDelete(rctx, channel.Id) }()
member := &model.ChannelMember{
ChannelId: channel.Id,
@@ -2359,7 +2359,7 @@ func testChannelUpdateMember(t *testing.T, rctx request.CTX, ss store.Store) {
member.SchemeUser = tc.SchemeUser
member.SchemeAdmin = tc.SchemeAdmin
member.ExplicitRoles = tc.ExplicitRoles
member, nErr = ss.Channel().UpdateMember(member)
member, nErr = ss.Channel().UpdateMember(rctx, member)
require.NoError(t, nErr)
assert.Equal(t, tc.ExpectedRoles, member.Roles)
assert.Equal(t, tc.ExpectedExplicitRoles, member.ExplicitRoles)
@@ -2399,7 +2399,7 @@ func testChannelUpdateMember(t *testing.T, rctx request.CTX, ss store.Store) {
}
channel, nErr = ss.Channel().Save(channel, -1)
require.NoError(t, nErr)
defer func() { ss.Channel().PermanentDelete(channel.Id) }()
defer func() { ss.Channel().PermanentDelete(rctx, channel.Id) }()
member := &model.ChannelMember{
ChannelId: channel.Id,
@@ -2522,7 +2522,7 @@ func testChannelUpdateMember(t *testing.T, rctx request.CTX, ss store.Store) {
member.SchemeUser = tc.SchemeUser
member.SchemeAdmin = tc.SchemeAdmin
member.ExplicitRoles = tc.ExplicitRoles
member, nErr = ss.Channel().UpdateMember(member)
member, nErr = ss.Channel().UpdateMember(rctx, member)
require.NoError(t, nErr)
assert.Equal(t, tc.ExpectedRoles, member.Roles)
assert.Equal(t, tc.ExpectedExplicitRoles, member.ExplicitRoles)
@@ -2561,7 +2561,7 @@ func testChannelUpdateMember(t *testing.T, rctx request.CTX, ss store.Store) {
SchemeId: &cs.Id,
}, -1)
require.NoError(t, nErr)
defer func() { ss.Channel().PermanentDelete(channel.Id) }()
defer func() { ss.Channel().PermanentDelete(rctx, channel.Id) }()
member := &model.ChannelMember{
ChannelId: channel.Id,
@@ -2684,7 +2684,7 @@ func testChannelUpdateMember(t *testing.T, rctx request.CTX, ss store.Store) {
member.SchemeUser = tc.SchemeUser
member.SchemeAdmin = tc.SchemeAdmin
member.ExplicitRoles = tc.ExplicitRoles
member, nErr = ss.Channel().UpdateMember(member)
member, nErr = ss.Channel().UpdateMember(rctx, member)
require.NoError(t, nErr)
assert.Equal(t, tc.ExpectedRoles, member.Roles)
assert.Equal(t, tc.ExpectedExplicitRoles, member.ExplicitRoles)
@@ -2753,15 +2753,15 @@ func testChannelUpdateMultipleMembers(t *testing.T, rctx request.CTX, ss store.S
}
channel, nErr = ss.Channel().Save(channel, -1)
require.NoError(t, nErr)
defer func() { ss.Channel().PermanentDelete(channel.Id) }()
defer func() { ss.Channel().PermanentDelete(rctx, channel.Id) }()
member := &model.ChannelMember{ChannelId: channel.Id, UserId: u1.Id, NotifyProps: defaultNotifyProps}
otherMember := &model.ChannelMember{ChannelId: channel.Id, UserId: u2.Id, NotifyProps: defaultNotifyProps}
var members []*model.ChannelMember
members, nErr = ss.Channel().SaveMultipleMembers([]*model.ChannelMember{member, otherMember})
require.NoError(t, nErr)
defer ss.Channel().RemoveMember(channel.Id, u1.Id)
defer ss.Channel().RemoveMember(channel.Id, u2.Id)
defer ss.Channel().RemoveMember(rctx, channel.Id, u1.Id)
defer ss.Channel().RemoveMember(rctx, channel.Id, u2.Id)
require.Len(t, members, 2)
member = members[0]
otherMember = members[1]
@@ -2923,15 +2923,15 @@ func testChannelUpdateMultipleMembers(t *testing.T, rctx request.CTX, ss store.S
}
channel, nErr = ss.Channel().Save(channel, -1)
require.NoError(t, nErr)
defer func() { ss.Channel().PermanentDelete(channel.Id) }()
defer func() { ss.Channel().PermanentDelete(rctx, channel.Id) }()
member := &model.ChannelMember{ChannelId: channel.Id, UserId: u1.Id, NotifyProps: defaultNotifyProps}
otherMember := &model.ChannelMember{ChannelId: channel.Id, UserId: u2.Id, NotifyProps: defaultNotifyProps}
var members []*model.ChannelMember
members, nErr = ss.Channel().SaveMultipleMembers([]*model.ChannelMember{member, otherMember})
require.NoError(t, nErr)
defer ss.Channel().RemoveMember(channel.Id, u1.Id)
defer ss.Channel().RemoveMember(channel.Id, u2.Id)
defer ss.Channel().RemoveMember(rctx, channel.Id, u1.Id)
defer ss.Channel().RemoveMember(rctx, channel.Id, u2.Id)
require.Len(t, members, 2)
member = members[0]
otherMember = members[1]
@@ -3092,14 +3092,14 @@ func testChannelUpdateMultipleMembers(t *testing.T, rctx request.CTX, ss store.S
SchemeId: &cs.Id,
}, -1)
require.NoError(t, nErr)
defer func() { ss.Channel().PermanentDelete(channel.Id) }()
defer func() { ss.Channel().PermanentDelete(rctx, channel.Id) }()
member := &model.ChannelMember{ChannelId: channel.Id, UserId: u1.Id, NotifyProps: defaultNotifyProps}
otherMember := &model.ChannelMember{ChannelId: channel.Id, UserId: u2.Id, NotifyProps: defaultNotifyProps}
members, err := ss.Channel().SaveMultipleMembers([]*model.ChannelMember{member, otherMember})
require.NoError(t, err)
defer ss.Channel().RemoveMember(channel.Id, u1.Id)
defer ss.Channel().RemoveMember(channel.Id, u2.Id)
defer ss.Channel().RemoveMember(rctx, channel.Id, u1.Id)
defer ss.Channel().RemoveMember(rctx, channel.Id, u2.Id)
require.Len(t, members, 2)
member = members[0]
otherMember = members[1]
@@ -3255,7 +3255,7 @@ func testChannelUpdateMemberNotifyProps(t *testing.T, rctx request.CTX, ss store
}
channel, nErr = ss.Channel().Save(channel, -1)
require.NoError(t, nErr)
defer func() { ss.Channel().PermanentDelete(channel.Id) }()
defer func() { ss.Channel().PermanentDelete(rctx, channel.Id) }()
member := &model.ChannelMember{
ChannelId: channel.Id,
@@ -3301,7 +3301,7 @@ func testChannelRemoveMember(t *testing.T, rctx request.CTX, ss store.Store) {
require.NoError(t, nErr)
t.Run("remove member from not existing channel", func(t *testing.T) {
nErr = ss.Channel().RemoveMember("not-existing-channel", u1.Id)
nErr = ss.Channel().RemoveMember(rctx, "not-existing-channel", u1.Id)
require.NoError(t, nErr)
var membersCount int64
membersCount, nErr = ss.Channel().GetMemberCount(channelID, false)
@@ -3310,7 +3310,7 @@ func testChannelRemoveMember(t *testing.T, rctx request.CTX, ss store.Store) {
})
t.Run("remove not existing member from an existing channel", func(t *testing.T) {
nErr = ss.Channel().RemoveMember(channelID, model.NewId())
nErr = ss.Channel().RemoveMember(rctx, channelID, model.NewId())
require.NoError(t, nErr)
var membersCount int64
membersCount, nErr = ss.Channel().GetMemberCount(channelID, false)
@@ -3319,7 +3319,7 @@ func testChannelRemoveMember(t *testing.T, rctx request.CTX, ss store.Store) {
})
t.Run("remove existing member from an existing channel", func(t *testing.T) {
nErr = ss.Channel().RemoveMember(channelID, u1.Id)
nErr = ss.Channel().RemoveMember(rctx, channelID, u1.Id)
require.NoError(t, nErr)
defer ss.Channel().SaveMember(m1)
var membersCount int64
@@ -3348,7 +3348,7 @@ func testChannelRemoveMembers(t *testing.T, rctx request.CTX, ss store.Store) {
require.NoError(t, nErr)
t.Run("remove members from not existing channel", func(t *testing.T) {
nErr = ss.Channel().RemoveMembers("not-existing-channel", []string{u1.Id, u2.Id, u3.Id, u4.Id})
nErr = ss.Channel().RemoveMembers(rctx, "not-existing-channel", []string{u1.Id, u2.Id, u3.Id, u4.Id})
require.NoError(t, nErr)
var membersCount int64
membersCount, nErr = ss.Channel().GetMemberCount(channelID, false)
@@ -3357,7 +3357,7 @@ func testChannelRemoveMembers(t *testing.T, rctx request.CTX, ss store.Store) {
})
t.Run("remove not existing members from an existing channel", func(t *testing.T) {
nErr = ss.Channel().RemoveMembers(channelID, []string{model.NewId(), model.NewId()})
nErr = ss.Channel().RemoveMembers(rctx, channelID, []string{model.NewId(), model.NewId()})
require.NoError(t, nErr)
var membersCount int64
membersCount, nErr = ss.Channel().GetMemberCount(channelID, false)
@@ -3366,7 +3366,7 @@ func testChannelRemoveMembers(t *testing.T, rctx request.CTX, ss store.Store) {
})
t.Run("remove not existing and not existing members from an existing channel", func(t *testing.T) {
nErr = ss.Channel().RemoveMembers(channelID, []string{u1.Id, u2.Id, model.NewId(), model.NewId()})
nErr = ss.Channel().RemoveMembers(rctx, channelID, []string{u1.Id, u2.Id, model.NewId(), model.NewId()})
require.NoError(t, nErr)
defer ss.Channel().SaveMultipleMembers([]*model.ChannelMember{m1, m2})
var membersCount int64
@@ -3375,7 +3375,7 @@ func testChannelRemoveMembers(t *testing.T, rctx request.CTX, ss store.Store) {
require.Equal(t, int64(2), membersCount)
})
t.Run("remove existing members from an existing channel", func(t *testing.T) {
nErr = ss.Channel().RemoveMembers(channelID, []string{u1.Id, u2.Id, u3.Id})
nErr = ss.Channel().RemoveMembers(rctx, channelID, []string{u1.Id, u2.Id, u3.Id})
require.NoError(t, nErr)
defer ss.Channel().SaveMultipleMembers([]*model.ChannelMember{m1, m2, m3})
membersCount, err := ss.Channel().GetMemberCount(channelID, false)
@@ -3433,14 +3433,14 @@ func testChannelDeleteMemberStore(t *testing.T, rctx request.CTX, ss store.Store
require.NoError(t, nErr)
require.EqualValues(t, 2, count, "should have saved 2 members")
nErr = ss.Channel().PermanentDeleteMembersByUser(o2.UserId)
nErr = ss.Channel().PermanentDeleteMembersByUser(rctx, o2.UserId)
require.NoError(t, nErr)
count, nErr = ss.Channel().GetMemberCount(o1.ChannelId, false)
require.NoError(t, nErr)
require.EqualValues(t, 1, count, "should have removed 1 member")
nErr = ss.Channel().PermanentDeleteMembersByChannel(o1.ChannelId)
nErr = ss.Channel().PermanentDeleteMembersByChannel(rctx, o1.ChannelId)
require.NoError(t, nErr)
count, nErr = ss.Channel().GetMemberCount(o1.ChannelId, false)
@@ -3545,7 +3545,7 @@ func testChannelStoreGetChannels(t *testing.T, rctx request.CTX, ss store.Store)
time.Sleep(time.Millisecond)
now := model.GetMillis()
_, nErr = ss.Channel().Update(o1)
_, nErr = ss.Channel().Update(rctx, o1)
require.NoError(t, nErr)
list, nErr = ss.Channel().GetChannels(o1.TeamId, m1.UserId, &model.ChannelSearchOpts{
@@ -3777,7 +3777,7 @@ func testChannelStoreGetAllChannels(t *testing.T, rctx request.CTX, ss store.Sto
u1 := model.User{Id: model.NewId()}
u2 := model.User{Id: model.NewId()}
_, nErr = ss.Channel().CreateDirectChannel(&u1, &u2)
_, nErr = ss.Channel().CreateDirectChannel(rctx, &u1, &u2)
require.NoError(t, nErr)
userIds := []string{model.NewId(), model.NewId(), model.NewId()}
@@ -4379,12 +4379,12 @@ func testChannelStoreGetMembersForUser(t *testing.T, rctx request.CTX, ss store.
u2 := model.User{Id: model.NewId()}
u3 := model.User{Id: model.NewId()}
u4 := model.User{Id: model.NewId()}
_, nErr = ss.Channel().CreateDirectChannel(&u1, &user)
_, nErr = ss.Channel().CreateDirectChannel(rctx, &u1, &user)
require.NoError(t, nErr)
_, nErr = ss.Channel().CreateDirectChannel(&u2, &user)
_, nErr = ss.Channel().CreateDirectChannel(rctx, &u2, &user)
require.NoError(t, nErr)
// other user direct message
_, nErr = ss.Channel().CreateDirectChannel(&u3, &u4)
_, nErr = ss.Channel().CreateDirectChannel(rctx, &u3, &u4)
require.NoError(t, nErr)
var members model.ChannelMembers
@@ -4828,11 +4828,11 @@ func testUpdateChannelMember(t *testing.T, rctx request.CTX, ss store.Store) {
require.NoError(t, err)
m1.NotifyProps["test"] = "sometext"
_, err = ss.Channel().UpdateMember(m1)
_, err = ss.Channel().UpdateMember(rctx, m1)
require.NoError(t, err, err)
m1.UserId = ""
_, err = ss.Channel().UpdateMember(m1)
_, err = ss.Channel().UpdateMember(rctx, m1)
require.Error(t, err, "bad user id - should fail")
}
@@ -5799,7 +5799,7 @@ func testChannelStoreSearchInTeam(t *testing.T, rctx request.CTX, ss store.Store
for _, testCase := range testCases {
t.Run("AutoCompleteInTeam/"+testCase.Description, func(t *testing.T) {
channels, err := ss.Channel().AutocompleteInTeam(testCase.TeamID, testCase.UserID, testCase.Term, testCase.IncludeDeleted, false)
channels, err := ss.Channel().AutocompleteInTeam(rctx, testCase.TeamID, testCase.UserID, testCase.Term, testCase.IncludeDeleted, false)
require.NoError(t, err)
sort.Sort(ByChannelDisplayName(channels))
require.Equal(t, testCase.ExpectedResults, channels)
@@ -5960,11 +5960,11 @@ func testAutocomplete(t *testing.T, rctx request.CTX, ss store.Store, s SqlStore
_, err = ss.Team().SaveMember(tm5, -1)
require.NoError(t, err)
err = ss.Channel().RemoveMember(o5.Id, m1.UserId)
err = ss.Channel().RemoveMember(rctx, o5.Id, m1.UserId)
require.NoError(t, err)
tm5.Roles = ""
tm5.DeleteAt = model.GetMillis()
_, err = ss.Team().UpdateMember(tm5)
_, err = ss.Team().UpdateMember(rctx, tm5)
require.NoError(t, err)
testCases := []struct {
@@ -5987,7 +5987,7 @@ func testAutocomplete(t *testing.T, rctx request.CTX, ss store.Store, s SqlStore
for _, testCase := range testCases {
t.Run(testCase.Description, func(t *testing.T) {
channels, err2 := ss.Channel().Autocomplete(testCase.UserID, testCase.Term, testCase.IncludeDeleted, testCase.IsGuest)
channels, err2 := ss.Channel().Autocomplete(rctx, testCase.UserID, testCase.Term, testCase.IncludeDeleted, testCase.IsGuest)
require.NoError(t, err2)
var gotChannelIds []string
var gotTeamNames []string
@@ -6010,7 +6010,7 @@ func testAutocomplete(t *testing.T, rctx request.CTX, ss store.Store, s SqlStore
}, -1)
require.NoError(t, err)
}
channels, err := ss.Channel().Autocomplete(m1.UserId, "Chann", false, false)
channels, err := ss.Channel().Autocomplete(rctx, m1.UserId, "Chann", false, false)
require.NoError(t, err)
assert.Len(t, channels, model.ChannelSearchDefaultLimit)
})
@@ -6615,8 +6615,8 @@ func testChannelStoreSearchGroupChannels(t *testing.T, rctx request.CTX, ss stor
defer func() {
for _, gc := range []model.Channel{gc1, gc2, gc3} {
ss.Channel().PermanentDeleteMembersByChannel(gc3.Id)
ss.Channel().PermanentDelete(gc.Id)
ss.Channel().PermanentDeleteMembersByChannel(rctx, gc3.Id)
ss.Channel().PermanentDelete(rctx, gc.Id)
}
}()
@@ -6722,11 +6722,11 @@ func testChannelStoreAnalyticsDeletedTypeCount(t *testing.T, rctx request.CTX, s
_, err = ss.User().Save(u2)
require.NoError(t, err)
d4, nErr := ss.Channel().CreateDirectChannel(u1, u2)
d4, nErr := ss.Channel().CreateDirectChannel(rctx, u1, u2)
require.NoError(t, nErr)
defer func() {
ss.Channel().PermanentDeleteMembersByChannel(d4.Id)
ss.Channel().PermanentDelete(d4.Id)
ss.Channel().PermanentDeleteMembersByChannel(rctx, d4.Id)
ss.Channel().PermanentDelete(rctx, d4.Id)
}()
var openStartCount int64
@@ -7220,7 +7220,7 @@ func testMaterializedPublicChannels(t *testing.T, rctx request.CTX, ss store.Sto
require.Equal(t, model.ChannelList{&o1, &o2}, channels)
})
ss.Channel().PermanentDelete(o1.Id)
ss.Channel().PermanentDelete(rctx, o1.Id)
t.Run("o1 no longer listed in public channels when permanently deleted", func(t *testing.T) {
channels, channelErr := ss.Channel().SearchInTeam(teamId, "", true)
@@ -7229,7 +7229,7 @@ func testMaterializedPublicChannels(t *testing.T, rctx request.CTX, ss store.Sto
})
o2.Type = model.ChannelTypePrivate
_, err := ss.Channel().Update(&o2)
_, err := ss.Channel().Update(rctx, &o2)
require.NoError(t, err)
t.Run("o2 no longer listed since now private", func(t *testing.T) {
@@ -7239,7 +7239,7 @@ func testMaterializedPublicChannels(t *testing.T, rctx request.CTX, ss store.Sto
})
o2.Type = model.ChannelTypeOpen
_, err = ss.Channel().Update(&o2)
_, err = ss.Channel().Update(rctx, &o2)
require.NoError(t, err)
t.Run("o2 listed once again since now public", func(t *testing.T) {
@@ -7325,7 +7325,7 @@ func testMaterializedPublicChannels(t *testing.T, rctx request.CTX, ss store.Sto
require.NoError(t, execerr)
o4.DisplayName += " - Modified"
_, err = ss.Channel().Update(&o4)
_, err = ss.Channel().Update(rctx, &o4)
require.NoError(t, err)
t.Run("verify o4 UPDATE converted to INSERT", func(t *testing.T) {
@@ -7492,13 +7492,13 @@ func testChannelStoreRemoveAllDeactivatedMembers(t *testing.T, rctx request.CTX,
// Deactivate users 1 & 2.
u1.DeleteAt = model.GetMillis()
u2.DeleteAt = model.GetMillis()
_, err = ss.User().Update(&u1, true)
_, err = ss.User().Update(rctx, &u1, true)
require.NoError(t, err)
_, err = ss.User().Update(&u2, true)
_, err = ss.User().Update(rctx, &u2, true)
require.NoError(t, err)
// Remove all deactivated users from the channel.
assert.NoError(t, ss.Channel().RemoveAllDeactivatedMembers(c1.Id))
assert.NoError(t, ss.Channel().RemoveAllDeactivatedMembers(rctx, c1.Id))
// Get all the channel members. Check there is now only 1: m3.
d2, err := ss.Channel().GetMembers(c1.Id, 0, 1000)
@@ -7559,7 +7559,7 @@ func testChannelStoreExportAllDirectChannels(t *testing.T, rctx request.CTX, ss
m2.UserId = u2.Id
m2.NotifyProps = model.GetDefaultChannelNotifyProps()
ss.Channel().SaveDirectChannel(&o1, &m1, &m2)
ss.Channel().SaveDirectChannel(rctx, &o1, &m1, &m2)
d1, nErr := ss.Channel().GetAllDirectChannelsForExportAfter(10000, strings.Repeat("0", 26))
assert.NoError(t, nErr)
@@ -7622,7 +7622,7 @@ func testChannelStoreExportAllDirectChannelsExcludePrivateAndPublic(t *testing.T
m2.UserId = u2.Id
m2.NotifyProps = model.GetDefaultChannelNotifyProps()
ss.Channel().SaveDirectChannel(&o1, &m1, &m2)
ss.Channel().SaveDirectChannel(rctx, &o1, &m1, &m2)
d1, nErr := ss.Channel().GetAllDirectChannelsForExportAfter(10000, strings.Repeat("0", 26))
assert.NoError(t, nErr)
@@ -7668,7 +7668,7 @@ func testChannelStoreExportAllDirectChannelsDeletedChannel(t *testing.T, rctx re
m2.UserId = u2.Id
m2.NotifyProps = model.GetDefaultChannelNotifyProps()
ss.Channel().SaveDirectChannel(&o1, &m1, &m2)
ss.Channel().SaveDirectChannel(rctx, &o1, &m1, &m2)
o1.DeleteAt = 1
nErr = ss.Channel().SetDeleteAt(o1.Id, 1, 1)
@@ -7758,7 +7758,7 @@ func testGroupSyncedChannelCount(t *testing.T, rctx request.CTX, ss store.Store)
}, 999)
require.NoError(t, nErr)
require.True(t, channel1.IsGroupConstrained())
defer ss.Channel().PermanentDelete(channel1.Id)
defer ss.Channel().PermanentDelete(rctx, channel1.Id)
channel2, nErr := ss.Channel().Save(&model.Channel{
DisplayName: model.NewId(),
@@ -7767,14 +7767,14 @@ func testGroupSyncedChannelCount(t *testing.T, rctx request.CTX, ss store.Store)
}, 999)
require.NoError(t, nErr)
require.False(t, channel2.IsGroupConstrained())
defer ss.Channel().PermanentDelete(channel2.Id)
defer ss.Channel().PermanentDelete(rctx, channel2.Id)
count, err := ss.Channel().GroupSyncedChannelCount()
require.NoError(t, err)
require.GreaterOrEqual(t, count, int64(1))
channel2.GroupConstrained = model.NewBool(true)
channel2, err = ss.Channel().Update(channel2)
channel2, err = ss.Channel().Update(rctx, channel2)
require.NoError(t, err)
require.True(t, channel2.IsGroupConstrained())
@@ -7878,7 +7878,7 @@ func testGetChannelsWithUnreadsAndWithMentions(t *testing.T, rctx request.CTX, s
return o1, m1
}
o1, err := ss.Channel().CreateDirectChannel(&model.User{Id: userId}, &model.User{Id: model.NewId()}, func(channel *model.Channel) {
o1, err := ss.Channel().CreateDirectChannel(rctx, &model.User{Id: userId}, &model.User{Id: model.NewId()}, func(channel *model.Channel) {
channel.TotalMsgCount = 25
channel.LastPostAt = 12345
channel.LastRootPostAt = 12345
@@ -7896,7 +7896,7 @@ func testGetChannelsWithUnreadsAndWithMentions(t *testing.T, rctx request.CTX, s
m1.MentionCount = 5
}
m1, err = ss.Channel().UpdateMember(m1)
m1, err = ss.Channel().UpdateMember(rctx, m1)
require.NoError(t, err)
return *o1, *m1

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

@@ -324,7 +324,7 @@ func testCreateInitialSidebarCategories(t *testing.T, rctx request.CTX, ss store
otherUserId2 := model.NewId()
// Set up two direct channels, one favorited and one not
dmChannel1, err := ss.Channel().SaveDirectChannel(
dmChannel1, err := ss.Channel().SaveDirectChannel(rctx,
&model.Channel{
Name: model.GetDMNameFromIds(userId, otherUserId1),
Type: model.ChannelTypeDirect,
@@ -340,7 +340,7 @@ func testCreateInitialSidebarCategories(t *testing.T, rctx request.CTX, ss store
)
require.NoError(t, err)
dmChannel2, err := ss.Channel().SaveDirectChannel(
dmChannel2, err := ss.Channel().SaveDirectChannel(rctx,
&model.Channel{
Name: model.GetDMNameFromIds(userId, otherUserId2),
Type: model.ChannelTypeDirect,
@@ -795,7 +795,7 @@ func testGetSidebarCategory(t *testing.T, rctx request.CTX, ss store.Store, s Sq
Type: model.ChannelTypeOpen,
}, 10)
require.NoError(t, nErr)
defer ss.Channel().PermanentDelete(channel1.Id)
defer ss.Channel().PermanentDelete(rctx, channel1.Id)
_, nErr = ss.Channel().SaveMember(&model.ChannelMember{
UserId: userId,
@@ -900,7 +900,7 @@ func testGetSidebarCategory(t *testing.T, rctx request.CTX, ss store.Store, s Sq
// Create a DM
otherUserId := model.NewId()
dmChannel, nErr := ss.Channel().SaveDirectChannel(
dmChannel, nErr := ss.Channel().SaveDirectChannel(rctx,
&model.Channel{
Name: model.GetDMNameFromIds(userId, otherUserId),
Type: model.ChannelTypeDirect,
@@ -950,7 +950,7 @@ func testGetSidebarCategory(t *testing.T, rctx request.CTX, ss store.Store, s Sq
Type: model.ChannelTypeGroup,
}, 10)
require.NoError(t, nErr)
defer ss.Channel().PermanentDelete(gmChannel.Id)
defer ss.Channel().PermanentDelete(rctx, gmChannel.Id)
_, nErr = ss.Channel().SaveMember(&model.ChannelMember{
UserId: userId,
ChannelId: gmChannel.Id,
@@ -987,7 +987,7 @@ func testGetSidebarCategory(t *testing.T, rctx request.CTX, ss store.Store, s Sq
// Create a DM
otherUserId := model.NewId()
dmChannel, nErr := ss.Channel().SaveDirectChannel(
dmChannel, nErr := ss.Channel().SaveDirectChannel(rctx,
&model.Channel{
Name: model.GetDMNameFromIds(userId, otherUserId),
Type: model.ChannelTypeDirect,
@@ -1086,7 +1086,7 @@ func testGetSidebarCategories(t *testing.T, rctx request.CTX, ss store.Store) {
require.NotEmpty(t, members)
member := members[0]
member.DeleteAt = model.GetMillis()
ss.Team().UpdateMember(member)
ss.Team().UpdateMember(rctx, member)
teamIds := []string{
teamMember1.Id,
@@ -1360,7 +1360,7 @@ func testUpdateSidebarCategories(t *testing.T, rctx request.CTX, ss store.Store)
// Create a direct channel
otherUserId := model.NewId()
dmChannel, nErr := ss.Channel().SaveDirectChannel(
dmChannel, nErr := ss.Channel().SaveDirectChannel(rctx,
&model.Channel{
Name: model.GetDMNameFromIds(userId, otherUserId),
Type: model.ChannelTypeDirect,
@@ -1445,7 +1445,7 @@ func testUpdateSidebarCategories(t *testing.T, rctx request.CTX, ss store.Store)
// Create a direct channel
otherUserId := model.NewId()
dmChannel, nErr := ss.Channel().SaveDirectChannel(
dmChannel, nErr := ss.Channel().SaveDirectChannel(rctx,
&model.Channel{
Name: model.GetDMNameFromIds(userId, otherUserId),
Type: model.ChannelTypeDirect,
@@ -1681,6 +1681,7 @@ func testUpdateSidebarCategories(t *testing.T, rctx request.CTX, ss store.Store)
otherUserId := model.NewId()
dmChannel, nErr := ss.Channel().SaveDirectChannel(
rctx,
&model.Channel{
Name: model.GetDMNameFromIds(userId, otherUserId),
Type: model.ChannelTypeDirect,
@@ -1739,7 +1740,7 @@ func testUpdateSidebarCategories(t *testing.T, rctx request.CTX, ss store.Store)
team := setupTeam(t, rctx, ss, userId)
otherUserId := model.NewId()
dmChannel, nErr := ss.Channel().SaveDirectChannel(
dmChannel, nErr := ss.Channel().SaveDirectChannel(rctx,
&model.Channel{
Name: model.GetDMNameFromIds(userId, otherUserId),
Type: model.ChannelTypeDirect,
@@ -2008,7 +2009,7 @@ func testClearSidebarOnTeamLeave(t *testing.T, rctx request.CTX, ss store.Store,
}, 1000)
require.NoError(t, nErr)
dmChannel1, nErr := ss.Channel().CreateDirectChannel(user, &model.User{
dmChannel1, nErr := ss.Channel().CreateDirectChannel(rctx, user, &model.User{
Id: model.NewId(),
})
require.NoError(t, nErr)
@@ -2057,7 +2058,7 @@ func testClearSidebarOnTeamLeave(t *testing.T, rctx request.CTX, ss store.Store,
}, 1000)
require.NoError(t, nErr)
dmChannel1, nErr := ss.Channel().CreateDirectChannel(user, &model.User{
dmChannel1, nErr := ss.Channel().CreateDirectChannel(rctx, user, &model.User{
Id: model.NewId(),
})
require.NoError(t, nErr)
@@ -2124,7 +2125,7 @@ func testClearSidebarOnTeamLeave(t *testing.T, rctx request.CTX, ss store.Store,
}, 1000)
require.NoError(t, nErr)
dmChannel1, nErr := ss.Channel().CreateDirectChannel(user, user2)
dmChannel1, nErr := ss.Channel().CreateDirectChannel(rctx, user, user2)
require.NoError(t, nErr)
_, err = ss.Channel().CreateSidebarCategory(userId, teamId, &model.SidebarCategoryWithChannels{
@@ -2216,7 +2217,7 @@ func testDeleteSidebarCategory(t *testing.T, rctx request.CTX, ss store.Store, s
Type: model.ChannelTypeOpen,
}, 1000)
require.NoError(t, nErr)
defer ss.Channel().PermanentDelete(channel1.Id)
defer ss.Channel().PermanentDelete(rctx, channel1.Id)
channel2, nErr := ss.Channel().Save(&model.Channel{
Name: model.NewId(),
@@ -2224,13 +2225,13 @@ func testDeleteSidebarCategory(t *testing.T, rctx request.CTX, ss store.Store, s
Type: model.ChannelTypePrivate,
}, 1000)
require.NoError(t, nErr)
defer ss.Channel().PermanentDelete(channel2.Id)
defer ss.Channel().PermanentDelete(rctx, channel2.Id)
dmChannel1, nErr := ss.Channel().CreateDirectChannel(user, &model.User{
dmChannel1, nErr := ss.Channel().CreateDirectChannel(rctx, user, &model.User{
Id: model.NewId(),
})
require.NoError(t, nErr)
defer ss.Channel().PermanentDelete(dmChannel1.Id)
defer ss.Channel().PermanentDelete(rctx, dmChannel1.Id)
// Assign some of those channels to a custom category
newCategory, err := ss.Channel().CreateSidebarCategory(userId, teamId, &model.SidebarCategoryWithChannels{

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

@@ -25,7 +25,7 @@ func cleanupStoreState(t *testing.T, rctx request.CTX, ss store.Store) {
require.NoError(t, err, "failed cleaning up test user %s", u.Username)
//remove all posts by this user
nErr := ss.Post().PermanentDeleteByUser(u.Id)
nErr := ss.Post().PermanentDeleteByUser(rctx, u.Id)
require.NoError(t, nErr, "failed cleaning all posts of test user %s", u.Username)
}
@@ -33,7 +33,7 @@ func cleanupStoreState(t *testing.T, rctx request.CTX, ss store.Store) {
allChannels, nErr := ss.Channel().GetAllChannels(0, 100000, store.ChannelSearchOpts{IncludeDeleted: true})
require.NoError(t, nErr, "error cleaning all test channels", nErr)
for _, channel := range allChannels {
nErr = ss.Channel().PermanentDelete(channel.Id)
nErr = ss.Channel().PermanentDelete(rctx, channel.Id)
require.NoError(t, nErr, "failed cleaning up test channel %s", channel.Id)
}
@@ -269,7 +269,7 @@ func testComplianceExportDirectMessages(t *testing.T, rctx request.CTX, ss store
c1, nErr = ss.Channel().Save(c1, -1)
require.NoError(t, nErr)
cDM, nErr := ss.Channel().CreateDirectChannel(u1, u2)
cDM, nErr := ss.Channel().CreateDirectChannel(rctx, u1, u2)
require.NoError(t, nErr)
o1 := &model.Post{}
o1.ChannelId = c1.Id
@@ -650,7 +650,7 @@ func testMessageExportDirectMessageChannel(t *testing.T, rctx request.CTX, ss st
require.NoError(t, nErr)
// as well as a DM channel between those users
directMessageChannel, nErr := ss.Channel().CreateDirectChannel(user1, user2)
directMessageChannel, nErr := ss.Channel().CreateDirectChannel(rctx, user1, user2)
require.NoError(t, nErr)
// user1 also sends a DM to user2
@@ -840,7 +840,7 @@ func testEditExportMessage(t *testing.T, rctx request.CTX, ss store.Store) {
post1e := post1.Clone()
post1e.Message = "edit " + post1.Message
post1e, err = ss.Post().Update(post1e, post1)
post1e, err = ss.Post().Update(rctx, post1e, post1)
require.NoError(t, err)
// fetch the message exports from the start
@@ -951,7 +951,7 @@ func testEditAfterExportMessage(t *testing.T, rctx request.CTX, ss store.Store)
post1e := post1.Clone()
post1e.EditAt = postEditTime
post1e.Message = "edit " + post1.Message
post1e, err = ss.Post().Update(post1e, post1)
post1e, err = ss.Post().Update(rctx, post1e, post1)
require.NoError(t, err)
// fetch the message exports after edit
@@ -1041,7 +1041,7 @@ func testDeleteExportMessage(t *testing.T, rctx request.CTX, ss store.Store) {
//user 1 deletes the previous post
postDeleteTime := post1.UpdateAt + 1
err = ss.Post().Delete(post1.Id, postDeleteTime, user1.Id)
err = ss.Post().Delete(rctx, post1.Id, postDeleteTime, user1.Id)
require.NoError(t, err)
// fetch the message exports from the start
@@ -1144,7 +1144,7 @@ func testDeleteAfterExportMessage(t *testing.T, rctx request.CTX, ss store.Store
//user 1 deletes the previous post
postDeleteTime := post1.UpdateAt + 1
err = ss.Post().Delete(post1.Id, postDeleteTime, user1.Id)
err = ss.Post().Delete(rctx, post1.Id, postDeleteTime, user1.Id)
require.NoError(t, err)
// fetch the message exports after delete

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

@@ -45,19 +45,19 @@ func testFileInfoSaveGet(t *testing.T, rctx request.CTX, ss store.Store) {
Path: "file.txt",
}
info, err := ss.FileInfo().Save(info)
info, err := ss.FileInfo().Save(rctx, info)
require.NoError(t, err)
require.NotEqual(t, len(info.Id), 0)
defer func() {
ss.FileInfo().PermanentDelete(info.Id)
ss.FileInfo().PermanentDelete(rctx, info.Id)
}()
rinfo, err := ss.FileInfo().Get(info.Id)
require.NoError(t, err)
require.Equal(t, info.Id, rinfo.Id)
info2, err := ss.FileInfo().Save(&model.FileInfo{
info2, err := ss.FileInfo().Save(rctx, &model.FileInfo{
CreatorId: model.NewId(),
Path: "file.txt",
DeleteAt: 123,
@@ -68,7 +68,7 @@ func testFileInfoSaveGet(t *testing.T, rctx request.CTX, ss store.Store) {
assert.Error(t, err)
defer func() {
ss.FileInfo().PermanentDelete(info2.Id)
ss.FileInfo().PermanentDelete(rctx, info2.Id)
}()
}
@@ -78,18 +78,18 @@ func testFileInfoSaveGetByPath(t *testing.T, rctx request.CTX, ss store.Store) {
Path: fmt.Sprintf("%v/file.txt", model.NewId()),
}
info, err := ss.FileInfo().Save(info)
info, err := ss.FileInfo().Save(rctx, info)
require.NoError(t, err)
assert.NotEqual(t, len(info.Id), 0)
defer func() {
ss.FileInfo().PermanentDelete(info.Id)
ss.FileInfo().PermanentDelete(rctx, info.Id)
}()
rinfo, err := ss.FileInfo().GetByPath(info.Path)
require.NoError(t, err)
assert.Equal(t, info.Id, rinfo.Id)
info2, err := ss.FileInfo().Save(&model.FileInfo{
info2, err := ss.FileInfo().Save(rctx, &model.FileInfo{
CreatorId: model.NewId(),
Path: "file.txt",
DeleteAt: 123,
@@ -100,7 +100,7 @@ func testFileInfoSaveGetByPath(t *testing.T, rctx request.CTX, ss store.Store) {
assert.Error(t, err)
defer func() {
ss.FileInfo().PermanentDelete(info2.Id)
ss.FileInfo().PermanentDelete(rctx, info2.Id)
}()
}
@@ -138,11 +138,11 @@ func testFileInfoGetForPost(t *testing.T, rctx request.CTX, ss store.Store) {
}
for i, info := range infos {
newInfo, err := ss.FileInfo().Save(info)
newInfo, err := ss.FileInfo().Save(rctx, info)
require.NoError(t, err)
infos[i] = newInfo
defer func(id string) {
ss.FileInfo().PermanentDelete(id)
ss.FileInfo().PermanentDelete(rctx, id)
}(newInfo.Id)
}
@@ -260,11 +260,11 @@ func testFileInfoGetForUser(t *testing.T, rctx request.CTX, ss store.Store) {
}
for i, info := range infos {
newInfo, err := ss.FileInfo().Save(info)
newInfo, err := ss.FileInfo().Save(rctx, info)
require.NoError(t, err)
infos[i] = newInfo
defer func(id string) {
ss.FileInfo().PermanentDelete(id)
ss.FileInfo().PermanentDelete(rctx, id)
}(newInfo.Id)
}
@@ -302,7 +302,7 @@ func testFileInfoGetWithOptions(t *testing.T, rctx request.CTX, ss store.Store)
if post.ChannelId != "" {
fileInfo.ChannelId = post.ChannelId
}
_, err := ss.FileInfo().Save(&fileInfo)
_, err := ss.FileInfo().Save(rctx, &fileInfo)
require.NoError(t, err)
return fileInfo
}
@@ -327,7 +327,7 @@ func testFileInfoGetWithOptions(t *testing.T, rctx request.CTX, ss store.Store)
file2_2 := makeFile(post2_2, userId2, epoch.AddDate(0, 0, 5).Unix(), "e")
// delete a file
_, err := ss.FileInfo().DeleteForPost(file2_2.PostId)
_, err := ss.FileInfo().DeleteForPost(rctx, file2_2.PostId)
require.NoError(t, err)
testCases := []struct {
@@ -429,12 +429,12 @@ func testFileInfoAttachToPost(t *testing.T, rctx request.CTX, ss store.Store) {
postId := model.NewId()
channelId := model.NewId()
info1, err := ss.FileInfo().Save(&model.FileInfo{
info1, err := ss.FileInfo().Save(rctx, &model.FileInfo{
CreatorId: userId,
Path: "file.txt",
})
require.NoError(t, err)
info2, err := ss.FileInfo().Save(&model.FileInfo{
info2, err := ss.FileInfo().Save(rctx, &model.FileInfo{
CreatorId: userId,
Path: "file2.txt",
})
@@ -443,12 +443,12 @@ func testFileInfoAttachToPost(t *testing.T, rctx request.CTX, ss store.Store) {
require.Equal(t, "", info1.PostId)
require.Equal(t, "", info2.PostId)
err = ss.FileInfo().AttachToPost(info1.Id, postId, channelId, userId)
err = ss.FileInfo().AttachToPost(rctx, info1.Id, postId, channelId, userId)
assert.NoError(t, err)
info1.PostId = postId
info1.ChannelId = channelId
err = ss.FileInfo().AttachToPost(info2.Id, postId, channelId, userId)
err = ss.FileInfo().AttachToPost(rctx, info2.Id, postId, channelId, userId)
assert.NoError(t, err)
info2.PostId = postId
info2.ChannelId = channelId
@@ -467,7 +467,7 @@ func testFileInfoAttachToPost(t *testing.T, rctx request.CTX, ss store.Store) {
postId := model.NewId()
channelId := model.NewId()
info, err := ss.FileInfo().Save(&model.FileInfo{
info, err := ss.FileInfo().Save(rctx, &model.FileInfo{
CreatorId: userId,
Path: "file.txt",
})
@@ -475,10 +475,10 @@ func testFileInfoAttachToPost(t *testing.T, rctx request.CTX, ss store.Store) {
require.Equal(t, "", info.PostId)
err = ss.FileInfo().AttachToPost(info.Id, model.NewId(), channelId, userId)
err = ss.FileInfo().AttachToPost(rctx, info.Id, model.NewId(), channelId, userId)
require.NoError(t, err)
err = ss.FileInfo().AttachToPost(info.Id, postId, channelId, userId)
err = ss.FileInfo().AttachToPost(rctx, info.Id, postId, channelId, userId)
require.Error(t, err)
})
@@ -487,7 +487,7 @@ func testFileInfoAttachToPost(t *testing.T, rctx request.CTX, ss store.Store) {
postId := model.NewId()
channelId := model.NewId()
info, err := ss.FileInfo().Save(&model.FileInfo{
info, err := ss.FileInfo().Save(rctx, &model.FileInfo{
CreatorId: model.NewId(),
Path: "file.txt",
})
@@ -495,7 +495,7 @@ func testFileInfoAttachToPost(t *testing.T, rctx request.CTX, ss store.Store) {
require.Equal(t, "", info.PostId)
err = ss.FileInfo().AttachToPost(info.Id, postId, channelId, userId)
err = ss.FileInfo().AttachToPost(rctx, info.Id, postId, channelId, userId)
assert.Error(t, err)
})
@@ -503,14 +503,14 @@ func testFileInfoAttachToPost(t *testing.T, rctx request.CTX, ss store.Store) {
postId := model.NewId()
channelId := model.NewId()
info, err := ss.FileInfo().Save(&model.FileInfo{
info, err := ss.FileInfo().Save(rctx, &model.FileInfo{
CreatorId: "nouser",
Path: "file.txt",
})
require.NoError(t, err)
assert.Equal(t, "", info.PostId)
err = ss.FileInfo().AttachToPost(info.Id, postId, channelId, model.NewId())
err = ss.FileInfo().AttachToPost(rctx, info.Id, postId, channelId, model.NewId())
require.NoError(t, err)
data, err := ss.FileInfo().GetForPost(postId, true, false, false)
@@ -555,15 +555,15 @@ func testFileInfoDeleteForPost(t *testing.T, rctx request.CTX, ss store.Store) {
}
for i, info := range infos {
newInfo, err := ss.FileInfo().Save(info)
newInfo, err := ss.FileInfo().Save(rctx, info)
require.NoError(t, err)
infos[i] = newInfo
defer func(id string) {
ss.FileInfo().PermanentDelete(id)
ss.FileInfo().PermanentDelete(rctx, id)
}(newInfo.Id)
}
_, err := ss.FileInfo().DeleteForPost(postId)
_, err := ss.FileInfo().DeleteForPost(rctx, postId)
require.NoError(t, err)
infos, err = ss.FileInfo().GetForPost(postId, true, false, false)
@@ -572,7 +572,7 @@ func testFileInfoDeleteForPost(t *testing.T, rctx request.CTX, ss store.Store) {
}
func testFileInfoPermanentDelete(t *testing.T, rctx request.CTX, ss store.Store) {
info, err := ss.FileInfo().Save(&model.FileInfo{
info, err := ss.FileInfo().Save(rctx, &model.FileInfo{
PostId: model.NewId(),
ChannelId: model.NewId(),
CreatorId: model.NewId(),
@@ -580,7 +580,7 @@ func testFileInfoPermanentDelete(t *testing.T, rctx request.CTX, ss store.Store)
})
require.NoError(t, err)
err = ss.FileInfo().PermanentDelete(info.Id)
err = ss.FileInfo().PermanentDelete(rctx, info.Id)
require.NoError(t, err)
}
@@ -588,7 +588,7 @@ func testFileInfoPermanentDeleteBatch(t *testing.T, rctx request.CTX, ss store.S
postId := model.NewId()
channelId := model.NewId()
_, err := ss.FileInfo().Save(&model.FileInfo{
_, err := ss.FileInfo().Save(rctx, &model.FileInfo{
PostId: postId,
ChannelId: channelId,
CreatorId: model.NewId(),
@@ -597,7 +597,7 @@ func testFileInfoPermanentDeleteBatch(t *testing.T, rctx request.CTX, ss store.S
})
require.NoError(t, err)
_, err = ss.FileInfo().Save(&model.FileInfo{
_, err = ss.FileInfo().Save(rctx, &model.FileInfo{
PostId: postId,
ChannelId: channelId,
CreatorId: model.NewId(),
@@ -606,7 +606,7 @@ func testFileInfoPermanentDeleteBatch(t *testing.T, rctx request.CTX, ss store.S
})
require.NoError(t, err)
_, err = ss.FileInfo().Save(&model.FileInfo{
_, err = ss.FileInfo().Save(rctx, &model.FileInfo{
PostId: postId,
ChannelId: channelId,
CreatorId: model.NewId(),
@@ -619,7 +619,7 @@ func testFileInfoPermanentDeleteBatch(t *testing.T, rctx request.CTX, ss store.S
require.NoError(t, err)
assert.Len(t, postFiles, 3)
_, err = ss.FileInfo().PermanentDeleteBatch(1500, 1000)
_, err = ss.FileInfo().PermanentDeleteBatch(rctx, 1500, 1000)
require.NoError(t, err)
postFiles, err = ss.FileInfo().GetForPost(postId, true, false, false)
@@ -632,7 +632,7 @@ func testFileInfoPermanentDeleteByUser(t *testing.T, rctx request.CTX, ss store.
postId := model.NewId()
channelId := model.NewId()
_, err := ss.FileInfo().Save(&model.FileInfo{
_, err := ss.FileInfo().Save(rctx, &model.FileInfo{
PostId: postId,
ChannelId: channelId,
CreatorId: userId,
@@ -640,7 +640,7 @@ func testFileInfoPermanentDeleteByUser(t *testing.T, rctx request.CTX, ss store.
})
require.NoError(t, err)
_, err = ss.FileInfo().PermanentDeleteByUser(userId)
_, err = ss.FileInfo().PermanentDeleteByUser(rctx, userId)
require.NoError(t, err)
}
@@ -650,12 +650,12 @@ func testFileInfoUpdateMinipreview(t *testing.T, rctx request.CTX, ss store.Stor
Path: "image.png",
}
info, err := ss.FileInfo().Save(info)
info, err := ss.FileInfo().Save(rctx, info)
require.NoError(t, err)
require.NotEqual(t, len(info.Id), 0)
defer func() {
ss.FileInfo().PermanentDelete(info.Id)
ss.FileInfo().PermanentDelete(rctx, info.Id)
}()
rinfo, err := ss.FileInfo().Get(info.Id)
@@ -667,7 +667,7 @@ func testFileInfoUpdateMinipreview(t *testing.T, rctx request.CTX, ss store.Stor
rinfo.MiniPreview = &miniPreview
rinfo, err = ss.FileInfo().Upsert(rinfo)
rinfo, err = ss.FileInfo().Upsert(rctx, rinfo)
require.NoError(t, err)
require.Equal(t, info.Id, rinfo.Id)
@@ -698,7 +698,7 @@ func testFileInfoStoreGetFilesBatchForIndexing(t *testing.T, rctx request.CTX, s
o1.Message = "zz" + model.NewId() + "AAAAAAAAAAA"
o1, err := ss.Post().Save(o1)
require.NoError(t, err)
f1, err := ss.FileInfo().Save(&model.FileInfo{
f1, err := ss.FileInfo().Save(rctx, &model.FileInfo{
PostId: o1.Id,
ChannelId: o1.ChannelId,
CreatorId: model.NewId(),
@@ -706,7 +706,7 @@ func testFileInfoStoreGetFilesBatchForIndexing(t *testing.T, rctx request.CTX, s
})
require.NoError(t, err)
defer func() {
ss.FileInfo().PermanentDelete(f1.Id)
ss.FileInfo().PermanentDelete(rctx, f1.Id)
}()
time.Sleep(2 * time.Millisecond)
@@ -717,7 +717,7 @@ func testFileInfoStoreGetFilesBatchForIndexing(t *testing.T, rctx request.CTX, s
o2, err = ss.Post().Save(o2)
require.NoError(t, err)
f2, err := ss.FileInfo().Save(&model.FileInfo{
f2, err := ss.FileInfo().Save(rctx, &model.FileInfo{
PostId: o2.Id,
ChannelId: o2.ChannelId,
CreatorId: model.NewId(),
@@ -725,7 +725,7 @@ func testFileInfoStoreGetFilesBatchForIndexing(t *testing.T, rctx request.CTX, s
})
require.NoError(t, err)
defer func() {
ss.FileInfo().PermanentDelete(f2.Id)
ss.FileInfo().PermanentDelete(rctx, f2.Id)
}()
time.Sleep(2 * time.Millisecond)
@@ -737,7 +737,7 @@ func testFileInfoStoreGetFilesBatchForIndexing(t *testing.T, rctx request.CTX, s
o3, err = ss.Post().Save(o3)
require.NoError(t, err)
f3, err := ss.FileInfo().Save(&model.FileInfo{
f3, err := ss.FileInfo().Save(rctx, &model.FileInfo{
PostId: o3.Id,
ChannelId: o3.ChannelId,
CreatorId: model.NewId(),
@@ -745,11 +745,11 @@ func testFileInfoStoreGetFilesBatchForIndexing(t *testing.T, rctx request.CTX, s
})
require.NoError(t, err)
defer func() {
ss.FileInfo().PermanentDelete(f3.Id)
ss.FileInfo().PermanentDelete(rctx, f3.Id)
}()
// Soft-deleting one file info
_, err = ss.FileInfo().DeleteForPost(f1.PostId)
_, err = ss.FileInfo().DeleteForPost(rctx, f1.PostId)
require.NoError(t, err)
// Getting all
@@ -776,9 +776,9 @@ func testFileInfoStoreGetFilesBatchForIndexing(t *testing.T, rctx request.CTX, s
}
func testFileInfoStoreCountAll(t *testing.T, rctx request.CTX, ss store.Store) {
_, err := ss.FileInfo().PermanentDeleteBatch(model.GetMillis(), 100000)
_, err := ss.FileInfo().PermanentDeleteBatch(rctx, model.GetMillis(), 100000)
require.NoError(t, err)
f1, err := ss.FileInfo().Save(&model.FileInfo{
f1, err := ss.FileInfo().Save(rctx, &model.FileInfo{
PostId: model.NewId(),
ChannelId: model.NewId(),
CreatorId: model.NewId(),
@@ -786,14 +786,14 @@ func testFileInfoStoreCountAll(t *testing.T, rctx request.CTX, ss store.Store) {
})
require.NoError(t, err)
_, err = ss.FileInfo().Save(&model.FileInfo{
_, err = ss.FileInfo().Save(rctx, &model.FileInfo{
PostId: model.NewId(),
ChannelId: model.NewId(),
CreatorId: model.NewId(),
Path: "file2.txt",
})
require.NoError(t, err)
_, err = ss.FileInfo().Save(&model.FileInfo{
_, err = ss.FileInfo().Save(rctx, &model.FileInfo{
PostId: model.NewId(),
ChannelId: model.NewId(),
CreatorId: model.NewId(),
@@ -805,7 +805,7 @@ func testFileInfoStoreCountAll(t *testing.T, rctx request.CTX, ss store.Store) {
require.NoError(t, err)
require.Equal(t, int64(3), count)
_, err = ss.FileInfo().DeleteForPost(f1.PostId)
_, err = ss.FileInfo().DeleteForPost(rctx, f1.PostId)
require.NoError(t, err)
count, err = ss.FileInfo().CountAll()
require.NoError(t, err)
@@ -813,14 +813,14 @@ func testFileInfoStoreCountAll(t *testing.T, rctx request.CTX, ss store.Store) {
}
func testFileInfoGetStorageUsage(t *testing.T, rctx request.CTX, ss store.Store) {
_, err := ss.FileInfo().PermanentDeleteBatch(model.GetMillis(), 100000)
_, err := ss.FileInfo().PermanentDeleteBatch(rctx, model.GetMillis(), 100000)
require.NoError(t, err)
usage, err := ss.FileInfo().GetStorageUsage(false, false)
require.NoError(t, err)
require.Equal(t, int64(0), usage)
f1, err := ss.FileInfo().Save(&model.FileInfo{
f1, err := ss.FileInfo().Save(rctx, &model.FileInfo{
PostId: model.NewId(),
CreatorId: model.NewId(),
Size: 10,
@@ -828,14 +828,14 @@ func testFileInfoGetStorageUsage(t *testing.T, rctx request.CTX, ss store.Store)
})
require.NoError(t, err)
_, err = ss.FileInfo().Save(&model.FileInfo{
_, err = ss.FileInfo().Save(rctx, &model.FileInfo{
PostId: model.NewId(),
CreatorId: model.NewId(),
Size: 10,
Path: "file2.txt",
})
require.NoError(t, err)
_, err = ss.FileInfo().Save(&model.FileInfo{
_, err = ss.FileInfo().Save(rctx, &model.FileInfo{
PostId: model.NewId(),
CreatorId: model.NewId(),
Size: 10,
@@ -847,7 +847,7 @@ func testFileInfoGetStorageUsage(t *testing.T, rctx request.CTX, ss store.Store)
require.NoError(t, err)
require.Equal(t, int64(30), usage)
_, err = ss.FileInfo().DeleteForPost(f1.PostId)
_, err = ss.FileInfo().DeleteForPost(rctx, f1.PostId)
require.NoError(t, err)
usage, err = ss.FileInfo().GetStorageUsage(false, false)
require.NoError(t, err)
@@ -866,13 +866,13 @@ func testGetUptoNSizeFileTime(t *testing.T, rctx request.CTX, ss store.Store, s
_, err = ss.FileInfo().GetUptoNSizeFileTime(-1)
assert.Error(t, err)
_, err = ss.FileInfo().PermanentDeleteBatch(model.GetMillis(), 100000)
_, err = ss.FileInfo().PermanentDeleteBatch(rctx, model.GetMillis(), 100000)
require.NoError(t, err)
diff := int64(10000)
now := utils.MillisFromTime(time.Now()) + diff
f1, err := ss.FileInfo().Save(&model.FileInfo{
f1, err := ss.FileInfo().Save(rctx, &model.FileInfo{
PostId: model.NewId(),
CreatorId: model.NewId(),
Size: 10,
@@ -880,9 +880,9 @@ func testGetUptoNSizeFileTime(t *testing.T, rctx request.CTX, ss store.Store, s
CreateAt: now,
})
require.NoError(t, err)
defer ss.FileInfo().PermanentDelete(f1.Id)
defer ss.FileInfo().PermanentDelete(rctx, f1.Id)
now = now + diff
f2, err := ss.FileInfo().Save(&model.FileInfo{
f2, err := ss.FileInfo().Save(rctx, &model.FileInfo{
PostId: model.NewId(),
CreatorId: model.NewId(),
Size: 10,
@@ -890,9 +890,9 @@ func testGetUptoNSizeFileTime(t *testing.T, rctx request.CTX, ss store.Store, s
CreateAt: now,
})
require.NoError(t, err)
defer ss.FileInfo().PermanentDelete(f2.Id)
defer ss.FileInfo().PermanentDelete(rctx, f2.Id)
now = now + diff
f3, err := ss.FileInfo().Save(&model.FileInfo{
f3, err := ss.FileInfo().Save(rctx, &model.FileInfo{
PostId: model.NewId(),
CreatorId: model.NewId(),
Size: 10,
@@ -900,9 +900,9 @@ func testGetUptoNSizeFileTime(t *testing.T, rctx request.CTX, ss store.Store, s
CreateAt: now,
})
require.NoError(t, err)
defer ss.FileInfo().PermanentDelete(f3.Id)
defer ss.FileInfo().PermanentDelete(rctx, f3.Id)
now = now + diff
tmp, err := ss.FileInfo().Save(&model.FileInfo{
tmp, err := ss.FileInfo().Save(rctx, &model.FileInfo{
PostId: model.NewId(),
CreatorId: model.NewId(),
Size: 10,
@@ -910,7 +910,7 @@ func testGetUptoNSizeFileTime(t *testing.T, rctx request.CTX, ss store.Store, s
CreateAt: now,
})
require.NoError(t, err)
defer ss.FileInfo().PermanentDelete(tmp.Id)
defer ss.FileInfo().PermanentDelete(rctx, tmp.Id)
createAt, err := ss.FileInfo().GetUptoNSizeFileTime(20)
require.NoError(t, err)
@@ -924,7 +924,7 @@ func testGetUptoNSizeFileTime(t *testing.T, rctx request.CTX, ss store.Store, s
require.NoError(t, err)
assert.Equal(t, f1.CreateAt, createAt)
_, err = ss.FileInfo().DeleteForPost(f3.PostId)
_, err = ss.FileInfo().DeleteForPost(rctx, f3.PostId)
require.NoError(t, err)
createAt, err = ss.FileInfo().GetUptoNSizeFileTime(20)

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

@@ -1910,7 +1910,7 @@ func testTeamMembersToAdd(t *testing.T, rctx request.CTX, ss store.Store) {
require.Empty(t, teamMembers)
// Leaving Team should still not return result
_, nErr = ss.Team().UpdateMember(&model.TeamMember{
_, nErr = ss.Team().UpdateMember(rctx, &model.TeamMember{
TeamId: team.Id,
UserId: user.Id,
DeleteAt: model.GetMillis(),
@@ -2129,7 +2129,7 @@ func testChannelMembersToAdd(t *testing.T, rctx request.CTX, ss store.Store) {
// reset state of channel and verify
channel.DeleteAt = 0
_, nErr = ss.Channel().Update(channel)
_, nErr = ss.Channel().Update(rctx, channel)
require.NoError(t, nErr)
channelMembers, err = ss.Group().ChannelMembersToAdd(0, nil, false)
require.NoError(t, err)
@@ -2334,17 +2334,17 @@ func testTeamMembersToRemove(t *testing.T, rctx request.CTX, ss store.Store) {
require.Len(t, teamMembers, 3)
// add users back to groups
res := ss.Team().RemoveMember(data.ConstrainedTeam.Id, data.UserA.Id)
res := ss.Team().RemoveMember(rctx, data.ConstrainedTeam.Id, data.UserA.Id)
require.NoError(t, res)
res = ss.Team().RemoveMember(data.ConstrainedTeam.Id, data.UserB.Id)
res = ss.Team().RemoveMember(rctx, data.ConstrainedTeam.Id, data.UserB.Id)
require.NoError(t, res)
res = ss.Team().RemoveMember(data.ConstrainedTeam.Id, data.UserC.Id)
res = ss.Team().RemoveMember(rctx, data.ConstrainedTeam.Id, data.UserC.Id)
require.NoError(t, res)
nErr = ss.Channel().RemoveMember(data.ConstrainedChannel.Id, data.UserA.Id)
nErr = ss.Channel().RemoveMember(rctx, data.ConstrainedChannel.Id, data.UserA.Id)
require.NoError(t, nErr)
nErr = ss.Channel().RemoveMember(data.ConstrainedChannel.Id, data.UserB.Id)
nErr = ss.Channel().RemoveMember(rctx, data.ConstrainedChannel.Id, data.UserB.Id)
require.NoError(t, nErr)
nErr = ss.Channel().RemoveMember(data.ConstrainedChannel.Id, data.UserC.Id)
nErr = ss.Channel().RemoveMember(rctx, data.ConstrainedChannel.Id, data.UserC.Id)
require.NoError(t, nErr)
}
@@ -2486,17 +2486,17 @@ func testChannelMembersToRemove(t *testing.T, rctx request.CTX, ss store.Store)
require.Len(t, channelMembers, 3)
// add users back to groups
res := ss.Team().RemoveMember(data.ConstrainedTeam.Id, data.UserA.Id)
res := ss.Team().RemoveMember(rctx, data.ConstrainedTeam.Id, data.UserA.Id)
require.NoError(t, res)
res = ss.Team().RemoveMember(data.ConstrainedTeam.Id, data.UserB.Id)
res = ss.Team().RemoveMember(rctx, data.ConstrainedTeam.Id, data.UserB.Id)
require.NoError(t, res)
res = ss.Team().RemoveMember(data.ConstrainedTeam.Id, data.UserC.Id)
res = ss.Team().RemoveMember(rctx, data.ConstrainedTeam.Id, data.UserC.Id)
require.NoError(t, res)
nErr = ss.Channel().RemoveMember(data.ConstrainedChannel.Id, data.UserA.Id)
nErr = ss.Channel().RemoveMember(rctx, data.ConstrainedChannel.Id, data.UserA.Id)
require.NoError(t, nErr)
nErr = ss.Channel().RemoveMember(data.ConstrainedChannel.Id, data.UserB.Id)
nErr = ss.Channel().RemoveMember(rctx, data.ConstrainedChannel.Id, data.UserB.Id)
require.NoError(t, nErr)
nErr = ss.Channel().RemoveMember(data.ConstrainedChannel.Id, data.UserC.Id)
nErr = ss.Channel().RemoveMember(rctx, data.ConstrainedChannel.Id, data.UserC.Id)
require.NoError(t, nErr)
}
@@ -2835,7 +2835,7 @@ func testGetGroupsByChannel(t *testing.T, rctx request.CTX, ss store.Store) {
require.NoError(t, err)
user2.DeleteAt = 1
_, err = ss.User().Update(user2, true)
_, err = ss.User().Update(rctx, user2, true)
require.NoError(t, err)
group1WithMemberCount := *group1
@@ -3083,7 +3083,7 @@ func testGetGroupsAssociatedToChannelsByTeam(t *testing.T, rctx request.CTX, ss
require.NoError(t, err)
user2.DeleteAt = 1
_, err = ss.User().Update(user2, true)
_, err = ss.User().Update(rctx, user2, true)
require.NoError(t, err)
group1WithMemberCount := *group1
@@ -3320,7 +3320,7 @@ func testGetGroupsByTeam(t *testing.T, rctx request.CTX, ss store.Store) {
require.NoError(t, err)
user2.DeleteAt = 1
_, err = ss.User().Update(user2, true)
_, err = ss.User().Update(rctx, user2, true)
require.NoError(t, err)
_, err = ss.Group().UpsertMember(deletedGroup.Id, user1.Id)
@@ -3643,7 +3643,7 @@ func testGetGroups(t *testing.T, rctx request.CTX, ss store.Store) {
require.NoError(t, err)
user2.DeleteAt = 1
u2Update, _ := ss.User().Update(user2, true)
u2Update, _ := ss.User().Update(rctx, user2, true)
group2NameSubstring := "group-2"
@@ -4343,7 +4343,7 @@ func groupTestGetMemberCount(t *testing.T, rctx request.CTX, ss store.Store) {
require.Equal(t, int64(2), count)
user.DeleteAt = 1
_, nErr = ss.User().Update(user, true)
_, nErr = ss.User().Update(rctx, user, true)
require.NoError(t, nErr)
count, err = ss.Group().GetMemberCount(group.Id)

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

@@ -68,25 +68,25 @@ func (_m *ChannelStore) AnalyticsTypeCount(teamID string, channelType model.Chan
return r0, r1
}
// Autocomplete provides a mock function with given fields: userID, term, includeDeleted, isGuest
func (_m *ChannelStore) Autocomplete(userID string, term string, includeDeleted bool, isGuest bool) (model.ChannelListWithTeamData, error) {
ret := _m.Called(userID, term, includeDeleted, isGuest)
// Autocomplete provides a mock function with given fields: rctx, userID, term, includeDeleted, isGuest
func (_m *ChannelStore) Autocomplete(rctx request.CTX, userID string, term string, includeDeleted bool, isGuest bool) (model.ChannelListWithTeamData, error) {
ret := _m.Called(rctx, userID, term, includeDeleted, isGuest)
var r0 model.ChannelListWithTeamData
var r1 error
if rf, ok := ret.Get(0).(func(string, string, bool, bool) (model.ChannelListWithTeamData, error)); ok {
return rf(userID, term, includeDeleted, isGuest)
if rf, ok := ret.Get(0).(func(request.CTX, string, string, bool, bool) (model.ChannelListWithTeamData, error)); ok {
return rf(rctx, userID, term, includeDeleted, isGuest)
}
if rf, ok := ret.Get(0).(func(string, string, bool, bool) model.ChannelListWithTeamData); ok {
r0 = rf(userID, term, includeDeleted, isGuest)
if rf, ok := ret.Get(0).(func(request.CTX, string, string, bool, bool) model.ChannelListWithTeamData); ok {
r0 = rf(rctx, userID, term, includeDeleted, isGuest)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(model.ChannelListWithTeamData)
}
}
if rf, ok := ret.Get(1).(func(string, string, bool, bool) error); ok {
r1 = rf(userID, term, includeDeleted, isGuest)
if rf, ok := ret.Get(1).(func(request.CTX, string, string, bool, bool) error); ok {
r1 = rf(rctx, userID, term, includeDeleted, isGuest)
} else {
r1 = ret.Error(1)
}
@@ -94,25 +94,25 @@ func (_m *ChannelStore) Autocomplete(userID string, term string, includeDeleted
return r0, r1
}
// AutocompleteInTeam provides a mock function with given fields: teamID, userID, term, includeDeleted, isGuest
func (_m *ChannelStore) AutocompleteInTeam(teamID string, userID string, term string, includeDeleted bool, isGuest bool) (model.ChannelList, error) {
ret := _m.Called(teamID, userID, term, includeDeleted, isGuest)
// AutocompleteInTeam provides a mock function with given fields: rctx, teamID, userID, term, includeDeleted, isGuest
func (_m *ChannelStore) AutocompleteInTeam(rctx request.CTX, teamID string, userID string, term string, includeDeleted bool, isGuest bool) (model.ChannelList, error) {
ret := _m.Called(rctx, teamID, userID, term, includeDeleted, isGuest)
var r0 model.ChannelList
var r1 error
if rf, ok := ret.Get(0).(func(string, string, string, bool, bool) (model.ChannelList, error)); ok {
return rf(teamID, userID, term, includeDeleted, isGuest)
if rf, ok := ret.Get(0).(func(request.CTX, string, string, string, bool, bool) (model.ChannelList, error)); ok {
return rf(rctx, teamID, userID, term, includeDeleted, isGuest)
}
if rf, ok := ret.Get(0).(func(string, string, string, bool, bool) model.ChannelList); ok {
r0 = rf(teamID, userID, term, includeDeleted, isGuest)
if rf, ok := ret.Get(0).(func(request.CTX, string, string, string, bool, bool) model.ChannelList); ok {
r0 = rf(rctx, teamID, userID, term, includeDeleted, isGuest)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(model.ChannelList)
}
}
if rf, ok := ret.Get(1).(func(string, string, string, bool, bool) error); ok {
r1 = rf(teamID, userID, term, includeDeleted, isGuest)
if rf, ok := ret.Get(1).(func(request.CTX, string, string, string, bool, bool) error); ok {
r1 = rf(rctx, teamID, userID, term, includeDeleted, isGuest)
} else {
r1 = ret.Error(1)
}
@@ -239,32 +239,32 @@ func (_m *ChannelStore) CountUrgentPostsAfter(channelID string, timestamp int64,
return r0, r1
}
// CreateDirectChannel provides a mock function with given fields: userID, otherUserID, channelOptions
func (_m *ChannelStore) CreateDirectChannel(userID *model.User, otherUserID *model.User, channelOptions ...model.ChannelOption) (*model.Channel, error) {
// CreateDirectChannel provides a mock function with given fields: ctx, userID, otherUserID, channelOptions
func (_m *ChannelStore) CreateDirectChannel(ctx request.CTX, userID *model.User, otherUserID *model.User, channelOptions ...model.ChannelOption) (*model.Channel, error) {
_va := make([]interface{}, len(channelOptions))
for _i := range channelOptions {
_va[_i] = channelOptions[_i]
}
var _ca []interface{}
_ca = append(_ca, userID, otherUserID)
_ca = append(_ca, ctx, userID, otherUserID)
_ca = append(_ca, _va...)
ret := _m.Called(_ca...)
var r0 *model.Channel
var r1 error
if rf, ok := ret.Get(0).(func(*model.User, *model.User, ...model.ChannelOption) (*model.Channel, error)); ok {
return rf(userID, otherUserID, channelOptions...)
if rf, ok := ret.Get(0).(func(request.CTX, *model.User, *model.User, ...model.ChannelOption) (*model.Channel, error)); ok {
return rf(ctx, userID, otherUserID, channelOptions...)
}
if rf, ok := ret.Get(0).(func(*model.User, *model.User, ...model.ChannelOption) *model.Channel); ok {
r0 = rf(userID, otherUserID, channelOptions...)
if rf, ok := ret.Get(0).(func(request.CTX, *model.User, *model.User, ...model.ChannelOption) *model.Channel); ok {
r0 = rf(ctx, userID, otherUserID, channelOptions...)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.Channel)
}
}
if rf, ok := ret.Get(1).(func(*model.User, *model.User, ...model.ChannelOption) error); ok {
r1 = rf(userID, otherUserID, channelOptions...)
if rf, ok := ret.Get(1).(func(request.CTX, *model.User, *model.User, ...model.ChannelOption) error); ok {
r1 = rf(ctx, userID, otherUserID, channelOptions...)
} else {
r1 = ret.Error(1)
}
@@ -1945,13 +1945,13 @@ func (_m *ChannelStore) MigrateChannelMembers(fromChannelID string, fromUserID s
return r0, r1
}
// PermanentDelete provides a mock function with given fields: channelID
func (_m *ChannelStore) PermanentDelete(channelID string) error {
ret := _m.Called(channelID)
// PermanentDelete provides a mock function with given fields: ctx, channelID
func (_m *ChannelStore) PermanentDelete(ctx request.CTX, channelID string) error {
ret := _m.Called(ctx, channelID)
var r0 error
if rf, ok := ret.Get(0).(func(string) error); ok {
r0 = rf(channelID)
if rf, ok := ret.Get(0).(func(request.CTX, string) error); ok {
r0 = rf(ctx, channelID)
} else {
r0 = ret.Error(0)
}
@@ -1973,13 +1973,13 @@ func (_m *ChannelStore) PermanentDeleteByTeam(teamID string) error {
return r0
}
// PermanentDeleteMembersByChannel provides a mock function with given fields: channelID
func (_m *ChannelStore) PermanentDeleteMembersByChannel(channelID string) error {
ret := _m.Called(channelID)
// PermanentDeleteMembersByChannel provides a mock function with given fields: ctx, channelID
func (_m *ChannelStore) PermanentDeleteMembersByChannel(ctx request.CTX, channelID string) error {
ret := _m.Called(ctx, channelID)
var r0 error
if rf, ok := ret.Get(0).(func(string) error); ok {
r0 = rf(channelID)
if rf, ok := ret.Get(0).(func(request.CTX, string) error); ok {
r0 = rf(ctx, channelID)
} else {
r0 = ret.Error(0)
}
@@ -1987,13 +1987,13 @@ func (_m *ChannelStore) PermanentDeleteMembersByChannel(channelID string) error
return r0
}
// PermanentDeleteMembersByUser provides a mock function with given fields: userID
func (_m *ChannelStore) PermanentDeleteMembersByUser(userID string) error {
ret := _m.Called(userID)
// PermanentDeleteMembersByUser provides a mock function with given fields: ctx, userID
func (_m *ChannelStore) PermanentDeleteMembersByUser(ctx request.CTX, userID string) error {
ret := _m.Called(ctx, userID)
var r0 error
if rf, ok := ret.Get(0).(func(string) error); ok {
r0 = rf(userID)
if rf, ok := ret.Get(0).(func(request.CTX, string) error); ok {
r0 = rf(ctx, userID)
} else {
r0 = ret.Error(0)
}
@@ -2001,13 +2001,13 @@ func (_m *ChannelStore) PermanentDeleteMembersByUser(userID string) error {
return r0
}
// RemoveAllDeactivatedMembers provides a mock function with given fields: channelID
func (_m *ChannelStore) RemoveAllDeactivatedMembers(channelID string) error {
ret := _m.Called(channelID)
// RemoveAllDeactivatedMembers provides a mock function with given fields: ctx, channelID
func (_m *ChannelStore) RemoveAllDeactivatedMembers(ctx request.CTX, channelID string) error {
ret := _m.Called(ctx, channelID)
var r0 error
if rf, ok := ret.Get(0).(func(string) error); ok {
r0 = rf(channelID)
if rf, ok := ret.Get(0).(func(request.CTX, string) error); ok {
r0 = rf(ctx, channelID)
} else {
r0 = ret.Error(0)
}
@@ -2015,13 +2015,13 @@ func (_m *ChannelStore) RemoveAllDeactivatedMembers(channelID string) error {
return r0
}
// RemoveMember provides a mock function with given fields: channelID, userID
func (_m *ChannelStore) RemoveMember(channelID string, userID string) error {
ret := _m.Called(channelID, userID)
// RemoveMember provides a mock function with given fields: ctx, channelID, userID
func (_m *ChannelStore) RemoveMember(ctx request.CTX, channelID string, userID string) error {
ret := _m.Called(ctx, channelID, userID)
var r0 error
if rf, ok := ret.Get(0).(func(string, string) error); ok {
r0 = rf(channelID, userID)
if rf, ok := ret.Get(0).(func(request.CTX, string, string) error); ok {
r0 = rf(ctx, channelID, userID)
} else {
r0 = ret.Error(0)
}
@@ -2029,13 +2029,13 @@ func (_m *ChannelStore) RemoveMember(channelID string, userID string) error {
return r0
}
// RemoveMembers provides a mock function with given fields: channelID, userIds
func (_m *ChannelStore) RemoveMembers(channelID string, userIds []string) error {
ret := _m.Called(channelID, userIds)
// RemoveMembers provides a mock function with given fields: ctx, channelID, userIds
func (_m *ChannelStore) RemoveMembers(ctx request.CTX, channelID string, userIds []string) error {
ret := _m.Called(ctx, channelID, userIds)
var r0 error
if rf, ok := ret.Get(0).(func(string, []string) error); ok {
r0 = rf(channelID, userIds)
if rf, ok := ret.Get(0).(func(request.CTX, string, []string) error); ok {
r0 = rf(ctx, channelID, userIds)
} else {
r0 = ret.Error(0)
}
@@ -2097,25 +2097,25 @@ func (_m *ChannelStore) Save(channel *model.Channel, maxChannelsPerTeam int64) (
return r0, r1
}
// SaveDirectChannel provides a mock function with given fields: channel, member1, member2
func (_m *ChannelStore) SaveDirectChannel(channel *model.Channel, member1 *model.ChannelMember, member2 *model.ChannelMember) (*model.Channel, error) {
ret := _m.Called(channel, member1, member2)
// SaveDirectChannel provides a mock function with given fields: ctx, channel, member1, member2
func (_m *ChannelStore) SaveDirectChannel(ctx request.CTX, channel *model.Channel, member1 *model.ChannelMember, member2 *model.ChannelMember) (*model.Channel, error) {
ret := _m.Called(ctx, channel, member1, member2)
var r0 *model.Channel
var r1 error
if rf, ok := ret.Get(0).(func(*model.Channel, *model.ChannelMember, *model.ChannelMember) (*model.Channel, error)); ok {
return rf(channel, member1, member2)
if rf, ok := ret.Get(0).(func(request.CTX, *model.Channel, *model.ChannelMember, *model.ChannelMember) (*model.Channel, error)); ok {
return rf(ctx, channel, member1, member2)
}
if rf, ok := ret.Get(0).(func(*model.Channel, *model.ChannelMember, *model.ChannelMember) *model.Channel); ok {
r0 = rf(channel, member1, member2)
if rf, ok := ret.Get(0).(func(request.CTX, *model.Channel, *model.ChannelMember, *model.ChannelMember) *model.Channel); ok {
r0 = rf(ctx, channel, member1, member2)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.Channel)
}
}
if rf, ok := ret.Get(1).(func(*model.Channel, *model.ChannelMember, *model.ChannelMember) error); ok {
r1 = rf(channel, member1, member2)
if rf, ok := ret.Get(1).(func(request.CTX, *model.Channel, *model.ChannelMember, *model.ChannelMember) error); ok {
r1 = rf(ctx, channel, member1, member2)
} else {
r1 = ret.Error(1)
}
@@ -2366,25 +2366,25 @@ func (_m *ChannelStore) SetShared(channelId string, shared bool) error {
return r0
}
// Update provides a mock function with given fields: channel
func (_m *ChannelStore) Update(channel *model.Channel) (*model.Channel, error) {
ret := _m.Called(channel)
// Update provides a mock function with given fields: ctx, channel
func (_m *ChannelStore) Update(ctx request.CTX, channel *model.Channel) (*model.Channel, error) {
ret := _m.Called(ctx, channel)
var r0 *model.Channel
var r1 error
if rf, ok := ret.Get(0).(func(*model.Channel) (*model.Channel, error)); ok {
return rf(channel)
if rf, ok := ret.Get(0).(func(request.CTX, *model.Channel) (*model.Channel, error)); ok {
return rf(ctx, channel)
}
if rf, ok := ret.Get(0).(func(*model.Channel) *model.Channel); ok {
r0 = rf(channel)
if rf, ok := ret.Get(0).(func(request.CTX, *model.Channel) *model.Channel); ok {
r0 = rf(ctx, channel)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.Channel)
}
}
if rf, ok := ret.Get(1).(func(*model.Channel) error); ok {
r1 = rf(channel)
if rf, ok := ret.Get(1).(func(request.CTX, *model.Channel) error); ok {
r1 = rf(ctx, channel)
} else {
r1 = ret.Error(1)
}
@@ -2444,25 +2444,25 @@ func (_m *ChannelStore) UpdateLastViewedAtPost(unreadPost *model.Post, userID st
return r0, r1
}
// UpdateMember provides a mock function with given fields: member
func (_m *ChannelStore) UpdateMember(member *model.ChannelMember) (*model.ChannelMember, error) {
ret := _m.Called(member)
// UpdateMember provides a mock function with given fields: ctx, member
func (_m *ChannelStore) UpdateMember(ctx request.CTX, member *model.ChannelMember) (*model.ChannelMember, error) {
ret := _m.Called(ctx, member)
var r0 *model.ChannelMember
var r1 error
if rf, ok := ret.Get(0).(func(*model.ChannelMember) (*model.ChannelMember, error)); ok {
return rf(member)
if rf, ok := ret.Get(0).(func(request.CTX, *model.ChannelMember) (*model.ChannelMember, error)); ok {
return rf(ctx, member)
}
if rf, ok := ret.Get(0).(func(*model.ChannelMember) *model.ChannelMember); ok {
r0 = rf(member)
if rf, ok := ret.Get(0).(func(request.CTX, *model.ChannelMember) *model.ChannelMember); ok {
r0 = rf(ctx, member)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.ChannelMember)
}
}
if rf, ok := ret.Get(1).(func(*model.ChannelMember) error); ok {
r1 = rf(member)
if rf, ok := ret.Get(1).(func(request.CTX, *model.ChannelMember) error); ok {
r1 = rf(ctx, member)
} else {
r1 = ret.Error(1)
}

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

@@ -6,6 +6,7 @@ package mocks
import (
model "github.com/mattermost/mattermost/server/public/model"
request "github.com/mattermost/mattermost/server/public/shared/request"
mock "github.com/stretchr/testify/mock"
)
@@ -14,13 +15,13 @@ type FileInfoStore struct {
mock.Mock
}
// AttachToPost provides a mock function with given fields: fileID, postID, channelID, creatorID
func (_m *FileInfoStore) AttachToPost(fileID string, postID string, channelID string, creatorID string) error {
ret := _m.Called(fileID, postID, channelID, creatorID)
// AttachToPost provides a mock function with given fields: c, fileID, postID, channelID, creatorID
func (_m *FileInfoStore) AttachToPost(c request.CTX, fileID string, postID string, channelID string, creatorID string) error {
ret := _m.Called(c, fileID, postID, channelID, creatorID)
var r0 error
if rf, ok := ret.Get(0).(func(string, string, string, string) error); ok {
r0 = rf(fileID, postID, channelID, creatorID)
if rf, ok := ret.Get(0).(func(request.CTX, string, string, string, string) error); ok {
r0 = rf(c, fileID, postID, channelID, creatorID)
} else {
r0 = ret.Error(0)
}
@@ -57,23 +58,23 @@ func (_m *FileInfoStore) CountAll() (int64, error) {
return r0, r1
}
// DeleteForPost provides a mock function with given fields: postID
func (_m *FileInfoStore) DeleteForPost(postID string) (string, error) {
ret := _m.Called(postID)
// DeleteForPost provides a mock function with given fields: c, postID
func (_m *FileInfoStore) DeleteForPost(c request.CTX, postID string) (string, error) {
ret := _m.Called(c, postID)
var r0 string
var r1 error
if rf, ok := ret.Get(0).(func(string) (string, error)); ok {
return rf(postID)
if rf, ok := ret.Get(0).(func(request.CTX, string) (string, error)); ok {
return rf(c, postID)
}
if rf, ok := ret.Get(0).(func(string) string); ok {
r0 = rf(postID)
if rf, ok := ret.Get(0).(func(request.CTX, string) string); ok {
r0 = rf(c, postID)
} else {
r0 = ret.Get(0).(string)
}
if rf, ok := ret.Get(1).(func(string) error); ok {
r1 = rf(postID)
if rf, ok := ret.Get(1).(func(request.CTX, string) error); ok {
r1 = rf(c, postID)
} else {
r1 = ret.Error(1)
}
@@ -342,13 +343,13 @@ func (_m *FileInfoStore) InvalidateFileInfosForPostCache(postID string, deleted
_m.Called(postID, deleted)
}
// PermanentDelete provides a mock function with given fields: fileID
func (_m *FileInfoStore) PermanentDelete(fileID string) error {
ret := _m.Called(fileID)
// PermanentDelete provides a mock function with given fields: c, fileID
func (_m *FileInfoStore) PermanentDelete(c request.CTX, fileID string) error {
ret := _m.Called(c, fileID)
var r0 error
if rf, ok := ret.Get(0).(func(string) error); ok {
r0 = rf(fileID)
if rf, ok := ret.Get(0).(func(request.CTX, string) error); ok {
r0 = rf(c, fileID)
} else {
r0 = ret.Error(0)
}
@@ -356,23 +357,23 @@ func (_m *FileInfoStore) PermanentDelete(fileID string) error {
return r0
}
// PermanentDeleteBatch provides a mock function with given fields: endTime, limit
func (_m *FileInfoStore) PermanentDeleteBatch(endTime int64, limit int64) (int64, error) {
ret := _m.Called(endTime, limit)
// PermanentDeleteBatch provides a mock function with given fields: ctx, endTime, limit
func (_m *FileInfoStore) PermanentDeleteBatch(ctx request.CTX, endTime int64, limit int64) (int64, error) {
ret := _m.Called(ctx, endTime, limit)
var r0 int64
var r1 error
if rf, ok := ret.Get(0).(func(int64, int64) (int64, error)); ok {
return rf(endTime, limit)
if rf, ok := ret.Get(0).(func(request.CTX, int64, int64) (int64, error)); ok {
return rf(ctx, endTime, limit)
}
if rf, ok := ret.Get(0).(func(int64, int64) int64); ok {
r0 = rf(endTime, limit)
if rf, ok := ret.Get(0).(func(request.CTX, int64, int64) int64); ok {
r0 = rf(ctx, endTime, limit)
} else {
r0 = ret.Get(0).(int64)
}
if rf, ok := ret.Get(1).(func(int64, int64) error); ok {
r1 = rf(endTime, limit)
if rf, ok := ret.Get(1).(func(request.CTX, int64, int64) error); ok {
r1 = rf(ctx, endTime, limit)
} else {
r1 = ret.Error(1)
}
@@ -380,23 +381,23 @@ func (_m *FileInfoStore) PermanentDeleteBatch(endTime int64, limit int64) (int64
return r0, r1
}
// PermanentDeleteByUser provides a mock function with given fields: userID
func (_m *FileInfoStore) PermanentDeleteByUser(userID string) (int64, error) {
ret := _m.Called(userID)
// PermanentDeleteByUser provides a mock function with given fields: ctx, userID
func (_m *FileInfoStore) PermanentDeleteByUser(ctx request.CTX, userID string) (int64, error) {
ret := _m.Called(ctx, userID)
var r0 int64
var r1 error
if rf, ok := ret.Get(0).(func(string) (int64, error)); ok {
return rf(userID)
if rf, ok := ret.Get(0).(func(request.CTX, string) (int64, error)); ok {
return rf(ctx, userID)
}
if rf, ok := ret.Get(0).(func(string) int64); ok {
r0 = rf(userID)
if rf, ok := ret.Get(0).(func(request.CTX, string) int64); ok {
r0 = rf(ctx, userID)
} else {
r0 = ret.Get(0).(int64)
}
if rf, ok := ret.Get(1).(func(string) error); ok {
r1 = rf(userID)
if rf, ok := ret.Get(1).(func(request.CTX, string) error); ok {
r1 = rf(ctx, userID)
} else {
r1 = ret.Error(1)
}
@@ -404,25 +405,25 @@ func (_m *FileInfoStore) PermanentDeleteByUser(userID string) (int64, error) {
return r0, r1
}
// Save provides a mock function with given fields: info
func (_m *FileInfoStore) Save(info *model.FileInfo) (*model.FileInfo, error) {
ret := _m.Called(info)
// Save provides a mock function with given fields: ctx, info
func (_m *FileInfoStore) Save(ctx request.CTX, info *model.FileInfo) (*model.FileInfo, error) {
ret := _m.Called(ctx, info)
var r0 *model.FileInfo
var r1 error
if rf, ok := ret.Get(0).(func(*model.FileInfo) (*model.FileInfo, error)); ok {
return rf(info)
if rf, ok := ret.Get(0).(func(request.CTX, *model.FileInfo) (*model.FileInfo, error)); ok {
return rf(ctx, info)
}
if rf, ok := ret.Get(0).(func(*model.FileInfo) *model.FileInfo); ok {
r0 = rf(info)
if rf, ok := ret.Get(0).(func(request.CTX, *model.FileInfo) *model.FileInfo); ok {
r0 = rf(ctx, info)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.FileInfo)
}
}
if rf, ok := ret.Get(1).(func(*model.FileInfo) error); ok {
r1 = rf(info)
if rf, ok := ret.Get(1).(func(request.CTX, *model.FileInfo) error); ok {
r1 = rf(ctx, info)
} else {
r1 = ret.Error(1)
}
@@ -430,25 +431,25 @@ func (_m *FileInfoStore) Save(info *model.FileInfo) (*model.FileInfo, error) {
return r0, r1
}
// Search provides a mock function with given fields: paramsList, userID, teamID, page, perPage
func (_m *FileInfoStore) Search(paramsList []*model.SearchParams, userID string, teamID string, page int, perPage int) (*model.FileInfoList, error) {
ret := _m.Called(paramsList, userID, teamID, page, perPage)
// Search provides a mock function with given fields: ctx, paramsList, userID, teamID, page, perPage
func (_m *FileInfoStore) Search(ctx request.CTX, paramsList []*model.SearchParams, userID string, teamID string, page int, perPage int) (*model.FileInfoList, error) {
ret := _m.Called(ctx, paramsList, userID, teamID, page, perPage)
var r0 *model.FileInfoList
var r1 error
if rf, ok := ret.Get(0).(func([]*model.SearchParams, string, string, int, int) (*model.FileInfoList, error)); ok {
return rf(paramsList, userID, teamID, page, perPage)
if rf, ok := ret.Get(0).(func(request.CTX, []*model.SearchParams, string, string, int, int) (*model.FileInfoList, error)); ok {
return rf(ctx, paramsList, userID, teamID, page, perPage)
}
if rf, ok := ret.Get(0).(func([]*model.SearchParams, string, string, int, int) *model.FileInfoList); ok {
r0 = rf(paramsList, userID, teamID, page, perPage)
if rf, ok := ret.Get(0).(func(request.CTX, []*model.SearchParams, string, string, int, int) *model.FileInfoList); ok {
r0 = rf(ctx, paramsList, userID, teamID, page, perPage)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.FileInfoList)
}
}
if rf, ok := ret.Get(1).(func([]*model.SearchParams, string, string, int, int) error); ok {
r1 = rf(paramsList, userID, teamID, page, perPage)
if rf, ok := ret.Get(1).(func(request.CTX, []*model.SearchParams, string, string, int, int) error); ok {
r1 = rf(ctx, paramsList, userID, teamID, page, perPage)
} else {
r1 = ret.Error(1)
}
@@ -456,13 +457,13 @@ func (_m *FileInfoStore) Search(paramsList []*model.SearchParams, userID string,
return r0, r1
}
// SetContent provides a mock function with given fields: fileID, content
func (_m *FileInfoStore) SetContent(fileID string, content string) error {
ret := _m.Called(fileID, content)
// SetContent provides a mock function with given fields: ctx, fileID, content
func (_m *FileInfoStore) SetContent(ctx request.CTX, fileID string, content string) error {
ret := _m.Called(ctx, fileID, content)
var r0 error
if rf, ok := ret.Get(0).(func(string, string) error); ok {
r0 = rf(fileID, content)
if rf, ok := ret.Get(0).(func(request.CTX, string, string) error); ok {
r0 = rf(ctx, fileID, content)
} else {
r0 = ret.Error(0)
}
@@ -470,25 +471,25 @@ func (_m *FileInfoStore) SetContent(fileID string, content string) error {
return r0
}
// Upsert provides a mock function with given fields: info
func (_m *FileInfoStore) Upsert(info *model.FileInfo) (*model.FileInfo, error) {
ret := _m.Called(info)
// Upsert provides a mock function with given fields: rctx, info
func (_m *FileInfoStore) Upsert(rctx request.CTX, info *model.FileInfo) (*model.FileInfo, error) {
ret := _m.Called(rctx, info)
var r0 *model.FileInfo
var r1 error
if rf, ok := ret.Get(0).(func(*model.FileInfo) (*model.FileInfo, error)); ok {
return rf(info)
if rf, ok := ret.Get(0).(func(request.CTX, *model.FileInfo) (*model.FileInfo, error)); ok {
return rf(rctx, info)
}
if rf, ok := ret.Get(0).(func(*model.FileInfo) *model.FileInfo); ok {
r0 = rf(info)
if rf, ok := ret.Get(0).(func(request.CTX, *model.FileInfo) *model.FileInfo); ok {
r0 = rf(rctx, info)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.FileInfo)
}
}
if rf, ok := ret.Get(1).(func(*model.FileInfo) error); ok {
r1 = rf(info)
if rf, ok := ret.Get(1).(func(request.CTX, *model.FileInfo) error); ok {
r1 = rf(rctx, info)
} else {
r1 = ret.Error(1)
}

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

@@ -10,6 +10,8 @@ import (
model "github.com/mattermost/mattermost/server/public/model"
mock "github.com/stretchr/testify/mock"
request "github.com/mattermost/mattermost/server/public/shared/request"
store "github.com/mattermost/mattermost/server/v8/channels/store"
)
@@ -99,13 +101,13 @@ func (_m *PostStore) ClearCaches() {
_m.Called()
}
// Delete provides a mock function with given fields: postID, timestamp, deleteByID
func (_m *PostStore) Delete(postID string, timestamp int64, deleteByID string) error {
ret := _m.Called(postID, timestamp, deleteByID)
// Delete provides a mock function with given fields: rctx, postID, timestamp, deleteByID
func (_m *PostStore) Delete(rctx request.CTX, postID string, timestamp int64, deleteByID string) error {
ret := _m.Called(rctx, postID, timestamp, deleteByID)
var r0 error
if rf, ok := ret.Get(0).(func(string, int64, string) error); ok {
r0 = rf(postID, timestamp, deleteByID)
if rf, ok := ret.Get(0).(func(request.CTX, string, int64, string) error); ok {
r0 = rf(rctx, postID, timestamp, deleteByID)
} else {
r0 = ret.Error(0)
}
@@ -845,25 +847,25 @@ func (_m *PostStore) InvalidateLastPostTimeCache(channelID string) {
_m.Called(channelID)
}
// Overwrite provides a mock function with given fields: post
func (_m *PostStore) Overwrite(post *model.Post) (*model.Post, error) {
ret := _m.Called(post)
// Overwrite provides a mock function with given fields: rctx, post
func (_m *PostStore) Overwrite(rctx request.CTX, post *model.Post) (*model.Post, error) {
ret := _m.Called(rctx, post)
var r0 *model.Post
var r1 error
if rf, ok := ret.Get(0).(func(*model.Post) (*model.Post, error)); ok {
return rf(post)
if rf, ok := ret.Get(0).(func(request.CTX, *model.Post) (*model.Post, error)); ok {
return rf(rctx, post)
}
if rf, ok := ret.Get(0).(func(*model.Post) *model.Post); ok {
r0 = rf(post)
if rf, ok := ret.Get(0).(func(request.CTX, *model.Post) *model.Post); ok {
r0 = rf(rctx, post)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.Post)
}
}
if rf, ok := ret.Get(1).(func(*model.Post) error); ok {
r1 = rf(post)
if rf, ok := ret.Get(1).(func(request.CTX, *model.Post) error); ok {
r1 = rf(rctx, post)
} else {
r1 = ret.Error(1)
}
@@ -959,13 +961,13 @@ func (_m *PostStore) PermanentDeleteBatchForRetentionPolicies(now int64, globalP
return r0, r1, r2
}
// PermanentDeleteByChannel provides a mock function with given fields: channelID
func (_m *PostStore) PermanentDeleteByChannel(channelID string) error {
ret := _m.Called(channelID)
// PermanentDeleteByChannel provides a mock function with given fields: rctx, channelID
func (_m *PostStore) PermanentDeleteByChannel(rctx request.CTX, channelID string) error {
ret := _m.Called(rctx, channelID)
var r0 error
if rf, ok := ret.Get(0).(func(string) error); ok {
r0 = rf(channelID)
if rf, ok := ret.Get(0).(func(request.CTX, string) error); ok {
r0 = rf(rctx, channelID)
} else {
r0 = ret.Error(0)
}
@@ -973,13 +975,13 @@ func (_m *PostStore) PermanentDeleteByChannel(channelID string) error {
return r0
}
// PermanentDeleteByUser provides a mock function with given fields: userID
func (_m *PostStore) PermanentDeleteByUser(userID string) error {
ret := _m.Called(userID)
// PermanentDeleteByUser provides a mock function with given fields: rctx, userID
func (_m *PostStore) PermanentDeleteByUser(rctx request.CTX, userID string) error {
ret := _m.Called(rctx, userID)
var r0 error
if rf, ok := ret.Get(0).(func(string) error); ok {
r0 = rf(userID)
if rf, ok := ret.Get(0).(func(request.CTX, string) error); ok {
r0 = rf(rctx, userID)
} else {
r0 = ret.Error(0)
}
@@ -1072,25 +1074,25 @@ func (_m *PostStore) Search(teamID string, userID string, params *model.SearchPa
return r0, r1
}
// SearchPostsForUser provides a mock function with given fields: paramsList, userID, teamID, page, perPage
func (_m *PostStore) SearchPostsForUser(paramsList []*model.SearchParams, userID string, teamID string, page int, perPage int) (*model.PostSearchResults, error) {
ret := _m.Called(paramsList, userID, teamID, page, perPage)
// SearchPostsForUser provides a mock function with given fields: rctx, paramsList, userID, teamID, page, perPage
func (_m *PostStore) SearchPostsForUser(rctx request.CTX, paramsList []*model.SearchParams, userID string, teamID string, page int, perPage int) (*model.PostSearchResults, error) {
ret := _m.Called(rctx, paramsList, userID, teamID, page, perPage)
var r0 *model.PostSearchResults
var r1 error
if rf, ok := ret.Get(0).(func([]*model.SearchParams, string, string, int, int) (*model.PostSearchResults, error)); ok {
return rf(paramsList, userID, teamID, page, perPage)
if rf, ok := ret.Get(0).(func(request.CTX, []*model.SearchParams, string, string, int, int) (*model.PostSearchResults, error)); ok {
return rf(rctx, paramsList, userID, teamID, page, perPage)
}
if rf, ok := ret.Get(0).(func([]*model.SearchParams, string, string, int, int) *model.PostSearchResults); ok {
r0 = rf(paramsList, userID, teamID, page, perPage)
if rf, ok := ret.Get(0).(func(request.CTX, []*model.SearchParams, string, string, int, int) *model.PostSearchResults); ok {
r0 = rf(rctx, paramsList, userID, teamID, page, perPage)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.PostSearchResults)
}
}
if rf, ok := ret.Get(1).(func([]*model.SearchParams, string, string, int, int) error); ok {
r1 = rf(paramsList, userID, teamID, page, perPage)
if rf, ok := ret.Get(1).(func(request.CTX, []*model.SearchParams, string, string, int, int) error); ok {
r1 = rf(rctx, paramsList, userID, teamID, page, perPage)
} else {
r1 = ret.Error(1)
}
@@ -1112,25 +1114,25 @@ func (_m *PostStore) SetPostReminder(reminder *model.PostReminder) error {
return r0
}
// Update provides a mock function with given fields: newPost, oldPost
func (_m *PostStore) Update(newPost *model.Post, oldPost *model.Post) (*model.Post, error) {
ret := _m.Called(newPost, oldPost)
// Update provides a mock function with given fields: rctx, newPost, oldPost
func (_m *PostStore) Update(rctx request.CTX, newPost *model.Post, oldPost *model.Post) (*model.Post, error) {
ret := _m.Called(rctx, newPost, oldPost)
var r0 *model.Post
var r1 error
if rf, ok := ret.Get(0).(func(*model.Post, *model.Post) (*model.Post, error)); ok {
return rf(newPost, oldPost)
if rf, ok := ret.Get(0).(func(request.CTX, *model.Post, *model.Post) (*model.Post, error)); ok {
return rf(rctx, newPost, oldPost)
}
if rf, ok := ret.Get(0).(func(*model.Post, *model.Post) *model.Post); ok {
r0 = rf(newPost, oldPost)
if rf, ok := ret.Get(0).(func(request.CTX, *model.Post, *model.Post) *model.Post); ok {
r0 = rf(rctx, newPost, oldPost)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.Post)
}
}
if rf, ok := ret.Get(1).(func(*model.Post, *model.Post) error); ok {
r1 = rf(newPost, oldPost)
if rf, ok := ret.Get(1).(func(request.CTX, *model.Post, *model.Post) error); ok {
r1 = rf(rctx, newPost, oldPost)
} else {
r1 = ret.Error(1)
}

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

@@ -7,9 +7,11 @@ package mocks
import (
context "context"
model "github.com/mattermost/mattermost/server/public/model"
mlog "github.com/mattermost/mattermost/server/public/shared/mlog"
mock "github.com/stretchr/testify/mock"
model "github.com/mattermost/mattermost/server/public/model"
sql "database/sql"
store "github.com/mattermost/mattermost/server/v8/channels/store"
@@ -455,6 +457,22 @@ func (_m *Store) LockToMaster() {
_m.Called()
}
// Logger provides a mock function with given fields:
func (_m *Store) Logger() mlog.LoggerIFace {
ret := _m.Called()
var r0 mlog.LoggerIFace
if rf, ok := ret.Get(0).(func() mlog.LoggerIFace); ok {
r0 = rf()
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(mlog.LoggerIFace)
}
}
return r0
}
// MarkSystemRanUnitTests provides a mock function with given fields:
func (_m *Store) MarkSystemRanUnitTests() {
_m.Called()

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

@@ -837,13 +837,13 @@ func (_m *TeamStore) RemoveAllMembersByTeam(teamID string) error {
return r0
}
// RemoveAllMembersByUser provides a mock function with given fields: userID
func (_m *TeamStore) RemoveAllMembersByUser(userID string) error {
ret := _m.Called(userID)
// RemoveAllMembersByUser provides a mock function with given fields: ctx, userID
func (_m *TeamStore) RemoveAllMembersByUser(ctx request.CTX, userID string) error {
ret := _m.Called(ctx, userID)
var r0 error
if rf, ok := ret.Get(0).(func(string) error); ok {
r0 = rf(userID)
if rf, ok := ret.Get(0).(func(request.CTX, string) error); ok {
r0 = rf(ctx, userID)
} else {
r0 = ret.Error(0)
}
@@ -851,13 +851,13 @@ func (_m *TeamStore) RemoveAllMembersByUser(userID string) error {
return r0
}
// RemoveMember provides a mock function with given fields: teamID, userID
func (_m *TeamStore) RemoveMember(teamID string, userID string) error {
ret := _m.Called(teamID, userID)
// RemoveMember provides a mock function with given fields: rctx, teamID, userID
func (_m *TeamStore) RemoveMember(rctx request.CTX, teamID string, userID string) error {
ret := _m.Called(rctx, teamID, userID)
var r0 error
if rf, ok := ret.Get(0).(func(string, string) error); ok {
r0 = rf(teamID, userID)
if rf, ok := ret.Get(0).(func(request.CTX, string, string) error); ok {
r0 = rf(rctx, teamID, userID)
} else {
r0 = ret.Error(0)
}
@@ -865,13 +865,13 @@ func (_m *TeamStore) RemoveMember(teamID string, userID string) error {
return r0
}
// RemoveMembers provides a mock function with given fields: teamID, userIds
func (_m *TeamStore) RemoveMembers(teamID string, userIds []string) error {
ret := _m.Called(teamID, userIds)
// RemoveMembers provides a mock function with given fields: rctx, teamID, userIds
func (_m *TeamStore) RemoveMembers(rctx request.CTX, teamID string, userIds []string) error {
ret := _m.Called(rctx, teamID, userIds)
var r0 error
if rf, ok := ret.Get(0).(func(string, []string) error); ok {
r0 = rf(teamID, userIds)
if rf, ok := ret.Get(0).(func(request.CTX, string, []string) error); ok {
r0 = rf(rctx, teamID, userIds)
} else {
r0 = ret.Error(0)
}
@@ -1122,25 +1122,25 @@ func (_m *TeamStore) UpdateLastTeamIconUpdate(teamID string, curTime int64) erro
return r0
}
// UpdateMember provides a mock function with given fields: member
func (_m *TeamStore) UpdateMember(member *model.TeamMember) (*model.TeamMember, error) {
ret := _m.Called(member)
// UpdateMember provides a mock function with given fields: rctx, member
func (_m *TeamStore) UpdateMember(rctx request.CTX, member *model.TeamMember) (*model.TeamMember, error) {
ret := _m.Called(rctx, member)
var r0 *model.TeamMember
var r1 error
if rf, ok := ret.Get(0).(func(*model.TeamMember) (*model.TeamMember, error)); ok {
return rf(member)
if rf, ok := ret.Get(0).(func(request.CTX, *model.TeamMember) (*model.TeamMember, error)); ok {
return rf(rctx, member)
}
if rf, ok := ret.Get(0).(func(*model.TeamMember) *model.TeamMember); ok {
r0 = rf(member)
if rf, ok := ret.Get(0).(func(request.CTX, *model.TeamMember) *model.TeamMember); ok {
r0 = rf(rctx, member)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.TeamMember)
}
}
if rf, ok := ret.Get(1).(func(*model.TeamMember) error); ok {
r1 = rf(member)
if rf, ok := ret.Get(1).(func(request.CTX, *model.TeamMember) error); ok {
r1 = rf(rctx, member)
} else {
r1 = ret.Error(1)
}

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

@@ -10,6 +10,8 @@ import (
model "github.com/mattermost/mattermost/server/public/model"
mock "github.com/stretchr/testify/mock"
request "github.com/mattermost/mattermost/server/public/shared/request"
store "github.com/mattermost/mattermost/server/v8/channels/store"
)
@@ -162,25 +164,25 @@ func (_m *UserStore) AnalyticsGetSystemAdminCount() (int64, error) {
return r0, r1
}
// AutocompleteUsersInChannel provides a mock function with given fields: teamID, channelID, term, options
func (_m *UserStore) AutocompleteUsersInChannel(teamID string, channelID string, term string, options *model.UserSearchOptions) (*model.UserAutocompleteInChannel, error) {
ret := _m.Called(teamID, channelID, term, options)
// AutocompleteUsersInChannel provides a mock function with given fields: rctx, teamID, channelID, term, options
func (_m *UserStore) AutocompleteUsersInChannel(rctx request.CTX, teamID string, channelID string, term string, options *model.UserSearchOptions) (*model.UserAutocompleteInChannel, error) {
ret := _m.Called(rctx, teamID, channelID, term, options)
var r0 *model.UserAutocompleteInChannel
var r1 error
if rf, ok := ret.Get(0).(func(string, string, string, *model.UserSearchOptions) (*model.UserAutocompleteInChannel, error)); ok {
return rf(teamID, channelID, term, options)
if rf, ok := ret.Get(0).(func(request.CTX, string, string, string, *model.UserSearchOptions) (*model.UserAutocompleteInChannel, error)); ok {
return rf(rctx, teamID, channelID, term, options)
}
if rf, ok := ret.Get(0).(func(string, string, string, *model.UserSearchOptions) *model.UserAutocompleteInChannel); ok {
r0 = rf(teamID, channelID, term, options)
if rf, ok := ret.Get(0).(func(request.CTX, string, string, string, *model.UserSearchOptions) *model.UserAutocompleteInChannel); ok {
r0 = rf(rctx, teamID, channelID, term, options)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.UserAutocompleteInChannel)
}
}
if rf, ok := ret.Get(1).(func(string, string, string, *model.UserSearchOptions) error); ok {
r1 = rf(teamID, channelID, term, options)
if rf, ok := ret.Get(1).(func(request.CTX, string, string, string, *model.UserSearchOptions) error); ok {
r1 = rf(rctx, teamID, channelID, term, options)
} else {
r1 = ret.Error(1)
}
@@ -1386,25 +1388,25 @@ func (_m *UserStore) Save(user *model.User) (*model.User, error) {
return r0, r1
}
// Search provides a mock function with given fields: teamID, term, options
func (_m *UserStore) Search(teamID string, term string, options *model.UserSearchOptions) ([]*model.User, error) {
ret := _m.Called(teamID, term, options)
// Search provides a mock function with given fields: rctx, teamID, term, options
func (_m *UserStore) Search(rctx request.CTX, teamID string, term string, options *model.UserSearchOptions) ([]*model.User, error) {
ret := _m.Called(rctx, teamID, term, options)
var r0 []*model.User
var r1 error
if rf, ok := ret.Get(0).(func(string, string, *model.UserSearchOptions) ([]*model.User, error)); ok {
return rf(teamID, term, options)
if rf, ok := ret.Get(0).(func(request.CTX, string, string, *model.UserSearchOptions) ([]*model.User, error)); ok {
return rf(rctx, teamID, term, options)
}
if rf, ok := ret.Get(0).(func(string, string, *model.UserSearchOptions) []*model.User); ok {
r0 = rf(teamID, term, options)
if rf, ok := ret.Get(0).(func(request.CTX, string, string, *model.UserSearchOptions) []*model.User); ok {
r0 = rf(rctx, teamID, term, options)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).([]*model.User)
}
}
if rf, ok := ret.Get(1).(func(string, string, *model.UserSearchOptions) error); ok {
r1 = rf(teamID, term, options)
if rf, ok := ret.Get(1).(func(request.CTX, string, string, *model.UserSearchOptions) error); ok {
r1 = rf(rctx, teamID, term, options)
} else {
r1 = ret.Error(1)
}
@@ -1568,25 +1570,25 @@ func (_m *UserStore) SearchWithoutTeam(term string, options *model.UserSearchOpt
return r0, r1
}
// Update provides a mock function with given fields: user, allowRoleUpdate
func (_m *UserStore) Update(user *model.User, allowRoleUpdate bool) (*model.UserUpdate, error) {
ret := _m.Called(user, allowRoleUpdate)
// Update provides a mock function with given fields: rctx, user, allowRoleUpdate
func (_m *UserStore) Update(rctx request.CTX, user *model.User, allowRoleUpdate bool) (*model.UserUpdate, error) {
ret := _m.Called(rctx, user, allowRoleUpdate)
var r0 *model.UserUpdate
var r1 error
if rf, ok := ret.Get(0).(func(*model.User, bool) (*model.UserUpdate, error)); ok {
return rf(user, allowRoleUpdate)
if rf, ok := ret.Get(0).(func(request.CTX, *model.User, bool) (*model.UserUpdate, error)); ok {
return rf(rctx, user, allowRoleUpdate)
}
if rf, ok := ret.Get(0).(func(*model.User, bool) *model.UserUpdate); ok {
r0 = rf(user, allowRoleUpdate)
if rf, ok := ret.Get(0).(func(request.CTX, *model.User, bool) *model.UserUpdate); ok {
r0 = rf(rctx, user, allowRoleUpdate)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.UserUpdate)
}
}
if rf, ok := ret.Get(1).(func(*model.User, bool) error); ok {
r1 = rf(user, allowRoleUpdate)
if rf, ok := ret.Get(1).(func(request.CTX, *model.User, bool) error); ok {
r1 = rf(rctx, user, allowRoleUpdate)
} else {
r1 = ret.Error(1)
}

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

@@ -85,7 +85,7 @@ func testPostPersistentNotificationStoreGet(t *testing.T, rctx request.CTX, ss s
require.NoError(t, err)
require.Equal(t, -1, errIdx)
defer ss.Post().PermanentDeleteByChannel(p1.ChannelId)
defer ss.Post().PermanentDeleteByChannel(rctx, p1.ChannelId)
defer ss.PostPersistentNotification().Delete([]string{p1.Id, p2.Id, p3.Id, p4.Id, p5.Id})
t.Run("Get Single", func(t *testing.T) {
@@ -160,7 +160,7 @@ func testPostPersistentNotificationStoreUpdateLastSentAt(t *testing.T, rctx requ
require.NoError(t, err)
require.Equal(t, -1, errIdx)
defer ss.Post().PermanentDeleteByChannel(p1.ChannelId)
defer ss.Post().PermanentDeleteByChannel(rctx, p1.ChannelId)
defer ss.PostPersistentNotification().Delete([]string{p1.Id})
// Update from 0 value
@@ -239,7 +239,7 @@ func testPostPersistentNotificationStoreDelete(t *testing.T, rctx request.CTX, s
require.NoError(t, err)
require.Equal(t, -1, errIdx)
defer ss.Post().PermanentDeleteByChannel(p1.ChannelId)
defer ss.Post().PermanentDeleteByChannel(rctx, p1.ChannelId)
defer ss.PostPersistentNotification().Delete([]string{p1.Id, p2.Id, p3.Id})
err = ss.PostPersistentNotification().Delete([]string{p1.Id, p3.Id})
@@ -325,8 +325,8 @@ func testPostPersistentNotificationStoreDelete(t *testing.T, rctx request.CTX, s
require.NoError(t, err)
require.Equal(t, -1, errIdx)
defer ss.Post().PermanentDeleteByChannel(p1.ChannelId)
defer ss.Post().PermanentDeleteByChannel(p4.ChannelId)
defer ss.Post().PermanentDeleteByChannel(rctx, p1.ChannelId)
defer ss.Post().PermanentDeleteByChannel(rctx, p4.ChannelId)
defer ss.PostPersistentNotification().Delete([]string{p1.Id, p2.Id, p3.Id, p4.Id, p5.Id})
err = ss.PostPersistentNotification().DeleteByChannel([]string{p1.ChannelId})
@@ -429,9 +429,9 @@ func testPostPersistentNotificationStoreDelete(t *testing.T, rctx request.CTX, s
require.NoError(t, err)
require.Equal(t, -1, errIdx)
defer ss.Post().PermanentDeleteByChannel(c1.Id)
defer ss.Post().PermanentDeleteByChannel(c2.Id)
defer ss.Post().PermanentDeleteByChannel(c3.Id)
defer ss.Post().PermanentDeleteByChannel(rctx, c1.Id)
defer ss.Post().PermanentDeleteByChannel(rctx, c2.Id)
defer ss.Post().PermanentDeleteByChannel(rctx, c3.Id)
defer ss.Channel().PermanentDeleteByTeam(t1.Id)
defer ss.Channel().PermanentDeleteByTeam(t2.Id)
defer ss.Team().PermanentDelete(t1.Id)

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

@@ -934,10 +934,10 @@ func testPostStoreGetSingle(t *testing.T, rctx request.CTX, ss store.Store) {
o4, err = ss.Post().Save(o4)
require.NoError(t, err)
err = ss.Post().Delete(o2.Id, model.GetMillis(), o2.UserId)
err = ss.Post().Delete(rctx, o2.Id, model.GetMillis(), o2.UserId)
require.NoError(t, err)
err = ss.Post().Delete(o4.Id, model.GetMillis(), o4.UserId)
err = ss.Post().Delete(rctx, o4.Id, model.GetMillis(), o4.UserId)
require.NoError(t, err)
post, err := ss.Post().GetSingle(o1.Id, false)
@@ -1006,7 +1006,7 @@ func testPostStoreUpdate(t *testing.T, rctx request.CTX, ss store.Store) {
o1a := ro1.Clone()
o1a.Message = ro1.Message + "BBBBBBBBBB"
_, err = ss.Post().Update(o1a, ro1)
_, err = ss.Post().Update(rctx, o1a, ro1)
require.NoError(t, err)
r1, err = ss.Post().Get(context.Background(), o1.Id, model.GetPostsOptions{}, "", map[string]bool{})
@@ -1017,7 +1017,7 @@ func testPostStoreUpdate(t *testing.T, rctx request.CTX, ss store.Store) {
o2a := ro2.Clone()
o2a.Message = ro2.Message + "DDDDDDD"
_, err = ss.Post().Update(o2a, ro2)
_, err = ss.Post().Update(rctx, o2a, ro2)
require.NoError(t, err)
r2, err = ss.Post().Get(context.Background(), o1.Id, model.GetPostsOptions{}, "", map[string]bool{})
@@ -1028,7 +1028,7 @@ func testPostStoreUpdate(t *testing.T, rctx request.CTX, ss store.Store) {
o3a := ro3.Clone()
o3a.Message = ro3.Message + "WWWWWWW"
_, err = ss.Post().Update(o3a, ro3)
_, err = ss.Post().Update(rctx, o3a, ro3)
require.NoError(t, err)
r3, err = ss.Post().Get(context.Background(), o3.Id, model.GetPostsOptions{}, "", map[string]bool{})
@@ -1061,7 +1061,7 @@ func testPostStoreUpdate(t *testing.T, rctx request.CTX, ss store.Store) {
o4a := ro4.Clone()
o4a.Filenames = []string{}
o4a.FileIds = []string{model.NewId()}
_, err = ss.Post().Update(o4a, ro4)
_, err = ss.Post().Update(rctx, o4a, ro4)
require.NoError(t, err)
r4, err = ss.Post().Get(context.Background(), o4.Id, model.GetPostsOptions{}, "", map[string]bool{})
@@ -1103,7 +1103,7 @@ func testPostStoreDelete(t *testing.T, rctx request.CTX, ss store.Store) {
// Mark the post as deleted by the user identified with deleteByID.
deleteByID := model.NewId()
err = ss.Post().Delete(rootPost.Id, model.GetMillis(), deleteByID)
err = ss.Post().Delete(rctx, rootPost.Id, model.GetMillis(), deleteByID)
require.NoError(t, err)
// Ensure the appropriate posts prop reflects the user deleting the post.
@@ -1150,7 +1150,7 @@ func testPostStoreDelete(t *testing.T, rctx request.CTX, ss store.Store) {
require.NoError(t, err)
// Delete the root post
err = ss.Post().Delete(rootPost.Id, model.GetMillis(), "")
err = ss.Post().Delete(rctx, rootPost.Id, model.GetMillis(), "")
require.NoError(t, err)
// Verify the root post deleted
@@ -1217,7 +1217,7 @@ func testPostStoreDelete(t *testing.T, rctx request.CTX, ss store.Store) {
require.NoError(t, err)
// Delete the root post
err = ss.Post().Delete(rootPost1.Id, model.GetMillis(), "")
err = ss.Post().Delete(rctx, rootPost1.Id, model.GetMillis(), "")
require.NoError(t, err)
// Verify the root post and replies deleted
@@ -1285,7 +1285,7 @@ func testPostStoreDelete(t *testing.T, rctx request.CTX, ss store.Store) {
require.Equal(t, replyPost3.CreateAt, thread.LastReplyAt)
// Delete the reply previous to last
err = ss.Post().Delete(replyPost2.Id, model.GetMillis(), "")
err = ss.Post().Delete(rctx, replyPost2.Id, model.GetMillis(), "")
require.NoError(t, err)
thread, err = ss.Thread().Get(rootPost1.Id)
@@ -1294,7 +1294,7 @@ func testPostStoreDelete(t *testing.T, rctx request.CTX, ss store.Store) {
require.Equal(t, replyPost3.CreateAt, thread.LastReplyAt)
// Delete the last reply
err = ss.Post().Delete(replyPost3.Id, model.GetMillis(), "")
err = ss.Post().Delete(rctx, replyPost3.Id, model.GetMillis(), "")
require.NoError(t, err)
thread, err = ss.Thread().Get(rootPost1.Id)
@@ -1303,7 +1303,7 @@ func testPostStoreDelete(t *testing.T, rctx request.CTX, ss store.Store) {
require.Equal(t, replyPost1.CreateAt, thread.LastReplyAt)
// Delete the last reply
err = ss.Post().Delete(replyPost1.Id, model.GetMillis(), "")
err = ss.Post().Delete(rctx, replyPost1.Id, model.GetMillis(), "")
require.NoError(t, err)
thread, err = ss.Thread().Get(rootPost1.Id)
@@ -1346,14 +1346,14 @@ func testPostStoreDelete(t *testing.T, rctx request.CTX, ss store.Store) {
RootId: rootPost1.Id,
})
require.NoError(t, err)
file11, err := ss.FileInfo().Save(&model.FileInfo{
file11, err := ss.FileInfo().Save(rctx, &model.FileInfo{
Id: model.NewId(),
PostId: replyPost1.Id,
CreatorId: replyPost1.UserId,
Path: "file1.txt",
})
require.NoError(t, err)
file12, err := ss.FileInfo().Save(&model.FileInfo{
file12, err := ss.FileInfo().Save(rctx, &model.FileInfo{
Id: model.NewId(),
PostId: replyPost1.Id,
CreatorId: replyPost1.UserId,
@@ -1369,7 +1369,7 @@ func testPostStoreDelete(t *testing.T, rctx request.CTX, ss store.Store) {
RootId: rootPost2.Id,
})
require.NoError(t, err)
file21, err := ss.FileInfo().Save(&model.FileInfo{
file21, err := ss.FileInfo().Save(rctx, &model.FileInfo{
Id: model.NewId(),
PostId: replyPost2.Id,
CreatorId: replyPost2.UserId,
@@ -1378,7 +1378,7 @@ func testPostStoreDelete(t *testing.T, rctx request.CTX, ss store.Store) {
require.NoError(t, err)
// Delete the first root post
err = ss.Post().Delete(rootPost1.Id, model.GetMillis(), "")
err = ss.Post().Delete(rctx, rootPost1.Id, model.GetMillis(), "")
require.NoError(t, err)
// Verify the reply post's files are deleted
@@ -1504,7 +1504,7 @@ func testPostStorePermDelete1Level(t *testing.T, rctx request.CTX, ss store.Stor
require.EqualValues(t, 2, thread.ReplyCount)
require.EqualValues(t, model.StringArray{o2.UserId}, thread.Participants)
err2 := ss.Post().PermanentDeleteByUser(o2.UserId)
err2 := ss.Post().PermanentDeleteByUser(rctx, o2.UserId)
require.NoError(t, err2)
thread, err = ss.Thread().Get(o1.Id)
@@ -1535,7 +1535,7 @@ func testPostStorePermDelete1Level(t *testing.T, rctx request.CTX, ss store.Stor
require.NoError(t, err)
require.NotEmpty(t, thread)
err = ss.Post().PermanentDeleteByChannel(o3.ChannelId)
err = ss.Post().PermanentDeleteByChannel(rctx, o3.ChannelId)
require.NoError(t, err)
thread, err = ss.Thread().Get(o5.Id)
@@ -1606,7 +1606,7 @@ func testPostStorePermDelete1Level2(t *testing.T, rctx request.CTX, ss store.Sto
o3, err = ss.Post().Save(o3)
require.NoError(t, err)
err2 := ss.Post().PermanentDeleteByUser(o1.UserId)
err2 := ss.Post().PermanentDeleteByUser(rctx, o1.UserId)
require.NoError(t, err2)
_, err = ss.Post().Get(context.Background(), o1.Id, model.GetPostsOptions{}, "", map[string]bool{})
@@ -1657,7 +1657,7 @@ func testPostStoreGetWithChildren(t *testing.T, rctx request.CTX, ss store.Store
require.Len(t, pl.Posts, 3, "invalid returned post")
dErr := ss.Post().Delete(o3.Id, model.GetMillis(), "")
dErr := ss.Post().Delete(rctx, o3.Id, model.GetMillis(), "")
require.NoError(t, dErr)
pl, err = ss.Post().Get(context.Background(), o1.Id, model.GetPostsOptions{}, "", map[string]bool{})
@@ -1665,7 +1665,7 @@ func testPostStoreGetWithChildren(t *testing.T, rctx request.CTX, ss store.Store
require.Len(t, pl.Posts, 2, "invalid returned post")
dErr = ss.Post().Delete(o2.Id, model.GetMillis(), "")
dErr = ss.Post().Delete(rctx, o2.Id, model.GetMillis(), "")
require.NoError(t, dErr)
pl, err = ss.Post().Get(context.Background(), o1.Id, model.GetPostsOptions{}, "", map[string]bool{})
@@ -2478,7 +2478,7 @@ func testPostStoreGetPosts(t *testing.T, rctx request.CTX, ss store.Store) {
})
t.Run("should return all posts in a channel included deleted posts", func(t *testing.T) {
err := ss.Post().Delete(post1.Id, 1, userId)
err := ss.Post().Delete(rctx, post1.Id, 1, userId)
require.NoError(t, err)
postList, err := ss.Post().GetPosts(model.GetPostsOptions{ChannelId: channelId, Page: 0, PerPage: 30, SkipFetchThreads: false, IncludeDeleted: true}, false, map[string]bool{})
@@ -2503,7 +2503,7 @@ func testPostStoreGetPosts(t *testing.T, rctx request.CTX, ss store.Store) {
})
t.Run("should return all posts in a channel included deleted posts without threads", func(t *testing.T) {
err := ss.Post().Delete(post5.Id, 1, userId)
err := ss.Post().Delete(rctx, post5.Id, 1, userId)
require.NoError(t, err)
postList, err := ss.Post().GetPosts(model.GetPostsOptions{ChannelId: channelId, Page: 0, PerPage: 30, SkipFetchThreads: true, IncludeDeleted: true}, false, map[string]bool{})
@@ -2526,7 +2526,7 @@ func testPostStoreGetPosts(t *testing.T, rctx request.CTX, ss store.Store) {
})
t.Run("should return the lasts posts created in channel without include deleted posts", func(t *testing.T) {
err := ss.Post().Delete(post6.Id, 1, userId)
err := ss.Post().Delete(rctx, post6.Id, 1, userId)
require.NoError(t, err)
postList, err := ss.Post().GetPosts(model.GetPostsOptions{ChannelId: channelId, Page: 0, PerPage: 30, SkipFetchThreads: true, IncludeDeleted: false}, false, map[string]bool{})
@@ -2982,7 +2982,7 @@ func testPostCounts(t *testing.T, rctx request.CTX, ss store.Store) {
assert.Equal(t, int64(2), c)
// delete 1 post
err = ss.Post().Delete(p2.Id, 1, p2.UserId)
err = ss.Post().Delete(rctx, p2.Id, 1, p2.UserId)
require.NoError(t, err)
// total for single team with the deleted post excluded
@@ -3069,7 +3069,7 @@ func testPostStoreGetFlaggedPostsForTeam(t *testing.T, rctx request.CTX, ss stor
m2.UserId = model.NewId()
m2.NotifyProps = model.GetDefaultChannelNotifyProps()
c2, err = ss.Channel().SaveDirectChannel(c2, m1, m2)
c2, err = ss.Channel().SaveDirectChannel(rctx, c2, m1, m2)
require.NoError(t, err)
o5 := &model.Post{}
@@ -3783,17 +3783,17 @@ func testPostStoreOverwrite(t *testing.T, rctx request.CTX, ss store.Store) {
t.Run("overwrite changing message", func(t *testing.T) {
o1a := ro1.Clone()
o1a.Message = ro1.Message + "BBBBBBBBBB"
_, err = ss.Post().Overwrite(o1a)
_, err = ss.Post().Overwrite(rctx, o1a)
require.NoError(t, err)
o2a := ro2.Clone()
o2a.Message = ro2.Message + "DDDDDDD"
_, err = ss.Post().Overwrite(o2a)
_, err = ss.Post().Overwrite(rctx, o2a)
require.NoError(t, err)
o3a := ro3.Clone()
o3a.Message = ro3.Message + "WWWWWWW"
_, err = ss.Post().Overwrite(o3a)
_, err = ss.Post().Overwrite(rctx, o3a)
require.NoError(t, err)
r1, err = ss.Post().Get(context.Background(), o1.Id, model.GetPostsOptions{}, "", map[string]bool{})
@@ -3817,7 +3817,7 @@ func testPostStoreOverwrite(t *testing.T, rctx request.CTX, ss store.Store) {
o4a := ro4.Clone()
o4a.Filenames = []string{}
o4a.FileIds = []string{model.NewId()}
_, err = ss.Post().Overwrite(o4a)
_, err = ss.Post().Overwrite(rctx, o4a)
require.NoError(t, err)
r4, err = ss.Post().Get(context.Background(), o4.Id, model.GetPostsOptions{}, "", map[string]bool{})
@@ -3882,7 +3882,7 @@ func testPostStoreGetPostsByIds(t *testing.T, rctx request.CTX, ss store.Store)
require.NoError(t, err)
require.Len(t, posts, 3, "Expected 3 posts in results. Got %v", len(posts))
err = ss.Post().Delete(ro1.Id, model.GetMillis(), "")
err = ss.Post().Delete(rctx, ro1.Id, model.GetMillis(), "")
require.NoError(t, err)
posts, err = ss.Post().GetPostsByIds(postIds)
@@ -4391,7 +4391,7 @@ func testPostStoreGetRepliesForExport(t *testing.T, rctx request.CTX, ss store.S
// Checking whether replies by deleted user are exported
u1.DeleteAt = 1002
_, err = ss.User().Update(&u1, false)
_, err = ss.User().Update(rctx, &u1, false)
require.NoError(t, err)
r1, err = ss.Post().GetRepliesForExport(p1.Id)
@@ -4440,7 +4440,7 @@ func testPostStoreGetDirectPostParentsForExportAfter(t *testing.T, rctx request.
m2.UserId = u2.Id
m2.NotifyProps = model.GetDefaultChannelNotifyProps()
ss.Channel().SaveDirectChannel(&o1, &m1, &m2)
ss.Channel().SaveDirectChannel(rctx, &o1, &m1, &m2)
p1 := &model.Post{}
p1.ChannelId = o1.Id
@@ -4496,7 +4496,7 @@ func testPostStoreGetDirectPostParentsForExportAfterDeleted(t *testing.T, rctx r
m2.UserId = u2.Id
m2.NotifyProps = model.GetDefaultChannelNotifyProps()
ss.Channel().SaveDirectChannel(&o1, &m1, &m2)
ss.Channel().SaveDirectChannel(rctx, &o1, &m1, &m2)
o1.DeleteAt = 1
nErr = ss.Channel().SetDeleteAt(o1.Id, 1, 1)
@@ -4513,7 +4513,7 @@ func testPostStoreGetDirectPostParentsForExportAfterDeleted(t *testing.T, rctx r
o1a := p1.Clone()
o1a.DeleteAt = 1
o1a.Message = p1.Message + "BBBBBBBBBB"
_, nErr = ss.Post().Update(o1a, p1)
_, nErr = ss.Post().Update(rctx, o1a, p1)
require.NoError(t, nErr)
r1, nErr := ss.Post().GetDirectPostParentsForExportAfter(10000, strings.Repeat("0", 26))
@@ -4562,7 +4562,7 @@ func testPostStoreGetDirectPostParentsForExportAfterBatched(t *testing.T, rctx r
m2.UserId = u2.Id
m2.NotifyProps = model.GetDefaultChannelNotifyProps()
ss.Channel().SaveDirectChannel(&o1, &m1, &m2)
ss.Channel().SaveDirectChannel(rctx, &o1, &m1, &m2)
p1 := &model.Post{}
p1.ChannelId = o1.Id
@@ -4646,7 +4646,7 @@ func testHasAutoResponsePostByUserSince(t *testing.T, rctx request.CTX, ss store
require.NoError(t, err)
assert.True(t, exists)
err = ss.Post().Delete(post3.Id, time.Now().Unix(), userId)
err = ss.Post().Delete(rctx, post3.Id, time.Now().Unix(), userId)
require.NoError(t, err)
exists, err = ss.Post().HasAutoResponsePostByUserSince(model.GetPostsSinceOptions{ChannelId: channelId, Time: post2.CreateAt}, userId)
@@ -5026,7 +5026,7 @@ func testGetEditHistoryForPost(t *testing.T, rctx request.CTX, ss store.Store) {
// create an edit
updatedPost := originalPost.Clone()
updatedPost.Message = "test edited"
savedUpdatedPost, err := ss.Post().Update(updatedPost, originalPost)
savedUpdatedPost, err := ss.Post().Update(rctx, updatedPost, originalPost)
require.NoError(t, err)
// get edit history
edits, err := ss.Post().GetEditHistoryForPost(savedUpdatedPost.Id)
@@ -5067,7 +5067,7 @@ func testGetEditHistoryForPost(t *testing.T, rctx request.CTX, ss store.Store) {
originalPost, err := ss.Post().Save(post)
require.NoError(t, err)
// delete post
err = ss.Post().Delete(post.Id, 100, post.UserId)
err = ss.Post().Delete(rctx, post.Id, 100, post.UserId)
require.NoError(t, err)
// get edit history
_, err = ss.Post().GetEditHistoryForPost(originalPost.Id)
@@ -5086,10 +5086,10 @@ func testGetEditHistoryForPost(t *testing.T, rctx request.CTX, ss store.Store) {
// create an edit
updatedPost := originalPost.Clone()
updatedPost.Message = "test edited"
savedUpdatedPost, err := ss.Post().Update(updatedPost, originalPost)
savedUpdatedPost, err := ss.Post().Update(rctx, updatedPost, originalPost)
require.NoError(t, err)
// delete edit
err = ss.Post().Delete(savedUpdatedPost.Id, 100, savedUpdatedPost.UserId)
err = ss.Post().Delete(rctx, savedUpdatedPost.Id, 100, savedUpdatedPost.UserId)
require.NoError(t, err)
// get edit history
_, err = ss.Post().GetEditHistoryForPost(savedUpdatedPost.Id)

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

@@ -157,14 +157,14 @@ func cleanupRetentionPolicyTest(s SqlStore) {
}
}
func deleteTeamsAndChannels(ss store.Store, teamIDs, channelIDs []string) {
func deleteTeamsAndChannels(rctx request.CTX, ss store.Store, teamIDs, channelIDs []string) {
for _, teamID := range teamIDs {
if err := ss.Team().PermanentDelete(teamID); err != nil {
panic(err)
}
}
for _, channelID := range channelIDs {
if err := ss.Channel().PermanentDelete(channelID); err != nil {
if err := ss.Channel().PermanentDelete(rctx, channelID); err != nil {
panic(err)
}
}
@@ -213,7 +213,7 @@ func testRetentionPolicyStoreSave(t *testing.T, rctx request.CTX, ss store.Store
})
t.Run("some teams and channels are specified", func(t *testing.T) {
teamIDs, channelIDs := createTeamsAndChannelsForRetentionPolicy(t, rctx, ss)
defer deleteTeamsAndChannels(ss, teamIDs, channelIDs)
defer deleteTeamsAndChannels(rctx, ss, teamIDs, channelIDs)
policy := saveRetentionPolicyWithTeamAndChannelIds(t, ss, "Policy 3", teamIDs, channelIDs)
checkRetentionPolicyLikeThisExists(t, ss, policy)
})
@@ -233,7 +233,7 @@ func testRetentionPolicyStorePatch(t *testing.T, rctx request.CTX, ss store.Stor
teamIDs, channelIDs := createTeamsAndChannelsForRetentionPolicy(t, rctx, ss)
policy := saveRetentionPolicyWithTeamAndChannelIds(t, ss, "Policy 1", teamIDs, channelIDs)
defer deleteTeamsAndChannels(ss, teamIDs, channelIDs)
defer deleteTeamsAndChannels(rctx, ss, teamIDs, channelIDs)
defer cleanupRetentionPolicyTest(s)
t.Run("modify DisplayName", func(t *testing.T) {
@@ -335,7 +335,7 @@ func testRetentionPolicyStoreGet(t *testing.T, rctx request.CTX, ss store.Store,
policiesWithCounts := make([]*model.RetentionPolicyWithTeamAndChannelCounts, 0)
for i := 0; i < 3; i++ {
teamIDs, channelIDs := createTeamsAndChannelsForRetentionPolicy(t, rctx, ss)
defer deleteTeamsAndChannels(ss, teamIDs, channelIDs)
defer deleteTeamsAndChannels(rctx, ss, teamIDs, channelIDs)
policyWithIds := createRetentionPolicyWithTeamAndChannelIds(
"Policy "+strconv.Itoa(i+1), teamIDs, channelIDs)
policyWithCounts, err := ss.RetentionPolicy().Save(policyWithIds)
@@ -363,7 +363,7 @@ func testRetentionPolicyStoreGet(t *testing.T, rctx request.CTX, ss store.Store,
t.Run("get all with same display name", func(t *testing.T) {
for i := 0; i < 5; i++ {
teamIDs, channelIDs := createTeamsAndChannelsForRetentionPolicy(t, rctx, ss)
defer deleteTeamsAndChannels(ss, teamIDs, channelIDs)
defer deleteTeamsAndChannels(rctx, ss, teamIDs, channelIDs)
proposal := createRetentionPolicyWithTeamAndChannelIds(
"Policy Name", teamIDs, channelIDs)
_, err := ss.RetentionPolicy().Save(proposal)
@@ -403,7 +403,7 @@ func testRetentionPolicyStoreDelete(t *testing.T, rctx request.CTX, ss store.Sto
teamIDs, channelIDs := createTeamsAndChannelsForRetentionPolicy(t, rctx, ss)
policy := saveRetentionPolicyWithTeamAndChannelIds(t, ss, "Policy 1", teamIDs, channelIDs)
defer deleteTeamsAndChannels(ss, teamIDs, channelIDs)
defer deleteTeamsAndChannels(rctx, ss, teamIDs, channelIDs)
defer cleanupRetentionPolicyTest(s)
t.Run("delete policy", func(t *testing.T) {
@@ -426,7 +426,7 @@ func testRetentionPolicyStoreGetChannels(t *testing.T, rctx request.CTX, ss stor
})
t.Run("some channels", func(t *testing.T) {
teamIDs, channelIDs := createTeamsAndChannelsForRetentionPolicy(t, rctx, ss)
defer deleteTeamsAndChannels(ss, teamIDs, channelIDs)
defer deleteTeamsAndChannels(rctx, ss, teamIDs, channelIDs)
policy := saveRetentionPolicyWithTeamAndChannelIds(t, ss, "Policy 2", teamIDs, channelIDs)
channels, err := ss.RetentionPolicy().GetChannels(policy.ID, 0, len(channelIDs))
require.NoError(t, err)
@@ -445,7 +445,7 @@ func testRetentionPolicyStoreAddChannels(t *testing.T, rctx request.CTX, ss stor
teamIDs, channelIDs := createTeamsAndChannelsForRetentionPolicy(t, rctx, ss)
policy := saveRetentionPolicyWithTeamAndChannelIds(t, ss, "Policy 1", teamIDs, channelIDs)
defer deleteTeamsAndChannels(ss, teamIDs, channelIDs)
defer deleteTeamsAndChannels(rctx, ss, teamIDs, channelIDs)
defer cleanupRetentionPolicyTest(s)
t.Run("add empty array", func(t *testing.T) {
@@ -455,7 +455,7 @@ func testRetentionPolicyStoreAddChannels(t *testing.T, rctx request.CTX, ss stor
})
t.Run("add new channels", func(t *testing.T) {
channelIDs := createChannelsForRetentionPolicy(t, ss, teamIDs[0], 2)
defer deleteTeamsAndChannels(ss, nil, channelIDs)
defer deleteTeamsAndChannels(rctx, ss, nil, channelIDs)
err := ss.RetentionPolicy().AddChannels(policy.ID, channelIDs)
require.NoError(t, err)
// verify that the channels were actually added
@@ -470,7 +470,7 @@ func testRetentionPolicyStoreAddChannels(t *testing.T, rctx request.CTX, ss stor
})
t.Run("add channel to policy which does not exist", func(t *testing.T) {
channelIDs := createChannelsForRetentionPolicy(t, ss, teamIDs[0], 1)
defer deleteTeamsAndChannels(ss, nil, channelIDs)
defer deleteTeamsAndChannels(rctx, ss, nil, channelIDs)
err := ss.RetentionPolicy().AddChannels("no_such_policy", channelIDs)
require.Error(t, err)
})
@@ -480,7 +480,7 @@ func testRetentionPolicyStoreRemoveChannels(t *testing.T, rctx request.CTX, ss s
teamIDs, channelIDs := createTeamsAndChannelsForRetentionPolicy(t, rctx, ss)
policy := saveRetentionPolicyWithTeamAndChannelIds(t, ss, "Policy 1", teamIDs, channelIDs)
defer deleteTeamsAndChannels(ss, teamIDs, channelIDs)
defer deleteTeamsAndChannels(rctx, ss, teamIDs, channelIDs)
defer cleanupRetentionPolicyTest(s)
t.Run("remove empty array", func(t *testing.T) {
@@ -522,7 +522,7 @@ func testRetentionPolicyStoreGetTeams(t *testing.T, rctx request.CTX, ss store.S
})
t.Run("some teams", func(t *testing.T) {
teamIDs, channelIDs := createTeamsAndChannelsForRetentionPolicy(t, rctx, ss)
defer deleteTeamsAndChannels(ss, teamIDs, channelIDs)
defer deleteTeamsAndChannels(rctx, ss, teamIDs, channelIDs)
policy := saveRetentionPolicyWithTeamAndChannelIds(t, ss, "Policy 2", teamIDs, channelIDs)
teams, err := ss.RetentionPolicy().GetTeams(policy.ID, 0, len(teamIDs))
require.NoError(t, err)
@@ -541,7 +541,7 @@ func testRetentionPolicyStoreAddTeams(t *testing.T, rctx request.CTX, ss store.S
teamIDs, channelIDs := createTeamsAndChannelsForRetentionPolicy(t, rctx, ss)
policy := saveRetentionPolicyWithTeamAndChannelIds(t, ss, "Policy 1", teamIDs, channelIDs)
defer deleteTeamsAndChannels(ss, teamIDs, channelIDs)
defer deleteTeamsAndChannels(rctx, ss, teamIDs, channelIDs)
defer cleanupRetentionPolicyTest(s)
t.Run("add empty array", func(t *testing.T) {
@@ -551,7 +551,7 @@ func testRetentionPolicyStoreAddTeams(t *testing.T, rctx request.CTX, ss store.S
})
t.Run("add new teams", func(t *testing.T) {
teamIDs := createTeamsForRetentionPolicy(t, ss, 2)
defer deleteTeamsAndChannels(ss, teamIDs, nil)
defer deleteTeamsAndChannels(rctx, ss, teamIDs, nil)
err := ss.RetentionPolicy().AddTeams(policy.ID, teamIDs)
require.NoError(t, err)
// verify that the teams were actually added
@@ -566,7 +566,7 @@ func testRetentionPolicyStoreAddTeams(t *testing.T, rctx request.CTX, ss store.S
})
t.Run("add team to policy which does not exist", func(t *testing.T) {
teamIDs := createTeamsForRetentionPolicy(t, ss, 1)
defer deleteTeamsAndChannels(ss, teamIDs, nil)
defer deleteTeamsAndChannels(rctx, ss, teamIDs, nil)
err := ss.RetentionPolicy().AddTeams("no_such_policy", teamIDs)
require.Error(t, err)
})
@@ -576,7 +576,7 @@ func testRetentionPolicyStoreRemoveTeams(t *testing.T, rctx request.CTX, ss stor
teamIDs, channelIDs := createTeamsAndChannelsForRetentionPolicy(t, rctx, ss)
policy := saveRetentionPolicyWithTeamAndChannelIds(t, ss, "Policy 1", teamIDs, channelIDs)
defer deleteTeamsAndChannels(ss, teamIDs, channelIDs)
defer deleteTeamsAndChannels(rctx, ss, teamIDs, channelIDs)
defer cleanupRetentionPolicyTest(s)
t.Run("remove empty array", func(t *testing.T) {
@@ -611,7 +611,7 @@ func testRetentionPolicyStoreGetPoliciesForUser(t *testing.T, rctx request.CTX,
teamIDs, channelIDs := createTeamsAndChannelsForRetentionPolicy(t, rctx, ss)
saveRetentionPolicyWithTeamAndChannelIds(t, ss, "Policy 1", teamIDs, channelIDs)
defer deleteTeamsAndChannels(ss, teamIDs, channelIDs)
defer deleteTeamsAndChannels(rctx, ss, teamIDs, channelIDs)
defer cleanupRetentionPolicyTest(s)
user, userSaveErr := ss.User().Save(&model.User{
@@ -669,7 +669,7 @@ func testRetentionPolicyStoreRemoveOrphanedRows(t *testing.T, rctx request.CTX,
policy := saveRetentionPolicyWithTeamAndChannelIds(t, ss, "Policy 1",
[]string{teamID}, []string{channelID})
err := ss.Channel().PermanentDelete(channelID)
err := ss.Channel().PermanentDelete(rctx, channelID)
require.NoError(t, err)
err = ss.Team().PermanentDelete(teamID)
require.NoError(t, err)

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

@@ -11,6 +11,7 @@ import (
"github.com/stretchr/testify/mock"
"github.com/mattermost/mattermost/server/public/model"
"github.com/mattermost/mattermost/server/public/shared/mlog"
"github.com/mattermost/mattermost/server/v8/channels/store"
"github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks"
)
@@ -56,6 +57,7 @@ type Store struct {
SharedChannelStore mocks.SharedChannelStore
ProductNoticesStore mocks.ProductNoticesStore
DraftStore mocks.DraftStore
logger mlog.LoggerIFace
context context.Context
NotifyAdminStore mocks.NotifyAdminStore
PostPriorityStore mocks.PostPriorityStore
@@ -67,6 +69,7 @@ type Store struct {
func (s *Store) SetContext(context context.Context) { s.context = context }
func (s *Store) Context() context.Context { return s.context }
func (s *Store) Logger() mlog.LoggerIFace { return s.logger }
func (s *Store) Team() store.TeamStore { return &s.TeamStore }
func (s *Store) Channel() store.ChannelStore { return &s.ChannelStore }
func (s *Store) Post() store.PostStore { return &s.PostStore }

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

@@ -1324,7 +1324,7 @@ func testTeamMembers(t *testing.T, rctx request.CTX, ss store.Store) {
require.Len(t, ms, 1)
require.Equal(t, m1.TeamId, ms[0].TeamId)
err = ss.Team().RemoveMember(teamId1, m1.UserId)
err = ss.Team().RemoveMember(rctx, teamId1, m1.UserId)
require.NoError(t, err)
ms, err = ss.Team().GetMembers(teamId1, 0, 100, nil)
@@ -1357,7 +1357,7 @@ func testTeamMembers(t *testing.T, rctx request.CTX, ss store.Store) {
require.Len(t, ms, 1)
m4.DeleteAt = model.GetMillis()
_, err = ss.Team().UpdateMember(m4)
_, err = ss.Team().UpdateMember(rctx, m4)
require.NoError(t, err)
ms, err = ss.Team().GetTeamsForUser(rctx, uid, "", true)
@@ -1368,7 +1368,7 @@ func testTeamMembers(t *testing.T, rctx request.CTX, ss store.Store) {
require.NoError(t, err)
require.Len(t, ms, 1)
nErr = ss.Team().RemoveAllMembersByUser(uid)
nErr = ss.Team().RemoveAllMembersByUser(rctx, uid)
require.NoError(t, nErr)
ms, err = ss.Team().GetTeamsForUser(rctx, m1.UserId, "", true)
@@ -1549,7 +1549,7 @@ func testTeamSaveMember(t *testing.T, rctx request.CTX, ss store.Store) {
}
member, nErr := ss.Team().SaveMember(member, -1)
require.NoError(t, nErr)
defer ss.Team().RemoveMember(team.Id, u1.Id)
defer ss.Team().RemoveMember(rctx, team.Id, u1.Id)
assert.Equal(t, tc.ExpectedRoles, member.Roles)
assert.Equal(t, tc.ExpectedExplicitRoles, member.ExplicitRoles)
@@ -1700,7 +1700,7 @@ func testTeamSaveMember(t *testing.T, rctx request.CTX, ss store.Store) {
}
member, nErr := ss.Team().SaveMember(member, -1)
require.NoError(t, nErr)
defer ss.Team().RemoveMember(team.Id, u1.Id)
defer ss.Team().RemoveMember(rctx, team.Id, u1.Id)
assert.Equal(t, tc.ExpectedRoles, member.Roles)
assert.Equal(t, tc.ExpectedExplicitRoles, member.ExplicitRoles)
@@ -1916,8 +1916,8 @@ func testTeamSaveMultipleMembers(t *testing.T, rctx request.CTX, ss store.Store)
require.NoError(t, nErr)
require.Len(t, members, 2)
member = members[0]
defer ss.Team().RemoveMember(team.Id, u1.Id)
defer ss.Team().RemoveMember(team.Id, u2.Id)
defer ss.Team().RemoveMember(rctx, team.Id, u1.Id)
defer ss.Team().RemoveMember(rctx, team.Id, u2.Id)
assert.Equal(t, tc.ExpectedRoles, member.Roles)
assert.Equal(t, tc.ExpectedExplicitRoles, member.ExplicitRoles)
@@ -2078,8 +2078,8 @@ func testTeamSaveMultipleMembers(t *testing.T, rctx request.CTX, ss store.Store)
require.NoError(t, nErr)
require.Len(t, members, 2)
member = members[0]
defer ss.Team().RemoveMember(team.Id, u1.Id)
defer ss.Team().RemoveMember(team.Id, u2.Id)
defer ss.Team().RemoveMember(rctx, team.Id, u1.Id)
defer ss.Team().RemoveMember(rctx, team.Id, u2.Id)
assert.Equal(t, tc.ExpectedRoles, member.Roles)
assert.Equal(t, tc.ExpectedExplicitRoles, member.ExplicitRoles)
@@ -2097,7 +2097,7 @@ func testTeamUpdateMember(t *testing.T, rctx request.CTX, ss store.Store) {
t.Run("not valid team member", func(t *testing.T) {
member := &model.TeamMember{TeamId: "wrong", UserId: u1.Id}
_, nErr := ss.Team().UpdateMember(member)
_, nErr := ss.Team().UpdateMember(rctx, member)
require.Error(t, nErr)
var appErr *model.AppError
require.True(t, errors.As(nErr, &appErr))
@@ -2233,7 +2233,7 @@ func testTeamUpdateMember(t *testing.T, rctx request.CTX, ss store.Store) {
member.SchemeAdmin = tc.SchemeAdmin
member.ExplicitRoles = tc.ExplicitRoles
member, nErr = ss.Team().UpdateMember(member)
member, nErr = ss.Team().UpdateMember(rctx, member)
require.NoError(t, nErr)
assert.Equal(t, tc.ExpectedRoles, member.Roles)
@@ -2384,7 +2384,7 @@ func testTeamUpdateMember(t *testing.T, rctx request.CTX, ss store.Store) {
member.SchemeAdmin = tc.SchemeAdmin
member.ExplicitRoles = tc.ExplicitRoles
member, nErr = ss.Team().UpdateMember(member)
member, nErr = ss.Team().UpdateMember(rctx, member)
require.NoError(t, nErr)
assert.Equal(t, tc.ExpectedRoles, member.Roles)
@@ -2738,7 +2738,7 @@ func testTeamRemoveMember(t *testing.T, rctx request.CTX, ss store.Store) {
require.NoError(t, nErr)
t.Run("remove member from not existing team", func(t *testing.T) {
nErr = ss.Team().RemoveMember("not-existing-team", u1.Id)
nErr = ss.Team().RemoveMember(rctx, "not-existing-team", u1.Id)
require.NoError(t, nErr)
var membersOtherTeam []*model.TeamMember
membersOtherTeam, nErr = ss.Team().GetMembers(teamID, 0, 100, nil)
@@ -2747,7 +2747,7 @@ func testTeamRemoveMember(t *testing.T, rctx request.CTX, ss store.Store) {
})
t.Run("remove not existing member from an existing team", func(t *testing.T) {
nErr = ss.Team().RemoveMember(teamID, model.NewId())
nErr = ss.Team().RemoveMember(rctx, teamID, model.NewId())
require.NoError(t, nErr)
var membersOtherTeam []*model.TeamMember
membersOtherTeam, nErr = ss.Team().GetMembers(teamID, 0, 100, nil)
@@ -2756,7 +2756,7 @@ func testTeamRemoveMember(t *testing.T, rctx request.CTX, ss store.Store) {
})
t.Run("remove existing member from an existing team", func(t *testing.T) {
nErr = ss.Team().RemoveMember(teamID, u1.Id)
nErr = ss.Team().RemoveMember(rctx, teamID, u1.Id)
require.NoError(t, nErr)
defer ss.Team().SaveMember(m1, -1)
var membersOtherTeam []*model.TeamMember
@@ -2784,7 +2784,7 @@ func testTeamRemoveMembers(t *testing.T, rctx request.CTX, ss store.Store) {
require.NoError(t, nErr)
t.Run("remove members from not existing team", func(t *testing.T) {
nErr = ss.Team().RemoveMembers("not-existing-team", []string{u1.Id, u2.Id, u3.Id, u4.Id})
nErr = ss.Team().RemoveMembers(rctx, "not-existing-team", []string{u1.Id, u2.Id, u3.Id, u4.Id})
require.NoError(t, nErr)
var membersOtherTeam []*model.TeamMember
membersOtherTeam, nErr = ss.Team().GetMembers(teamID, 0, 100, nil)
@@ -2793,7 +2793,7 @@ func testTeamRemoveMembers(t *testing.T, rctx request.CTX, ss store.Store) {
})
t.Run("remove not existing members from an existing team", func(t *testing.T) {
nErr = ss.Team().RemoveMembers(teamID, []string{model.NewId(), model.NewId()})
nErr = ss.Team().RemoveMembers(rctx, teamID, []string{model.NewId(), model.NewId()})
require.NoError(t, nErr)
var membersOtherTeam []*model.TeamMember
membersOtherTeam, nErr = ss.Team().GetMembers(teamID, 0, 100, nil)
@@ -2802,7 +2802,7 @@ func testTeamRemoveMembers(t *testing.T, rctx request.CTX, ss store.Store) {
})
t.Run("remove not existing and not existing members from an existing team", func(t *testing.T) {
nErr = ss.Team().RemoveMembers(teamID, []string{u1.Id, u2.Id, model.NewId(), model.NewId()})
nErr = ss.Team().RemoveMembers(rctx, teamID, []string{u1.Id, u2.Id, model.NewId(), model.NewId()})
require.NoError(t, nErr)
defer ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2}, -1)
var membersOtherTeam []*model.TeamMember
@@ -2811,7 +2811,7 @@ func testTeamRemoveMembers(t *testing.T, rctx request.CTX, ss store.Store) {
require.Len(t, membersOtherTeam, 2)
})
t.Run("remove existing members from an existing team", func(t *testing.T) {
nErr = ss.Team().RemoveMembers(teamID, []string{u1.Id, u2.Id, u3.Id})
nErr = ss.Team().RemoveMembers(rctx, teamID, []string{u1.Id, u2.Id, u3.Id})
require.NoError(t, nErr)
defer ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2, m3}, -1)
var membersOtherTeam []*model.TeamMember
@@ -2838,7 +2838,7 @@ func testTeamMembersWithPagination(t *testing.T, rctx request.CTX, ss store.Stor
require.Len(t, ms, 1)
require.Equal(t, m1.TeamId, ms[0].TeamId)
e := ss.Team().RemoveMember(teamId1, m1.UserId)
e := ss.Team().RemoveMember(rctx, teamId1, m1.UserId)
require.NoError(t, e)
ms, err := ss.Team().GetMembers(teamId1, 0, 100, nil)
@@ -2863,7 +2863,7 @@ func testTeamMembersWithPagination(t *testing.T, rctx request.CTX, ss store.Stor
require.NoError(t, err)
require.Len(t, result, 1)
nErr = ss.Team().RemoveAllMembersByUser(uid)
nErr = ss.Team().RemoveAllMembersByUser(rctx, uid)
require.NoError(t, nErr)
result, err = ss.Team().GetTeamsForUserWithPagination(uid, 1, 1)
@@ -2905,7 +2905,7 @@ func testSaveTeamMemberMaxMembers(t *testing.T, rctx request.CTX, ss store.Store
require.NoError(t, nErr)
defer func(userId string) {
ss.Team().RemoveMember(team.Id, userId)
ss.Team().RemoveMember(rctx, team.Id, userId)
}(userIds[i])
}
@@ -2934,7 +2934,7 @@ func testSaveTeamMemberMaxMembers(t *testing.T, rctx request.CTX, ss store.Store
require.Equal(t, maxUsersPerTeam, int(totalMemberCount), "should still have 5 team members, had %v instead", totalMemberCount)
// Leaving the team from the UI sets DeleteAt instead of using TeamStore.RemoveMember
_, teamErr = ss.Team().UpdateMember(&model.TeamMember{
_, teamErr = ss.Team().UpdateMember(rctx, &model.TeamMember{
TeamId: team.Id,
UserId: userIds[0],
DeleteAt: 1234,
@@ -2948,7 +2948,7 @@ func testSaveTeamMemberMaxMembers(t *testing.T, rctx request.CTX, ss store.Store
_, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: team.Id, UserId: newUserId}, maxUsersPerTeam)
require.NoError(t, nErr, "should've been able to save new member after deleting one")
defer ss.Team().RemoveMember(team.Id, newUserId)
defer ss.Team().RemoveMember(rctx, team.Id, newUserId)
totalMemberCount, teamErr = ss.Team().GetTotalMemberCount(team.Id, nil)
require.NoError(t, teamErr)
@@ -2958,7 +2958,7 @@ func testSaveTeamMemberMaxMembers(t *testing.T, rctx request.CTX, ss store.Store
user2, nErr := ss.User().Get(context.Background(), userIds[1])
require.NoError(t, nErr)
user2.DeleteAt = 1234
_, nErr = ss.User().Update(user2, true)
_, nErr = ss.User().Update(rctx, user2, true)
require.NoError(t, nErr)
user, nErr = ss.User().Save(&model.User{
@@ -2970,7 +2970,7 @@ func testSaveTeamMemberMaxMembers(t *testing.T, rctx request.CTX, ss store.Store
_, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: team.Id, UserId: newUserId2}, maxUsersPerTeam)
require.NoError(t, nErr, "should've been able to save new member after deleting one")
defer ss.Team().RemoveMember(team.Id, newUserId2)
defer ss.Team().RemoveMember(rctx, team.Id, newUserId2)
}
func testGetTeamMember(t *testing.T, rctx request.CTX, ss store.Store) {
@@ -3163,7 +3163,7 @@ func testGetChannelUnreadsForAllTeams(t *testing.T, rctx request.CTX, ss store.S
require.Equal(t, 10, int(ms2[0].MsgCount), "subtraction failed")
nErr = ss.Team().RemoveAllMembersByUser(uid)
nErr = ss.Team().RemoveAllMembersByUser(rctx, uid)
require.NoError(t, nErr)
}
@@ -3687,10 +3687,10 @@ func testGetCommonTeamIDsForMultipleUsers(t *testing.T, rctx request.CTX, ss sto
require.Contains(t, commonTeamIDs, t2.Id)
// cleanup
err2 = ss.Team().RemoveAllMembersByUser(u1.Id)
err2 = ss.Team().RemoveAllMembersByUser(rctx, u1.Id)
require.NoError(t, err2)
err2 = ss.Team().RemoveAllMembersByUser(u2.Id)
err2 = ss.Team().RemoveAllMembersByUser(rctx, u2.Id)
require.NoError(t, err2)
})
@@ -3714,10 +3714,10 @@ func testGetCommonTeamIDsForMultipleUsers(t *testing.T, rctx request.CTX, ss sto
require.Contains(t, commonTeamIDs, t1.Id)
// cleanup
err2 = ss.Team().RemoveAllMembersByUser(u1.Id)
err2 = ss.Team().RemoveAllMembersByUser(rctx, u1.Id)
require.NoError(t, err2)
err2 = ss.Team().RemoveAllMembersByUser(u2.Id)
err2 = ss.Team().RemoveAllMembersByUser(rctx, u2.Id)
require.NoError(t, err2)
})
@@ -3739,10 +3739,10 @@ func testGetCommonTeamIDsForMultipleUsers(t *testing.T, rctx request.CTX, ss sto
require.Equal(t, 0, len(commonTeamIDs))
// cleanup
err2 = ss.Team().RemoveAllMembersByUser(u1.Id)
err2 = ss.Team().RemoveAllMembersByUser(rctx, u1.Id)
require.NoError(t, err2)
err2 = ss.Team().RemoveAllMembersByUser(u2.Id)
err2 = ss.Team().RemoveAllMembersByUser(rctx, u2.Id)
require.NoError(t, err2)
})
@@ -3763,7 +3763,7 @@ func testGetCommonTeamIDsForMultipleUsers(t *testing.T, rctx request.CTX, ss sto
require.Equal(t, 0, len(commonTeamIDs))
// cleanup
err2 = ss.Team().RemoveAllMembersByUser(u1.Id)
err2 = ss.Team().RemoveAllMembersByUser(rctx, u1.Id)
require.NoError(t, err2)
})
@@ -3811,10 +3811,10 @@ func testGetCommonTeamIDsForMultipleUsers(t *testing.T, rctx request.CTX, ss sto
require.Contains(t, commonTeamIDs, t2.Id)
// cleanup
err = ss.Team().RemoveAllMembersByUser(u1.Id)
err = ss.Team().RemoveAllMembersByUser(rctx, u1.Id)
require.NoError(t, err)
err = ss.Team().RemoveAllMembersByUser(u2.Id)
err = ss.Team().RemoveAllMembersByUser(rctx, u2.Id)
require.NoError(t, err)
})
}

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

@@ -150,7 +150,7 @@ func testThreadStorePopulation(t *testing.T, rctx request.CTX, ss store.Store) {
require.Equal(t, int64(2), thread.ReplyCount)
require.ElementsMatch(t, model.StringArray{newPosts[0].UserId, newPosts[1].UserId}, thread.Participants)
err = ss.Post().Delete(newPosts[1].Id, 1234, model.NewId())
err = ss.Post().Delete(rctx, newPosts[1].Id, 1234, model.NewId())
require.NoError(t, err, "couldn't delete post")
thread, err = ss.Thread().Get(newPosts[0].Id)
@@ -262,14 +262,14 @@ func testThreadStorePopulation(t *testing.T, rctx request.CTX, ss store.Store) {
require.EqualValues(t, thread.ReplyCount, 3)
require.EqualValues(t, thread.Participants, model.StringArray{replyPost.UserId, replyPost3.UserId})
err = ss.Post().Delete(replyPost2.Id, 123, model.NewId())
err = ss.Post().Delete(rctx, replyPost2.Id, 123, model.NewId())
require.NoError(t, err)
thread, err = ss.Thread().Get(rootPost.Id)
require.NoError(t, err)
require.EqualValues(t, thread.ReplyCount, 2)
require.EqualValues(t, thread.Participants, model.StringArray{replyPost.UserId, replyPost3.UserId})
err = ss.Post().Delete(replyPost.Id, 123, model.NewId())
err = ss.Post().Delete(rctx, replyPost.Id, 123, model.NewId())
require.NoError(t, err)
thread, err = ss.Thread().Get(rootPost.Id)
require.NoError(t, err)
@@ -309,7 +309,7 @@ func testThreadStorePopulation(t *testing.T, rctx request.CTX, ss store.Store) {
require.EqualValues(t, thread1.ReplyCount, 1)
require.Len(t, thread1.Participants, 1)
err = ss.Post().PermanentDeleteByUser(rootPost.UserId)
err = ss.Post().PermanentDeleteByUser(rctx, rootPost.UserId)
require.NoError(t, err)
thread2, _ := ss.Thread().Get(rootPost.Id)
@@ -389,7 +389,7 @@ func testThreadStorePopulation(t *testing.T, rctx request.CTX, ss store.Store) {
editedPost := newPosts[2].Clone()
editedPost.Message = "This is an edited post"
_, err = ss.Post().Update(editedPost, newPosts[2])
_, err = ss.Post().Update(rctx, editedPost, newPosts[2])
require.NoError(t, err)
th, err = ss.Thread().GetThreadForUser(m, false, false)
@@ -852,7 +852,7 @@ func testVarious(t *testing.T, rctx request.CTX, ss store.Store) {
}, -1)
require.NoError(t, err)
dm1, err := ss.Channel().CreateDirectChannel(&model.User{Id: user1ID}, &model.User{Id: user2ID})
dm1, err := ss.Channel().CreateDirectChannel(rctx, &model.User{Id: user1ID}, &model.User{Id: user2ID})
require.NoError(t, err)
gm1, err := ss.Channel().Save(&model.Channel{
@@ -956,7 +956,7 @@ func testVarious(t *testing.T, rctx request.CTX, ss store.Store) {
threadStoreCreateReply(t, ss, team1channel1.Id, team1channel1post2.Id, user2ID, model.GetMillis())
// Actually make team2channel1post2deleted deleted
err = ss.Post().Delete(team2channel1post2deleted.Id, model.GetMillis(), user1ID)
err = ss.Post().Delete(rctx, team2channel1post2deleted.Id, model.GetMillis(), user1ID)
require.NoError(t, err)
// Re-fetch posts to ensure metadata up-to-date

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

@@ -190,21 +190,21 @@ func testUserStoreUpdate(t *testing.T, rctx request.CTX, ss store.Store) {
_, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1)
require.NoError(t, nErr)
_, err = ss.User().Update(u1, false)
_, err = ss.User().Update(rctx, u1, false)
require.NoError(t, err)
missing := &model.User{}
_, err = ss.User().Update(missing, false)
_, err = ss.User().Update(rctx, missing, false)
require.Error(t, err, "Update should have failed because of missing key")
newId := &model.User{
Id: model.NewId(),
}
_, err = ss.User().Update(newId, false)
_, err = ss.User().Update(rctx, newId, false)
require.Error(t, err, "Update should have failed because id change")
u2.Email = MakeEmail()
_, err = ss.User().Update(u2, false)
_, err = ss.User().Update(rctx, u2, false)
require.Error(t, err, "Update should have failed because you can't modify AD/LDAP fields")
u3 := &model.User{
@@ -219,12 +219,12 @@ func testUserStoreUpdate(t *testing.T, rctx request.CTX, ss store.Store) {
require.NoError(t, nErr)
u3.Email = MakeEmail()
userUpdate, err := ss.User().Update(u3, false)
userUpdate, err := ss.User().Update(rctx, u3, false)
require.NoError(t, err, "Update should not have failed")
assert.Equal(t, oldEmail, userUpdate.New.Email, "Email should not have been updated as the update is not trusted")
u3.Email = MakeEmail()
userUpdate, err = ss.User().Update(u3, true)
userUpdate, err = ss.User().Update(rctx, u3, true)
require.NoError(t, err, "Update should not have failed")
assert.NotEqual(t, oldEmail, userUpdate.New.Email, "Email should have been updated as the update is trusted")
@@ -254,7 +254,7 @@ func testUserStoreUpdate(t *testing.T, rctx request.CTX, ss store.Store) {
}
maxPostSize := ss.Post().GetMaxPostSize()
u4.NotifyProps[model.AutoResponderMessageNotifyProp] = strings.Repeat("a", maxPostSize+1)
_, err = ss.User().Update(&u4, false)
_, err = ss.User().Update(rctx, &u4, false)
require.Error(t, err, "auto responder message size should not be greater than maxPostSize")
err = ss.User().UpdateNotifyProps(u4.Id, u4.NotifyProps)
require.Error(t, err, "auto responder message size should not be greater than maxPostSize")
@@ -936,7 +936,7 @@ func testUserStoreGetProfilesInChannel(t *testing.T, rctx request.CTX, ss store.
require.NoError(t, nErr)
u4.DeleteAt = 1
_, err = ss.User().Update(u4, true)
_, err = ss.User().Update(rctx, u4, true)
require.NoError(t, err)
_, nErr = ss.Channel().SaveMember(&model.ChannelMember{
@@ -1210,7 +1210,7 @@ func testUserStoreGetProfilesInChannelByStatus(t *testing.T, rctx request.CTX, s
require.NoError(t, nErr)
u4.DeleteAt = 1
_, err = ss.User().Update(u4, true)
_, err = ss.User().Update(rctx, u4, true)
require.NoError(t, err)
_, nErr = ss.Channel().SaveMember(&model.ChannelMember{
@@ -2376,7 +2376,7 @@ func testUserStoreResetAuthDataToEmailForUsers(t *testing.T, rctx request.CTX, s
// delete user
user.DeleteAt = model.GetMillisForTime(time.Now())
ss.User().Update(user, true)
ss.User().Update(rctx, user, true)
// without deleted user
numAffected, err = ss.User().ResetAuthDataToEmailForUsers(model.UserAuthServiceSaml, nil, false, true)
require.NoError(t, err)
@@ -2456,7 +2456,7 @@ func testUserUnreadCount(t *testing.T, rctx request.CTX, ss store.Store) {
m1.ChannelId = c2.Id
m2.ChannelId = c2.Id
_, nErr = ss.Channel().SaveDirectChannel(&c2, &m1, &m2)
_, nErr = ss.Channel().SaveDirectChannel(rctx, &c2, &m1, &m2)
require.NoError(t, nErr, "couldn't save direct channel")
p1 := model.Post{}
@@ -2864,6 +2864,7 @@ func testUserStoreSearch(t *testing.T, rctx request.CTX, ss store.Store) {
for _, testCase := range testCases {
t.Run(testCase.Description, func(t *testing.T) {
users, err := ss.User().Search(
rctx,
testCase.TeamId,
testCase.Term,
testCase.Options,
@@ -3696,7 +3697,7 @@ func testUserStoreSearchInGroup(t *testing.T, rctx request.CTX, ss store.Store)
require.NoError(t, err)
u3.DeleteAt = 1
_, err = ss.User().Update(u3, true)
_, err = ss.User().Update(rctx, u3, true)
require.NoError(t, err)
testCases := []struct {
@@ -3839,7 +3840,7 @@ func testUserStoreSearchNotInGroup(t *testing.T, rctx request.CTX, ss store.Stor
require.NoError(t, err)
u3.DeleteAt = 1
_, err = ss.User().Update(u3, true)
_, err = ss.User().Update(rctx, u3, true)
require.NoError(t, err)
testCases := []struct {
@@ -4662,9 +4663,9 @@ func testUserStoreGetProfilesNotInTeam(t *testing.T, rctx request.CTX, ss store.
// Ensure update at timestamp changes
time.Sleep(time.Millisecond)
e := ss.Team().RemoveMember(teamId, u1.Id)
e := ss.Team().RemoveMember(rctx, teamId, u1.Id)
require.NoError(t, e)
e = ss.Team().RemoveMember(teamId, u2.Id)
e = ss.Team().RemoveMember(rctx, teamId, u2.Id)
require.NoError(t, e)
u1.UpdateAt, err = ss.User().UpdateUpdateAt(u1.Id)
@@ -4971,7 +4972,7 @@ func testUserStoreGetUsersBatchForIndexing(t *testing.T, rctx request.CTX, ss st
ChannelId: cDM.Id,
NotifyProps: model.GetDefaultChannelNotifyProps(),
}
cDM, nErr = ss.Channel().SaveDirectChannel(cDM, cm1, cm2)
cDM, nErr = ss.Channel().SaveDirectChannel(rctx, cDM, cm1, cm2)
require.NoError(t, nErr)
// Getting all users
@@ -5116,7 +5117,7 @@ func testUserStoreGetTeamGroupUsers(t *testing.T, rctx request.CTX, ss store.Sto
requireNUsers(2)
// delete team membership of allowed user
err = ss.Team().RemoveMember(team.Id, userGroupA.Id)
err = ss.Team().RemoveMember(rctx, team.Id, userGroupA.Id)
require.NoError(t, err)
// ensure removed allowed member still returned by query
@@ -5208,7 +5209,7 @@ func testUserStoreGetChannelGroupUsers(t *testing.T, rctx request.CTX, ss store.
// update team to be group-constrained
channel.GroupConstrained = model.NewBool(true)
_, nErr = ss.Channel().Update(channel)
_, nErr = ss.Channel().Update(rctx, channel)
require.NoError(t, nErr)
// still returns user (being group-constrained has no effect)
@@ -5238,7 +5239,7 @@ func testUserStoreGetChannelGroupUsers(t *testing.T, rctx request.CTX, ss store.
requireNUsers(2)
// delete team membership of allowed user
err = ss.Channel().RemoveMember(channel.Id, userGroupA.Id)
err = ss.Channel().RemoveMember(rctx, channel.Id, userGroupA.Id)
require.NoError(t, err)
// ensure removed allowed member still returned by query