support sort account

pkg/api/accounts.go

@@ -124,6 +124,40 @@ func (a *AccountsApi) AccountCreateHandler(c *core.Context) (interface{}, *errs.
 	return accountInfoResp, nil
 }
 
+func (a *AccountsApi) AccountMoveHandler(c *core.Context) (interface{}, *errs.Error) {
+	var accountMoveReq models.AccountMoveRequest
+	err := c.ShouldBindJSON(&accountMoveReq)
+
+	if err != nil {
+		log.WarnfWithRequestId(c, "[accounts.AccountMoveHandler] parse request failed, because %s", err.Error())
+		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
+	}
+
+	uid := c.GetCurrentUid()
+	accounts := make([]*models.Account, len(accountMoveReq.NewDisplayOrders))
+
+	for i := 0; i < len(accountMoveReq.NewDisplayOrders); i++ {
+		newDisplayOrder := accountMoveReq.NewDisplayOrders[i]
+		account := &models.Account{
+			Uid:          uid,
+			AccountId:    newDisplayOrder.Id,
+			DisplayOrder: newDisplayOrder.DisplayOrder,
+		}
+
+		accounts[i] = account
+	}
+
+	err = a.accounts.ModifyAccountDisplayOrders(uid, accounts)
+
+	if err != nil {
+		log.ErrorfWithRequestId(c, "[accounts.AccountMoveHandler] failed to move accounts for user \"uid:%d\", because %s", uid, err.Error())
+		return nil, errs.Or(err, errs.ErrOperationFailed)
+	}
+
+	log.InfofWithRequestId(c, "[accounts.AccountMoveHandler] user \"uid:%d\" has moved accounts", uid)
+	return true, nil
+}
+
 func (a *AccountsApi) AccountDeleteHandler(c *core.Context) (interface{}, *errs.Error) {
 	var accountDeleteReq models.AccountDeleteRequest
 	err := c.ShouldBindJSON(&accountDeleteReq)

pkg/models/account.go

@@ -51,6 +51,15 @@ type AccountCreateRequest struct {
 	SubAccounts []*AccountCreateRequest `json:"subAccounts" binding:"omitempty"`
 }
 
+type AccountMoveRequest struct {
+	NewDisplayOrders []*AccountNewDisplayOrderRequest `json:"newDisplayOrders"`
+}
+
+type AccountNewDisplayOrderRequest struct {
+	Id           int64 `json:"id,string" binding:"required,min=1"`
+	DisplayOrder int   `json:"displayOrder"`
+}
+
 type AccountDeleteRequest struct {
 	Id int64 `json:"id,string" binding:"required,min=1"`
 }

pkg/services/accounts.go

@@ -122,6 +122,25 @@ func (s *AccountService) CreateAccounts(mainAccount *models.Account, childrenAcc
 	})
 }
 
+func (s *AccountService) ModifyAccountDisplayOrders(uid int64, accounts []*models.Account) error {
+	for i := 0; i < len(accounts); i++ {
+		accounts[i].UpdatedUnixTime = time.Now().Unix()
+	}
+
+	return s.UserDataDB(uid).DoTransaction(func(sess *xorm.Session) error {
+		for i := 0; i < len(accounts); i++ {
+			account := accounts[i]
+			_, err := sess.Cols("display_order", "updated_unix_time").Where("account_id=? AND uid=? AND deleted=?", account.AccountId, account.Uid, false).Update(account)
+
+			if err != nil {
+				return err
+			}
+		}
+
+		return nil
+	})
+}
+
 func (s *AccountService) DeleteAccounts(uid int64, ids []int64) error {
 	if uid <= 0 {
 		return errs.ErrUserIdInvalid