From f4570260cdae94bf786680e49c1880f949560495 Mon Sep 17 00:00:00 2001
From: oysheng <33340252+oysheng@users.noreply.github.com>
Date: Tue, 14 Aug 2018 15:25:41 +0800
Subject: [PATCH] list-accounts add filter alias (#1253)

---
 api/query.go                     | 14 ++++++++++++--
 cmd/bytomcli/commands/account.go |  6 ++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/api/query.go b/api/query.go
index 50889ced..96a708b1 100644
--- a/api/query.go
+++ b/api/query.go
@@ -20,9 +20,19 @@ import (
 
 // POST /list-accounts
 func (a *API) listAccounts(ctx context.Context, filter struct {
-	ID string `json:"id"`
+	ID    string `json:"id"`
+	Alias string `json:"alias"`
 }) Response {
-	accounts, err := a.wallet.AccountMgr.ListAccounts(filter.ID)
+	accountID := filter.ID
+	if filter.Alias != "" {
+		acc, err := a.wallet.AccountMgr.FindByAlias(filter.Alias)
+		if err != nil {
+			return NewErrorResponse(err)
+		}
+		accountID = acc.ID
+	}
+
+	accounts, err := a.wallet.AccountMgr.ListAccounts(accountID)
 	if err != nil {
 		log.Errorf("listAccounts: %v", err)
 		return NewErrorResponse(err)
diff --git a/cmd/bytomcli/commands/account.go b/cmd/bytomcli/commands/account.go
index 57fd0d65..6a34c398 100644
--- a/cmd/bytomcli/commands/account.go
+++ b/cmd/bytomcli/commands/account.go
@@ -16,6 +16,7 @@ func init() {
 	createAccountCmd.PersistentFlags().StringVarP(&accountToken, "access", "a", "", "access token")
 
 	listAccountsCmd.PersistentFlags().StringVar(&accountID, "id", "", "account ID")
+	listAccountsCmd.PersistentFlags().StringVar(&accountAlias, "alias", "", "account alias")
 
 	listAddressesCmd.PersistentFlags().StringVar(&accountID, "id", "", "account ID")
 	listAddressesCmd.PersistentFlags().StringVar(&accountAlias, "alias", "", "account alias")
@@ -68,8 +69,9 @@ var listAccountsCmd = &cobra.Command{
 	Args:  cobra.NoArgs,
 	Run: func(cmd *cobra.Command, args []string) {
 		filter := struct {
-			ID string `json:"id"`
-		}{ID: accountID}
+			ID    string `json:"id"`
+			Alias string `json:"alias"`
+		}{ID: accountID, Alias: accountAlias}
 
 		data, exitCode := util.ClientCall("/list-accounts", &filter)
 		if exitCode != util.Success {
-- 
2.11.0