Refactor

Author: sahinakkaya

models/contributors/contributors_graph.go

@@ -1,14 +1,14 @@
 package contributors
 
 import (
+	"context"
+	"fmt"
+	"time"
+
 	repo_model "code.gitea.io/gitea/models/repo"
 	user_model "code.gitea.io/gitea/models/user"
 	"code.gitea.io/gitea/modules/git"
-	"code.gitea.io/gitea/modules/json"
 	util "code.gitea.io/gitea/modules/util"
-	"context"
-	"fmt"
-	"time"
 )
 
 type WeekData struct {
@@ -20,12 +20,12 @@ type WeekData struct {
 
 // ContributorData represents statistical git commit count data
 type ContributorData struct {
-	Name       string      `json:"name"`
-	Login      string      `json:"login"`
-	AvatarLink string      `json:"avatar_link"`
-	HomeLink   string      `json:"home_link"`
-	Total      int64       `json:"total"`
-	Weeks      []*WeekData `json:"weeks"`
+	Name         string      `json:"name"`
+	Login        string      `json:"login"`
+	AvatarLink   string      `json:"avatar_link"`
+	HomeLink     string      `json:"home_link"`
+	TotalCommits int64       `json:"total_commits"`
+	Weeks        []*WeekData `json:"weeks"`
 }
 
 func CreateWeeks(sundays []int64) []*WeekData {
@@ -51,7 +51,7 @@ func GetContributorStats(ctx context.Context, repo *repo_model.Repository) (map[
 	defer closer.Close()
 
 	default_branch, _ := gitRepo.GetDefaultBranch()
-	extended_commit_stats, err := gitRepo.ExtendedCommitStats(default_branch, 6000)
+	extended_commit_stats, err := gitRepo.ExtendedCommitStats(default_branch)
 	if err != nil {
 		return nil, fmt.Errorf("ExtendedCommitStats: %w", err)
 	}
@@ -66,11 +66,12 @@ func GetContributorStats(ctx context.Context, repo *repo_model.Repository) (map[
 
 	unknownUserAvatarLink := user_model.NewGhostUser().AvatarLink(ctx)
 	contributors_commit_stats := make(map[string]*ContributorData)
-	contributors_commit_stats[""] = &ContributorData{
+	contributors_commit_stats["Total"] = &ContributorData{
 		Name:       "Total",
 		AvatarLink: unknownUserAvatarLink,
 		Weeks:      CreateWeeks(sundays),
 	}
+	total, _ := contributors_commit_stats["Total"]
 
 	for _, v := range extended_commit_stats {
 		if len(v.Author.Email) == 0 {
@@ -92,7 +93,6 @@ func GetContributorStats(ctx context.Context, repo *repo_model.Repository) (map[
 					HomeLink:   u.HomeLink(),
 					Weeks:      CreateWeeks(sundays),
 				}
-
 			}
 		}
 		// Update user statistics
@@ -105,22 +105,14 @@ func GetContributorStats(ctx context.Context, repo *repo_model.Repository) (map[
 		user.Weeks[idx].Additions += v.Stats.Additions
 		user.Weeks[idx].Deletions += v.Stats.Deletions
 		user.Weeks[idx].Commits++
-		user.Total++
+		user.TotalCommits++
 
 		// Update overall statistics
-		total, _ := contributors_commit_stats[""]
 		total.Weeks[idx].Additions += v.Stats.Additions
 		total.Weeks[idx].Deletions += v.Stats.Deletions
 		total.Weeks[idx].Commits++
-		total.Total++
+		total.TotalCommits++
 	}
 
-	fmt.Printf("users are: %s", prettyPrint(contributors_commit_stats))
-
 	return contributors_commit_stats, nil
 }
-
-func prettyPrint(i interface{}) string {
-	s, _ := json.MarshalIndent(i, "", "\t")
-	return string(s)
-}

modules/git/repo_commit.go

@@ -225,7 +225,7 @@ type CommitsByFileAndRangeOptions struct {
 }
 
 // ExtendedCommitStats return the list of *api.ExtendedCommitStats for the given revision
-func (repo *Repository) ExtendedCommitStats(revision string, limit int) ([]*api.ExtendedCommitStats, error) {
+func (repo *Repository) ExtendedCommitStats(revision string /*, limit int */) ([]*api.ExtendedCommitStats, error) {
 	var baseCommit *Commit
 	baseCommit, err := repo.GetCommit(revision)
 	stdoutReader, stdoutWriter, err := os.Pipe()
@@ -276,7 +276,6 @@ func (repo *Repository) ExtendedCommitStats(revision string, limit int) ([]*api.
 
 					if strings.HasPrefix(type_, "insertion") {
 						commit_stats.Additions = amount
-
 					} else {
 						commit_stats.Deletions = amount
 					}

routers/api/v1/repo/commits.go

@@ -328,7 +328,7 @@ func GetAllCommitsStats(ctx *context.APIContext) {
 		sha = ctx.Repo.Repository.DefaultBranch
 	}
 
-	commits, err = ctx.Repo.GitRepo.ExtendedCommitStats(sha, 6000)
+	commits, err = ctx.Repo.GitRepo.ExtendedCommitStats(sha)
 
 	if err != nil {
 		ctx.Error(http.StatusInternalServerError, "ContributorsCommitStats", err)

routers/web/repo/contributors.go

@@ -15,7 +15,7 @@ const (
 
 // Contributors render the page to show repository contributors graph
 func Contributors(ctx *context.Context) {
-	ctx.Data["Title"] = ctx.Tr("repo.activity")
+	ctx.Data["Title"] = ctx.Tr("repo.contributors")
 	ctx.Data["PageIsContributors"] = true
 
 	ctx.Data["ContributionType"] = ctx.Params("contribution_type")
@@ -30,13 +30,17 @@ func Contributors(ctx *context.Context) {
 		ctx.ServerError("GetContributorStats", err)
 		return
 	} else {
-		ctx.PageData["repoContributorsCommitStats"] = contributor_stats
+		total_stats, ok := contributor_stats["Total"]
+		if ok {
+			delete(contributor_stats, "Total")
+		}
+		ctx.PageData["repoTotalStats"] = total_stats
+		ctx.PageData["repoContributorsStats"] = contributor_stats
+
+		timeFrom := time.UnixMilli(total_stats.Weeks[0].Week)
 		timeUntil := time.Now()
-		timeFrom := time.UnixMilli(contributor_stats[""].Weeks[0].Week)
-
 		ctx.Data["DateFrom"] = timeFrom.UTC().Format(time.RFC3339)
 		ctx.Data["DateUntil"] = timeUntil.UTC().Format(time.RFC3339)
-		// contributor_stats[""].Weeks.(map[string]interface{})
 	}
 
 	ctx.HTML(http.StatusOK, tplContributors)