From 763203de9a6dac7a3fd2fe84cb3fc1acd4f59d7e Mon Sep 17 00:00:00 2001 From: Scott Bishel Date: Mon, 24 Aug 2020 06:42:40 -0600 Subject: [PATCH] MM-28043:NoRows error now being returned, handle in callers (#15331) * NoRows error now being returned, handle in callers * remove nested ifs --- jobs/jobs.go | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/jobs/jobs.go b/jobs/jobs.go index 4d2df9d4f1..43cc1ce451 100644 --- a/jobs/jobs.go +++ b/jobs/jobs.go @@ -200,15 +200,9 @@ func (srv *JobServer) GetLastSuccessfulJobByType(jobType string) (*model.Job, *m statuses = []string{model.JOB_STATUS_WARNING, model.JOB_STATUS_SUCCESS} } job, err := srv.Store.Job().GetNewestJobByStatusesAndType(statuses, jobType) - if err != nil { - var nfErr *store.ErrNotFound - switch { - case errors.As(err, &nfErr): - return nil, model.NewAppError("GetLastSuccessfulJobByType", "app.job.get_newest_job_by_status_and_type.app_error", nil, nfErr.Error(), http.StatusNotFound) - default: - return nil, model.NewAppError("GetLastSuccessfulJobByType", "app.job.get_newest_job_by_status_and_type.app_error", nil, err.Error(), http.StatusInternalServerError) - } + var nfErr *store.ErrNotFound + if err != nil && !errors.As(err, &nfErr) { + return nil, model.NewAppError("GetLastSuccessfulJobByType", "app.job.get_newest_job_by_status_and_type.app_error", nil, err.Error(), http.StatusInternalServerError) } - return job, nil }