Refactor

Signed-off-by: JeffMboya <jangina.mboya@gmail.com>

Author: JeffMboya

domains/service.go

@@ -362,7 +362,7 @@ func (svc *service) RoleRemoveMembers(ctx context.Context, session authn.Session
 		return errors.Wrap(svcerr.ErrViewEntity, err)
 	}
 
-	if _, ok := svc.ProvisionManageService.BuiltInRoles[roles.BuiltInRoleName(ro.Name)]; ok {
+	if _, err := svc.ProvisionManageService.BuiltInRoleActions(roles.BuiltInRoleName(ro.Name)); err == nil {
 		membersPage, err := svc.repo.RoleListMembers(ctx, ro.ID, 0, 0)
 		if err != nil {
 			return errors.Wrap(svcerr.ErrViewEntity, err)
@@ -387,7 +387,7 @@ func (svc *service) RoleRemoveAllMembers(ctx context.Context, session authn.Sess
 		return errors.Wrap(svcerr.ErrViewEntity, err)
 	}
 
-	if _, ok := svc.ProvisionManageService.BuiltInRoles[roles.BuiltInRoleName(ro.Name)]; ok {
+	if _, err := svc.ProvisionManageService.BuiltInRoleActions(roles.BuiltInRoleName(ro.Name)); err == nil {
 		membersPage, err := svc.repo.RoleListMembers(ctx, ro.ID, 0, 0)
 		if err != nil {
 			return errors.Wrap(svcerr.ErrViewEntity, err)

pkg/roles/provisionmanage.go

@@ -34,7 +34,7 @@ type ProvisionManageService struct {
 	sidProvider  supermq.IDProvider
 	policy       policies.Service
 	actions      []Action
-	BuiltInRoles map[BuiltInRoleName][]Action
+	builtInRoles map[BuiltInRoleName][]Action
 }
 
 func NewProvisionManageService(entityType string, repo Repository, policy policies.Service, sidProvider supermq.IDProvider, actions []Action, builtInRoles map[BuiltInRoleName][]Action) (ProvisionManageService, error) {
@@ -44,11 +44,19 @@ func NewProvisionManageService(entityType string, repo Repository, policy polici
 		sidProvider:  sidProvider,
 		policy:       policy,
 		actions:      actions,
-		BuiltInRoles: builtInRoles,
+		builtInRoles: builtInRoles,
 	}
 	return rm, nil
 }
 
+func (pms ProvisionManageService) BuiltInRoleActions(name BuiltInRoleName) ([]Action, error) {
+	actions, ok := pms.builtInRoles[name]
+	if !ok {
+		return nil, errors.Wrap(svcerr.ErrNotFound, fmt.Errorf("role %s not found", name))
+	}
+	return actions, nil
+}
+
 func toRolesActions(actions []string) []Action {
 	roActions := []Action{}
 	for _, action := range actions {
@@ -143,7 +151,7 @@ func (r ProvisionManageService) AddNewEntitiesRoles(ctx context.Context, domainI
 
 	for _, entityID := range entityIDs {
 		for defaultRole, defaultRoleMembers := range newBuiltInRoleMembers {
-			actions, ok := r.BuiltInRoles[defaultRole]
+			actions, ok := r.builtInRoles[defaultRole]
 			if !ok {
 				return []RoleProvision{}, fmt.Errorf("default role %s not found in in-built roles", defaultRole)
 			}