mirror/ezbookkeeping
1
0
Fork 0
mirror of https://github.com/mayswind/ezbookkeeping.git synced 2026-05-14 06:57:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

not map to parent accounts, hidden accounts, and hidden categories when importing transactions

Browse Source
This commit is contained in:
MaysWind
2025-04-28 00:06:59 +08:00
parent be5b1a52ea
commit 68c078038a
4 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/accounts.go
+11 -2
View File
@@ -774,12 +774,21 @@ func (s *AccountService) GetAccountMapByList(accounts []*models.Account) map[int
return accountMap
}
// GetAccountNameMapByList returns an account map by a list
func (s *AccountService) GetAccountNameMapByList(accounts []*models.Account) map[string]*models.Account {
// GetVisibleAccountNameMapByList returns visible account map by a list
func (s *AccountService) GetVisibleAccountNameMapByList(accounts []*models.Account) map[string]*models.Account {
accountMap := make(map[string]*models.Account)
for i := 0; i < len(accounts); i++ {
account := accounts[i]
if account.Hidden {
continue
}
if account.Type == models.ACCOUNT_TYPE_MULTI_SUB_ACCOUNTS {
continue
}
accountMap[account.Name] = account
}
return accountMap
pkg/services/transaction_categories.go
+6 -2
View File
@@ -451,8 +451,8 @@ func (s *TransactionCategoryService) GetCategoryMapByList(categories []*models.T
return categoryMap
}
// GetSubCategoryNameMapByList returns a sub transaction category map by a list
func (s *TransactionCategoryService) GetSubCategoryNameMapByList(categories []*models.TransactionCategory) (expenseCategoryMap map[string]map[string]*models.TransactionCategory, incomeCategoryMap map[string]map[string]*models.TransactionCategory, transferCategoryMap map[string]map[string]*models.TransactionCategory) {
// GetVisibleSubCategoryNameMapByList returns visible sub transaction category map by a list
func (s *TransactionCategoryService) GetVisibleSubCategoryNameMapByList(categories []*models.TransactionCategory) (expenseCategoryMap map[string]map[string]*models.TransactionCategory, incomeCategoryMap map[string]map[string]*models.TransactionCategory, transferCategoryMap map[string]map[string]*models.TransactionCategory) {
categoryMap := make(map[int64]*models.TransactionCategory, len(categories))
expenseCategoryMap = make(map[string]map[string]*models.TransactionCategory)
incomeCategoryMap = make(map[string]map[string]*models.TransactionCategory)
@@ -466,6 +466,10 @@ func (s *TransactionCategoryService) GetSubCategoryNameMapByList(categories []*m
for i := 0; i < len(categories); i++ {
category := categories[i]
if category.Hidden {
continue
}
if category.ParentCategoryId == models.LevelOneTransactionCategoryParentId {
continue
}