From f5e491963d0bfb7d348af43034d718b478f7fbeb Mon Sep 17 00:00:00 2001
From: mchavez <miguel_chavez_m@hotmail.com>
Date: Wed, 21 Feb 2024 19:32:39 -0600
Subject: [PATCH] Refactoring Code

---
 pkg/connector/group.go |  6 +++---
 pkg/connector/org.go   |  4 ++--
 pkg/connector/role.go  | 39 ++-------------------------------------
 3 files changed, 7 insertions(+), 42 deletions(-)

diff --git a/pkg/connector/group.go b/pkg/connector/group.go
index a0fe92d..e399fa5 100644
--- a/pkg/connector/group.go
+++ b/pkg/connector/group.go
@@ -150,7 +150,7 @@ func (g *groupResourceType) Grant(ctx context.Context, principal *v2.Resource, e
 	}
 	if user.Role == "end-user" {
 		l.Warn("user must be a team member",
-			zap.String("user", fmt.Sprintf("%d", user.ID)),
+			zap.Int64("UserID", user.ID),
 			zap.String("user.Role", user.Role),
 		)
 		return nil, fmt.Errorf("user must be a team member")
@@ -172,8 +172,8 @@ func (g *groupResourceType) Grant(ctx context.Context, principal *v2.Resource, e
 
 	l.Warn("Membership has been created.",
 		zap.Int64("ID", membership.ID),
-		zap.String("UserID", fmt.Sprintf("%d", membership.UserID)),
-		zap.String("GroupID", fmt.Sprintf("%d", membership.GroupID)),
+		zap.Int64("UserID", membership.UserID),
+		zap.Int64("GroupID", membership.GroupID),
 		zap.String("CreatedAt", membership.CreatedAt.String()),
 	)
 
diff --git a/pkg/connector/org.go b/pkg/connector/org.go
index d0418ca..774afbb 100644
--- a/pkg/connector/org.go
+++ b/pkg/connector/org.go
@@ -192,8 +192,8 @@ func (o *orgResourceType) Grant(ctx context.Context, principal *v2.Resource, ent
 
 	l.Warn("Membership has been created.",
 		zap.Int64("ID", oganizationMembership.ID),
-		zap.String("UserID", fmt.Sprintf("%d", oganizationMembership.UserID)),
-		zap.String("OganizationID", fmt.Sprintf("%d", oganizationMembership.OrganizationID)),
+		zap.Int64("UserID", oganizationMembership.UserID),
+		zap.Int64("OganizationID", oganizationMembership.OrganizationID),
 		zap.String("CreatedAt", oganizationMembership.CreatedAt.String()),
 	)
 
diff --git a/pkg/connector/role.go b/pkg/connector/role.go
index 120a4f9..d2b92a9 100644
--- a/pkg/connector/role.go
+++ b/pkg/connector/role.go
@@ -140,7 +140,7 @@ func (r *roleResourceType) Grant(ctx context.Context, principal *v2.Resource, en
 
 	if user.Role == "end-user" {
 		l.Warn("user must be a team member",
-			zap.String("user", fmt.Sprintf("%d", user.ID)),
+			zap.Int64("user", user.ID),
 			zap.String("user.Role", user.Role),
 		)
 		return nil, fmt.Errorf("user must be a team member")
@@ -160,7 +160,7 @@ func (r *roleResourceType) Grant(ctx context.Context, principal *v2.Resource, en
 	}
 
 	l.Warn("Role Membership has been created.",
-		zap.String("ID", fmt.Sprintf("%d", membership.ID)),
+		zap.Int64("ID", membership.ID),
 		zap.String("Name", membership.Name),
 		zap.String("Configuration", fmt.Sprintf("%v", membership.Configuration)),
 		zap.String("CreatedAt", membership.CreatedAt.String()),
@@ -173,41 +173,6 @@ func (r *roleResourceType) Revoke(ctx context.Context, grant *v2.Grant) (annotat
 	return nil, nil
 }
 
-// GetAccounts returns all zendesk users and groups.
-func (r *roleResourceType) GetAccounts(ctx context.Context) ([]zendesk.User, []zendesk.Group, string, error) {
-	var (
-		userAccounts   []zendesk.User
-		groupsAccounts []zendesk.Group
-	)
-	users, nextPageToken, err := r.client.ListUsers(ctx, 0)
-	if err != nil {
-		return nil, nil, "", err
-	}
-
-	groups, _, err := r.client.ListGroups(ctx, 0)
-	if err != nil {
-		return nil, nil, "", err
-	}
-
-	for _, user := range users {
-		userAccountInfo, err := r.client.GetUser(ctx, user.ID)
-		if err != nil {
-			return nil, nil, "", err
-		}
-		userAccounts = append(userAccounts, userAccountInfo)
-	}
-
-	for _, group := range groups {
-		groupInfo, err := r.client.GetGroupDetails(ctx, group.ID)
-		if err != nil {
-			return nil, nil, "", err
-		}
-		groupsAccounts = append(groupsAccounts, groupInfo)
-	}
-
-	return userAccounts, groupsAccounts, nextPageToken, nil
-}
-
 func roleBuilder(c *client.ZendeskClient) *roleResourceType {
 	return &roleResourceType{
 		resourceType: resourceTypeRole,