From b053be0d31fb6040bf615fb667f61fc9a763d0e5 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Mon, 26 May 2025 12:27:02 -0700 Subject: [PATCH] correct names --- models/git/combined_status.go | 6 +++--- services/pull/pull.go | 5 ++--- services/repository/commitstatus/commitstatus.go | 8 ++++---- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/models/git/combined_status.go b/models/git/combined_status.go index 5484d4100a..8ff4201696 100644 --- a/models/git/combined_status.go +++ b/models/git/combined_status.go @@ -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 { diff --git a/services/pull/pull.go b/services/pull/pull.go index 55abe6fa00..d36817c9b3 100644 --- a/services/pull/pull.go +++ b/services/pull/pull.go @@ -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 diff --git a/services/repository/commitstatus/commitstatus.go b/services/repository/commitstatus/commitstatus.go index 4bd4415775..d6b4730ded 100644 --- a/services/repository/commitstatus/commitstatus.go +++ b/services/repository/commitstatus/commitstatus.go @@ -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 })