feat: create remote resource enhance...

Author: yeqown

.gitignore

@@ -19,4 +19,5 @@ testdata/
 gitlab-flow
 flow-debug
 flow2
-!gitlab-flow/
+!gitlab-flow/
+secret

internal/flow_impl.go

@@ -634,9 +634,9 @@ func (f flowImpl) createBranch(
 	req := gitlabop.CreateBranchRequest{
 		TargetBranch: targetBranchName,
 		SrcBranch:    srcBranch,
-		MilestoneID:  milestoneID,
-		IssueID:      issueIID,
 		ProjectID:    f.ctx.Project.ID,
+		//MilestoneID:  milestoneID,
+		//IssueID:      issueIID,
 	}
 
 	result, err := f.gitlabOperator.CreateBranch(ctx, &req)

internal/gitlab-operator/gitlab_operator.go

@@ -5,15 +5,23 @@ import "context"
 // IGitlabOperator contains all operations those manage repository,
 // milestones, branch, issue and merge requests.
 type IGitlabOperator interface {
+	// CreateBranch create a branch on remote gitlab repository, but this would check remote
+	// resource if create failed.
 	CreateBranch(ctx context.Context, req *CreateBranchRequest) (*CreateBranchResult, error)
 
+	// CreateMilestone create a milestone on remote gitlab repository, but this would check remote
+	// resource if create failed.
 	CreateMilestone(ctx context.Context, req *CreateMilestoneRequest) (*CreateMilestoneResult, error)
 	GetMilestone(ctx context.Context, req *GetMilestoneRequest) (*GetMilestoneResult, error)
 	GetMilestoneMergeRequests(
 		ctx context.Context, req *GetMilestoneMergeRequestsRequest) (*GetMilestoneMergeRequestsResult, error)
 	GetMilestoneIssues(ctx context.Context, req *GetMilestoneIssuesRequest) (*GetMilestoneIssuesResult, error)
 
+	// CreateIssue create an issue on remote repository, but this would check remote
+	// resource if create failed.
 	CreateIssue(ctx context.Context, req *CreateIssueRequest) (*CreateIssueResult, error)
+	// CreateMergeRequest create an merge request on remote repository, but this would check remote
+	// resource if create failed.
 	CreateMergeRequest(ctx context.Context, req *CreateMergeRequest) (*CreateMergeResult, error)
 
 	ListMilestones(ctx context.Context, req *ListMilestoneRequest) (*ListMilestoneResult, error)
@@ -24,9 +32,9 @@ type IGitlabOperator interface {
 type CreateBranchRequest struct {
 	TargetBranch string
 	SrcBranch    string
-	MilestoneID  int
-	IssueID      int
 	ProjectID    int
+	//MilestoneID  int
+	//IssueID      int
 }
 
 type CreateBranchResult struct {

internal/gitlab-operator/gitlab_operator_test.go

@@ -0,0 +1,106 @@
+package gitlabop
+
+import (
+	"context"
+	"io/ioutil"
+	"os"
+	"strings"
+	"testing"
+
+	"github.com/yeqown/gitlab-flow/internal/types"
+
+	"github.com/stretchr/testify/suite"
+)
+
+type gitlabOperatorTestSuite struct {
+	suite.Suite
+
+	op          IGitlabOperator
+	projectID   int
+	milestoneID int
+	issueIID    int
+}
+
+func (g *gitlabOperatorTestSuite) SetupSuite() {
+	r, err := os.Open("./secret")
+	g.Require().Nil(err)
+
+	data, err := ioutil.ReadAll(r)
+	g.Require().Nil(err)
+
+	arr := strings.Split(string(data), "\n")
+	g.Require().Equal(2, len(arr))
+	g.T().Logf("%+v", arr)
+	g.op = NewGitlabOperator(arr[0], arr[1])
+
+	// this only could be test locally
+	g.projectID = 851
+	g.milestoneID = 1140
+	g.issueIID = 18
+}
+
+func (g *gitlabOperatorTestSuite) TearDownSuite() {
+	// do nothing
+}
+
+func (g gitlabOperatorTestSuite) Test_CreateBranch() {
+	ctx := context.Background()
+	req := CreateBranchRequest{
+		TargetBranch: "feature/branch",
+		SrcBranch:    types.MasterBranch.String(),
+		ProjectID:    g.projectID,
+	}
+	result, err := g.op.CreateBranch(ctx, &req)
+	g.Nil(err)
+	g.NotNil(result)
+	g.T().Logf("result=%+v", result)
+}
+
+func (g gitlabOperatorTestSuite) Test_CreateMilestone() {
+	ctx := context.Background()
+	req := CreateMilestoneRequest{
+		Title:     "milestoneTest",
+		Desc:      "milestoneDesc",
+		ProjectID: g.projectID,
+	}
+	result, err := g.op.CreateMilestone(ctx, &req)
+	g.Nil(err)
+	g.NotNil(result)
+	g.T().Logf("result=%+v", result)
+}
+
+func (g gitlabOperatorTestSuite) Test_CreateIssue() {
+	ctx := context.Background()
+	req := CreateIssueRequest{
+		Title:         "milestoneTest",
+		Desc:          "milestoneDesc",
+		RelatedBranch: "feature/branch",
+		MilestoneID:   g.milestoneID,
+		ProjectID:     g.projectID,
+	}
+	result, err := g.op.CreateIssue(ctx, &req)
+	g.Nil(err)
+	g.NotNil(result)
+	g.T().Logf("result=%+v", result)
+}
+
+func (g gitlabOperatorTestSuite) Test_CreateMergeRequest() {
+	ctx := context.Background()
+	req := CreateMergeRequest{
+		Title:        "MR Title",
+		Desc:         "MR Desc",
+		SrcBranch:    "feature/branch",
+		TargetBranch: types.MasterBranch.String(),
+		MilestoneID:  g.milestoneID,
+		IssueIID:     g.issueIID,
+		ProjectID:    g.projectID,
+	}
+	result, err := g.op.CreateMergeRequest(ctx, &req)
+	g.Nil(err)
+	g.NotNil(result)
+	g.T().Logf("result=%+v", result)
+}
+
+func Test_gitlabOperator(t *testing.T) {
+	suite.Run(t, new(gitlabOperatorTestSuite))
+}

internal/gitlab-operator/gitlba_operator_impl.go

@@ -2,6 +2,8 @@ package gitlabop
 
 import (
 	"context"
+	"fmt"
+	"strings"
 	"time"
 
 	"github.com/pkg/errors"
@@ -37,7 +39,12 @@ func (g gitlabOperator) CreateBranch(ctx context.Context, req *CreateBranchReque
 	}
 	branch, _, err := g.gitlab.Branches.CreateBranch(req.ProjectID, opt)
 	if err != nil {
-		return nil, errors.Wrap(err, "create branch failed")
+		// if create failed then query from remote, if got then return
+		var err2 error
+		branch, _, err2 = g.gitlab.Branches.GetBranch(req.ProjectID, req.TargetBranch)
+		if err2 != nil {
+			return nil, fmt.Errorf("create branch failed: %v, query failed: %v", err, err2)
+		}
 	}
 
 	return &CreateBranchResult{
@@ -54,8 +61,34 @@ func (g gitlabOperator) CreateMilestone(ctx context.Context, req *CreateMileston
 		DueDate:     nil,
 	}
 	milestone, _, err := g.gitlab.Milestones.CreateMilestone(req.ProjectID, opt)
-	if err != nil {
-		return nil, errors.Wrap(err, "CreateMilestone failed")
+	if err != nil || milestone == nil {
+		// if create failed then query from remote, if got then return
+		opt := gogitlab.ListMilestonesOptions{
+			ListOptions: gogitlab.ListOptions{
+				Page:    1,
+				PerPage: 20,
+			},
+			Title:  &req.Title,
+			Search: &req.Title,
+		}
+		milestones, _, err2 := g.gitlab.Milestones.ListMilestones(req.ProjectID, &opt)
+		if err2 != nil {
+			return nil, fmt.Errorf("create milestone failed: %v, query failed: %v", err, err2)
+		}
+
+		matched := false
+		for idx, v := range milestones {
+			if strings.Compare(req.Title, v.Title) == 0 &&
+				strings.Compare(req.Desc, v.Description) == 0 {
+				//	matched
+				milestone = milestones[idx]
+				matched = true
+			}
+		}
+
+		if !matched || milestone == nil {
+			return nil, fmt.Errorf("[matched: %v] create milestone failed: %v", matched, err)
+		}
 	}
 
 	return &CreateMilestoneResult{
@@ -138,8 +171,34 @@ func (g gitlabOperator) CreateIssue(ctx context.Context, req *CreateIssueRequest
 		CreatedAt:   &now,
 	}
 	issue, _, err := g.gitlab.Issues.CreateIssue(req.ProjectID, opt3)
-	if err != nil {
-		return nil, errors.Wrap(err, "create Issue failed")
+	if err != nil || issue == nil {
+		// if create failed then query from remote, if got then return
+		opt := gogitlab.ListProjectIssuesOptions{
+			ListOptions: gogitlab.ListOptions{
+				Page:    1,
+				PerPage: 20,
+			},
+			Search: &req.Title,
+		}
+		issues, _, err2 := g.gitlab.Issues.ListProjectIssues(req.ProjectID, &opt)
+		if err2 != nil {
+			return nil, fmt.Errorf("create issue failed: %v, query failed: %v", err, err2)
+		}
+
+		matched := false
+		for idx, v := range issues {
+			if strings.Compare(req.Title, v.Title) == 0 &&
+				strings.Compare(req.Desc, v.Description) == 0 {
+				//	matched
+				issue = issues[idx]
+				matched = true
+			}
+		}
+
+		if !matched || issue == nil {
+			return nil, fmt.Errorf("[matched: %v] create issue failed: %v", matched, err)
+		}
+
 	}
 
 	return &CreateIssueResult{
@@ -162,8 +221,36 @@ func (g gitlabOperator) CreateMergeRequest(ctx context.Context, req *CreateMerge
 		// RemoveSourceBranch: true,
 	}
 	mr, _, err := g.gitlab.MergeRequests.CreateMergeRequest(req.ProjectID, opt5)
-	if err != nil {
-		return nil, errors.Wrap(err, "create merge request failed")
+	if err != nil || mr == nil {
+		// if create failed then query from remote, if got then return
+		opt := gogitlab.ListProjectMergeRequestsOptions{
+			ListOptions: gogitlab.ListOptions{
+				Page:    1,
+				PerPage: 20,
+			},
+			Search:       &req.Title,
+			TargetBranch: &req.TargetBranch,
+			SourceBranch: &req.SrcBranch,
+			//IIDs:         []int{req.IssueIID},
+		}
+		mergeRequests, _, err2 := g.gitlab.MergeRequests.ListProjectMergeRequests(req.ProjectID, &opt)
+		if err2 != nil {
+			return nil, fmt.Errorf("create merge request failed: %v, query failed: %v", err, err2)
+		}
+
+		matched := false
+		for idx, v := range mergeRequests {
+			if strings.Compare(req.Title, v.Title) == 0 &&
+				strings.Compare(req.Desc, v.Description) == 0 {
+				//	matched
+				mr = mergeRequests[idx]
+				matched = true
+			}
+		}
+
+		if !matched || mr == nil {
+			return nil, fmt.Errorf("[matched: %v] create merge request failed: %v", matched, err)
+		}
 	}
 
 	return &CreateMergeResult{

internal/repository/flow_repo_test.go

@@ -16,7 +16,7 @@ type flowRepoTestSuite struct {
 
 func (s *flowRepoTestSuite) SetupTest() {
 	s.T().Log("called")
-	s.repo = impl.NewBasedSqlite3(impl.ConnectDB("./testdata", true))
+	s.repo = impl.NewBasedSqlite3(impl.ConnectDB("./secret", true))
 	s.T().Logf("%+v", s.repo)
 }