Migrate to idiomatic error handling in app/preference.go (#9594)

This commit is contained in:
Hanzei
2018-10-18 18:15:30 +02:00
committed by George Goldberg
parent d346027691
commit a708c33520

View File

@@ -10,34 +10,35 @@ import (
)
func (a *App) GetPreferencesForUser(userId string) (model.Preferences, *model.AppError) {
if result := <-a.Srv.Store.Preference().GetAll(userId); result.Err != nil {
result := <-a.Srv.Store.Preference().GetAll(userId)
if result.Err != nil {
result.Err.StatusCode = http.StatusBadRequest
return nil, result.Err
} else {
return result.Data.(model.Preferences), nil
}
return result.Data.(model.Preferences), nil
}
func (a *App) GetPreferenceByCategoryForUser(userId string, category string) (model.Preferences, *model.AppError) {
if result := <-a.Srv.Store.Preference().GetCategory(userId, category); result.Err != nil {
result := <-a.Srv.Store.Preference().GetCategory(userId, category)
if result.Err != nil {
result.Err.StatusCode = http.StatusBadRequest
return nil, result.Err
} else if len(result.Data.(model.Preferences)) == 0 {
}
if len(result.Data.(model.Preferences)) == 0 {
err := model.NewAppError("getPreferenceCategory", "api.preference.preferences_category.get.app_error", nil, "", http.StatusNotFound)
return nil, err
} else {
return result.Data.(model.Preferences), nil
}
return result.Data.(model.Preferences), nil
}
func (a *App) GetPreferenceByCategoryAndNameForUser(userId string, category string, preferenceName string) (*model.Preference, *model.AppError) {
if result := <-a.Srv.Store.Preference().Get(userId, category, preferenceName); result.Err != nil {
result := <-a.Srv.Store.Preference().Get(userId, category, preferenceName)
if result.Err != nil {
result.Err.StatusCode = http.StatusBadRequest
return nil, result.Err
} else {
data := result.Data.(model.Preference)
return &data, nil
}
data := result.Data.(model.Preference)
return &data, nil
}
func (a *App) UpdatePreferences(userId string, preferences model.Preferences) *model.AppError {