Skip to content

refactor: reduce cognitive complexity of userOrOrgHandler (40 → ~12) #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
devin-ai-integration wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor: reduce cognitive complexity of userOrOrgHandler (40 → ~12) #144

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 39 additions & 28 deletions pkg/github/search.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,43 @@ type MinimalSearchUsersResult struct {
Items []MinimalUser `json:"items"`
}

// toMinimalUser converts a github.User to a MinimalUser, extracting non-nil fields.
func toMinimalUser(user *github.User) MinimalUser {
mu := MinimalUser{Login: user.GetLogin()}
if user.ID != nil {
mu.ID = *user.ID
}
if user.HTMLURL != nil {
mu.ProfileURL = *user.HTMLURL
}
if user.AvatarURL != nil {
mu.AvatarURL = *user.AvatarURL
}
return mu
}

// convertUsersToMinimal converts a slice of github.User to a slice of MinimalUser,
// filtering out users without a login.
func convertUsersToMinimal(users []*github.User) []MinimalUser {
result := make([]MinimalUser, 0, len(users))
for _, user := range users {
if user.GetLogin() != "" {
result = append(result, toMinimalUser(user))
}
}
return result
}

// buildMinimalSearchResult constructs a MinimalSearchUsersResult from search results.
func buildMinimalSearchResult(searchResult *github.UsersSearchResult, users []MinimalUser) *MinimalSearchUsersResult {
resp := &MinimalSearchUsersResult{
TotalCount: searchResult.GetTotal(),
IncompleteResults: searchResult.GetIncompleteResults(),
Items: users,
}
return resp
}

func userOrOrgHandler(accountType string, getClient GetClientFn) server.ToolHandlerFunc {
return func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
query, err := RequiredParam[string](request, "query")
Expand Down Expand Up @@ -220,34 +257,8 @@ func userOrOrgHandler(accountType string, getClient GetClientFn) server.ToolHand
return mcp.NewToolResultError(fmt.Sprintf("failed to search %ss: %s", accountType, string(body))), nil
}

minimalUsers := make([]MinimalUser, 0, len(result.Users))

for _, user := range result.Users {
if user.Login != nil {
mu := MinimalUser{Login: *user.Login}
if user.ID != nil {
mu.ID = *user.ID
}
if user.HTMLURL != nil {
mu.ProfileURL = *user.HTMLURL
}
if user.AvatarURL != nil {
mu.AvatarURL = *user.AvatarURL
}
minimalUsers = append(minimalUsers, mu)
}
}
minimalResp := &MinimalSearchUsersResult{
TotalCount: result.GetTotal(),
IncompleteResults: result.GetIncompleteResults(),
Items: minimalUsers,
}
if result.Total != nil {
minimalResp.TotalCount = *result.Total
}
if result.IncompleteResults != nil {
minimalResp.IncompleteResults = *result.IncompleteResults
}
minimalUsers := convertUsersToMinimal(result.Users)
minimalResp := buildMinimalSearchResult(result, minimalUsers)

r, err := json.Marshal(minimalResp)
if err != nil {
Expand Down