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

MM-39918: mmctl: list archived private channels in channel list command with system admin user (#28676)

Просмотр исходного кода
Этот коммит содержится в:
Nicolas Le Cam
2024-11-07 12:07:30 +01:00
коммит произвёл GitHub
родитель 7846ac86b4
Коммит 5ebdea506f
12 изменённых файлов: 95 добавлений и 61 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@@ -992,60 +992,79 @@ func testChannelStoreGetDeletedByName(t *testing.T, rctx request.CTX, ss store.S
}
func testChannelStoreGetDeleted(t *testing.T, rctx request.CTX, ss store.Store) {
o1 := model.Channel{}
o1.TeamId = model.NewId()
o1.DisplayName = "Channel1"
o1.Name = NewTestID()
o1.Type = model.ChannelTypeOpen
userID := model.NewId()
teamID := model.NewId()
o1 := model.Channel{
TeamId: teamID,
DisplayName: "Channel1",
Name: NewTestID(),
Type: model.ChannelTypeOpen,
}
_, nErr := ss.Channel().Save(rctx, &o1, -1)
require.NoError(t, nErr)
err := ss.Channel().Delete(o1.Id, model.GetMillis())
require.NoError(t, err, "channel should have been deleted")
list, nErr := ss.Channel().GetDeleted(o1.TeamId, 0, 100, userID)
userID := model.NewId()
list, nErr := ss.Channel().GetDeleted(teamID, 0, 100, userID, false)
require.NoError(t, nErr, nErr)
require.Len(t, list, 1, "wrong list")
require.Equal(t, o1.Name, list[0].Name, "missing channel")
o2 := model.Channel{}
o2.TeamId = o1.TeamId
o2.DisplayName = "Channel2"
o2.Name = NewTestID()
o2.Type = model.ChannelTypeOpen
o2 := model.Channel{
TeamId: teamID,
DisplayName: "Channel2",
Name: NewTestID(),
Type: model.ChannelTypeOpen,
}
_, nErr = ss.Channel().Save(rctx, &o2, -1)
require.NoError(t, nErr)
list, nErr = ss.Channel().GetDeleted(o1.TeamId, 0, 100, userID)
list, nErr = ss.Channel().GetDeleted(teamID, 0, 100, userID, false)
require.NoError(t, nErr, nErr)
require.Len(t, list, 1, "wrong list")
o3 := model.Channel{}
o3.TeamId = o1.TeamId
o3.DisplayName = "Channel3"
o3.Name = NewTestID()
o3.Type = model.ChannelTypeOpen
o3 := model.Channel{
TeamId: teamID,
DisplayName: "Channel3",
Name: NewTestID(),
Type: model.ChannelTypeOpen,
}
_, nErr = ss.Channel().Save(rctx, &o3, -1)
require.NoError(t, nErr)
o4 := model.Channel{
TeamId: teamID,
DisplayName: "Channel4",
Name: NewTestID(),
Type: model.ChannelTypePrivate,
}
_, nErr = ss.Channel().Save(rctx, &o4, -1)
require.NoError(t, nErr)
err = ss.Channel().Delete(o4.Id, model.GetMillis())
require.NoError(t, err, "channel should have been deleted")
err = ss.Channel().Delete(o3.Id, model.GetMillis())
require.NoError(t, err, "channel should have been deleted")
list, nErr = ss.Channel().GetDeleted(o1.TeamId, 0, 100, userID)
list, nErr = ss.Channel().GetDeleted(teamID, 0, 100, userID, false)
require.NoError(t, nErr, nErr)
require.Len(t, list, 2, "wrong list length")
list, nErr = ss.Channel().GetDeleted(o1.TeamId, 0, 1, userID)
list, nErr = ss.Channel().GetDeleted(teamID, 0, 1, userID, false)
require.NoError(t, nErr, nErr)
require.Len(t, list, 1, "wrong list length")
list, nErr = ss.Channel().GetDeleted(o1.TeamId, 1, 1, userID)
list, nErr = ss.Channel().GetDeleted(teamID, 1, 1, userID, false)
require.NoError(t, nErr, nErr)
require.Len(t, list, 1, "wrong list length")
list, nErr = ss.Channel().GetDeleted(teamID, 0, 100, userID, true)
require.NoError(t, nErr, nErr)
require.Len(t, list, 3, "wrong list length")
}
func testChannelMemberStore(t *testing.T, rctx request.CTX, ss store.Store) {

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

@@ -1210,9 +1210,9 @@ func (_m *ChannelStore) GetChannelsWithUnreadsAndWithMentions(ctx context.Contex
return r0, r1, r2, r3
}
// GetDeleted provides a mock function with given fields: teamID, offset, limit, userID
func (_m *ChannelStore) GetDeleted(teamID string, offset int, limit int, userID string) (model.ChannelList, error) {
ret := _m.Called(teamID, offset, limit, userID)
// GetDeleted provides a mock function with given fields: teamID, offset, limit, userID, skipTeamMembershipCheck
func (_m *ChannelStore) GetDeleted(teamID string, offset int, limit int, userID string, skipTeamMembershipCheck bool) (model.ChannelList, error) {
ret := _m.Called(teamID, offset, limit, userID, skipTeamMembershipCheck)
if len(ret) == 0 {
panic("no return value specified for GetDeleted")
@@ -1220,19 +1220,19 @@ func (_m *ChannelStore) GetDeleted(teamID string, offset int, limit int, userID
var r0 model.ChannelList
var r1 error
if rf, ok := ret.Get(0).(func(string, int, int, string) (model.ChannelList, error)); ok {
return rf(teamID, offset, limit, userID)
if rf, ok := ret.Get(0).(func(string, int, int, string, bool) (model.ChannelList, error)); ok {
return rf(teamID, offset, limit, userID, skipTeamMembershipCheck)
}
if rf, ok := ret.Get(0).(func(string, int, int, string) model.ChannelList); ok {
r0 = rf(teamID, offset, limit, userID)
if rf, ok := ret.Get(0).(func(string, int, int, string, bool) model.ChannelList); ok {
r0 = rf(teamID, offset, limit, userID, skipTeamMembershipCheck)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(model.ChannelList)
}
}
if rf, ok := ret.Get(1).(func(string, int, int, string) error); ok {
r1 = rf(teamID, offset, limit, userID)
if rf, ok := ret.Get(1).(func(string, int, int, string, bool) error); ok {
r1 = rf(teamID, offset, limit, userID, skipTeamMembershipCheck)
} else {
r1 = ret.Error(1)
}