fix: hotfix close with query first.

Author: yeqown

cmd/gitlab-flow/commands_hotfix.go

@@ -63,15 +63,13 @@ func getHotfixFinishSubCommand() *cli.Command {
 			},
 		},
 		Action: func(c *cli.Context) error {
-			log.
-				WithFields(log.Fields{"args": c.Args().Slice()}).
-				Debug("finish hotfix")
-
-			hotfixBranchName := c.Args().Get(0)
-			if hotfixBranchName == "" {
-				return errors.New("title could not be empty")
-			}
+			defer func() {
+				log.
+					WithFields(log.Fields{"args": c.Args().Slice()}).
+					Debug("finish hotfix")
+			}()
 
+			hotfixBranchName := c.String("hotfix_branch_name")
 			confPath := c.String("conf_path")
 			debug := c.Bool("debug")
 			return getFlow(confPath, debug).HotfixFinish(hotfixBranchName)

internal/flow_impl.go

@@ -339,20 +339,40 @@ func (f flowImpl) HotfixFinish(hotfixBranchName string) error {
 		return errors.Wrap(err, "locate issue failed")
 	}
 
-	// MR to master
+	// locate MR first
+	mr, err := f.repo.QueryMergeRequest(&repository.MergeRequestDO{
+		ProjectID:   f.ctx.Project.ID,
+		MilestoneID: issue.MilestoneID,
+		IssueIID:    issue.IssueIID,
+		//SourceBranch:   "",
+		TargetBranch: types.MasterBranch.String(),
+	})
+	if err != nil && !repository.IsErrNotFound(err) {
+		return errors.Wrap(err, "query database failed")
+	}
+
+	// hit hotfix merge request
+	if mr != nil {
+		f.printAndOpenBrowser("Hotfix Merge Request", mr.WebURL)
+		return nil
+	}
+
+	// then create MR to master
 	title := genMRTitle(hotfixBranchName, types.MasterBranch.String())
-	mr, err := f.createMergeRequest(
+	result, err := f.createMergeRequest(
 		title, issue.Desc, 0, issue.IssueIID, hotfixBranchName, types.MasterBranch.String())
 	if err != nil {
 		return errors.Wrap(err, "create hotfix MR failed")
 	}
 
+	f.printAndOpenBrowser("Hotfix Merge Request", result.WebURL)
+
 	log.
 		WithFields(log.Fields{
 			"issue":        issue,
-			"mergeRequest": mr,
+			"mergeRequest": result,
 		}).
-		Debug("hotfix begin finished")
+		Debug("hotfix finish done")
 
 	return nil
 }

internal/repository/flow_repo.go

@@ -1,6 +1,7 @@
 package repository
 
 import (
+	"github.com/pkg/errors"
 	gorm2 "gorm.io/gorm"
 )
 
@@ -31,6 +32,10 @@ type IFlowRepository interface {
 	QueryMergeRequests(filter *MergeRequestDO) ([]*MergeRequestDO, error)
 }
 
+func IsErrNotFound(err error) bool {
+	return errors.Is(err, gorm2.ErrRecordNotFound)
+}
+
 // ProjectDO data model
 type ProjectDO struct {
 	gorm2.Model