mirror/ezbookkeeping
1
0
Fork 0
mirror of https://github.com/mayswind/ezbookkeeping.git synced 2026-05-20 17:54:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

code refactor

Browse Source
This commit is contained in:
MaysWind
2020-12-05 20:42:28 +08:00
parent 611e10e846
commit 68c269d3c0
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/api/accounts.go
+5 -5
View File
@@ -161,8 +161,8 @@ func (a *AccountsApi) AccountCreateHandler(c *core.Context) (interface{}, *errs.
return nil, errs.ErrOperationFailed return nil, errs.ErrOperationFailed
} }
mainAccount := a.createNewAccount(uid, &accountCreateReq, maxOrderId+1) mainAccount := a.createNewAccountModel(uid, &accountCreateReq, maxOrderId+1)
childrenAccounts := a.createSubAccounts(uid, &accountCreateReq) childrenAccounts := a.createSubAccountModels(uid, &accountCreateReq)
err = a.accounts.CreateAccounts(mainAccount, childrenAccounts) err = a.accounts.CreateAccounts(mainAccount, childrenAccounts)
@@ -335,7 +335,7 @@ func (a *AccountsApi) AccountDeleteHandler(c *core.Context) (interface{}, *errs.
return true, nil return true, nil
} }
func (a *AccountsApi) createNewAccount(uid int64, accountCreateReq *models.AccountCreateRequest, order int) *models.Account { func (a *AccountsApi) createNewAccountModel(uid int64, accountCreateReq *models.AccountCreateRequest, order int) *models.Account {
return &models.Account{ return &models.Account{
Uid: uid, Uid: uid,
Name: accountCreateReq.Name, Name: accountCreateReq.Name,
@@ -349,7 +349,7 @@ func (a *AccountsApi) createNewAccount(uid int64, accountCreateReq *models.Accou
} }
} }
func (a *AccountsApi) createSubAccounts(uid int64, accountCreateReq *models.AccountCreateRequest) []*models.Account { func (a *AccountsApi) createSubAccountModels(uid int64, accountCreateReq *models.AccountCreateRequest) []*models.Account {
if len(accountCreateReq.SubAccounts) <= 0 { if len(accountCreateReq.SubAccounts) <= 0 {
return nil return nil
} }
@@ -357,7 +357,7 @@ func (a *AccountsApi) createSubAccounts(uid int64, accountCreateReq *models.Acco
childrenAccounts := make([]*models.Account, len(accountCreateReq.SubAccounts)) childrenAccounts := make([]*models.Account, len(accountCreateReq.SubAccounts))
for i := 0; i < len(accountCreateReq.SubAccounts); i++ { for i := 0; i < len(accountCreateReq.SubAccounts); i++ {
childrenAccounts[i] = a.createNewAccount(uid, accountCreateReq.SubAccounts[i], i+1) childrenAccounts[i] = a.createNewAccountModel(uid, accountCreateReq.SubAccounts[i], i+1)
} }
return childrenAccounts return childrenAccounts
pkg/api/transaction_categories.go
+4 -4
View File
@@ -110,7 +110,7 @@ func (a *TransactionCategoriesApi) CategoryCreateHandler(c *core.Context) (inter
return nil, errs.ErrOperationFailed return nil, errs.ErrOperationFailed
} }
category := a.createNewCategory(uid, &categoryCreateReq, maxOrderId+1) category := a.createNewCategoryModel(uid, &categoryCreateReq, maxOrderId+1)
err = a.categories.CreateCategory(category) err = a.categories.CreateCategory(category)
@@ -155,7 +155,7 @@ func (a *TransactionCategoriesApi) CategoryCreateBatchHandler(c *core.Context) (
} }
} }
category := a.createNewCategory(uid, &models.TransactionCategoryCreateRequest{ category := a.createNewCategoryModel(uid, &models.TransactionCategoryCreateRequest{
Name: categoryCreateReq.Name, Name: categoryCreateReq.Name,
Type: categoryCreateReq.Type, Type: categoryCreateReq.Type,
Icon: categoryCreateReq.Icon, Icon: categoryCreateReq.Icon,
@@ -165,7 +165,7 @@ func (a *TransactionCategoriesApi) CategoryCreateBatchHandler(c *core.Context) (
categoriesMap[category] = make([]*models.TransactionCategory, len(categoryCreateReq.SubCategories)) categoriesMap[category] = make([]*models.TransactionCategory, len(categoryCreateReq.SubCategories))
for j := 0; j < len(categoryCreateReq.SubCategories); j++ { for j := 0; j < len(categoryCreateReq.SubCategories); j++ {
subCategory := a.createNewCategory(uid, categoryCreateReq.SubCategories[j], j+1) subCategory := a.createNewCategoryModel(uid, categoryCreateReq.SubCategories[j], j+1)
categoriesMap[category][j] = subCategory categoriesMap[category][j] = subCategory
totalCount++ totalCount++
} }
@@ -310,7 +310,7 @@ func (a *TransactionCategoriesApi) CategoryDeleteHandler(c *core.Context) (inter
return true, nil return true, nil
} }
func (a *TransactionCategoriesApi) createNewCategory(uid int64, categoryCreateReq *models.TransactionCategoryCreateRequest, order int) *models.TransactionCategory { func (a *TransactionCategoriesApi) createNewCategoryModel(uid int64, categoryCreateReq *models.TransactionCategoryCreateRequest, order int) *models.TransactionCategory {
return &models.TransactionCategory{ return &models.TransactionCategory{
Uid: uid, Uid: uid,
Name: categoryCreateReq.Name, Name: categoryCreateReq.Name,