MM-28043:NoRows error now being returned, handle in callers (#15331)

* NoRows error now being returned, handle in callers

* remove nested ifs
Этот коммит содержится в:
Scott Bishel
2020-08-24 06:42:40 -06:00
коммит произвёл GitHub
родитель 456bd4cd70
Коммит 763203de9a

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

@@ -200,15 +200,9 @@ func (srv *JobServer) GetLastSuccessfulJobByType(jobType string) (*model.Job, *m
statuses = []string{model.JOB_STATUS_WARNING, model.JOB_STATUS_SUCCESS} statuses = []string{model.JOB_STATUS_WARNING, model.JOB_STATUS_SUCCESS}
} }
job, err := srv.Store.Job().GetNewestJobByStatusesAndType(statuses, jobType) job, err := srv.Store.Job().GetNewestJobByStatusesAndType(statuses, jobType)
if err != nil { var nfErr *store.ErrNotFound
var nfErr *store.ErrNotFound if err != nil && !errors.As(err, &nfErr) {
switch { return nil, model.NewAppError("GetLastSuccessfulJobByType", "app.job.get_newest_job_by_status_and_type.app_error", nil, err.Error(), http.StatusInternalServerError)
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)
}
} }
return job, nil return job, nil
} }