support modify account

2026-05-17 00:12:11 +08:00 · 2020-11-15 23:11:14 +08:00
parent f74ea31c6d
commit 84317975c8
11 changed files with 408 additions and 34 deletions
@@ -68,6 +68,48 @@ func (a *AccountsApi) AccountListHandler(c *core.Context) (interface{}, *errs.Er
 	return userFinalAccountResps, nil
 }

+func (a *AccountsApi) AccountGetHandler(c *core.Context) (interface{}, *errs.Error) {
+	var accountGetReq models.AccountGetRequest
+	err := c.ShouldBindQuery(&accountGetReq)
+
+	if err != nil {
+		log.WarnfWithRequestId(c, "[accounts.AccountGetHandler] parse request failed, because %s", err.Error())
+		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
+	}
+
+	uid := c.GetCurrentUid()
+	accountAndSubAccounts, err := a.accounts.GetAccountByAccountId(uid, accountGetReq.Id)
+
+	if err != nil {
+		log.ErrorfWithRequestId(c, "[accounts.AccountGetHandler] failed to get account \"id:%d\" for user \"uid:%d\", because %s", accountGetReq.Id, uid, err.Error())
+		return nil, errs.ErrOperationFailed
+	}
+
+	accountRespMap := make(map[int64]*models.AccountInfoResponse)
+
+	for i := 0; i < len(accountAndSubAccounts); i++ {
+		acccountResp := accountAndSubAccounts[i].ToAccountInfoResponse()
+		accountRespMap[acccountResp.Id] = acccountResp
+	}
+
+	accountResp := accountRespMap[accountGetReq.Id]
+
+	if accountResp == nil {
+		return nil, errs.ErrAccountNotFound
+	}
+
+	for i := 0; i < len(accountAndSubAccounts); i++ {
+		if accountAndSubAccounts[i].ParentAccountId == accountResp.Id {
+			subAccountResp := accountAndSubAccounts[i].ToAccountInfoResponse()
+			accountResp.SubAccounts = append(accountResp.SubAccounts, subAccountResp)
+		}
+	}
+
+	sort.Sort(accountResp.SubAccounts)
+
+	return accountResp, nil
+}
+
 func (a *AccountsApi) AccountCreateHandler(c *core.Context) (interface{}, *errs.Error) {
 	var accountCreateReq models.AccountCreateRequest
 	err := c.ShouldBindJSON(&accountCreateReq)
@@ -144,6 +186,79 @@ func (a *AccountsApi) AccountCreateHandler(c *core.Context) (interface{}, *errs.
 	return accountInfoResp, nil
 }

+func (a *AccountsApi) AccountModifyHandler(c *core.Context) (interface{}, *errs.Error) {
+	var accountModifyReq models.AccountModifyRequest
+	err := c.ShouldBindJSON(&accountModifyReq)
+
+	if err != nil {
+		log.WarnfWithRequestId(c, "[accounts.AccountModifyHandler] parse request failed, because %s", err.Error())
+		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
+	}
+
+	uid := c.GetCurrentUid()
+	accountAndSubAccounts, err := a.accounts.GetAccountByAccountId(uid, accountModifyReq.Id)
+
+	if err != nil {
+		log.ErrorfWithRequestId(c, "[accounts.AccountModifyHandler] failed to get account \"id:%d\" for user \"uid:%d\", because %s", accountModifyReq.Id, uid, err.Error())
+		return nil, errs.ErrOperationFailed
+	}
+
+	accountMap := make(map[int64]*models.Account)
+
+	for i := 0; i < len(accountAndSubAccounts); i++ {
+		acccount := accountAndSubAccounts[i]
+		accountMap[acccount.AccountId] = acccount
+	}
+
+	if _, exists := accountMap[accountModifyReq.Id]; !exists {
+		return nil, errs.ErrAccountNotFound
+	}
+
+	if len(accountModifyReq.SubAccounts)+1 != len(accountAndSubAccounts) {
+		return nil, errs.ErrCannotAddOrDeleteSubAccountsWhenModify
+	}
+
+	anythingUpdate := false
+	var toUpdateAccounts []*models.Account
+
+	toUpdateAccount := a.getToUpdateAccount(uid, &accountModifyReq, accountMap[accountModifyReq.Id])
+
+	if toUpdateAccount != nil {
+		anythingUpdate = true
+		toUpdateAccounts = append(toUpdateAccounts, toUpdateAccount)
+	}
+
+	for i := 0; i < len(accountModifyReq.SubAccounts); i++ {
+		subAcccountReq := accountModifyReq.SubAccounts[i]
+
+		if _, exists := accountMap[subAcccountReq.Id]; !exists {
+			return nil, errs.ErrAccountNotFound
+		}
+
+		toUpdateSubAccount := a.getToUpdateAccount(uid, subAcccountReq, accountMap[subAcccountReq.Id])
+
+		if toUpdateSubAccount != nil {
+			anythingUpdate = true
+			toUpdateAccounts = append(toUpdateAccounts, toUpdateSubAccount)
+		}
+	}
+
+	if !anythingUpdate {
+		return nil, errs.ErrNothingWillBeUpdated
+	}
+
+	err = a.accounts.ModifyAccounts(uid, toUpdateAccounts)
+
+	if err != nil {
+		log.ErrorfWithRequestId(c, "[accounts.AccountModifyHandler] failed to update account \"id:%d\" for user \"uid:%d\", because %s", accountModifyReq.Id, uid, err.Error())
+		return nil, errs.Or(err, errs.ErrOperationFailed)
+	}
+
+	log.InfofWithRequestId(c, "[accounts.AccountModifyHandler] user \"uid:%d\" has updated account \"id:%d\" successfully", uid, accountModifyReq.Id)
+
+	return true, nil
+}
+
 func (a *AccountsApi) AccountHideHandler(c *core.Context) (interface{}, *errs.Error) {
 	var accountHideReq models.AccountHideRequest
 	err := c.ShouldBindJSON(&accountHideReq)
@@ -246,3 +361,25 @@ func (a *AccountsApi) createSubAccounts(uid int64, accountCreateReq *models.Acco

 	return childrenAccounts
 }
+
+func (a *AccountsApi) getToUpdateAccount(uid int64, accountModifyReq *models.AccountModifyRequest, oldAccount *models.Account) *models.Account {
+	newAccount := &models.Account{
+		AccountId: oldAccount.AccountId,
+		Uid:       uid,
+		Name:      accountModifyReq.Name,
+		Category:  accountModifyReq.Category,
+		Icon:      accountModifyReq.Icon,
+		Comment:   accountModifyReq.Comment,
+		Hidden:    accountModifyReq.Hidden,
+	}
+
+	if newAccount.Name != oldAccount.Name ||
+		newAccount.Category != oldAccount.Category ||
+		newAccount.Icon != oldAccount.Icon ||
+		newAccount.Comment != oldAccount.Comment ||
+		newAccount.Hidden != oldAccount.Hidden {
+		return newAccount
+	}
+
+	return nil
+}
@@ -3,12 +3,13 @@ package errs
 import "net/http"

 var (
-	ErrAccountIdInvalid                    = NewNormalError(NORMAL_SUBCATEGORY_ACCOUNT, 0, http.StatusBadRequest, "account id is invalid")
-	ErrAccountNotFound                     = NewNormalError(NORMAL_SUBCATEGORY_ACCOUNT, 1, http.StatusBadRequest, "account not found")
-	ErrAccountTypeInvalid                  = NewNormalError(NORMAL_SUBCATEGORY_ACCOUNT, 2, http.StatusBadRequest, "account type is invalid")
-	ErrAccountHaveNoSubAccount             = NewNormalError(NORMAL_SUBCATEGORY_ACCOUNT, 3, http.StatusBadRequest, "account must have at least one sub account")
-	ErrAccountCannotHaveSubAccounts        = NewNormalError(NORMAL_SUBCATEGORY_ACCOUNT, 4, http.StatusBadRequest, "account cannot have sub accounts")
-	ErrParentAccountCannotSetCurrency      = NewNormalError(NORMAL_SUBCATEGORY_ACCOUNT, 5, http.StatusBadRequest, "parent account cannot set currency")
-	ErrSubAccountCategoryNotEqualsToParent = NewNormalError(NORMAL_SUBCATEGORY_ACCOUNT, 6, http.StatusBadRequest, "sub account category not equals to parent")
-	ErrSubAccountTypeInvalid               = NewNormalError(NORMAL_SUBCATEGORY_ACCOUNT, 7, http.StatusBadRequest, "sub account type invalid")
+	ErrAccountIdInvalid                       = NewNormalError(NORMAL_SUBCATEGORY_ACCOUNT, 0, http.StatusBadRequest, "account id is invalid")
+	ErrAccountNotFound                        = NewNormalError(NORMAL_SUBCATEGORY_ACCOUNT, 1, http.StatusBadRequest, "account not found")
+	ErrAccountTypeInvalid                     = NewNormalError(NORMAL_SUBCATEGORY_ACCOUNT, 2, http.StatusBadRequest, "account type is invalid")
+	ErrAccountHaveNoSubAccount                = NewNormalError(NORMAL_SUBCATEGORY_ACCOUNT, 3, http.StatusBadRequest, "account must have at least one sub account")
+	ErrAccountCannotHaveSubAccounts           = NewNormalError(NORMAL_SUBCATEGORY_ACCOUNT, 4, http.StatusBadRequest, "account cannot have sub accounts")
+	ErrParentAccountCannotSetCurrency         = NewNormalError(NORMAL_SUBCATEGORY_ACCOUNT, 5, http.StatusBadRequest, "parent account cannot set currency")
+	ErrSubAccountCategoryNotEqualsToParent    = NewNormalError(NORMAL_SUBCATEGORY_ACCOUNT, 6, http.StatusBadRequest, "sub account category not equals to parent")
+	ErrSubAccountTypeInvalid                  = NewNormalError(NORMAL_SUBCATEGORY_ACCOUNT, 7, http.StatusBadRequest, "sub account type invalid")
+	ErrCannotAddOrDeleteSubAccountsWhenModify = NewNormalError(NORMAL_SUBCATEGORY_ACCOUNT, 8, http.StatusBadRequest, "cannot add or delete sub accounts when modify account")
 )
@@ -51,6 +51,20 @@ type AccountCreateRequest struct {
 	SubAccounts []*AccountCreateRequest `json:"subAccounts" binding:"omitempty"`
 }

+type AccountGetRequest struct {
+	Id int64 `form:"id,string" binding:"required,min=1"`
+}
+
+type AccountModifyRequest struct {
+	Id          int64                   `json:"id,string" binding:"required,min=1"`
+	Name        string                  `json:"name" binding:"required,notBlank,max=32"`
+	Category    AccountCategory         `json:"category" binding:"required"`
+	Icon        int64                   `json:"icon,string" binding:"min=1"`
+	Comment     string                  `json:"comment" binding:"max=255"`
+	Hidden      bool                    `json:"hidden"`
+	SubAccounts []*AccountModifyRequest `json:"subAccounts" binding:"omitempty"`
+}
+
 type AccountHideRequest struct {
 	Id     int64 `json:"id,string" binding:"required,min=1"`
 	Hidden bool  `json:"hidden"`
@@ -38,6 +38,21 @@ func (s *AccountService) GetAllAccountsByUid(uid int64) ([]*models.Account, erro
 	return accounts, err
 }

+func (s *AccountService) GetAccountByAccountId(uid int64, accountId int64) ([]*models.Account, error) {
+	if uid <= 0 {
+		return nil, errs.ErrUserIdInvalid
+	}
+
+	if accountId <= 0 {
+		return nil, errs.ErrAccountIdInvalid
+	}
+
+	var accounts []*models.Account
+	err := s.UserDataDB(uid).Where("uid=? AND deleted=? AND (account_id=? OR parent_account_id=?)", uid, false, accountId, accountId).OrderBy("parent_account_id asc, display_order asc").Find(&accounts)
+
+	return accounts, err
+}
+
 func (s *AccountService) GetMaxDisplayOrder(uid int64, category models.AccountCategory) (int, error) {
 	if uid <= 0 {
 		return 0, errs.ErrUserIdInvalid
@@ -122,6 +137,31 @@ func (s *AccountService) CreateAccounts(mainAccount *models.Account, childrenAcc
 	})
 }

+func (s *AccountService) ModifyAccounts(uid int64, accounts []*models.Account) error {
+	if uid <= 0 {
+		return errs.ErrUserIdInvalid
+	}
+
+	now := time.Now().Unix()
+
+	for i := 0; i < len(accounts); i++ {
+		accounts[i].UpdatedUnixTime = now
+	}
+
+	return s.UserDataDB(uid).DoTransaction(func(sess *xorm.Session) error {
+		for i := 0; i < len(accounts); i++ {
+			account := accounts[i]
+			_, err := sess.Cols("name", "category", "icon", "comment", "hidden", "updated_unix_time").Where("account_id=? AND uid=? AND deleted=?", account.AccountId, uid, false).Update(account)
+
+			if err != nil {
+				return err
+			}
+		}
+
+		return nil
+	})
+}
+
 func (s *AccountService) HideAccount(uid int64, ids []int64, hidden bool) error {
 	if uid <= 0 {
 		return errs.ErrUserIdInvalid