DQSAAS-826 Fix status and check commit if already in dest branch (#1)

Author: lupiuz

flow-manager/manager.go

@@ -1,6 +1,8 @@
 package flow_manager
 
 import (
+	"fmt"
+
 	"github.com/Docplanner/github-flow-manager/github"
 	"github.com/araddon/qlbridge/datasource"
 	"github.com/araddon/qlbridge/expr"
@@ -17,9 +19,20 @@ func Manage(githubToken, owner, repo, sourceBranch, destinationBranch, expressio
 	}
 	firstParentCommits := github.PickFirstParentCommits(commits)
 
+	destinationCommits, err := gm.GetCommits(owner, repo, destinationBranch, 1)
+	if nil != err {
+		return nil, err
+	}
+
 	var evaluationResultList []evaluationResult
 	builtins.LoadAllBuiltins()
 	for _, commit := range firstParentCommits {
+
+		if destinationCommits[0].SHA == commit.SHA {
+			fmt.Println("COMMIT ID: " + commit.SHA + " IS ALREADY IN " + destinationBranch + " branch. EXITING THE PROCESS WITHOUT ANY ACTION.")
+			return evaluationResultList, nil
+		}
+
 		evalContext := datasource.NewContextSimpleNative(map[string]interface{}{
 			"SHA":           commit.SHA,
 			"Message":       commit.Message,

github/github-query.go

@@ -18,12 +18,14 @@ type githubQuery struct {
 										}
 									}
 								} `graphql:"parents(first: $parentsNumber)"`
-								Oid        githubql.String
-								Message    githubql.String
-								PushedDate githubql.DateTime
-								Status struct {
-									Id    githubql.String
-									State githubql.String
+								Oid               githubql.String
+								Message           githubql.String
+								PushedDate        githubql.DateTime
+								StatusCheckRollup struct {
+									State    githubql.String
+									Contexts struct {
+										TotalCount githubql.Int
+									} `graphql:"contexts(first: $parentsNumber)"`
 								}
 							}
 						}

github/manager.go

@@ -1,11 +1,12 @@
 package github
 
 import (
-	"golang.org/x/oauth2"
-	"golang.org/x/net/context"
-	"github.com/shurcooL/githubql"
-	"github.com/google/go-github/github"
 	"net/http"
+
+	"github.com/google/go-github/github"
+	"github.com/shurcooL/githubql"
+	"golang.org/x/net/context"
+	"golang.org/x/oauth2"
 )
 
 type githubManager struct {
@@ -14,7 +15,7 @@ type githubManager struct {
 	HttpClient *http.Client
 }
 
-func New(githubAccessToken string) (*githubManager) {
+func New(githubAccessToken string) *githubManager {
 	ctx := context.Background()
 	src := oauth2.StaticTokenSource(
 		&oauth2.Token{AccessToken: githubAccessToken},
@@ -47,7 +48,7 @@ func (gm *githubManager) GetCommits(owner, repo, branch string, lastCommitsNumbe
 	return hydrateCommits(q), nil
 }
 
-func PickFirstParentCommits(fullCommitsList []Commit) ([]Commit) {
+func PickFirstParentCommits(fullCommitsList []Commit) []Commit {
 	var firstParentCommits []Commit
 	if 0 == len(fullCommitsList) {
 		return firstParentCommits
@@ -76,7 +77,7 @@ func PickFirstParentCommits(fullCommitsList []Commit) ([]Commit) {
 }
 
 // TODO remove v3 client when implemented in v4
-func (gm *githubManager) ChangeBranchHead(owner, repo, branch, sha string, force bool) (error) {
+func (gm *githubManager) ChangeBranchHead(owner, repo, branch, sha string, force bool) error {
 	httpClient := gm.HttpClient
 
 	client := github.NewClient(httpClient)
@@ -95,7 +96,7 @@ func (gm *githubManager) ChangeBranchHead(owner, repo, branch, sha string, force
 	return nil
 }
 
-func hydrateCommits(q *githubQuery) ([]Commit) {
+func hydrateCommits(q *githubQuery) []Commit {
 	var fullCommitsList []Commit
 	for _, edge := range q.Repository.Ref.Target.Commit.History.Edges {
 		var parents []Commit
@@ -105,11 +106,12 @@ func hydrateCommits(q *githubQuery) ([]Commit) {
 				Message: string(parent.Node.Message),
 			})
 		}
+
 		fullCommitsList = append(fullCommitsList, Commit{
 			SHA:           string(edge.Node.Oid),
 			Message:       string(edge.Node.Message),
 			Parents:       parents,
-			StatusSuccess: bool(edge.Node.Status.State == githubql.String(githubql.StatusStateSuccess)),
+			StatusSuccess: bool(edge.Node.StatusCheckRollup.State == githubql.String(githubql.StatusStateSuccess)),
 			PushedDate:    edge.Node.PushedDate.Time,
 		})
 	}