output total number of users

Author: Lauri Piispanen

github/github.go

@@ -60,14 +60,15 @@ func (client HTTPGithubClient) User(login string) (User, error) {
 	return user, nil
 }
 
-func (client HTTPGithubClient) SearchUsers(query UserSearchQuery) ([]User, error) {
+func (client HTTPGithubClient) SearchUsers(query UserSearchQuery) (GithubSearchResults, error) {
 	users := []User{}
 	userLogins := map[string]bool{}
 
 	totalCount := 0
 	minFollowerCount := -1
 	maxPerQuery := 1000
 	perPage := 5
+	totalUsersCount := 0
 
 Pages:
 	for totalCount < query.MaxUsers {
@@ -83,6 +84,7 @@ Pages:
 			}
 			graphQlString := fmt.Sprintf(`{ "query": "query {
         search(type: USER, query:\"%s%s sort:%s-%s\", first: %d%s) {
+          userCount
           edges {
             node {
               __typename
@@ -130,6 +132,7 @@ Pages:
 			}
 			dataNode := rootNode["data"].(map[string]interface{})
 			searchNode := dataNode["search"].(map[string]interface{})
+			totalUsersCount = int(searchNode["userCount"].(float64))
 			edgeNodes := searchNode["edges"].([]interface{})
 
 			if len(edgeNodes) == 0 {
@@ -184,7 +187,10 @@ Pages:
 		}
 	}
 
-	return users, nil
+	return GithubSearchResults{
+		Users:                users,
+		MinimumFollowerCount: minFollowerCount,
+		TotalUserCount:       totalUsersCount}, nil
 }
 
 func strPropOrEmpty(obj map[string]interface{}, prop string) string {
@@ -245,3 +251,9 @@ type UserSearchQuery struct {
 	Order    string
 	MaxUsers int
 }
+
+type GithubSearchResults struct {
+	Users                []User
+	MinimumFollowerCount int
+	TotalUserCount       int
+}

output/output.go

@@ -15,9 +15,10 @@ import (
 	"github.com/lauripiispanen/most-active-github-users-counter/top"
 )
 
-type Format func(users GithubUserList, writer io.Writer, options top.Options) error
+type Format func(results github.GithubSearchResults, writer io.Writer, options top.Options) error
 
-func PlainOutput(users GithubUserList, writer io.Writer, options top.Options) error {
+func PlainOutput(results github.GithubSearchResults, writer io.Writer, options top.Options) error {
+	users := GithubUserList(results.Users)
 	fmt.Fprintln(writer, "USERS\n--------")
 	for i, user := range users {
 		fmt.Fprintf(writer, "#%+v: %+v (%+v):%+v (%+v) %+v\n", i+1, user.Name, user.Login, user.ContributionCount, user.Company, strings.Join(user.Organizations, ","))
@@ -29,7 +30,8 @@ func PlainOutput(users GithubUserList, writer io.Writer, options top.Options) er
 	return nil
 }
 
-func CsvOutput(users GithubUserList, writer io.Writer, options top.Options) error {
+func CsvOutput(results github.GithubSearchResults, writer io.Writer, options top.Options) error {
+	users := GithubUserList(results.Users)
 	w := csv.NewWriter(writer)
 	if err := w.Write([]string{"rank", "name", "login", "contributions", "company", "organizations"}); err != nil {
 		return err
@@ -49,7 +51,8 @@ func CsvOutput(users GithubUserList, writer io.Writer, options top.Options) erro
 	return nil
 }
 
-func YamlOutput(users GithubUserList, writer io.Writer, options top.Options) error {
+func YamlOutput(results github.GithubSearchResults, writer io.Writer, options top.Options) error {
+	users := GithubUserList(results.Users)
 	outputUsers := func(user []github.User, public_only bool) {
 		for i, u := range user {
 			contributionCount := u.ContributionCount
@@ -106,7 +109,8 @@ func YamlOutput(users GithubUserList, writer io.Writer, options top.Options) err
 	outputOrganizations(topPrivate.TopOrgs(10))
 
 	fmt.Fprintf(writer, "generated: %+v\n", time.Now())
-	fmt.Fprintf(writer, "min_followers_required: %+v\n", users.MinFollowers())
+	fmt.Fprintf(writer, "min_followers_required: %+v\n", results.MinimumFollowerCount)
+	fmt.Fprintf(writer, "total_user_count: %+v\n", results.TotalUserCount)
 
 	return nil
 }

top/top.go

@@ -8,21 +8,21 @@ import (
 	"github.com/lauripiispanen/most-active-github-users-counter/net"
 )
 
-func GithubTop(options Options) ([]github.User, error) {
+func GithubTop(options Options) (github.GithubSearchResults, error) {
 	var token = options.Token
 	if token == "" {
-		return []github.User{}, errors.New("Missing GITHUB token")
+		return github.GithubSearchResults{}, errors.New("Missing GITHUB token")
 	}
 
-	query := "repos:>1 type:user"
+	query := "type:user"
 	for _, location := range options.Locations {
 		query = fmt.Sprintf("%s location:%s", query, location)
 	}
 
 	var client = github.NewGithubClient(net.TokenAuth(token))
 	users, err := client.SearchUsers(github.UserSearchQuery{Q: query, Sort: "followers", Order: "desc", MaxUsers: options.ConsiderNum})
 	if err != nil {
-		return []github.User{}, err
+		return github.GithubSearchResults{}, err
 	}
 	return users, nil
 }