Migrate Update method from ChannelStore to return idiomatic plain error (#14687)
* Partial advances * Update migrated * Fix imports * Suggestions * Suggestions * Updating i18n Co-authored-by: Jesús Espino <jespinog@gmail.com> Co-authored-by: mattermod <mattermod@users.noreply.github.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
6a5dd550c8
Коммит
60cc775cf6
@@ -527,7 +527,16 @@ func (a *App) GetGroupChannel(userIds []string) (*model.Channel, *model.AppError
|
||||
func (a *App) UpdateChannel(channel *model.Channel) (*model.Channel, *model.AppError) {
|
||||
_, err := a.Srv().Store.Channel().Update(channel)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
var appErr *model.AppError
|
||||
var iErr *store.ErrInvalidInput
|
||||
switch {
|
||||
case errors.As(err, &iErr):
|
||||
return nil, model.NewAppError("UpdateChannel", "app.channel.update.bad_id", nil, iErr.Error(), http.StatusBadRequest)
|
||||
case errors.As(err, &appErr):
|
||||
return nil, appErr
|
||||
default:
|
||||
return nil, model.NewAppError("UpdateChannel", "app.channel.update_channel.internal_error", nil, err.Error(), http.StatusInternalServerError)
|
||||
}
|
||||
}
|
||||
|
||||
a.invalidateCacheForChannel(channel)
|
||||
@@ -2326,7 +2335,16 @@ func (a *App) MoveChannel(team *model.Team, channel *model.Channel, user *model.
|
||||
|
||||
channel.TeamId = team.Id
|
||||
if _, err := a.Srv().Store.Channel().Update(channel); err != nil {
|
||||
return err
|
||||
var appErr *model.AppError
|
||||
var iErr *store.ErrInvalidInput
|
||||
switch {
|
||||
case errors.As(err, &iErr):
|
||||
return model.NewAppError("MoveChannel", "app.channel.update.bad_id", nil, iErr.Error(), http.StatusBadRequest)
|
||||
case errors.As(err, &appErr):
|
||||
return appErr
|
||||
default:
|
||||
return model.NewAppError("MoveChannel", "app.channel.update_channel.internal_error", nil, err.Error(), http.StatusInternalServerError)
|
||||
}
|
||||
}
|
||||
a.postChannelMoveMessage(user, channel, previousTeam)
|
||||
|
||||
|
||||
Ссылка в новой задаче
Block a user