improvements

Author: lunny

models/git/commit_status.go

@@ -228,7 +228,7 @@ func (status *CommitStatus) HideActionsURL(ctx context.Context) {
 	}
 }
 
-// CalcCommitStatus returns commit status state via some status, the commit statues should order by id desc
+// CalcCommitStatus returns a combined status, the commit statuses should order by id desc
 func CalcCommitStatus(statuses []*CommitStatus) commitstatus.CombinedStatus {
 	states := make(commitstatus.CommitStatusStates, 0, len(statuses))
 	for _, status := range statuses {
@@ -237,7 +237,7 @@ func CalcCommitStatus(statuses []*CommitStatus) commitstatus.CombinedStatus {
 	return states.Merge()
 }
 
-// CalcCommitStatusSummary returns commit status state via some status, the commit statues should order by id desc
+// CalcCommitStatusSummary returns commit status summary, the commit statuses should order by id desc
 func CalcCommitStatusSummary(statuses []*CommitStatus) *CommitStatusSummary {
 	if len(statuses) == 0 {
 		return nil

modules/commitstatus/commit_status.go

@@ -20,33 +20,10 @@ const (
 	CommitStatusWarning CommitStatusState = "warning"
 )
 
-var commitStatusPriorities = map[CommitStatusState]int{
-	CommitStatusError:   0,
-	CommitStatusFailure: 1,
-	CommitStatusWarning: 2,
-	CommitStatusPending: 3,
-	CommitStatusSuccess: 4,
-}
-
 func (css CommitStatusState) String() string {
 	return string(css)
 }
 
-// NoBetterThan returns true if this State is no better than the given State
-// This function only handles the states defined in CommitStatusPriorities
-func (css CommitStatusState) NoBetterThan(css2 CommitStatusState) bool {
-	// NoBetterThan only handles the 5 states above
-	if _, exist := commitStatusPriorities[css]; !exist {
-		return false
-	}
-
-	if _, exist := commitStatusPriorities[css2]; !exist {
-		return false
-	}
-
-	return commitStatusPriorities[css] <= commitStatusPriorities[css2]
-}
-
 // IsPending represents if commit status state is pending
 func (css CommitStatusState) IsPending() bool {
 	return css == CommitStatusPending

modules/commitstatus/commit_status_test.go

@@ -8,7 +8,6 @@ import (
 
 	git_model "code.gitea.io/gitea/models/git"
 	user_model "code.gitea.io/gitea/models/user"
-	"code.gitea.io/gitea/modules/commitstatus"
 	api "code.gitea.io/gitea/modules/structs"
 )
 
@@ -39,18 +38,12 @@ func ToCombinedStatus(ctx context.Context, statuses []*git_model.CommitStatus, r
 		return nil
 	}
 
-	retStatus := &api.CombinedStatus{
-		SHA:        statuses[0].SHA,
+	summary := git_model.CalcCommitStatusSummary(statuses)
+	return &api.CombinedStatus{
+		State:      summary.State,
+		SHA:        summary.SHA,
 		TotalCount: len(statuses),
 		Repository: repo,
-		URL:        "",
+		URL:        summary.TargetURL,
 	}
-
-	states := make(commitstatus.CommitStatusStates, 0, len(statuses))
-	for _, status := range statuses {
-		retStatus.Statuses = append(retStatus.Statuses, ToCommitStatus(ctx, status))
-		states = append(states, status.State)
-	}
-	retStatus.State = states.Merge()
-	return retStatus
 }