From a708c33520e327487fd2dc05eaab3563c8161fb7 Mon Sep 17 00:00:00 2001
From: Hanzei <16541325+hanzei@users.noreply.github.com>
Date: Thu, 18 Oct 2018 18:15:30 +0200
Subject: Migrate to idiomatic error handling in app/preference.go (#9594)

---
 app/preference.go | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/preference.go b/app/preference.go
index eb41992da..3e4acd115 100644
--- a/app/preference.go
+++ b/app/preference.go
@@ -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 {
-- 
cgit v1.2.3-1-g7c22