From 1002d7538e7aeb8456dce9dc1c9ae57a2227e0aa Mon Sep 17 00:00:00 2001 From: JakobDev Date: Mon, 17 Jul 2023 12:34:36 +0200 Subject: [PATCH 1/5] Count only visible repos on profile --- routers/web/org/home.go | 12 ++++++++++++ routers/web/user/profile.go | 11 +++++++++++ templates/org/menu.tmpl | 4 ++-- templates/user/overview/header.tmpl | 4 ++-- 4 files changed, 27 insertions(+), 4 deletions(-) diff --git a/routers/web/org/home.go b/routers/web/org/home.go index 7f38ec51ba6e2..ba8319d9e811e 100644 --- a/routers/web/org/home.go +++ b/routers/web/org/home.go @@ -16,6 +16,7 @@ import ( "code.gitea.io/gitea/modules/markup" "code.gitea.io/gitea/modules/markup/markdown" "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/util" ) const ( @@ -158,6 +159,17 @@ func Home(ctx *context.Context) { ctx.Data["PageIsViewRepositories"] = true ctx.Data["IsFollowing"] = isFollowing + if !opts.PublicOnly { + ctx.Data["RepoCount"] = ctx.ContextUser.NumRepos + } else { + publicCount, err := repo_model.CountRepositories(ctx, repo_model.CountRepositoryOptions{OwnerID: ctx.ContextUser.ID, Private: util.OptionalBoolFalse}) + if err != nil { + ctx.ServerError("CountPublicRepos", err) + return + } + ctx.Data["RepoCount"] = publicCount + } + pager := context.NewPagination(int(count), setting.UI.User.RepoPagingNum, page, 5) pager.SetDefaultParams(ctx) pager.AddParam(ctx, "language", "Language") diff --git a/routers/web/user/profile.go b/routers/web/user/profile.go index 07a2261c967d3..436f4dc65dc8f 100644 --- a/routers/web/user/profile.go +++ b/routers/web/user/profile.go @@ -264,6 +264,17 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileGi ctx.Data["Repos"] = repos ctx.Data["Total"] = total + if ctx.Doer != nil && (ctx.Doer.ID == ctx.ContextUser.ID || ctx.Doer.IsAdmin) { + ctx.Data["RepoCount"] = ctx.ContextUser.NumRepos + } else { + publicCount, err := repo_model.CountRepositories(ctx, repo_model.CountRepositoryOptions{OwnerID: ctx.ContextUser.ID, Private: util.OptionalBoolFalse}) + if err != nil { + ctx.ServerError("CountPublicRepos", err) + return + } + ctx.Data["RepoCount"] = publicCount + } + pager := context.NewPagination(total, pagingNum, page, 5) pager.SetDefaultParams(ctx) pager.AddParam(ctx, "tab", "TabName") diff --git a/templates/org/menu.tmpl b/templates/org/menu.tmpl index 6492e5e668eb1..a4f602730a503 100644 --- a/templates/org/menu.tmpl +++ b/templates/org/menu.tmpl @@ -2,8 +2,8 @@
{{svg "octicon-repo"}} {{.locale.Tr "user.repositories"}} - {{if .ContextUser.NumRepos}} -
{{.ContextUser.NumRepos}}
+ {{if .RepoCount}} +
{{.RepoCount}}
{{end}} {{if .CanReadProjects}} diff --git a/templates/user/overview/header.tmpl b/templates/user/overview/header.tmpl index 0491020959f4e..5134449084d84 100644 --- a/templates/user/overview/header.tmpl +++ b/templates/user/overview/header.tmpl @@ -6,8 +6,8 @@ {{end}} {{svg "octicon-repo"}} {{.locale.Tr "user.repositories"}} - {{if .ContextUser.NumRepos}} -
{{.ContextUser.NumRepos}}
+ {{if .RepoCount}} +
{{.RepoCount}}
{{end}} {{if or .ContextUser.IsIndividual (and .ContextUser.IsOrganization .CanReadProjects)}} From 06905269262ae629208c71bfed1a8bb32f3b020b Mon Sep 17 00:00:00 2001 From: JakobDev Date: Fri, 21 Jul 2023 16:42:00 +0200 Subject: [PATCH 2/5] Code rewrite --- routers/web/org/home.go | 15 +++++--------- routers/web/org/projects.go | 25 +++++++++++++++++++++++ routers/web/shared/user/header.go | 34 +++++++++++++++++++++++++++++++ routers/web/user/package.go | 18 ++++++++++++++++ routers/web/user/profile.go | 13 ++++-------- 5 files changed, 86 insertions(+), 19 deletions(-) diff --git a/routers/web/org/home.go b/routers/web/org/home.go index ba8319d9e811e..9104c15f949bc 100644 --- a/routers/web/org/home.go +++ b/routers/web/org/home.go @@ -16,7 +16,7 @@ import ( "code.gitea.io/gitea/modules/markup" "code.gitea.io/gitea/modules/markup/markdown" "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" + shared_user "code.gitea.io/gitea/routers/web/shared/user" ) const ( @@ -159,15 +159,10 @@ func Home(ctx *context.Context) { ctx.Data["PageIsViewRepositories"] = true ctx.Data["IsFollowing"] = isFollowing - if !opts.PublicOnly { - ctx.Data["RepoCount"] = ctx.ContextUser.NumRepos - } else { - publicCount, err := repo_model.CountRepositories(ctx, repo_model.CountRepositoryOptions{OwnerID: ctx.ContextUser.ID, Private: util.OptionalBoolFalse}) - if err != nil { - ctx.ServerError("CountPublicRepos", err) - return - } - ctx.Data["RepoCount"] = publicCount + err = shared_user.LoadHeaderCount(ctx) + if err != nil { + ctx.ServerError("LoadHeaderCount", err) + return } pager := context.NewPagination(int(count), setting.UI.User.RepoPagingNum, page, 5) diff --git a/routers/web/org/projects.go b/routers/web/org/projects.go index 50bb5591e57aa..64073d7422124 100644 --- a/routers/web/org/projects.go +++ b/routers/web/org/projects.go @@ -101,6 +101,12 @@ func Projects(ctx *context.Context) { project.RenderedContent = project.Description } + err = shared_user.LoadHeaderCount(ctx) + if err != nil { + ctx.ServerError("LoadHeaderCount", err) + return + } + numPages := 0 if total > 0 { numPages = (int(total) - 1/setting.UI.IssuePagingNum) @@ -135,6 +141,13 @@ func RenderNewProject(ctx *context.Context) { ctx.Data["HomeLink"] = ctx.ContextUser.HomeLink() ctx.Data["CancelLink"] = ctx.ContextUser.HomeLink() + "/-/projects" shared_user.RenderUserHeader(ctx) + + err := shared_user.LoadHeaderCount(ctx) + if err != nil { + ctx.ServerError("LoadHeaderCount", err) + return + } + ctx.HTML(http.StatusOK, tplProjectsNew) } @@ -272,6 +285,12 @@ func EditProjectPost(ctx *context.Context) { shared_user.RenderUserHeader(ctx) + err := shared_user.LoadHeaderCount(ctx) + if err != nil { + ctx.ServerError("LoadHeaderCount", err) + return + } + if ctx.HasError() { ctx.HTML(http.StatusOK, tplProjectsNew) return @@ -381,6 +400,12 @@ func ViewProject(ctx *context.Context) { ctx.Data["Boards"] = boards shared_user.RenderUserHeader(ctx) + err = shared_user.LoadHeaderCount(ctx) + if err != nil { + ctx.ServerError("LoadHeaderCount", err) + return + } + ctx.HTML(http.StatusOK, tplProjectsView) } diff --git a/routers/web/shared/user/header.go b/routers/web/shared/user/header.go index 516c853b02e3e..7a1ba584c1641 100644 --- a/routers/web/shared/user/header.go +++ b/routers/web/shared/user/header.go @@ -14,6 +14,7 @@ import ( "code.gitea.io/gitea/modules/markup" "code.gitea.io/gitea/modules/markup/markdown" "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/util" ) // prepareContextForCommonProfile store some common data into context data for user's profile related pages (including the nav menu) @@ -110,3 +111,36 @@ func RenderUserHeader(ctx *context.Context) { defer profileClose() ctx.Data["HasProfileReadme"] = profileReadmeBlob != nil } + +func LoadHeaderCount(ctx *context.Context) error { + prepareContextForCommonProfile(ctx) + + var err error + var showPrivate bool + if ctx.Doer == nil { + showPrivate = false + } else if ctx.ContextUser.IsAdmin { + showPrivate = true + } else if ctx.ContextUser.ID == ctx.Doer.ID { + showPrivate = true + } else if ctx.ContextUser.IsOrganization() { + showPrivate, err = ctx.Org.Organization.IsOrgMember(ctx.Doer.ID) + if err != nil { + return err + } + } else { + showPrivate = false + } + + if showPrivate { + ctx.Data["RepoCount"] = ctx.ContextUser.NumRepos + } else { + repoCount, err := repo_model.CountRepositories(ctx, repo_model.CountRepositoryOptions{OwnerID: ctx.ContextUser.ID, Private: util.OptionalBoolFalse}) + if err != nil { + return err + } + ctx.Data["RepoCount"] = repoCount + } + + return nil +} diff --git a/routers/web/user/package.go b/routers/web/user/package.go index 2e2c2a6e1f9db..d44638d48bbc0 100644 --- a/routers/web/user/package.go +++ b/routers/web/user/package.go @@ -101,6 +101,12 @@ func ListPackages(ctx *context.Context) { ctx.Data["Total"] = total ctx.Data["RepositoryAccessMap"] = repositoryAccessMap + err = shared_user.LoadHeaderCount(ctx) + if err != nil { + ctx.ServerError("LoadHeaderCount", err) + return + } + // TODO: context/org -> HandleOrgAssignment() can not be used if ctx.ContextUser.IsOrganization() { org := org_model.OrgFromUser(ctx.ContextUser) @@ -255,6 +261,12 @@ func ViewPackageVersion(ctx *context.Context) { } ctx.Data["HasRepositoryAccess"] = hasRepositoryAccess + err = shared_user.LoadHeaderCount(ctx) + if err != nil { + ctx.ServerError("LoadHeaderCount", err) + return + } + ctx.HTML(http.StatusOK, tplPackagesView) } @@ -346,6 +358,12 @@ func ListPackageVersions(ctx *context.Context) { ctx.Data["Total"] = total + err = shared_user.LoadHeaderCount(ctx) + if err != nil { + ctx.ServerError("LoadHeaderCount", err) + return + } + pager := context.NewPagination(int(total), setting.UI.PackagesPagingNum, page, 5) for k, v := range pagerParams { pager.AddParamString(k, v) diff --git a/routers/web/user/profile.go b/routers/web/user/profile.go index 436f4dc65dc8f..8243429732ee0 100644 --- a/routers/web/user/profile.go +++ b/routers/web/user/profile.go @@ -264,15 +264,10 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileGi ctx.Data["Repos"] = repos ctx.Data["Total"] = total - if ctx.Doer != nil && (ctx.Doer.ID == ctx.ContextUser.ID || ctx.Doer.IsAdmin) { - ctx.Data["RepoCount"] = ctx.ContextUser.NumRepos - } else { - publicCount, err := repo_model.CountRepositories(ctx, repo_model.CountRepositoryOptions{OwnerID: ctx.ContextUser.ID, Private: util.OptionalBoolFalse}) - if err != nil { - ctx.ServerError("CountPublicRepos", err) - return - } - ctx.Data["RepoCount"] = publicCount + err = shared_user.LoadHeaderCount(ctx) + if err != nil { + ctx.ServerError("LoadHeaderCount", err) + return } pager := context.NewPagination(total, pagingNum, page, 5) From 62e33ec98f9eef1f539ae4e2ad81fc42b0962a1c Mon Sep 17 00:00:00 2001 From: JakobDev Date: Fri, 28 Jul 2023 16:14:30 +0200 Subject: [PATCH 3/5] Use repo_model.SearchRepository --- routers/web/shared/user/header.go | 35 +++++++++---------------------- 1 file changed, 10 insertions(+), 25 deletions(-) diff --git a/routers/web/shared/user/header.go b/routers/web/shared/user/header.go index 7a1ba584c1641..c6077537ab759 100644 --- a/routers/web/shared/user/header.go +++ b/routers/web/shared/user/header.go @@ -115,32 +115,17 @@ func RenderUserHeader(ctx *context.Context) { func LoadHeaderCount(ctx *context.Context) error { prepareContextForCommonProfile(ctx) - var err error - var showPrivate bool - if ctx.Doer == nil { - showPrivate = false - } else if ctx.ContextUser.IsAdmin { - showPrivate = true - } else if ctx.ContextUser.ID == ctx.Doer.ID { - showPrivate = true - } else if ctx.ContextUser.IsOrganization() { - showPrivate, err = ctx.Org.Organization.IsOrgMember(ctx.Doer.ID) - if err != nil { - return err - } - } else { - showPrivate = false - } - - if showPrivate { - ctx.Data["RepoCount"] = ctx.ContextUser.NumRepos - } else { - repoCount, err := repo_model.CountRepositories(ctx, repo_model.CountRepositoryOptions{OwnerID: ctx.ContextUser.ID, Private: util.OptionalBoolFalse}) - if err != nil { - return err - } - ctx.Data["RepoCount"] = repoCount + _, repoCount, err := repo_model.SearchRepository(ctx, &repo_model.SearchRepoOptions{ + Actor: ctx.Doer, + OwnerID: ctx.ContextUser.ID, + Private: ctx.IsSigned, + Collaborate: util.OptionalBoolFalse, + IncludeDescription: setting.UI.SearchRepoDescription, + }) + if err != nil { + return err } + ctx.Data["RepoCount"] = repoCount return nil } From 0ee37a2e6aaf898ba1f7f5d3d20cb03853489dfe Mon Sep 17 00:00:00 2001 From: JakobDev Date: Thu, 10 Aug 2023 18:15:45 +0200 Subject: [PATCH 4/5] Use CountRepository --- models/repo/repo_list.go | 5 +++++ routers/web/shared/user/header.go | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/models/repo/repo_list.go b/models/repo/repo_list.go index 83ba02e31653a..b8427bec4eb45 100644 --- a/models/repo/repo_list.go +++ b/models/repo/repo_list.go @@ -522,6 +522,11 @@ func SearchRepository(ctx context.Context, opts *SearchRepoOptions) (RepositoryL return SearchRepositoryByCondition(ctx, opts, cond, true) } +// CountRepository counts repositories based on search options, +func CountRepository(ctx context.Context, opts *SearchRepoOptions) (int64, error) { + return db.GetEngine(ctx).Where(SearchRepositoryCondition(opts)).Count(new(Repository)) +} + // SearchRepositoryByCondition search repositories by condition func SearchRepositoryByCondition(ctx context.Context, opts *SearchRepoOptions, cond builder.Cond, loadAttributes bool) (RepositoryList, int64, error) { sess, count, err := searchRepositoryByCondition(ctx, opts, cond) diff --git a/routers/web/shared/user/header.go b/routers/web/shared/user/header.go index c6077537ab759..e0bfe63aa0a07 100644 --- a/routers/web/shared/user/header.go +++ b/routers/web/shared/user/header.go @@ -115,7 +115,7 @@ func RenderUserHeader(ctx *context.Context) { func LoadHeaderCount(ctx *context.Context) error { prepareContextForCommonProfile(ctx) - _, repoCount, err := repo_model.SearchRepository(ctx, &repo_model.SearchRepoOptions{ + repoCount, err := repo_model.CountRepository(ctx, &repo_model.SearchRepoOptions{ Actor: ctx.Doer, OwnerID: ctx.ContextUser.ID, Private: ctx.IsSigned, From f877d1effbc3a4ab861567d928cc347b86fa6877 Mon Sep 17 00:00:00 2001 From: JakobDev Date: Thu, 10 Aug 2023 18:58:05 +0200 Subject: [PATCH 5/5] Add TestCountRepository --- models/repo/repo_list_test.go | 229 +++++++++++++++++++--------------- 1 file changed, 127 insertions(+), 102 deletions(-) diff --git a/models/repo/repo_list_test.go b/models/repo/repo_list_test.go index e013953c68a80..7097b6ea14a2b 100644 --- a/models/repo/repo_list_test.go +++ b/models/repo/repo_list_test.go @@ -15,108 +15,11 @@ import ( "github.com/stretchr/testify/assert" ) -func TestSearchRepository(t *testing.T) { - assert.NoError(t, unittest.PrepareTestDatabase()) - - // test search public repository on explore page - repos, count, err := repo_model.SearchRepositoryByName(db.DefaultContext, &repo_model.SearchRepoOptions{ - ListOptions: db.ListOptions{ - Page: 1, - PageSize: 10, - }, - Keyword: "repo_12", - Collaborate: util.OptionalBoolFalse, - }) - - assert.NoError(t, err) - if assert.Len(t, repos, 1) { - assert.Equal(t, "test_repo_12", repos[0].Name) - } - assert.Equal(t, int64(1), count) - - repos, count, err = repo_model.SearchRepositoryByName(db.DefaultContext, &repo_model.SearchRepoOptions{ - ListOptions: db.ListOptions{ - Page: 1, - PageSize: 10, - }, - Keyword: "test_repo", - Collaborate: util.OptionalBoolFalse, - }) - - assert.NoError(t, err) - assert.Equal(t, int64(2), count) - assert.Len(t, repos, 2) - - // test search private repository on explore page - repos, count, err = repo_model.SearchRepositoryByName(db.DefaultContext, &repo_model.SearchRepoOptions{ - ListOptions: db.ListOptions{ - Page: 1, - PageSize: 10, - }, - Keyword: "repo_13", - Private: true, - Collaborate: util.OptionalBoolFalse, - }) - - assert.NoError(t, err) - if assert.Len(t, repos, 1) { - assert.Equal(t, "test_repo_13", repos[0].Name) - } - assert.Equal(t, int64(1), count) - - repos, count, err = repo_model.SearchRepositoryByName(db.DefaultContext, &repo_model.SearchRepoOptions{ - ListOptions: db.ListOptions{ - Page: 1, - PageSize: 10, - }, - Keyword: "test_repo", - Private: true, - Collaborate: util.OptionalBoolFalse, - }) - - assert.NoError(t, err) - assert.Equal(t, int64(3), count) - assert.Len(t, repos, 3) - - // Test non existing owner - repos, count, err = repo_model.SearchRepositoryByName(db.DefaultContext, &repo_model.SearchRepoOptions{OwnerID: unittest.NonexistentID}) - - assert.NoError(t, err) - assert.Empty(t, repos) - assert.Equal(t, int64(0), count) - - // Test search within description - repos, count, err = repo_model.SearchRepository(db.DefaultContext, &repo_model.SearchRepoOptions{ - ListOptions: db.ListOptions{ - Page: 1, - PageSize: 10, - }, - Keyword: "description_14", - Collaborate: util.OptionalBoolFalse, - IncludeDescription: true, - }) - - assert.NoError(t, err) - if assert.Len(t, repos, 1) { - assert.Equal(t, "test_repo_14", repos[0].Name) - } - assert.Equal(t, int64(1), count) - - // Test NOT search within description - repos, count, err = repo_model.SearchRepository(db.DefaultContext, &repo_model.SearchRepoOptions{ - ListOptions: db.ListOptions{ - Page: 1, - PageSize: 10, - }, - Keyword: "description_14", - Collaborate: util.OptionalBoolFalse, - IncludeDescription: false, - }) - - assert.NoError(t, err) - assert.Empty(t, repos) - assert.Equal(t, int64(0), count) - +func getTestCases() []struct { + name string + opts *repo_model.SearchRepoOptions + count int +} { testCases := []struct { name string opts *repo_model.SearchRepoOptions @@ -274,6 +177,113 @@ func TestSearchRepository(t *testing.T) { }, } + return testCases +} + +func TestSearchRepository(t *testing.T) { + assert.NoError(t, unittest.PrepareTestDatabase()) + + // test search public repository on explore page + repos, count, err := repo_model.SearchRepositoryByName(db.DefaultContext, &repo_model.SearchRepoOptions{ + ListOptions: db.ListOptions{ + Page: 1, + PageSize: 10, + }, + Keyword: "repo_12", + Collaborate: util.OptionalBoolFalse, + }) + + assert.NoError(t, err) + if assert.Len(t, repos, 1) { + assert.Equal(t, "test_repo_12", repos[0].Name) + } + assert.Equal(t, int64(1), count) + + repos, count, err = repo_model.SearchRepositoryByName(db.DefaultContext, &repo_model.SearchRepoOptions{ + ListOptions: db.ListOptions{ + Page: 1, + PageSize: 10, + }, + Keyword: "test_repo", + Collaborate: util.OptionalBoolFalse, + }) + + assert.NoError(t, err) + assert.Equal(t, int64(2), count) + assert.Len(t, repos, 2) + + // test search private repository on explore page + repos, count, err = repo_model.SearchRepositoryByName(db.DefaultContext, &repo_model.SearchRepoOptions{ + ListOptions: db.ListOptions{ + Page: 1, + PageSize: 10, + }, + Keyword: "repo_13", + Private: true, + Collaborate: util.OptionalBoolFalse, + }) + + assert.NoError(t, err) + if assert.Len(t, repos, 1) { + assert.Equal(t, "test_repo_13", repos[0].Name) + } + assert.Equal(t, int64(1), count) + + repos, count, err = repo_model.SearchRepositoryByName(db.DefaultContext, &repo_model.SearchRepoOptions{ + ListOptions: db.ListOptions{ + Page: 1, + PageSize: 10, + }, + Keyword: "test_repo", + Private: true, + Collaborate: util.OptionalBoolFalse, + }) + + assert.NoError(t, err) + assert.Equal(t, int64(3), count) + assert.Len(t, repos, 3) + + // Test non existing owner + repos, count, err = repo_model.SearchRepositoryByName(db.DefaultContext, &repo_model.SearchRepoOptions{OwnerID: unittest.NonexistentID}) + + assert.NoError(t, err) + assert.Empty(t, repos) + assert.Equal(t, int64(0), count) + + // Test search within description + repos, count, err = repo_model.SearchRepository(db.DefaultContext, &repo_model.SearchRepoOptions{ + ListOptions: db.ListOptions{ + Page: 1, + PageSize: 10, + }, + Keyword: "description_14", + Collaborate: util.OptionalBoolFalse, + IncludeDescription: true, + }) + + assert.NoError(t, err) + if assert.Len(t, repos, 1) { + assert.Equal(t, "test_repo_14", repos[0].Name) + } + assert.Equal(t, int64(1), count) + + // Test NOT search within description + repos, count, err = repo_model.SearchRepository(db.DefaultContext, &repo_model.SearchRepoOptions{ + ListOptions: db.ListOptions{ + Page: 1, + PageSize: 10, + }, + Keyword: "description_14", + Collaborate: util.OptionalBoolFalse, + IncludeDescription: false, + }) + + assert.NoError(t, err) + assert.Empty(t, repos) + assert.Equal(t, int64(0), count) + + testCases := getTestCases() + for _, testCase := range testCases { t.Run(testCase.name, func(t *testing.T) { repos, count, err := repo_model.SearchRepositoryByName(db.DefaultContext, testCase.opts) @@ -349,6 +359,21 @@ func TestSearchRepository(t *testing.T) { } } +func TestCountRepository(t *testing.T) { + assert.NoError(t, unittest.PrepareTestDatabase()) + + testCases := getTestCases() + + for _, testCase := range testCases { + t.Run(testCase.name, func(t *testing.T) { + count, err := repo_model.CountRepository(db.DefaultContext, testCase.opts) + + assert.NoError(t, err) + assert.Equal(t, int64(testCase.count), count) + }) + } +} + func TestSearchRepositoryByTopicName(t *testing.T) { assert.NoError(t, unittest.PrepareTestDatabase())