From 64a70363dbc3075c7afa3936447e6166e7eb7422 Mon Sep 17 00:00:00 2001
From: Abin Simon <abin.simon@rafay.co>
Date: Thu, 13 Jan 2022 10:29:54 +0530
Subject: [PATCH] Simplify server package for usermgmt

---
 components/usermgmt/pkg/server/group.go | 29 ++++-------------------
 components/usermgmt/pkg/server/role.go  | 29 ++++-------------------
 components/usermgmt/pkg/server/user.go  | 31 +++++--------------------
 3 files changed, 16 insertions(+), 73 deletions(-)

diff --git a/components/usermgmt/pkg/server/group.go b/components/usermgmt/pkg/server/group.go
index 456ed23..3e396d9 100644
--- a/components/usermgmt/pkg/server/group.go
+++ b/components/usermgmt/pkg/server/group.go
@@ -18,45 +18,26 @@ func NewGroupServer(ps service.GroupService) rpcv3.GroupServer {
 }
 
 func (s *groupServer) CreateGroup(ctx context.Context, p *userpbv3.Group) (*userpbv3.Group, error) {
-	group, err := s.Create(ctx, p)
-	if err != nil {
-		return group, err
-	}
-	return group, nil
+	return s.Create(ctx, p)
 }
 
 func (s *groupServer) GetGroups(ctx context.Context, p *userpbv3.Group) (*userpbv3.GroupList, error) {
-	groups, err := s.List(ctx, p)
-	if err != nil {
-		return groups, err
-	}
-	return groups, nil
+	return s.List(ctx, p)
 }
 
 func (s *groupServer) GetGroup(ctx context.Context, p *userpbv3.Group) (*userpbv3.Group, error) {
 	group, err := s.GetByName(ctx, p.Metadata.Name)
 	if err != nil {
-		group, err = s.GetByID(ctx, p.Metadata.Id)
-		if err != nil {
-			return group, err
-		}
+		return s.GetByID(ctx, p.Metadata.Id)
 	}
-
 	return group, nil
 }
 
 func (s *groupServer) DeleteGroup(ctx context.Context, p *userpbv3.Group) (*userpbv3.Group, error) {
 	_, err := s.Delete(ctx, p)
-	if err != nil {
-		return nil, err
-	}
-	return nil, nil
+	return nil, err
 }
 
 func (s *groupServer) UpdateGroup(ctx context.Context, p *userpbv3.Group) (*userpbv3.Group, error) {
-	group, err := s.Update(ctx, p)
-	if err != nil {
-		return group, err
-	}
-	return group, nil
+	return s.Update(ctx, p)
 }
diff --git a/components/usermgmt/pkg/server/role.go b/components/usermgmt/pkg/server/role.go
index fe19903..d63d22c 100644
--- a/components/usermgmt/pkg/server/role.go
+++ b/components/usermgmt/pkg/server/role.go
@@ -18,45 +18,26 @@ func NewRoleServer(ps service.RoleService) rpcv3.RoleServer {
 }
 
 func (s *roleServer) CreateRole(ctx context.Context, p *userpbv3.Role) (*userpbv3.Role, error) {
-	role, err := s.Create(ctx, p)
-	if err != nil {
-		return role, err
-	}
-	return role, nil
+	return s.Create(ctx, p)
 }
 
 func (s *roleServer) GetRoles(ctx context.Context, p *userpbv3.Role) (*userpbv3.RoleList, error) {
-	roles, err := s.List(ctx, p)
-	if err != nil {
-		return roles, err
-	}
-	return roles, nil
+	return s.List(ctx, p)
 }
 
 func (s *roleServer) GetRole(ctx context.Context, p *userpbv3.Role) (*userpbv3.Role, error) {
 	role, err := s.GetByName(ctx, p.Metadata.Name)
 	if err != nil {
-		role, err = s.GetByID(ctx, p.Metadata.Id)
-		if err != nil {
-			return role, err
-		}
+		return s.GetByID(ctx, p.Metadata.Id)
 	}
-
 	return role, nil
 }
 
 func (s *roleServer) DeleteRole(ctx context.Context, p *userpbv3.Role) (*userpbv3.Role, error) {
 	_, err := s.Delete(ctx, p)
-	if err != nil {
-		return nil, err
-	}
-	return nil, nil
+	return nil, err
 }
 
 func (s *roleServer) UpdateRole(ctx context.Context, p *userpbv3.Role) (*userpbv3.Role, error) {
-	role, err := s.Update(ctx, p)
-	if err != nil {
-		return role, err
-	}
-	return role, nil
+	return s.Update(ctx, p)
 }
diff --git a/components/usermgmt/pkg/server/user.go b/components/usermgmt/pkg/server/user.go
index c279870..7104106 100644
--- a/components/usermgmt/pkg/server/user.go
+++ b/components/usermgmt/pkg/server/user.go
@@ -18,45 +18,26 @@ func NewUserServer(ps service.UserService) rpcv3.UserServer {
 }
 
 func (s *userServer) CreateUser(ctx context.Context, p *userpbv3.User) (*userpbv3.User, error) {
-	user, err := s.Create(ctx, p)
-	if err != nil {
-		return user, err
-	}
-	return user, nil
+	return s.Create(ctx, p)
 }
 
 func (s *userServer) GetUsers(ctx context.Context, p *userpbv3.User) (*userpbv3.UserList, error) {
-	users, err := s.List(ctx, p)
-	if err != nil {
-		return users, err
-	}
-	return users, nil
+	return s.List(ctx, p)
 }
 
 func (s *userServer) GetUser(ctx context.Context, p *userpbv3.User) (*userpbv3.User, error) {
 	// user, err := s.GetByName(ctx, p.Metadata.Name)
 	// if err != nil {
-	user, err := s.GetByID(ctx, p.Metadata.Id)
-	if err != nil {
-		return user, err
-	}
+	return s.GetByID(ctx, p.Metadata.Id)
 	// }
-
-	return user, nil
+	// return user, nil
 }
 
 func (s *userServer) DeleteUser(ctx context.Context, p *userpbv3.User) (*rpcv3.DeleteUserResponse, error) {
 	_, err := s.Delete(ctx, p)
-	if err != nil {
-		return nil, err
-	}
-	return nil, nil
+	return nil, err
 }
 
 func (s *userServer) UpdateUser(ctx context.Context, p *userpbv3.User) (*userpbv3.User, error) {
-	user, err := s.Update(ctx, p)
-	if err != nil {
-		return nil, err
-	}
-	return user, nil
+	return s.Update(ctx, p)
 }