change commit hash status table unique index

Author: lunny

models/commit_status.go

@@ -156,27 +156,6 @@ func GetLatestCommitStatus(repo *Repository, sha string, page int) ([]*CommitSta
 	return statuses, x.In("id", ids).Find(&statuses)
 }
 
-// GetCommitStatus populates a given status for a given commit.
-// NOTE: If ID or Index isn't given, and only Context, TargetURL and/or Description
-//       is given, the CommitStatus created _last_ will be returned.
-func GetCommitStatus(repo *Repository, sha string, status *CommitStatus) (*CommitStatus, error) {
-	conds := &CommitStatus{
-		Context:     status.Context,
-		State:       status.State,
-		TargetURL:   status.TargetURL,
-		Description: status.Description,
-	}
-	has, err := x.Where("repo_id = ?", repo.ID).And("sha = ?", sha).Desc("created_unix").Get(conds)
-	if err != nil {
-		return nil, fmt.Errorf("GetCommitStatus[%s, %s]: %v", repo.RepoPath(), sha, err)
-	}
-	if !has {
-		return nil, fmt.Errorf("GetCommitStatus[%s, %s]: not found", repo.RepoPath(), sha)
-	}
-
-	return conds, nil
-}
-
 // NewCommitStatusOptions holds options for creating a CommitStatus
 type NewCommitStatusOptions struct {
 	Repo         *Repository
@@ -240,7 +219,9 @@ func NewCommitStatus(opts NewCommitStatusOptions) error {
 		return fmt.Errorf("Insert CommitStatus[%s, %s]: %v", repoPath, opts.SHA, err)
 	}
 
-	exist, err := sess.Table("commit_status_context").Where("context_hash = ?", opts.CommitStatus.ContextHash).Exist()
+	exist, err := sess.Table("commit_status_context").
+		Where("repo_id =? AND context_hash = ?", opts.Repo.ID, opts.CommitStatus.ContextHash).
+		Exist()
 	if err != nil {
 		return fmt.Errorf("Check CommistStatusContext Exist failed: %v", err)
 	}
@@ -297,8 +278,8 @@ func HashCommitStatusContext(context string) string {
 // CommitStatusContext represents commit status context
 type CommitStatusContext struct {
 	ID          int64
-	RepoID      int64          `xorm:"index"`
-	ContextHash string         `xorm:"varchar(40) unique"`
+	RepoID      int64          `xorm:"index unique(s)"`
+	ContextHash string         `xorm:"varchar(40) unique(s)"`
 	ContextLogo string         `xorm:"TEXT"`
 	Context     string         `xorm:"TEXT"`
 	CreatedUnix util.TimeStamp `xorm:"created"`

models/migrations/v88.go

@@ -66,8 +66,8 @@ func addCommitStatusContext(x *xorm.Engine) error {
 
 	type CommitStatusContext struct {
 		ID          int64
-		RepoID      int64          `xorm:"index"`
-		ContextHash string         `xorm:"varchar(64) unique"`
+		RepoID      int64          `xorm:"index unique(s)"`
+		ContextHash string         `xorm:"varchar(40) unique(s)"`
 		ContextLogo string         `xorm:"TEXT"`
 		Context     string         `xorm:"TEXT"`
 		CreatedUnix util.TimeStamp `xorm:"created"`

modules/repofiles/commit_status.go

@@ -14,7 +14,7 @@ import (
 // CreateCommitStatus creates a new CommitStatus given a bunch of parameters
 // NOTE: All text-values will be trimmed from whitespaces.
 // Requires: Repo, Creator, SHA
-func CreateCommitStatus(repo *models.Repository, creator *models.User, sha string, status *models.CommitStatus, isOAuth bool) error {
+func CreateCommitStatus(repo *models.Repository, creator *models.User, sha string, status *models.CommitStatus) error {
 	repoPath := repo.RepoPath()
 
 	// confirm that commit is exist

routers/api/v1/repo/status.go

@@ -58,18 +58,12 @@ func NewCommitStatus(ctx *context.APIContext, form api.CreateStatusOption) {
 		Description: form.Description,
 		Context:     form.Context,
 	}
-	isOAuthToken := ctx.Data["IsApiToken"] == true
-	if err := repofiles.CreateCommitStatus(ctx.Repo.Repository, ctx.User, sha, status, isOAuthToken); err != nil {
-		ctx.Error(500, "NewCommitStatus", err)
+	if err := repofiles.CreateCommitStatus(ctx.Repo.Repository, ctx.User, sha, status); err != nil {
+		ctx.Error(500, "CreateCommitStatus", err)
 		return
 	}
 
-	newStatus, err := models.GetCommitStatus(ctx.Repo.Repository, sha, status)
-	if err != nil {
-		ctx.Error(500, "GetCommitStatus", err)
-		return
-	}
-	ctx.JSON(201, newStatus.APIFormat())
+	ctx.JSON(201, status.APIFormat())
 }
 
 // GetCommitStatuses returns all statuses for any given commit hash