[MM-25477] - Migrate command webhook store AppError to error (#14703)
* Migrate command webhook store AppError to error * Migrate command webhook store AppError to error * Migrate command webhook store AppError to error * Migrate command webhook store AppError to error * Migrate command webhook store AppError to error * Migrate command webhook store AppError to error * Migrate command webhook store AppError to error * Changes requested in the review. * Changing http status * fix i18n Co-authored-by: Mattermod <mattermod@users.noreply.github.com> Co-authored-by: Agniva De Sarker <agnivade@yahoo.co.in>
Этот коммит содержится в:
@@ -711,17 +711,37 @@ func (a *App) CreateCommandWebhook(commandId string, args *model.CommandArgs) (*
|
||||
ParentId: args.ParentId,
|
||||
}
|
||||
|
||||
return a.Srv().Store.CommandWebhook().Save(hook)
|
||||
savedHook, err := a.Srv().Store.CommandWebhook().Save(hook)
|
||||
if err != nil {
|
||||
var invErr *store.ErrInvalidInput
|
||||
var appErr *model.AppError
|
||||
switch {
|
||||
case errors.As(err, &invErr):
|
||||
return nil, model.NewAppError("CreateCommandWebhook", "app.command_webhook.create_command_webhook.existing", nil, invErr.Error(), http.StatusBadRequest)
|
||||
case errors.As(err, &appErr):
|
||||
return nil, appErr
|
||||
default:
|
||||
return nil, model.NewAppError("CreateCommandWebhook", "app.command_webhook.create_command_webhook.internal_error", nil, err.Error(), http.StatusInternalServerError)
|
||||
}
|
||||
|
||||
}
|
||||
return savedHook, nil
|
||||
}
|
||||
|
||||
func (a *App) HandleCommandWebhook(hookId string, response *model.CommandResponse) *model.AppError {
|
||||
if response == nil {
|
||||
return model.NewAppError("HandleCommandWebhook", "web.command_webhook.parse.app_error", nil, "", http.StatusBadRequest)
|
||||
return model.NewAppError("HandleCommandWebhook", "app.command_webhook.handle_command_webhook.parse", nil, "", http.StatusBadRequest)
|
||||
}
|
||||
|
||||
hook, err := a.Srv().Store.CommandWebhook().Get(hookId)
|
||||
if err != nil {
|
||||
return model.NewAppError("HandleCommandWebhook", "web.command_webhook.invalid.app_error", nil, "err="+err.Message, err.StatusCode)
|
||||
hook, nErr := a.Srv().Store.CommandWebhook().Get(hookId)
|
||||
if nErr != nil {
|
||||
var nfErr *store.ErrNotFound
|
||||
switch {
|
||||
case errors.As(nErr, &nfErr):
|
||||
return model.NewAppError("HandleCommandWebhook", "app.command_webhook.get.missing", map[string]interface{}{"hook_id": hookId}, nfErr.Error(), http.StatusNotFound)
|
||||
default:
|
||||
return model.NewAppError("HandleCommandWebhook", "app.command_webhook.get.internal_error", nil, nErr.Error(), http.StatusInternalServerError)
|
||||
}
|
||||
}
|
||||
|
||||
cmd, cmdErr := a.Srv().Store.Command().Get(hook.CommandId)
|
||||
@@ -743,10 +763,16 @@ func (a *App) HandleCommandWebhook(hookId string, response *model.CommandRespons
|
||||
ParentId: hook.ParentId,
|
||||
}
|
||||
|
||||
if err = a.Srv().Store.CommandWebhook().TryUse(hook.Id, 5); err != nil {
|
||||
return model.NewAppError("HandleCommandWebhook", "web.command_webhook.invalid.app_error", nil, "err="+err.Message, err.StatusCode)
|
||||
if nErr := a.Srv().Store.CommandWebhook().TryUse(hook.Id, 5); nErr != nil {
|
||||
var invErr *store.ErrInvalidInput
|
||||
switch {
|
||||
case errors.As(nErr, &invErr):
|
||||
return model.NewAppError("HandleCommandWebhook", "app.command_webhook.try_use.invalid", nil, invErr.Error(), http.StatusBadRequest)
|
||||
default:
|
||||
return model.NewAppError("HandleCommandWebhook", "app.command_webhook.try_use.internal_error", nil, nErr.Error(), http.StatusInternalServerError)
|
||||
}
|
||||
}
|
||||
|
||||
_, err = a.HandleCommandResponse(cmd, args, response, false)
|
||||
_, err := a.HandleCommandResponse(cmd, args, response, false)
|
||||
return err
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user