search refs before passing sha

Author: sapk

models/commit_status_test.go

@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestGetCommitStatuses(t *testing.T) {
+func TestGetCommitStatusesViaSHA(t *testing.T) {
 	assert.NoError(t, PrepareTestDatabase())
 
 	repo1 := AssertExistsAndLoadBean(t, &Repository{ID: 1}).(*Repository)
@@ -20,20 +20,59 @@ func TestGetCommitStatuses(t *testing.T) {
 	statuses, maxResults, err := GetCommitStatuses(repo1, sha1, &CommitStatusOptions{})
 	assert.NoError(t, err)
 	assert.Equal(t, int(maxResults), 5)
-	if assert.Len(t, statuses, 5) {
-		assert.Equal(t, statuses[0].Context, "ci/awesomeness")
-		assert.Equal(t, statuses[0].State, CommitStatusPending)
+	assert.Len(t, statuses, 5)
 
-		assert.Equal(t, statuses[1].Context, "cov/awesomeness")
-		assert.Equal(t, statuses[1].State, CommitStatusWarning)
+	assert.Equal(t, statuses[0].Context, "ci/awesomeness")
+	assert.Equal(t, statuses[0].State, CommitStatusPending)
+	assert.Equal(t, statuses[0].APIURL(), "TODO")
 
-		assert.Equal(t, statuses[2].Context, "cov/awesomeness")
-		assert.Equal(t, statuses[2].State, CommitStatusSuccess)
+	assert.Equal(t, statuses[1].Context, "cov/awesomeness")
+	assert.Equal(t, statuses[1].State, CommitStatusWarning)
+	assert.Equal(t, statuses[1].APIURL(), "TODO")
 
-		assert.Equal(t, statuses[3].Context, "ci/awesomeness")
-		assert.Equal(t, statuses[3].State, CommitStatusFailure)
+	assert.Equal(t, statuses[2].Context, "cov/awesomeness")
+	assert.Equal(t, statuses[2].State, CommitStatusSuccess)
+	assert.Equal(t, statuses[2].APIURL(), "TODO")
 
-		assert.Equal(t, statuses[4].Context, "deploy/awesomeness")
-		assert.Equal(t, statuses[4].State, CommitStatusError)
-	}
+	assert.Equal(t, statuses[3].Context, "ci/awesomeness")
+	assert.Equal(t, statuses[3].State, CommitStatusFailure)
+	assert.Equal(t, statuses[3].APIURL(), "TODO")
+
+	assert.Equal(t, statuses[4].Context, "deploy/awesomeness")
+	assert.Equal(t, statuses[4].State, CommitStatusError)
+	assert.Equal(t, statuses[4].APIURL(), "TODO")
+}
+
+/* TODO
+func TestGetCommitStatusesViaBranch(t *testing.T) {
+	assert.NoError(t, PrepareTestDatabase())
+
+	repo1 := AssertExistsAndLoadBean(t, &Repository{ID: 1}).(*Repository)
+
+	sha1 := "master"
+	statuses, maxResults, err := GetCommitStatuses(repo1, sha1, &CommitStatusOptions{})
+	assert.NoError(t, err)
+	assert.Equal(t, int(maxResults), 5)
+	assert.Len(t, statuses, 5)
+
+	assert.Equal(t, statuses[0].Context, "ci/awesomeness")
+	assert.Equal(t, statuses[0].State, CommitStatusPending)
+	assert.Equal(t, statuses[0].APIURL(), "TODO")
+
+	assert.Equal(t, statuses[1].Context, "cov/awesomeness")
+	assert.Equal(t, statuses[1].State, CommitStatusWarning)
+	assert.Equal(t, statuses[1].APIURL(), "TODO")
+
+	assert.Equal(t, statuses[2].Context, "cov/awesomeness")
+	assert.Equal(t, statuses[2].State, CommitStatusSuccess)
+	assert.Equal(t, statuses[2].APIURL(), "TODO")
+
+	assert.Equal(t, statuses[3].Context, "ci/awesomeness")
+	assert.Equal(t, statuses[3].State, CommitStatusFailure)
+	assert.Equal(t, statuses[3].APIURL(), "TODO")
+
+	assert.Equal(t, statuses[4].Context, "deploy/awesomeness")
+	assert.Equal(t, statuses[4].State, CommitStatusError)
+	assert.Equal(t, statuses[4].APIURL(), "TODO")
 }
+*/

routers/api/v1/repo/git_ref.go

@@ -71,19 +71,22 @@ func GetGitRefs(ctx *context.APIContext) {
 	getGitRefsInternal(ctx, ctx.Params("*"))
 }
 
-func getGitRefsInternal(ctx *context.APIContext, filter string) {
+func getGitRefs(ctx *context.APIContext, filter string) ([]*git.Reference, string, error) {
 	gitRepo, err := git.OpenRepository(ctx.Repo.Repository.RepoPath())
 	if err != nil {
-		ctx.Error(500, "OpenRepository", err)
-		return
+		return nil, "OpenRepository", err
 	}
 	if len(filter) > 0 {
 		filter = "refs/" + filter
 	}
-
 	refs, err := gitRepo.GetRefsFiltered(filter)
+	return refs, "GetRefsFiltered", err
+}
+
+func getGitRefsInternal(ctx *context.APIContext, filter string) {
+	refs, lastMethodName, err := getGitRefs(ctx, filter)
 	if err != nil {
-		ctx.Error(500, "GetRefsFiltered", err)
+		ctx.Error(500, lastMethodName, err)
 		return
 	}
 

routers/api/v1/repo/status.go

@@ -155,7 +155,24 @@ func GetCommitStatusesByRef(ctx *context.APIContext) {
 	// responses:
 	//   "200":
 	//     "$ref": "#/responses/StatusList"
-	getCommitStatuses(ctx, ctx.Params("ref"))
+
+	filter := ctx.Params("ref")
+	sha := filter //By default and will be overridden if we found a good ref match
+
+	refs, lastMethodName, err := getGitRefs(ctx, filter)
+	if err != nil {
+		ctx.Error(500, lastMethodName, err)
+		return
+	}
+
+	if len(refs) > 0 {
+		c, err := refs[0].Commit()
+		if err == nil {
+			sha = c.ID.String() //Replace SHA with ref tag
+		}
+	}
+
+	getCommitStatuses(ctx, sha)
 }
 
 func getCommitStatuses(ctx *context.APIContext, sha string) {