Merge remote-tracking branch 'origin/V20211115' into zouap_static

models/repo_activity_custom.go

@@ -11,8 +11,10 @@ import (
 
 type ContributorWithUserId struct {
 	git.Contributor
-	UserId  int64
-	IsAdmin bool
+	UserId        int64
+	IsAdmin       bool
+	RelAvatarLink string
+	Email         string
 }
 
 func GetRepoKPIStats(repo *Repository) (*git.RepoKPIStats, error) {
@@ -146,6 +148,8 @@ func GetTop10Contributor(repoPath string) ([]ContributorWithUserId, error) {
 						contributor,
 						user.ID,
 						user.IsAdmin,
+						user.RelAvatarLink(),
+						user.Email,
 					}
 				} else {
 
@@ -159,6 +163,8 @@ func GetTop10Contributor(repoPath string) ([]ContributorWithUserId, error) {
 						contributor,
 						-1,
 						false,
+						"",
+						contributor.Email,
 					}
 				} else {
 					value.CommitCnt += contributor.CommitCnt

modules/cron/tasks_basic.go

@@ -164,13 +164,13 @@ func registerHandleBlockChainUnSuccessCommits() {
 	})
 }
 
-func registerHandleRepoStatistic() {
-	RegisterTaskFatal("handle_repo_statistic", &BaseConfig{
+func registerHandleRepoAndUserStatistic() {
+	RegisterTaskFatal("handle_repo_and_user_statistic", &BaseConfig{
 		Enabled:    true,
 		RunAtStart: false,
 		Schedule:   "@daily",
 	}, func(ctx context.Context, _ *models.User, _ Config) error {
-		repo.RepoStatisticAuto()
+		repo.StatisticAuto()
 		return nil
 	})
 }
@@ -185,16 +185,6 @@ func registerHandleSummaryStatistic() {
 		return nil
 	})
 }
-func registerHandleUserStatistic() {
-	RegisterTaskFatal("handle_user_statistic", &BaseConfig{
-		Enabled:    true,
-		RunAtStart: false,
-		Schedule:   "@daily",
-	}, func(ctx context.Context, _ *models.User, _ Config) error {
-		repo.TimingCountData()
-		return nil
-	})
-}
 
 func registerHandleClearRepoStatisticFile() {
 	RegisterTaskFatal("handle_repo_clear_statistic_file", &BaseConfig{
@@ -222,7 +212,6 @@ func initBasicTasks() {
 	registerHandleBlockChainMergedPulls()
 	registerHandleBlockChainUnSuccessCommits()
 
-	registerHandleRepoStatistic()
-	registerHandleUserStatistic()
+	registerHandleRepoAndUserStatistic()
 	registerHandleSummaryStatistic()
 }

routers/api/v1/repo/repo_dashbord.go

@@ -31,10 +31,12 @@ type ProjectsPeriodData struct {
 }
 
 type UserInfo struct {
-	User   string `json:"user"`
-	Mode   int    `json:"mode"`
-	PR     int64  `json:"pr"`
-	Commit int    `json:"commit"`
+	User          string `json:"user"`
+	Mode          int    `json:"mode"`
+	PR            int64  `json:"pr"`
+	Commit        int    `json:"commit"`
+	RelAvatarLink string `json:"relAvatarLink"`
+	Email         string `json:"email"`
 }
 
 type ProjectLatestData struct {
@@ -316,10 +318,11 @@ func GetProjectLatestStatistics(ctx *context.Context) {
 
 		pr := models.GetPullCountByUserAndRepoId(repoIdInt, contributor.UserId)
 		userInfo := UserInfo{
-			User:   contributor.Committer,
-			Commit: contributor.CommitCnt,
-			Mode:   mode,
-			PR:     pr,
+			User:          contributor.Committer,
+			Commit:        contributor.CommitCnt,
+			Mode:          mode,
+			PR:            pr,
+			RelAvatarLink: contributor.RelAvatarLink,
 		}
 		users = append(users, userInfo)
 

routers/repo/repo_statistic.go

@@ -3,18 +3,20 @@ package repo
 import (
 	"time"
 
-	"code.gitea.io/gitea/modules/setting"
-
-	"code.gitea.io/gitea/modules/normalization"
-
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/log"
+	"code.gitea.io/gitea/modules/normalization"
 	"code.gitea.io/gitea/modules/repository"
+	"code.gitea.io/gitea/modules/setting"
 )
 
-//auto daily or manually
+func StatisticAuto() {
+	RepoStatisticAuto()
+	TimingCountData()
+}
+
+//auto daily
 func RepoStatisticAuto() {
-	log.Info("", time.Now())
 	yesterday := time.Now().AddDate(0, 0, -1).Format("2006-01-02")
 	setting.UpdateRadarMap()
 	RepoStatisticDaily(yesterday)