fix various problems

Author: wxiaoguang

models/git/commit_status.go

@@ -298,15 +298,15 @@ type CommitStatusIndex struct {
 	MaxIndex int64  `xorm:"index"`
 }
 
-var getBase = func(ctx context.Context, repoID int64, sha string) *xorm.Session {
+func makeRepoCommitQuery(ctx context.Context, repoID int64, sha string) *xorm.Session {
 	return db.GetEngine(ctx).Table(&CommitStatus{}).
 		Where("repo_id = ?", repoID).And("sha = ?", sha)
 }
 
 // GetLatestCommitStatus returns all statuses with a unique context for a given commit.
 func GetLatestCommitStatus(ctx context.Context, repoID int64, sha string, listOptions db.ListOptions) ([]*CommitStatus, error) {
 	indices := make([]int64, 0, 10)
-	sess := getBase(ctx, repoID, sha).
+	sess := makeRepoCommitQuery(ctx, repoID, sha).
 		Select("max( `index` ) as `index`").
 		GroupBy("context_hash").
 		OrderBy("max( `index` ) desc")
@@ -320,11 +320,12 @@ func GetLatestCommitStatus(ctx context.Context, repoID int64, sha string, listOp
 	if len(indices) == 0 {
 		return statuses, nil
 	}
-	return statuses, getBase(ctx, repoID, sha).And(builder.In("`index`", indices)).Find(&statuses)
+	err := makeRepoCommitQuery(ctx, repoID, sha).And(builder.In("`index`", indices)).Find(&statuses)
+	return statuses, err
 }
 
 func CountLatestCommitStatus(ctx context.Context, repoID int64, sha string) (int64, error) {
-	return getBase(ctx, repoID, sha).
+	return makeRepoCommitQuery(ctx, repoID, sha).
 		Select("count(context_hash)").
 		GroupBy("context_hash").
 		Count()

models/git/commit_status_test.go

@@ -26,7 +26,7 @@ func TestGetCommitStatuses(t *testing.T) {
 
 	repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
 
-	sha1 := "1234123412341234123412341234123412341234"
+	sha1 := "1234123412341234123412341234123412341234" // the mocked commit ID in test fixtures
 
 	statuses, maxResults, err := db.FindAndCount[git_model.CommitStatus](db.DefaultContext, &git_model.CommitStatusOptions{
 		ListOptions: db.ListOptions{Page: 1, PageSize: 50},
@@ -262,7 +262,7 @@ func TestGetCountLatestCommitStatus(t *testing.T) {
 
 	repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
 
-	sha1 := "1234123412341234123412341234123412341234"
+	sha1 := "1234123412341234123412341234123412341234" // the mocked commit ID in test fixtures
 
 	commitStatuses, err := git_model.GetLatestCommitStatus(db.DefaultContext, repo1.ID, sha1, db.ListOptions{
 		Page:     1,

routers/api/v1/repo/status.go

@@ -266,7 +266,7 @@ func GetCombinedCommitStatusByRef(ctx *context.APIContext) {
 
 	count, err := git_model.CountLatestCommitStatus(ctx, repo.ID, refCommit.Commit.ID.String())
 	if err != nil {
-		ctx.APIErrorInternal(fmt.Errorf("GetLatestCommitStatus[%s, %s]: %w", repo.FullName(), refCommit.CommitID, err))
+		ctx.APIErrorInternal(fmt.Errorf("CountLatestCommitStatus[%s, %s]: %w", repo.FullName(), refCommit.CommitID, err))
 		return
 	}
 	ctx.SetTotalCountHeader(count)