Merge pull request #16 from mercari/fix-context-message

Fix context message

Author: south-mer

server/handler/eval_context.go

@@ -183,12 +183,7 @@ func (ec *EvalContext) PostStatus(ctx context.Context, state, message string) {
 	publicURL := strings.TrimSuffix(ec.PublicURL, "/")
 	detailsURL := fmt.Sprintf("%s/details/%s/%s/%d", publicURL, owner, repo, ec.PullContext.Number())
 
-	var context string
-	if !ec.Options.StatusCheckContextIgnoreBase {
-		context = fmt.Sprintf("%s: %s", ec.Options.StatusCheckContext, base)
-	} else {
-		context = ec.Options.StatusCheckContext
-	}
+	context := ec.Options.StatusCheckContextWithBranch(base)
 
 	var prefix string
 	switch state {

server/handler/eval_options.go

@@ -15,6 +15,7 @@
 package handler
 
 import (
+	"fmt"
 	"os"
 	"strconv"
 )
@@ -87,6 +88,13 @@ type PullEvaluationOptions struct {
 	Deprecated_DoNotLoadCommitPushedDate bool `yaml:"do_not_load_commit_pushed_date"`
 }
 
+func (p *PullEvaluationOptions) StatusCheckContextWithBranch(baseBranch string) string {
+	if p.StatusCheckContextIgnoreBase {
+		return p.StatusCheckContext
+	}
+	return fmt.Sprintf("%s: %s", p.StatusCheckContext, baseBranch)
+}
+
 func (p *PullEvaluationOptions) fillDefaults() {
 	if p.PolicyPath == "" {
 		p.PolicyPath = DefaultPolicyPath

server/handler/installation.go

@@ -98,7 +98,8 @@ func (h *Installation) postRepoInstallationStatus(ctx context.Context, client *g
 	}
 
 	head := branch.GetCommit().GetSHA()
-	contextWithBranch := fmt.Sprintf("%s: %s", h.PullOpts.StatusCheckContext, defaultBranch)
+
+	contextWithBranch := h.PullOpts.StatusCheckContextWithBranch(defaultBranch)
 	state := "success"
 	message := fmt.Sprintf("%s successfully installed.", h.AppName)
 	status := &github.RepoStatus{

server/handler/merge_group.go

@@ -65,7 +65,7 @@ func (h *MergeGroup) Handle(ctx context.Context, eventType, devlieryID string, p
 		return nil
 	}
 
-	contextWithBranch := fmt.Sprintf("%s: %s", h.PullOpts.StatusCheckContext, baseBranch)
+	contextWithBranch := h.PullOpts.StatusCheckContextWithBranch(baseBranch)
 	state := "success"
 	message := fmt.Sprintf("%s previously approved original pull request.", h.AppName)
 	status := &github.RepoStatus{