Merge pull request #332 from merico-dev/fix-todolistid-empty

fix: trello card can't be created  and adding delete function for trello

Author: IronCore864

internal/pkg/plugin/trello/delete.go

@@ -1,9 +1,19 @@
 package trello
 
-import "github.com/merico-dev/stream/pkg/util/log"
-
-// Delete does not remove trello board and lists
+// Delete delete trello board and lists
 func Delete(options map[string]interface{}) (bool, error) {
-	log.Info("Delelte will do nothing, because someone might be using the existing board.")
+	var opt *Options
+	var err error
+
+	if opt, err = convertMap2Options(options); err != nil {
+		return false, err
+	}
+	if err := validateOptions(opt); err != nil {
+		return false, err
+	}
+
+	if err = DeleteTrelloBoard(opt); err != nil {
+		return false, err
+	}
 	return true, nil
 }

internal/pkg/plugin/trello/trello.go

@@ -79,3 +79,12 @@ func CreateTrelloBoard(options *Options) (*TrelloItemId, error) {
 		doneListId:  done,
 	}, nil
 }
+
+// DeleteTrelloBoard delete specified board
+func DeleteTrelloBoard(options *Options) error {
+	c, err := trello.NewClient()
+	if err != nil {
+		return err
+	}
+	return c.CheckAndDeleteBoard(options.Owner, options.Repo, options.KanbanBoardName)
+}

internal/pkg/plugin/trello/update.go

@@ -14,6 +14,10 @@ func Update(options map[string]interface{}) (map[string]interface{}, error) {
 		return nil, err
 	}
 
+	if err = DeleteTrelloBoard(opt); err != nil {
+		return nil, err
+	}
+
 	trelloIds, err := CreateTrelloBoard(opt)
 	if err != nil {
 		return nil, err

internal/pkg/plugin/trellogithub/create.go

@@ -19,9 +19,9 @@ func Create(options map[string]interface{}) (map[string]interface{}, error) {
 
 	trelloItemId := &TrelloItemId{
 		boardId:     tg.options.BoardId,
-		todoListId:  tg.options.todoListId,
-		doingListId: tg.options.doingListId,
-		doneListId:  tg.options.doneListId,
+		todoListId:  tg.options.TodoListId,
+		doingListId: tg.options.DoingListId,
+		doneListId:  tg.options.DoneListId,
 	}
 
 	if err := tg.AddTrelloIdSecret(trelloItemId); err != nil {

internal/pkg/plugin/trellogithub/update.go

@@ -25,9 +25,9 @@ func Update(options map[string]interface{}) (map[string]interface{}, error) {
 
 	trelloItemId := &TrelloItemId{
 		boardId:     tg.options.BoardId,
-		todoListId:  tg.options.todoListId,
-		doingListId: tg.options.doingListId,
-		doneListId:  tg.options.doneListId,
+		todoListId:  tg.options.TodoListId,
+		doingListId: tg.options.DoingListId,
+		doneListId:  tg.options.DoneListId,
 	}
 
 	if err := tg.AddTrelloIdSecret(trelloItemId); err != nil {

internal/pkg/plugin/trellogithub/workflow.go

@@ -22,7 +22,7 @@ type Options struct {
 	Repo        string
 	Branch      string
 	BoardId     string
-	todoListId  string
-	doingListId string
-	doneListId  string
+	TodoListId  string
+	DoingListId string
+	DoneListId  string
 }

internal/pkg/pluginengine/change.go

@@ -90,7 +90,7 @@ func execute(smgr statemanager.Manager, changes []*Change) map[string]error {
 
 	for i, c := range changes {
 		log.Separatorf("Processing progress: %d/%d.", i+1, numOfChanges)
-		log.Infof("Processing: %s(kind: %s) -> %s ...", c.Tool.Name, c.Tool.Plugin.Kind, c.ActionName)
+		log.Infof("Processing: %s (%s) -> %s ...", c.Tool.Name, c.Tool.Plugin.Kind, c.ActionName)
 
 		var succeeded bool
 		var err error
@@ -166,7 +166,7 @@ func handleResult(smgr statemanager.Manager, change *Change) error {
 			log.Debugf("Failed to delete state %s: %s.", key, err)
 			return err
 		}
-		log.Successf("Plugin %s/%s delete done.", change.Tool.Name, change.Tool.Plugin.Kind)
+		log.Successf("Plugin %s (%s) delete done.", change.Tool.Name, change.Tool.Plugin.Kind)
 		return nil
 	}
 

pkg/util/trello/trello.go

@@ -93,6 +93,22 @@ func (c *Client) CheckBoardExists(owner, repo, kanbanBoardName string) (bool, er
 	return false, nil
 }
 
+// CheckAndDeleteBoard if the board exists, delete it
+func (c *Client) CheckAndDeleteBoard(owner, repo, kanbanBoardName string) error {
+	bs, err := c.Client.GetMyBoards()
+	if err != nil {
+		return err
+	}
+
+	for _, b := range bs {
+		if checkTargetBoard(owner, repo, kanbanBoardName, b) {
+			log.Infof("Board will be deleted, name: %s, description: %s.", b.Name, b.Desc)
+			return b.Delete()
+		}
+	}
+	return nil
+}
+
 func checkTargetBoard(owner, repo, kanbanBoardName string, b *trello.Board) bool {
 	return !b.Closed && b.Name == kanbanBoardName && b.Desc == boardDesc(owner, repo)
 }