MM-26753 Create initial sidebar categories on demand if migration hasn't ran (#14981)

* MM-26753 Change CreateInitialSidebarCategories to only take a user ID

* MM-26753 Create initial sidebar categories on demand if migration hasn't ran

* Wait for sidebar categories to be loaded in case of replication lag
Этот коммит содержится в:
Harrison Healey
2020-07-08 12:07:42 -04:00
коммит произвёл GitHub
родитель 31200fc657
Коммит 302e59a0fe
10 изменённых файлов: 219 добавлений и 167 удалений

Просмотреть файл

@@ -194,13 +194,13 @@ func (_m *ChannelStore) CreateDirectChannel(userId *model.User, otherUserId *mod
return r0, r1
}
// CreateInitialSidebarCategories provides a mock function with given fields: user, teamId
func (_m *ChannelStore) CreateInitialSidebarCategories(user *model.User, teamId string) error {
ret := _m.Called(user, teamId)
// CreateInitialSidebarCategories provides a mock function with given fields: userId, teamId
func (_m *ChannelStore) CreateInitialSidebarCategories(userId string, teamId string) error {
ret := _m.Called(userId, teamId)
var r0 error
if rf, ok := ret.Get(0).(func(*model.User, string) error); ok {
r0 = rf(user, teamId)
if rf, ok := ret.Get(0).(func(string, string) error); ok {
r0 = rf(userId, teamId)
} else {
r0 = ret.Error(0)
}