From fd1242490fbdf9a2f74c19ed612c0979bd4f2479 Mon Sep 17 00:00:00 2001 From: MaysWind Date: Sat, 19 Apr 2025 00:04:04 +0800 Subject: [PATCH] code refactor --- pkg/api/transaction_categories.go | 10 +++++----- pkg/cli/user_data.go | 2 +- .../converter/data_table_transaction_data_exporter.go | 2 +- pkg/models/transaction_category.go | 4 ++-- pkg/services/transaction_categories.go | 4 ++-- pkg/services/transactions.go | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkg/api/transaction_categories.go b/pkg/api/transaction_categories.go index 440a8070..5eeb8585 100644 --- a/pkg/api/transaction_categories.go +++ b/pkg/api/transaction_categories.go @@ -229,11 +229,11 @@ func (a *TransactionCategoriesApi) CategoryModifyHandler(c *core.WebContext) (an return nil, errs.ErrNothingWillBeUpdated } - if category.ParentCategoryId == 0 && newCategory.ParentCategoryId != 0 { + if category.ParentCategoryId == models.LevelOneTransactionCategoryParentId && newCategory.ParentCategoryId != models.LevelOneTransactionCategoryParentId { return nil, errs.Or(err, errs.ErrNotAllowChangePrimaryTransactionCategoryToSecondary) } - if category.ParentCategoryId != 0 && newCategory.ParentCategoryId == 0 { + if category.ParentCategoryId != models.LevelOneTransactionCategoryParentId && newCategory.ParentCategoryId == models.LevelOneTransactionCategoryParentId { return nil, errs.Or(err, errs.ErrNotAllowChangeSecondaryTransactionCategoryToPrimary) } @@ -256,7 +256,7 @@ func (a *TransactionCategoriesApi) CategoryModifyHandler(c *core.WebContext) (an return nil, errs.Or(err, errs.ErrNotAllowChangePrimaryTransactionType) } - if toPrimaryCategory.ParentCategoryId != 0 { + if toPrimaryCategory.ParentCategoryId != models.LevelOneTransactionCategoryParentId { return nil, errs.Or(err, errs.ErrNotAllowUseSecondaryTransactionAsPrimaryCategory) } } @@ -433,7 +433,7 @@ func (a *TransactionCategoriesApi) getTransactionCategoryListByTypeResponse(cate for i := 0; i < len(categoryResps); i++ { categoryResp := categoryResps[i] - if categoryResp.ParentId <= models.LevelOneTransactionParentId { + if categoryResp.ParentId <= models.LevelOneTransactionCategoryParentId { continue } @@ -449,7 +449,7 @@ func (a *TransactionCategoriesApi) getTransactionCategoryListByTypeResponse(cate finalCategoryResps := make(models.TransactionCategoryInfoResponseSlice, 0) for i := 0; i < len(categoryResps); i++ { - if parentId <= 0 && categoryResps[i].ParentId == models.LevelOneTransactionParentId { + if parentId <= 0 && categoryResps[i].ParentId == models.LevelOneTransactionCategoryParentId { sort.Sort(categoryResps[i].SubCategories) finalCategoryResps = append(finalCategoryResps, categoryResps[i]) } else if parentId > 0 && categoryResps[i].ParentId == parentId { diff --git a/pkg/cli/user_data.go b/pkg/cli/user_data.go index f2ec1a99..0a142fc5 100644 --- a/pkg/cli/user_data.go +++ b/pkg/cli/user_data.go @@ -959,7 +959,7 @@ func (l *UserDataCli) checkTransactionCategory(c *core.CliContext, transaction * return errs.ErrTransactionCategoryNotFound } - if category.ParentCategoryId == models.LevelOneTransactionParentId { + if category.ParentCategoryId == models.LevelOneTransactionCategoryParentId { log.CliErrorf(c, "[user_data.checkTransactionCategory] the transaction category \"id:%d\" of transaction \"id:%d\" is not a sub category", transaction.CategoryId, transaction.TransactionId) return errs.ErrOperationFailed } diff --git a/pkg/converters/converter/data_table_transaction_data_exporter.go b/pkg/converters/converter/data_table_transaction_data_exporter.go index c3a74a7d..da8425d3 100644 --- a/pkg/converters/converter/data_table_transaction_data_exporter.go +++ b/pkg/converters/converter/data_table_transaction_data_exporter.go @@ -78,7 +78,7 @@ func (c *DataTableTransactionDataExporter) getExportedTransactionCategoryName(da return "" } - if category.ParentCategoryId == 0 { + if category.ParentCategoryId == models.LevelOneTransactionCategoryParentId { return dataTableBuilder.ReplaceDelimiters(category.Name) } diff --git a/pkg/models/transaction_category.go b/pkg/models/transaction_category.go index c54e67ce..78af705d 100644 --- a/pkg/models/transaction_category.go +++ b/pkg/models/transaction_category.go @@ -1,7 +1,7 @@ package models -// LevelOneTransactionParentId represents the parent id of level-one transaction category -const LevelOneTransactionParentId = 0 +// LevelOneTransactionCategoryParentId represents the parent id of level-one transaction category +const LevelOneTransactionCategoryParentId = 0 // TransactionCategoryType represents transaction category type type TransactionCategoryType byte diff --git a/pkg/services/transaction_categories.go b/pkg/services/transaction_categories.go index ccb0eb0f..1aedab3a 100644 --- a/pkg/services/transaction_categories.go +++ b/pkg/services/transaction_categories.go @@ -161,7 +161,7 @@ func (s *TransactionCategoryService) GetMaxDisplayOrder(c core.Context, uid int6 } category := &models.TransactionCategory{} - has, err := s.UserDataDB(uid).NewSession(c).Cols("uid", "deleted", "parent_category_id", "display_order").Where("uid=? AND deleted=? AND type=? AND parent_category_id=?", uid, false, categoryType, models.LevelOneTransactionParentId).OrderBy("display_order desc").Limit(1).Get(category) + has, err := s.UserDataDB(uid).NewSession(c).Cols("uid", "deleted", "parent_category_id", "display_order").Where("uid=? AND deleted=? AND type=? AND parent_category_id=?", uid, false, categoryType, models.LevelOneTransactionCategoryParentId).OrderBy("display_order desc").Limit(1).Get(category) if err != nil { return 0, err @@ -463,7 +463,7 @@ func (s *TransactionCategoryService) GetSubCategoryNameMapByList(categories []*m for i := 0; i < len(categories); i++ { category := categories[i] - if category.ParentCategoryId == models.LevelOneTransactionParentId { + if category.ParentCategoryId == models.LevelOneTransactionCategoryParentId { continue } diff --git a/pkg/services/transactions.go b/pkg/services/transactions.go index d70790df..bd7ed310 100644 --- a/pkg/services/transactions.go +++ b/pkg/services/transactions.go @@ -2191,7 +2191,7 @@ func (s *TransactionService) isCategoryValid(sess *xorm.Session, transaction *mo return errs.ErrCannotUseHiddenTransactionCategory } - if category.ParentCategoryId < 1 { + if category.ParentCategoryId == models.LevelOneTransactionCategoryParentId { return errs.ErrCannotUsePrimaryCategoryForTransaction }