feat(dash): enhance dash milestone display; and finish one todo.

Author: yeqown

cmd/gitlab-flow/commands_dash.go

@@ -56,10 +56,11 @@ func getDashMilestoneOverviewSubCommand() *cli.Command {
 		Category:  "dash",
 		Flags: []cli.Flag{
 			&cli.StringFlag{
-				Name:     "milestone_name",
-				Aliases:  []string{"m"},
-				Usage:    "input `milestoneName` which you want to get its information",
-				Required: true,
+				Name:    "milestone_name",
+				Aliases: []string{"m"},
+				Usage: "input `milestoneName` which you want to get its information, " +
+					"default current branch milestone",
+				Required: false,
 			},
 			&cli.StringFlag{
 				Name:        "branch_name",

internal/dash_impl.go

@@ -252,7 +252,7 @@ func (d dashImpl) dealDataIntoFeatureDetail(
 }
 
 var (
-	_milestoneOverviewTblHeader = []string{"🏝Project🏖", "🎠MergeRequests🏕"}
+	_milestoneOverviewTblHeader = []string{"🏝Project", "MR#Action", "🏕MR#WebURL"}
 )
 
 func (d dashImpl) MilestoneOverview(milestoneName, branchFilter string) ([]byte, error) {
@@ -266,24 +266,25 @@ func (d dashImpl) MilestoneOverview(milestoneName, branchFilter string) ([]byte,
 	if milestoneName == "" {
 		// get milestoneName from feature branchName
 		// query milestone name automatically when no milestone name provided.
-		// TODO(@yeqown): optimize this logic, using repo method.
 		featureBranchName, _ := d.gitOperator.CurrentBranch()
 		featureBranchName = genFeatureBranchName(featureBranchName)
-		branch, err := d.repo.QueryBranch(&repository.BranchDO{
-			ProjectID:  d.ctx.Project.ID,
-			BranchName: featureBranchName,
-		})
-		if err == nil && branch != nil {
-			milestone, _ := d.repo.QueryMilestone(&repository.MilestoneDO{MilestoneID: branch.MilestoneID})
-			if milestone != nil {
-				milestoneName = milestone.Title
-			}
+		// DONE(@yeqown): optimize this logic, using repo method.
+		milestone, err := d.repo.QueryMilestoneByBranchName(d.ctx.Project.ID, featureBranchName)
+		if milestone != nil {
+			milestoneName = milestone.Title
 		}
+
 		log.
 			WithFields(log.Fields{
 				"featureBranchName": featureBranchName,
+				"error":             err,
 			}).
-			Debugf("could not locate branch of current branch: %v", err)
+			Debugf("locate milestone of current branch")
+	}
+
+	if milestoneName == "" {
+		return nil, errors.New("you must specify a milestone name or " +
+			"sure you are using a branch which could get milestone")
 	}
 
 	// query milestone by name (milestone-project), so there are many.
@@ -330,16 +331,26 @@ func (d dashImpl) MilestoneOverview(milestoneName, branchFilter string) ([]byte,
 				Warnf("could not locate project merge request: %v", err)
 		}
 
-		uris := make([]string, 0, len(mrs))
+		// insert all merge requests of current project into tblData
 		for _, mr := range mrs {
-			uris = append(uris, fmt.Sprintf("%s➡️%s	🧲%s", mr.SourceBranch, mr.TargetBranch, mr.WebURL))
+			tblData = append(tblData, []string{
+				project.ProjectName,
+				fmt.Sprintf("%s => %s", mr.SourceBranch, mr.TargetBranch),
+				mr.WebURL,
+			})
 		}
-		tblData = append(tblData, []string{project.ProjectName, strings.Join(uris, "\n")})
 	}
 
 	buf := bytes.NewBuffer(nil)
 	w := tablewriter.NewWriter(buf)
 	w.SetHeader(_milestoneOverviewTblHeader)
+	w.SetColumnColor(
+		tablewriter.Colors{tablewriter.Bold, tablewriter.FgGreenColor},
+		tablewriter.Colors{},
+		tablewriter.Colors{},
+	)
+	w.SetRowLine(true)
+	w.SetAutoMergeCells(true)
 	w.AppendBulk(tblData)
 	w.Render()
 

internal/repository/flow_repo.go

@@ -17,6 +17,7 @@ type IFlowRepository interface {
 	SaveMilestone(m *MilestoneDO, txs ...*gorm2.DB) error
 	QueryMilestone(filter *MilestoneDO) (*MilestoneDO, error)
 	QueryMilestones(filter *MilestoneDO) ([]*MilestoneDO, error)
+	QueryMilestoneByBranchName(projectId int, branchName string) (*MilestoneDO, error)
 
 	SaveBranch(m *BranchDO, txs ...*gorm2.DB) error
 	BatchCreateBranch(records []*BranchDO, txs ...*gorm2.DB) error

internal/repository/impl/flow_repo_sqlite3.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/cenkalti/backoff/v4"
 	"github.com/mattn/go-sqlite3"
+	"github.com/pkg/errors"
 	"github.com/yeqown/log"
 	"gorm.io/driver/sqlite"
 	gorm2 "gorm.io/gorm"
@@ -95,6 +96,7 @@ func ConnectDB(path string, debug bool) func() *gorm2.DB {
 	}
 }
 
+// NewBasedSqlite3
 // DONE(@yeqown): load or create sqlite3 database.
 func NewBasedSqlite3(connectFunc func() *gorm2.DB) repository.IFlowRepository {
 	repo := sqliteFlowRepositoryImpl{
@@ -203,6 +205,21 @@ func (repo *sqliteFlowRepositoryImpl) QueryMilestones(
 	return out, nil
 }
 
+func (repo *sqliteFlowRepositoryImpl) QueryMilestoneByBranchName(projectId int, branchName string,
+) (*repository.MilestoneDO, error) {
+	branch, err := repo.QueryBranch(&repository.BranchDO{
+		ProjectID:  projectId,
+		BranchName: branchName,
+	})
+
+	if err != nil {
+		return nil, errors.Wrapf(err, "could not locate branch:"+branchName)
+	}
+
+	milestone, err := repo.QueryMilestone(&repository.MilestoneDO{MilestoneID: branch.MilestoneID})
+	return milestone, err
+}
+
 func (repo *sqliteFlowRepositoryImpl) SaveBranch(m *repository.BranchDO, txs ...*gorm2.DB) (err error) {
 	return repo.insertRecordWithCheck(repo.txIn(txs...), m)
 }