Add support for multiple user emails (#52)

Co-authored-by: Oleksandr Redko <[email protected]>

Author: fdobrovolny

internal/app.go

@@ -33,7 +33,7 @@ type App struct {
 
 type User struct {
 	Name      string
-	Email     string
+	Emails    []string
 	Username  string
 	CreatedAt time.Time
 }

internal/gitlab.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"slices"
 	"strings"
 	"time"
 
@@ -33,9 +34,19 @@ func (s *GitLab) CurrentUser(ctx context.Context) (*User, error) {
 		return nil, fmt.Errorf("get current user: %w", err)
 	}
 
+	emails, _, err := s.gitlabClient.Users.ListEmails(gitlab.WithContext(ctx))
+	if err != nil {
+		return nil, fmt.Errorf("get user emails: %w", err)
+	}
+
+	emailAddresses := make([]string, 0, len(emails))
+	for _, email := range emails {
+		emailAddresses = append(emailAddresses, email.Email)
+	}
+
 	return &User{
 		Name:      user.Name,
-		Email:     user.Email,
+		Emails:    emailAddresses,
 		Username:  user.Username,
 		CreatedAt: *user.CreatedAt,
 	}, nil
@@ -100,7 +111,7 @@ func (s *GitLab) HasUserContributions(ctx context.Context, user *User, projectID
 		}
 
 		for _, c := range contrs {
-			if strings.EqualFold(c.Email, user.Email) {
+			if contains(user.Emails, c.Email) {
 				return true
 			}
 		}
@@ -161,7 +172,7 @@ func (s *GitLab) fetchCommitPage(
 	}
 
 	for _, comm := range comms {
-		if !strings.EqualFold(comm.AuthorEmail, user.Email) || !strings.EqualFold(comm.CommitterEmail, user.Email) {
+		if !contains(user.Emails, comm.AuthorEmail) || !contains(user.Emails, comm.CommitterEmail) {
 			continue
 		}
 
@@ -182,3 +193,10 @@ func (s *GitLab) fetchCommitPage(
 
 	return commits, resp.NextPage, nil
 }
+
+// contains checks if a string `v` is in the slice `s`, ignoring case.
+func contains(s []string, v string) bool {
+	return slices.ContainsFunc(s, func(item string) bool {
+		return strings.EqualFold(item, v)
+	})
+}

internal/gitlab_test.go

@@ -44,9 +44,17 @@ func newCurrentUser(t *testing.T, gitlabClient *gitlab.Client) *app.User {
 	user, _, err := gitlabClient.Users.CurrentUser()
 	require.NoError(t, err)
 
+	emails, _, err := gitlabClient.Users.ListEmails()
+	require.NoError(t, err)
+
+	emailAddresses := make([]string, 0, len(emails))
+	for _, email := range emails {
+		emailAddresses = append(emailAddresses, email.Email)
+	}
+
 	return &app.User{
 		Name:      user.Name,
-		Email:     user.Email,
+		Emails:    emailAddresses,
 		CreatedAt: *user.CreatedAt,
 	}
 }