From b61173c4ffad3c5d02ecfaa86154bb05dfc24eb7 Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Mon, 15 Nov 2021 14:33:07 +0800 Subject: [PATCH 1/3] make user stat behind repo stat --- modules/cron/tasks_basic.go | 19 ++++--------------- routers/repo/repo_statistic.go | 14 ++++++++------ 2 files changed, 12 insertions(+), 21 deletions(-) diff --git a/modules/cron/tasks_basic.go b/modules/cron/tasks_basic.go index eac081a8f..e238418d8 100755 --- a/modules/cron/tasks_basic.go +++ b/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() } diff --git a/routers/repo/repo_statistic.go b/routers/repo/repo_statistic.go index c1edb0fed..99a83f714 100755 --- a/routers/repo/repo_statistic.go +++ b/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) From 16e45fd61bcd9a41747d7e11fa140688214bd2ac Mon Sep 17 00:00:00 2001 From: ychao_1983 Date: Mon, 15 Nov 2021 15:44:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85top10?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=98=BE=E7=A4=BA=E7=94=A8=E6=88=B7=E5=A4=B4?= =?UTF-8?q?=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/repo_activity_custom.go | 7 +++++-- routers/api/v1/repo/repo_dashbord.go | 18 ++++++++++-------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/models/repo_activity_custom.go b/models/repo_activity_custom.go index 7cfed2359..779c50687 100644 --- a/models/repo_activity_custom.go +++ b/models/repo_activity_custom.go @@ -11,8 +11,9 @@ import ( type ContributorWithUserId struct { git.Contributor - UserId int64 - IsAdmin bool + UserId int64 + IsAdmin bool + RelAvatarLink string } func GetRepoKPIStats(repo *Repository) (*git.RepoKPIStats, error) { @@ -146,6 +147,7 @@ func GetTop10Contributor(repoPath string) ([]ContributorWithUserId, error) { contributor, user.ID, user.IsAdmin, + user.RelAvatarLink(), } } else { @@ -159,6 +161,7 @@ func GetTop10Contributor(repoPath string) ([]ContributorWithUserId, error) { contributor, -1, false, + "", } } else { value.CommitCnt += contributor.CommitCnt diff --git a/routers/api/v1/repo/repo_dashbord.go b/routers/api/v1/repo/repo_dashbord.go index 0fcd70a99..81eb95f61 100644 --- a/routers/api/v1/repo/repo_dashbord.go +++ b/routers/api/v1/repo/repo_dashbord.go @@ -31,10 +31,11 @@ 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"` } type ProjectLatestData struct { @@ -316,10 +317,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) From fce595b10c0422acf7d11153d63282e3615dcdd1 Mon Sep 17 00:00:00 2001 From: ychao_1983 Date: Mon, 15 Nov 2021 16:22:16 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0email=E7=9A=84=E5=B1=9E?= =?UTF-8?q?=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/repo_activity_custom.go | 3 +++ routers/api/v1/repo/repo_dashbord.go | 1 + 2 files changed, 4 insertions(+) diff --git a/models/repo_activity_custom.go b/models/repo_activity_custom.go index 779c50687..04f8f7ae1 100644 --- a/models/repo_activity_custom.go +++ b/models/repo_activity_custom.go @@ -14,6 +14,7 @@ type ContributorWithUserId struct { UserId int64 IsAdmin bool RelAvatarLink string + Email string } func GetRepoKPIStats(repo *Repository) (*git.RepoKPIStats, error) { @@ -148,6 +149,7 @@ func GetTop10Contributor(repoPath string) ([]ContributorWithUserId, error) { user.ID, user.IsAdmin, user.RelAvatarLink(), + user.Email, } } else { @@ -162,6 +164,7 @@ func GetTop10Contributor(repoPath string) ([]ContributorWithUserId, error) { -1, false, "", + contributor.Email, } } else { value.CommitCnt += contributor.CommitCnt diff --git a/routers/api/v1/repo/repo_dashbord.go b/routers/api/v1/repo/repo_dashbord.go index 81eb95f61..c08a7d8ca 100644 --- a/routers/api/v1/repo/repo_dashbord.go +++ b/routers/api/v1/repo/repo_dashbord.go @@ -36,6 +36,7 @@ type UserInfo struct { PR int64 `json:"pr"` Commit int `json:"commit"` RelAvatarLink string `json:"relAvatarLink"` + Email string `json:"email"` } type ProjectLatestData struct {