code refactor

pkg/services/accounts.go

@@ -825,3 +825,56 @@ func (s *AccountService) GetAccountNames(accounts []*models.Account) []string {
 
 	return accountNames
 }
+
+// GetAccountOrSubAccountIds returns a list of account ids or sub-account ids according to given account ids
+func (s *AccountService) GetAccountOrSubAccountIds(c *core.WebContext, accountIds string, uid int64) ([]int64, error) {
+	if accountIds == "" || accountIds == "0" {
+		return nil, nil
+	}
+
+	requestAccountIds, err := utils.StringArrayToInt64Array(strings.Split(accountIds, ","))
+
+	if err != nil {
+		return nil, errs.Or(err, errs.ErrAccountIdInvalid)
+	}
+
+	var allAccountIds []int64
+
+	if len(requestAccountIds) > 0 {
+		allSubAccounts, err := s.GetSubAccountsByAccountIds(c, uid, requestAccountIds)
+
+		if err != nil {
+			return nil, err
+		}
+
+		accountIdsMap := make(map[int64]int32, len(requestAccountIds))
+
+		for i := 0; i < len(requestAccountIds); i++ {
+			accountIdsMap[requestAccountIds[i]] = 0
+		}
+
+		for i := 0; i < len(allSubAccounts); i++ {
+			subAccount := allSubAccounts[i]
+
+			if refCount, exists := accountIdsMap[subAccount.ParentAccountId]; exists {
+				accountIdsMap[subAccount.ParentAccountId] = refCount + 1
+			} else {
+				accountIdsMap[subAccount.ParentAccountId] = 1
+			}
+
+			if _, exists := accountIdsMap[subAccount.AccountId]; exists {
+				delete(accountIdsMap, subAccount.AccountId)
+			}
+
+			allAccountIds = append(allAccountIds, subAccount.AccountId)
+		}
+
+		for accountId, refCount := range accountIdsMap {
+			if refCount < 1 {
+				allAccountIds = append(allAccountIds, accountId)
+			}
+		}
+	}
+
+	return allAccountIds, nil
+}

pkg/services/transaction_categories.go

@@ -10,6 +10,7 @@ import (
 	"github.com/mayswind/ezbookkeeping/pkg/datastore"
 	"github.com/mayswind/ezbookkeeping/pkg/errs"
 	"github.com/mayswind/ezbookkeeping/pkg/models"
+	"github.com/mayswind/ezbookkeeping/pkg/utils"
 	"github.com/mayswind/ezbookkeeping/pkg/uuid"
 )
 
@@ -523,3 +524,56 @@ func (s *TransactionCategoryService) GetCategoryNames(categories []*models.Trans
 
 	return categoryNames
 }
+
+// GetCategoryOrSubCategoryIds returns all category ids and sub-category ids according to given category ids
+func (s *TransactionCategoryService) GetCategoryOrSubCategoryIds(c *core.WebContext, categoryIds string, uid int64) ([]int64, error) {
+	if categoryIds == "" || categoryIds == "0" {
+		return nil, nil
+	}
+
+	requestCategoryIds, err := utils.StringArrayToInt64Array(strings.Split(categoryIds, ","))
+
+	if err != nil {
+		return nil, errs.Or(err, errs.ErrTransactionCategoryIdInvalid)
+	}
+
+	var allCategoryIds []int64
+
+	if len(requestCategoryIds) > 0 {
+		allSubCategories, err := s.GetSubCategoriesByCategoryIds(c, uid, requestCategoryIds)
+
+		if err != nil {
+			return nil, err
+		}
+
+		categoryIdsMap := make(map[int64]int32, len(requestCategoryIds))
+
+		for i := 0; i < len(requestCategoryIds); i++ {
+			categoryIdsMap[requestCategoryIds[i]] = 0
+		}
+
+		for i := 0; i < len(allSubCategories); i++ {
+			subCategory := allSubCategories[i]
+
+			if refCount, exists := categoryIdsMap[subCategory.ParentCategoryId]; exists {
+				categoryIdsMap[subCategory.ParentCategoryId] = refCount + 1
+			} else {
+				categoryIdsMap[subCategory.ParentCategoryId] = 1
+			}
+
+			if _, exists := categoryIdsMap[subCategory.CategoryId]; exists {
+				delete(categoryIdsMap, subCategory.CategoryId)
+			}
+
+			allCategoryIds = append(allCategoryIds, subCategory.CategoryId)
+		}
+
+		for accountId, refCount := range categoryIdsMap {
+			if refCount < 1 {
+				allCategoryIds = append(allCategoryIds, accountId)
+			}
+		}
+	}
+
+	return allCategoryIds, nil
+}

pkg/services/transaction_tags.go

@@ -1,6 +1,7 @@
 package services
 
 import (
+	"strings"
 	"time"
 
 	"xorm.io/xorm"
@@ -507,6 +508,7 @@ func (s *TransactionTagService) GetTagNames(tags []*models.TransactionTag) []str
 	return tagNames
 }
 
+// GetGroupedTransactionTagIds returns a map of transaction tag ids grouped by transaction id
 func (s *TransactionTagService) GetGroupedTransactionTagIds(tagIndexes []*models.TransactionTagIndex) map[int64][]int64 {
 	allTransactionTagIds := make(map[int64][]int64)
 
@@ -529,3 +531,29 @@ func (s *TransactionTagService) GetGroupedTransactionTagIds(tagIndexes []*models
 
 	return allTransactionTagIds
 }
+
+// GetTagIds converts a comma-separated string of tag ids into a slice of int64
+func (s *TransactionTagService) GetTagIds(tagIds string) ([]int64, error) {
+	if tagIds == "" || tagIds == "0" {
+		return nil, nil
+	}
+
+	requestTagIds, err := utils.StringArrayToInt64Array(strings.Split(tagIds, ","))
+
+	if err != nil {
+		return nil, errs.Or(err, errs.ErrTransactionTagIdInvalid)
+	}
+
+	return requestTagIds, nil
+}
+
+// GetTransactionTagIds returns a slice of all transaction tag ids from a map of transaction tag ids grouped by transaction id
+func (s *TransactionTagService) GetTransactionTagIds(allTransactionTagIds map[int64][]int64) []int64 {
+	allTagIds := make([]int64, 0, len(allTransactionTagIds))
+
+	for _, tagIds := range allTransactionTagIds {
+		allTagIds = append(allTagIds, tagIds...)
+	}
+
+	return allTagIds
+}