Merge pull request #66 from adavila0703/sum-contributions-streaks

Author: adavila0703

internal/github/contributions.go

@@ -169,16 +169,19 @@ func (g *GithubService) GetFirstContributionYearByUsername(ctx context.Context,
 }
 
 type CurrentContributionStreak struct {
-	Streak    int
-	StartedAt time.Time
+	Streak        int
+	Contributions int
+	StartedAt     time.Time
 }
 
 func (c CurrentContributionStreak) String() string {
-	msg := fmt.Sprintf("current contribution streak: %d days", c.Streak)
+	msg := fmt.Sprintf("current contribution streak\nstreak: %d days", c.Streak)
 	if c.Streak > 0 {
-		msg = fmt.Sprintf("%s started at: %s", msg, c.StartedAt.Format("2006-01-02"))
+		msg = fmt.Sprintf("%s\nstarted at: %s", msg, c.StartedAt.Format("2006-01-02"))
 	}
 
+	msg = fmt.Sprintf("%s\ncontributions: %d", msg, c.Contributions)
+
 	return msg
 }
 
@@ -212,23 +215,30 @@ func (g *GithubService) GetCurrentContributionStreakByUsername(ctx context.Conte
 		}
 		currentContributionStreak.StartedAt = d.Date
 
+		currentContributionStreak.Contributions += d.ContributionCount
+
 		currentContributionStreak.Streak++
 	}
 
 	return currentContributionStreak, nil
 }
 
 type LongestContributionStreak struct {
-	Streak    int
-	StartedAt time.Time
-	EndedAt   time.Time
+	Streak        int
+	Contributions int
+	StartedAt     time.Time
+	EndedAt       time.Time
 }
 
 func (c LongestContributionStreak) String() string {
+	startAt := c.StartedAt.Format("2006-01-02")
+	msg := "longest contribution streak"
+
 	if c.EndedAt.IsZero() {
-		return fmt.Sprintf("longest and current contribution streak: %d days started at: %s", c.Streak, c.StartedAt.Format("2006-01-02"))
+		return fmt.Sprintf("%s\nstreak: %d days\nstarted at: %s", msg, c.Streak, startAt)
 	}
-	return fmt.Sprintf("longest contribution streak: %d days started at: %s ended at: %s", c.Streak, c.StartedAt.Format("2006-01-02"), c.EndedAt.Format("2006-01-02"))
+
+	return fmt.Sprintf("%s\nstreak: %d days\nstarted at: %s\nended at: %s\ncontributions: %d", msg, c.Streak, startAt, c.EndedAt.Format("2006-01-02"), c.Contributions)
 }
 
 func (g *GithubService) GetLongestContributionStreakByUsername(ctx context.Context, username string) (*LongestContributionStreak, error) {
@@ -265,14 +275,17 @@ func (g *GithubService) GetLongestContributionStreakByUsername(ctx context.Conte
 	startedAt := time.Time{}
 	endedAt := time.Time{}
 	streak := 0
+	contributionCount := 0
 	for _, d := range days {
 		if d.ContributionCount == 0 {
 			if streak > longestContributionStreak.Streak {
 				longestContributionStreak.Streak = streak
 				longestContributionStreak.StartedAt = startedAt
 				longestContributionStreak.EndedAt = endedAt
+				longestContributionStreak.Contributions = contributionCount
 			}
 
+			contributionCount = 0
 			streak = 0
 
 			continue
@@ -283,7 +296,9 @@ func (g *GithubService) GetLongestContributionStreakByUsername(ctx context.Conte
 		}
 		startedAt = d.Date
 
+		contributionCount += d.ContributionCount
 		streak++
+
 	}
 
 	now := time.Date(time.Now().Year(), time.Now().Month(), time.Now().Day(), 0, 0, 0, 0, time.UTC)

internal/github/repositories.go

@@ -20,7 +20,7 @@ type LastRepo struct {
 func (c LastRepo) String() string {
 	msg := fmt.Sprintf("\nThe last repo updated \n\n **%v** \n \t %v \n %v \n Created At: %s \n Updated At: %s", c.Name, c.Description, c.URL, c.CreatedAt.Format("2006-01-02"), c.UpdatedAt.Format("2006-01-02"))
 	if len(c.Name) == 0 {
-		msg = fmt.Sprintf("Could not find a repository")
+		msg = "Could not find a repository"
 	}
 
 	return msg