Added warning feature

Author: dkrizic

template/collaborators.tpl

@@ -7,5 +7,9 @@ Last updated: {{ .Updated }}
 {{ range $user := .Users }}{{ range $org := $user.Organizations }}{{ range $repo := $org.Repositories }}| {{ $user.Number }} | [{{ $user.Login }}](https://github.com/{{ $user.Login }}) | {{if $user.Contributions}}:green_square:{{else}}:red_square:{{end}} {{ $user.Contributions }} | [{{ $org.Name }}](https://github.com/{{ $org.Login }}) | [{{ $repo.Name }}](https://github.com/{{ $org.Login }}/{{ $repo.Name }}) |
 {{ end }}{{ end }}{{ end }}
 
+{{ if .Warnings }}
+## Warnings
+{{ range .Warnings }}* {{ . }}
+{{ end }}{{ end }}
 ---
 Generated with :heart: by [github-users](https://github.com/prodyna/github-users)

template/members.tpl

@@ -9,5 +9,9 @@ Last updated: {{ .Updated }}
 
 {{ if .Users }}_{{ len .Users }} users_{{ else }}No users found.{{ end }}
 
+{{ if .Warnings }}
+## Warnings
+{{ range .Warnings }}* {{ . }}
+{{ end }}{{ end }}
 ---
 Generated with :heart: by [github-users](https://github.com/prodyna/github-users)

userlist/collaborators.go

@@ -46,6 +46,10 @@ func (c *UserListConfig) loadCollaborators() error {
 					Login string
 					Name  string
 				}
+				PageInfo struct {
+					HasNextPage bool
+					EndCursor   githubv4.String
+				}
 			} `graphql:"organizations(first:100)"`
 		} `graphql:"enterprise(slug: $slug)"`
 	}
@@ -62,6 +66,11 @@ func (c *UserListConfig) loadCollaborators() error {
 	}
 	slog.Info("Loaded organizations", "organization.count", len(organizations.Enterprise.Organizations.Nodes))
 
+	if organizations.Enterprise.Organizations.PageInfo.HasNextPage {
+		slog.Warn("More organizations available - not yet implemented")
+		c.userList.addWarning("More organizations available - not yet implemented")
+	}
+
 	/*
 		{
 		  organization(login:"prodyna") {
@@ -113,19 +122,26 @@ func (c *UserListConfig) loadCollaborators() error {
 									}
 								}
 							}
+							PageInfo struct {
+								HasNextPage bool
+								EndCursor   githubv4.String
+							}
 						} `graphql:"collaborators(first:100,affiliation:OUTSIDE)"`
 					}
-				} `graphql:"repositories(first:100)"`
+				} `graphql:"repositories(first:$first,after:$after)"`
 			} `graphql:"organization(login: $organization)"`
 		}
 
 		variables := map[string]interface{}{
 			"organization": githubv4.String(org.Login),
+			"first":        githubv4.Int(100),
+			"after":        (*githubv4.String)(nil),
 		}
 
 		err := client.Query(ctx, &query, variables)
 		if err != nil {
 			slog.WarnContext(ctx, "Unable to query - will skip this organization", "error", err, "organization", org.Login)
+			c.userList.addWarning(fmt.Sprintf("Unable to query organization %s", org.Login))
 			continue
 		}
 
@@ -172,16 +188,16 @@ func (c *UserListConfig) loadCollaborators() error {
 			continue
 		}
 
-		output, err := json.MarshalIndent(c.userList, "", "  ")
-		if err != nil {
-			slog.ErrorContext(ctx, "Unable to marshal json", "error", err)
-			return err
-		}
-		fmt.Printf("%s\n", output)
-
 		slog.InfoContext(ctx, "Adding collaborators", "organization", org.Login)
 	}
 
+	output, err := json.MarshalIndent(c.userList, "", "  ")
+	if err != nil {
+		slog.ErrorContext(ctx, "Unable to marshal json", "error", err)
+		return err
+	}
+	fmt.Printf("%s\n", output)
+
 	c.loaded = true
 	return nil
 }

userlist/userlist.go

@@ -31,6 +31,7 @@ type UserList struct {
 	Updated    string
 	Enterprise Enterprise
 	Users      []*User
+	Warnings   []string
 }
 
 type Enterprise struct {
@@ -208,3 +209,46 @@ func (o *Organization) upsertRepository(repo Repository) {
 	slog.Debug("Upserting repository", "name", repo.Name, "organization", o.Name)
 	*o.Repositories = append(*o.Repositories, repo)
 }
+
+func (u *User) findOrganization(login string) *Organization {
+	for _, o := range *u.Organizations {
+		if o.Login == login {
+			return &o
+		}
+	}
+	return nil
+}
+
+func (u *User) createOrganization(login string, name string) *Organization {
+	org := &Organization{
+		Login:        login,
+		Name:         name,
+		Repositories: new([]Repository),
+	}
+	u.upsertOrganization(*org)
+	return org
+}
+
+func (o *Organization) findRepository(name string) *Repository {
+	for _, r := range *o.Repositories {
+		if r.Name == name {
+			return &r
+		}
+	}
+	return nil
+}
+
+func (o *Organization) createRepository(name string) *Repository {
+	repo := &Repository{
+		Name: name,
+	}
+	o.upsertRepository(*repo)
+	return repo
+}
+
+func (c *UserList) addWarning(warning string) {
+	if c.Warnings == nil {
+		c.Warnings = make([]string, 0)
+	}
+	c.Warnings = append(c.Warnings, warning)
+}