fix the number of Repository for Organization on dashboard page #16799
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
a1012112796
force-pushed
the
a1012/fix_org_rpo_num
branch
from
012063a to
8c77904
Compare
fix go-gitea#16648 Signed-off-by: a1012112796 <1012112796@qq.com>
a1012112796
force-pushed
the
a1012/fix_org_rpo_num
branch
from
8c77904 to
b461a05
Compare
Codecov Report
@@ Coverage Diff @@
## main #16799 +/- ##
=======================================
Coverage 45.50% 45.50%
=======================================
Files 762 762
Lines 85940 85962 +22
=======================================
+ Hits 39108 39120 +12
- Misses 40521 40528 +7
- Partials 6311 6314 +3
Continue to review full report at Codecov.
|
GiteaBot
added
the
lgtm/need 2
zeripath
reviewed
Aug 24, 2021
Comment on lines
+449
to
+461
| for _, org := range orgs { | ||
| cond := SearchRepositoryCondition(&SearchRepoOptions{ | ||
| Actor: doer, | ||
| Private: true, | ||
| OwnerID: org.ID, | ||
| AllPublic: false, // Include also all public repositories of users and public organisations | ||
| AllLimited: false, // Include also all public repositories of limited organisations | ||
| }) | ||
| org.NumRepos, err = countRepositoryByCondition(x, cond) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| } |
There was a problem hiding this comment.
Unfortunately this is wildly inefficient - imagine you're the kind of person that has 500 organizations.
We should just do this in one query with a couple of joins - likely including the in at 442.
There was a problem hiding this comment.
See the code removed in https://github.com/go-gitea/gitea/pull/14032/files
There was a problem hiding this comment.
if too many organizations exist, maybe should paging...
Because of my poor sql knowledge, I don't know how to jon the count result with Organization. feel free to do it if you like. I have to stop this pull request now. Thanks.
zeripath
added a commit
to zeripath/gitea
that referenced
this pull request
Aug 24, 2021
Calculate and return the number of Repositories on the dashboard Organization list. This PR restores some of the logic that was removed in go-gitea#14032 to calculate the number of repos on the dashboard orgs list. Fix go-gitea#16648 Replaces go-gitea#16799 Signed-off-by: Andrew Thornton <art27@cantab.net>
techknowlogick
added a commit
that referenced
this pull request
Sep 1, 2021
Calculate and return the number of Repositories on the dashboard Organization list. This PR restores some of the logic that was removed in #14032 to calculate the number of repos on the dashboard orgs list. Fix #16648 Replaces #16799 Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
zeripath
added a commit
to zeripath/gitea
that referenced
this pull request
Sep 1, 2021
…ea#16807) Backport go-gitea#16807 Calculate and return the number of Repositories on the dashboard Organization list. This PR restores some of the logic that was removed in go-gitea#14032 to calculate the number of repos on the dashboard orgs list. Fix go-gitea#16648 Replaces go-gitea#16799 Signed-off-by: Andrew Thornton <art27@cantab.net>
6543
pushed a commit
that referenced
this pull request
Sep 1, 2021
#16911) Backport #16807 Calculate and return the number of Repositories on the dashboard Organization list. This PR restores some of the logic that was removed in #14032 to calculate the number of repos on the dashboard orgs list. Fix #16648 Replaces #16799 Signed-off-by: Andrew Thornton <art27@cantab.net>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fix #16648