From 38f117ed99e057a915f8f00c96e0dadef0e81cfc Mon Sep 17 00:00:00 2001
From: Mukul Rawat <mukulsrawat@gmail.com>
Date: Sat, 13 Oct 2018 18:20:05 +0530
Subject: [MM-12606] Migrate to idiomatic error handling in the file
 `app/role.go` in the mattermost-server repo. (#9586) (#9593)

* Refactor and make idiomatic changes in error handling
---
 app/role.go | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

(limited to 'app')

diff --git a/app/role.go b/app/role.go
index 3ffe88423..8a0e9dece 100644
--- a/app/role.go
+++ b/app/role.go
@@ -12,27 +12,28 @@ import (
 )
 
 func (a *App) GetRole(id string) (*model.Role, *model.AppError) {
-	if result := <-a.Srv.Store.Role().Get(id); result.Err != nil {
+	result := <-a.Srv.Store.Role().Get(id)
+	if result.Err != nil {
 		return nil, result.Err
-	} else {
-		return result.Data.(*model.Role), nil
 	}
+	return result.Data.(*model.Role), nil
+
 }
 
 func (a *App) GetRoleByName(name string) (*model.Role, *model.AppError) {
-	if result := <-a.Srv.Store.Role().GetByName(name); result.Err != nil {
+	result := <-a.Srv.Store.Role().GetByName(name)
+	if result.Err != nil {
 		return nil, result.Err
-	} else {
-		return result.Data.(*model.Role), nil
 	}
+	return result.Data.(*model.Role), nil
 }
 
 func (a *App) GetRolesByNames(names []string) ([]*model.Role, *model.AppError) {
-	if result := <-a.Srv.Store.Role().GetByNames(names); result.Err != nil {
+	result := <-a.Srv.Store.Role().GetByNames(names)
+	if result.Err != nil {
 		return nil, result.Err
-	} else {
-		return result.Data.([]*model.Role), nil
 	}
+	return result.Data.([]*model.Role), nil
 }
 
 func (a *App) PatchRole(role *model.Role, patch *model.RolePatch) (*model.Role, *model.AppError) {
@@ -58,21 +59,23 @@ func (a *App) CreateRole(role *model.Role) (*model.Role, *model.AppError) {
 	role.BuiltIn = false
 	role.SchemeManaged = false
 
-	if result := <-a.Srv.Store.Role().Save(role); result.Err != nil {
+	result := <-a.Srv.Store.Role().Save(role)
+	if result.Err != nil {
 		return nil, result.Err
-	} else {
-		return result.Data.(*model.Role), nil
 	}
+	return result.Data.(*model.Role), nil
+
 }
 
 func (a *App) UpdateRole(role *model.Role) (*model.Role, *model.AppError) {
-	if result := <-a.Srv.Store.Role().Save(role); result.Err != nil {
+	result := <-a.Srv.Store.Role().Save(role)
+	if result.Err != nil {
 		return nil, result.Err
-	} else {
-		a.sendUpdatedRoleEvent(role)
-
-		return role, nil
 	}
+	a.sendUpdatedRoleEvent(role)
+
+	return role, nil
+
 }
 
 func (a *App) CheckRolesExist(roleNames []string) *model.AppError {
-- 
cgit v1.2.3-1-g7c22