Mirrors/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-12-27 15:13:43 +01:00
Code Issues Activity

correct names

Browse Source
This commit is contained in:
Lunny Xiao 2025-05-26 12:27:02 -07:00
parent 0fe62db756
commit b053be0d31
No known key found for this signature in database
GPG Key ID: C3B7C91B632F738A
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
models/git/combined_status.go
View File

@ -82,11 +82,11 @@ func GetLatestCombinedStatusForRepoAndSHAs(ctx context.Context, repoSHAs []RepoS
cond = cond.Or(builder.Eq{"repo_id": rs.RepoID, "sha": rs.SHA})
}
var summaries []*CombinedStatus
if err := db.GetEngine(ctx).Where(cond).Find(&summaries); err != nil {
combinedStatuses := make([]*CombinedStatus, 0, len(repoSHAs))
if err := db.GetEngine(ctx).Where(cond).Find(&combinedStatuses); err != nil {
return nil, err
}
return summaries, nil
return combinedStatuses, nil
}
func InsertOrUpdateCombinedStatus(ctx context.Context, repoID int64, sha string) error {

5
services/pull/pull.go
View File

@ -998,14 +998,13 @@ func GetIssuesAllCommitStatus(ctx context.Context, issues issues_model.IssueList
}
// getAllCommitStatus get pr's commit statuses.
func getAllCommitStatus(ctx context.Context, gitRepo *git.Repository, pr *issues_model.PullRequest) (statuses []*git_model.CommitStatus, err error) {
func getAllCommitStatus(ctx context.Context, gitRepo *git.Repository, pr *issues_model.PullRequest) ([]*git_model.CommitStatus, error) {
sha, shaErr := gitRepo.GetRefCommitID(pr.GetGitRefName())
if shaErr != nil {
return nil, shaErr
}
statuses, err = git_model.GetLatestCommitStatus(ctx, pr.BaseRepo.ID, sha, db.ListOptionsAll)
return statuses, err
return git_model.GetLatestCommitStatus(ctx, pr.BaseRepo.ID, sha, db.ListOptionsAll)
}
// IsHeadEqualWithBranch returns if the commits of branchName are available in pull request head

8
services/repository/commitstatus/commitstatus.go
View File

@ -158,15 +158,15 @@ func FindReposLastestCombinedStatuses(ctx context.Context, repos []*repo_model.R
repoSHAs = append(repoSHAs, git_model.RepoSHA{RepoID: id, SHA: sha})
}
summaryResults, err := git_model.GetLatestCombinedStatusForRepoAndSHAs(ctx, repoSHAs)
combinedStatuses, err := git_model.GetLatestCombinedStatusForRepoAndSHAs(ctx, repoSHAs)
if err != nil {
return nil, fmt.Errorf("GetLatestCommitStatusForRepoAndSHAs: %v", err)
}
for _, summary := range summaryResults {
for _, combinedStatus := range combinedStatuses {
for i, repo := range repos {
if repo.ID == summary.RepoID {
results[i] = summary
if repo.ID == combinedStatus.RepoID {
results[i] = combinedStatus
repoSHAs = slices.DeleteFunc(repoSHAs, func(repoSHA git_model.RepoSHA) bool {
return repoSHA.RepoID == repo.ID
})