From a551b375fa6bed975e8df88bf5d024df957a7684 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Fri, 28 Sep 2018 16:55:14 +0200 Subject: Idiomatic error handling for app/{job,license,login}.go (#9474) --- app/job.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'app/job.go') diff --git a/app/job.go b/app/job.go index d80fe6262..782301de4 100644 --- a/app/job.go +++ b/app/job.go @@ -8,11 +8,11 @@ import ( ) func (a *App) GetJob(id string) (*model.Job, *model.AppError) { - if result := <-a.Srv.Store.Job().Get(id); result.Err != nil { + result := <-a.Srv.Store.Job().Get(id) + if result.Err != nil { return nil, result.Err - } else { - return result.Data.(*model.Job), nil } + return result.Data.(*model.Job), nil } func (a *App) GetJobsPage(page int, perPage int) ([]*model.Job, *model.AppError) { @@ -20,11 +20,11 @@ func (a *App) GetJobsPage(page int, perPage int) ([]*model.Job, *model.AppError) } func (a *App) GetJobs(offset int, limit int) ([]*model.Job, *model.AppError) { - if result := <-a.Srv.Store.Job().GetAllPage(offset, limit); result.Err != nil { + result := <-a.Srv.Store.Job().GetAllPage(offset, limit) + if result.Err != nil { return nil, result.Err - } else { - return result.Data.([]*model.Job), nil } + return result.Data.([]*model.Job), nil } func (a *App) GetJobsByTypePage(jobType string, page int, perPage int) ([]*model.Job, *model.AppError) { @@ -32,11 +32,11 @@ func (a *App) GetJobsByTypePage(jobType string, page int, perPage int) ([]*model } func (a *App) GetJobsByType(jobType string, offset int, limit int) ([]*model.Job, *model.AppError) { - if result := <-a.Srv.Store.Job().GetAllByTypePage(jobType, offset, limit); result.Err != nil { + result := <-a.Srv.Store.Job().GetAllByTypePage(jobType, offset, limit) + if result.Err != nil { return nil, result.Err - } else { - return result.Data.([]*model.Job), nil } + return result.Data.([]*model.Job), nil } func (a *App) CreateJob(job *model.Job) (*model.Job, *model.AppError) { -- cgit v1.2.3-1-g7c22