From 68c269d3c0f71a344955d1825e120efbab1c3512 Mon Sep 17 00:00:00 2001
From: MaysWind <i@mayswind.net>
Date: Sat, 5 Dec 2020 20:42:28 +0800
Subject: [PATCH] code refactor

---
 pkg/api/accounts.go               | 10 +++++-----
 pkg/api/transaction_categories.go |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkg/api/accounts.go b/pkg/api/accounts.go
index 23e33a56..43fdf92e 100644
--- a/pkg/api/accounts.go
+++ b/pkg/api/accounts.go
@@ -161,8 +161,8 @@ func (a *AccountsApi) AccountCreateHandler(c *core.Context) (interface{}, *errs.
 		return nil, errs.ErrOperationFailed
 	}
 
-	mainAccount := a.createNewAccount(uid, &accountCreateReq, maxOrderId+1)
-	childrenAccounts := a.createSubAccounts(uid, &accountCreateReq)
+	mainAccount := a.createNewAccountModel(uid, &accountCreateReq, maxOrderId+1)
+	childrenAccounts := a.createSubAccountModels(uid, &accountCreateReq)
 
 	err = a.accounts.CreateAccounts(mainAccount, childrenAccounts)
 
@@ -335,7 +335,7 @@ func (a *AccountsApi) AccountDeleteHandler(c *core.Context) (interface{}, *errs.
 	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{
 		Uid:          uid,
 		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 {
 		return nil
 	}
@@ -357,7 +357,7 @@ func (a *AccountsApi) createSubAccounts(uid int64, accountCreateReq *models.Acco
 	childrenAccounts := make([]*models.Account, len(accountCreateReq.SubAccounts))
 
 	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
diff --git a/pkg/api/transaction_categories.go b/pkg/api/transaction_categories.go
index c4f42b48..78dbd696 100644
--- a/pkg/api/transaction_categories.go
+++ b/pkg/api/transaction_categories.go
@@ -110,7 +110,7 @@ func (a *TransactionCategoriesApi) CategoryCreateHandler(c *core.Context) (inter
 		return nil, errs.ErrOperationFailed
 	}
 
-	category := a.createNewCategory(uid, &categoryCreateReq, maxOrderId+1)
+	category := a.createNewCategoryModel(uid, &categoryCreateReq, maxOrderId+1)
 
 	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,
 			Type: categoryCreateReq.Type,
 			Icon: categoryCreateReq.Icon,
@@ -165,7 +165,7 @@ func (a *TransactionCategoriesApi) CategoryCreateBatchHandler(c *core.Context) (
 		categoriesMap[category] = make([]*models.TransactionCategory, len(categoryCreateReq.SubCategories))
 
 		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
 			totalCount++
 		}
@@ -310,7 +310,7 @@ func (a *TransactionCategoriesApi) CategoryDeleteHandler(c *core.Context) (inter
 	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{
 		Uid:              uid,
 		Name:             categoryCreateReq.Name,