MM-15288: Migrate CommandStore.Get to sync by default (#10739)

* MM-15288: Migrate Command.Get to sync by default

* addressing review comments, updating status code of err returned by Get Method
Этот коммит содержится в:
Puneeth Reddy
2019-05-06 09:12:41 -07:00
коммит произвёл Jesús Espino
родитель fc15eda37f
Коммит 2d3fb4f426
7 изменённых файлов: 50 добавлений и 47 удалений

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

@@ -474,13 +474,13 @@ func (a *App) GetCommand(commandId string) (*model.Command, *model.AppError) {
return nil, model.NewAppError("GetCommand", "api.command.disabled.app_error", nil, "", http.StatusNotImplemented)
}
result := <-a.Srv.Store.Command().Get(commandId)
if result.Err != nil {
result.Err.StatusCode = http.StatusNotFound
return nil, result.Err
cmd, err := a.Srv.Store.Command().Get(commandId)
if err != nil {
err.StatusCode = http.StatusNotFound
return nil, err
}
return result.Data.(*model.Command), nil
return cmd, nil
}
func (a *App) UpdateCommand(oldCmd, updatedCmd *model.Command) (*model.Command, *model.AppError) {

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

@@ -686,11 +686,9 @@ func (a *App) HandleCommandWebhook(hookId string, response *model.CommandRespons
hook = result.Data.(*model.CommandWebhook)
}
var cmd *model.Command
if result := <-a.Srv.Store.Command().Get(hook.CommandId); result.Err != nil {
return model.NewAppError("HandleCommandWebhook", "web.command_webhook.command.app_error", nil, "err="+result.Err.Message, http.StatusBadRequest)
} else {
cmd = result.Data.(*model.Command)
cmd, err := a.Srv.Store.Command().Get(hook.CommandId)
if err != nil {
return model.NewAppError("HandleCommandWebhook", "web.command_webhook.command.app_error", nil, "err="+err.Message, http.StatusBadRequest)
}
args := &model.CommandArgs{
@@ -705,6 +703,6 @@ func (a *App) HandleCommandWebhook(hookId string, response *model.CommandRespons
return model.NewAppError("HandleCommandWebhook", "web.command_webhook.invalid.app_error", nil, "err="+result.Err.Message, result.Err.StatusCode)
}
_, err := a.HandleCommandResponse(cmd, args, response, false)
_, err = a.HandleCommandResponse(cmd, args, response, false)
return err
}