From 5872bf9c2f9b81c7aad761d40a6970f6267f1424 Mon Sep 17 00:00:00 2001 From: Martin Kraft Date: Mon, 30 Jul 2018 15:06:08 -0400 Subject: Pr 9039 (#9187) * MM-11065: Allow to search and get archived channels from the API * Fixing more tests * Add some unit tests * Add includeDeleted parameter to session permissions check function * More test fixing * Adding archive channels list in channels search * Add restriction for archived channel edition * Reverting permissions checks modification * Changed the query parameter to include_deleted * Enable search archive channels as true by default * Adding tests for verify search on deleted channels * Allowing to override archive channels during the imports * Fixed test * Search in archive channels from the API must be explicitly requested * Removing includeDeleted parameter from GetChannelByName and GetChannelByNameForTeam * Back to ViewArchivedChannels config * Fixing tests * Reverting GetChannelByName parameter * Add include deleted parameter on GetChannel functions in plugins api * Fixing tests --- store/storetest/mocks/ChannelStore.go | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'store/storetest/mocks') diff --git a/store/storetest/mocks/ChannelStore.go b/store/storetest/mocks/ChannelStore.go index 4929557ea..4cbf9cb77 100644 --- a/store/storetest/mocks/ChannelStore.go +++ b/store/storetest/mocks/ChannelStore.go @@ -46,12 +46,12 @@ func (_m *ChannelStore) AnalyticsTypeCount(teamId string, channelType string) st } // AutocompleteInTeam provides a mock function with given fields: teamId, term -func (_m *ChannelStore) AutocompleteInTeam(teamId string, term string) store.StoreChannel { +func (_m *ChannelStore) AutocompleteInTeam(teamId string, term string, includeDeleted bool) store.StoreChannel { ret := _m.Called(teamId, term) var r0 store.StoreChannel - if rf, ok := ret.Get(0).(func(string, string) store.StoreChannel); ok { - r0 = rf(teamId, term) + if rf, ok := ret.Get(0).(func(string, string, bool) store.StoreChannel); ok { + r0 = rf(teamId, term, includeDeleted) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(store.StoreChannel) @@ -147,12 +147,12 @@ func (_m *ChannelStore) GetAll(teamId string) store.StoreChannel { } // GetAllChannelMembersForUser provides a mock function with given fields: userId, allowFromCache -func (_m *ChannelStore) GetAllChannelMembersForUser(userId string, allowFromCache bool) store.StoreChannel { +func (_m *ChannelStore) GetAllChannelMembersForUser(userId string, allowFromCache bool, includeDeleted bool) store.StoreChannel { ret := _m.Called(userId, allowFromCache) var r0 store.StoreChannel - if rf, ok := ret.Get(0).(func(string, bool) store.StoreChannel); ok { - r0 = rf(userId, allowFromCache) + if rf, ok := ret.Get(0).(func(string, bool, bool) store.StoreChannel); ok { + r0 = rf(userId, allowFromCache, includeDeleted) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(store.StoreChannel) @@ -259,12 +259,12 @@ func (_m *ChannelStore) GetChannelUnread(channelId string, userId string) store. } // GetChannels provides a mock function with given fields: teamId, userId -func (_m *ChannelStore) GetChannels(teamId string, userId string) store.StoreChannel { +func (_m *ChannelStore) GetChannels(teamId string, userId string, includeDeleted bool) store.StoreChannel { ret := _m.Called(teamId, userId) var r0 store.StoreChannel - if rf, ok := ret.Get(0).(func(string, string) store.StoreChannel); ok { - r0 = rf(teamId, userId) + if rf, ok := ret.Get(0).(func(string, string, bool) store.StoreChannel); ok { + r0 = rf(teamId, userId, includeDeleted) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(store.StoreChannel) @@ -776,12 +776,12 @@ func (_m *ChannelStore) SaveMember(member *model.ChannelMember) store.StoreChann } // SearchInTeam provides a mock function with given fields: teamId, term -func (_m *ChannelStore) SearchInTeam(teamId string, term string) store.StoreChannel { +func (_m *ChannelStore) SearchInTeam(teamId string, term string, includeDeleted bool) store.StoreChannel { ret := _m.Called(teamId, term) var r0 store.StoreChannel - if rf, ok := ret.Get(0).(func(string, string) store.StoreChannel); ok { - r0 = rf(teamId, term) + if rf, ok := ret.Get(0).(func(string, string, bool) store.StoreChannel); ok { + r0 = rf(teamId, term, includeDeleted) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(store.StoreChannel) -- cgit v1.2.3-1-g7c22