53cc7a26ea
* MM-24135: Migrate AppError from SaveChannel/channel_store.go This is the first POC of migration of store app errors to plain error. We create a few basic error types in the store package and use them to return the errors from store methods. In the app layer, we inspect the error and re-create the exact app errors. This lets us preserve the same error content, but yet move to plain errors. Since this is a gradual migration, this means that the error inspection code will be duplicated across the app layer whenever a store method is invoked. But all of that should go away once we start propagating the errors higher up the hierarchy. There have been a significant amount of changes in the storetest and searchtest layer, primarily because we have to rename the err variable now that it is of a different type. * Addressed review comments * MM-24132: Migrate AppError from SaveDirectChannel/channel_store.go This PR migrates 2 new methods SaveDirectChannel and CreateDirectChannel to return error instead of AppError. We also need to handle the error internally in SaveMultipleMember for now until that is migrated too. * MM-24133: Migrate AppError from bot_store.go * Fix errors * Fix err * Fix bad return * Fix vet errors * Fix incorrect error check Co-authored-by: mattermod <mattermod@users.noreply.github.com>
122 строки
2.5 KiB
Go
122 строки
2.5 KiB
Go
// Code generated by mockery v1.0.0. DO NOT EDIT.
|
|
|
|
// Regenerate this file using `make store-mocks`.
|
|
|
|
package mocks
|
|
|
|
import (
|
|
model "github.com/mattermost/mattermost-server/v5/model"
|
|
mock "github.com/stretchr/testify/mock"
|
|
)
|
|
|
|
// BotStore is an autogenerated mock type for the BotStore type
|
|
type BotStore struct {
|
|
mock.Mock
|
|
}
|
|
|
|
// Get provides a mock function with given fields: userId, includeDeleted
|
|
func (_m *BotStore) Get(userId string, includeDeleted bool) (*model.Bot, error) {
|
|
ret := _m.Called(userId, includeDeleted)
|
|
|
|
var r0 *model.Bot
|
|
if rf, ok := ret.Get(0).(func(string, bool) *model.Bot); ok {
|
|
r0 = rf(userId, includeDeleted)
|
|
} else {
|
|
if ret.Get(0) != nil {
|
|
r0 = ret.Get(0).(*model.Bot)
|
|
}
|
|
}
|
|
|
|
var r1 error
|
|
if rf, ok := ret.Get(1).(func(string, bool) error); ok {
|
|
r1 = rf(userId, includeDeleted)
|
|
} else {
|
|
r1 = ret.Error(1)
|
|
}
|
|
|
|
return r0, r1
|
|
}
|
|
|
|
// GetAll provides a mock function with given fields: options
|
|
func (_m *BotStore) GetAll(options *model.BotGetOptions) ([]*model.Bot, error) {
|
|
ret := _m.Called(options)
|
|
|
|
var r0 []*model.Bot
|
|
if rf, ok := ret.Get(0).(func(*model.BotGetOptions) []*model.Bot); ok {
|
|
r0 = rf(options)
|
|
} else {
|
|
if ret.Get(0) != nil {
|
|
r0 = ret.Get(0).([]*model.Bot)
|
|
}
|
|
}
|
|
|
|
var r1 error
|
|
if rf, ok := ret.Get(1).(func(*model.BotGetOptions) error); ok {
|
|
r1 = rf(options)
|
|
} else {
|
|
r1 = ret.Error(1)
|
|
}
|
|
|
|
return r0, r1
|
|
}
|
|
|
|
// PermanentDelete provides a mock function with given fields: userId
|
|
func (_m *BotStore) PermanentDelete(userId string) error {
|
|
ret := _m.Called(userId)
|
|
|
|
var r0 error
|
|
if rf, ok := ret.Get(0).(func(string) error); ok {
|
|
r0 = rf(userId)
|
|
} else {
|
|
r0 = ret.Error(0)
|
|
}
|
|
|
|
return r0
|
|
}
|
|
|
|
// Save provides a mock function with given fields: bot
|
|
func (_m *BotStore) Save(bot *model.Bot) (*model.Bot, error) {
|
|
ret := _m.Called(bot)
|
|
|
|
var r0 *model.Bot
|
|
if rf, ok := ret.Get(0).(func(*model.Bot) *model.Bot); ok {
|
|
r0 = rf(bot)
|
|
} else {
|
|
if ret.Get(0) != nil {
|
|
r0 = ret.Get(0).(*model.Bot)
|
|
}
|
|
}
|
|
|
|
var r1 error
|
|
if rf, ok := ret.Get(1).(func(*model.Bot) error); ok {
|
|
r1 = rf(bot)
|
|
} else {
|
|
r1 = ret.Error(1)
|
|
}
|
|
|
|
return r0, r1
|
|
}
|
|
|
|
// Update provides a mock function with given fields: bot
|
|
func (_m *BotStore) Update(bot *model.Bot) (*model.Bot, error) {
|
|
ret := _m.Called(bot)
|
|
|
|
var r0 *model.Bot
|
|
if rf, ok := ret.Get(0).(func(*model.Bot) *model.Bot); ok {
|
|
r0 = rf(bot)
|
|
} else {
|
|
if ret.Get(0) != nil {
|
|
r0 = ret.Get(0).(*model.Bot)
|
|
}
|
|
}
|
|
|
|
var r1 error
|
|
if rf, ok := ret.Get(1).(func(*model.Bot) error); ok {
|
|
r1 = rf(bot)
|
|
} else {
|
|
r1 = ret.Error(1)
|
|
}
|
|
|
|
return r0, r1
|
|
}
|