diff --git a/pkg/api/accounts.go b/pkg/api/accounts.go index e473acc5..fe5f3066 100644 --- a/pkg/api/accounts.go +++ b/pkg/api/accounts.go @@ -38,7 +38,7 @@ func (a *AccountsApi) AccountListHandler(c *core.Context) (interface{}, *errs.Er if err != nil { log.ErrorfWithRequestId(c, "[accounts.AccountListHandler] failed to get all accounts for user \"uid:%d\", because %s", uid, err.Error()) - return nil, errs.ErrOperationFailed + return nil, errs.Or(err, errs.ErrOperationFailed) } userAllAccountResps := make([]*models.AccountInfoResponse, len(accounts)) @@ -98,7 +98,7 @@ func (a *AccountsApi) AccountGetHandler(c *core.Context) (interface{}, *errs.Err if err != nil { log.ErrorfWithRequestId(c, "[accounts.AccountGetHandler] failed to get account \"id:%d\" for user \"uid:%d\", because %s", accountGetReq.Id, uid, err.Error()) - return nil, errs.ErrOperationFailed + return nil, errs.Or(err, errs.ErrOperationFailed) } accountRespMap := make(map[int64]*models.AccountInfoResponse) @@ -190,7 +190,7 @@ func (a *AccountsApi) AccountCreateHandler(c *core.Context) (interface{}, *errs. if err != nil { log.ErrorfWithRequestId(c, "[accounts.AccountCreateHandler] failed to get max display order for user \"uid:%d\", because %s", uid, err.Error()) - return nil, errs.ErrOperationFailed + return nil, errs.Or(err, errs.ErrOperationFailed) } mainAccount := a.createNewAccountModel(uid, &accountCreateReq, maxOrderId+1) @@ -233,7 +233,7 @@ func (a *AccountsApi) AccountModifyHandler(c *core.Context) (interface{}, *errs. if err != nil { log.ErrorfWithRequestId(c, "[accounts.AccountModifyHandler] failed to get account \"id:%d\" for user \"uid:%d\", because %s", accountModifyReq.Id, uid, err.Error()) - return nil, errs.ErrOperationFailed + return nil, errs.Or(err, errs.ErrOperationFailed) } accountMap := a.accounts.GetAccountMapByList(accountAndSubAccounts) diff --git a/pkg/api/data_managements.go b/pkg/api/data_managements.go index 740bcd8e..13f81030 100644 --- a/pkg/api/data_managements.go +++ b/pkg/api/data_managements.go @@ -147,21 +147,21 @@ func (a *DataManagementsApi) ClearDataHandler(c *core.Context) (interface{}, *er if err != nil { log.ErrorfWithRequestId(c, "[data_managements.ClearDataHandler] failed to delete all transactions, because %s", err.Error()) - return nil, errs.ErrOperationFailed + return nil, errs.Or(err, errs.ErrOperationFailed) } err = a.categories.DeleteAllCategories(uid) if err != nil { log.ErrorfWithRequestId(c, "[data_managements.ClearDataHandler] failed to delete all transaction categories, because %s", err.Error()) - return nil, errs.ErrOperationFailed + return nil, errs.Or(err, errs.ErrOperationFailed) } err = a.tags.DeleteAllTags(uid) if err != nil { log.ErrorfWithRequestId(c, "[data_managements.ClearDataHandler] failed to delete all transaction tags, because %s", err.Error()) - return nil, errs.ErrOperationFailed + return nil, errs.Or(err, errs.ErrOperationFailed) } log.InfofWithRequestId(c, "[data_managements.ClearDataHandler] user \"uid:%d\" has cleared all data", uid) diff --git a/pkg/api/tokens.go b/pkg/api/tokens.go index d02a578e..2e544931 100644 --- a/pkg/api/tokens.go +++ b/pkg/api/tokens.go @@ -32,7 +32,7 @@ func (a *TokensApi) TokenListHandler(c *core.Context) (interface{}, *errs.Error) if err != nil { log.ErrorfWithRequestId(c, "[tokens.TokenListHandler] failed to get all tokens for user \"uid:%d\", because %s", uid, err.Error()) - return nil, errs.ErrOperationFailed + return nil, errs.Or(err, errs.ErrOperationFailed) } tokenResps := make(models.TokenInfoResponseSlice, len(tokens)) @@ -145,7 +145,7 @@ func (a *TokensApi) TokenRevokeAllHandler(c *core.Context) (interface{}, *errs.E if err != nil { log.ErrorfWithRequestId(c, "[tokens.TokenRevokeAllHandler] failed to get all tokens for user \"uid:%d\", because %s", uid, err.Error()) - return nil, errs.ErrOperationFailed + return nil, errs.Or(err, errs.ErrOperationFailed) } claims := c.GetTokenClaims() diff --git a/pkg/api/transaction_categories.go b/pkg/api/transaction_categories.go index 450695c7..bcd8eb1d 100644 --- a/pkg/api/transaction_categories.go +++ b/pkg/api/transaction_categories.go @@ -37,7 +37,7 @@ func (a *TransactionCategoriesApi) CategoryListHandler(c *core.Context) (interfa if err != nil { log.ErrorfWithRequestId(c, "[transaction_categories.CategoryListHandler] failed to get categories for user \"uid:%d\", because %s", uid, err.Error()) - return nil, errs.ErrOperationFailed + return nil, errs.Or(err, errs.ErrOperationFailed) } return a.getTransactionCategoryListByTypeResponse(categories, categoryListReq.ParentId) @@ -58,7 +58,7 @@ func (a *TransactionCategoriesApi) CategoryGetHandler(c *core.Context) (interfac if err != nil { log.ErrorfWithRequestId(c, "[transaction_categories.CategoryGetHandler] failed to get category \"id:%d\" for user \"uid:%d\", because %s", categoryGetReq.Id, uid, err.Error()) - return nil, errs.ErrOperationFailed + return nil, errs.Or(err, errs.ErrOperationFailed) } categoryResp := category.ToTransactionCategoryInfoResponse() @@ -112,7 +112,7 @@ func (a *TransactionCategoriesApi) CategoryCreateHandler(c *core.Context) (inter if err != nil { log.ErrorfWithRequestId(c, "[transaction_categories.CategoryCreateHandler] failed to get max display order for user \"uid:%d\", because %s", uid, err.Error()) - return nil, errs.ErrOperationFailed + return nil, errs.Or(err, errs.ErrOperationFailed) } category := a.createNewCategoryModel(uid, &categoryCreateReq, maxOrderId+1) @@ -157,7 +157,7 @@ func (a *TransactionCategoriesApi) CategoryCreateBatchHandler(c *core.Context) ( if err != nil { log.ErrorfWithRequestId(c, "[transaction_categories.CategoryCreateBatchHandler] failed to get max display order for user \"uid:%d\", because %s", uid, err.Error()) - return nil, errs.ErrOperationFailed + return nil, errs.Or(err, errs.ErrOperationFailed) } } @@ -208,7 +208,7 @@ func (a *TransactionCategoriesApi) CategoryModifyHandler(c *core.Context) (inter if err != nil { log.ErrorfWithRequestId(c, "[transaction_categories.CategoryModifyHandler] failed to get category \"id:%d\" for user \"uid:%d\", because %s", categoryModifyReq.Id, uid, err.Error()) - return nil, errs.ErrOperationFailed + return nil, errs.Or(err, errs.ErrOperationFailed) } newCategory := &models.TransactionCategory{ diff --git a/pkg/api/transaction_tags.go b/pkg/api/transaction_tags.go index 99dc9b14..b4965dbc 100644 --- a/pkg/api/transaction_tags.go +++ b/pkg/api/transaction_tags.go @@ -29,7 +29,7 @@ func (a *TransactionTagsApi) TagListHandler(c *core.Context) (interface{}, *errs if err != nil { log.ErrorfWithRequestId(c, "[transaction_tags.TagListHandler] failed to get tags for user \"uid:%d\", because %s", uid, err.Error()) - return nil, errs.ErrOperationFailed + return nil, errs.Or(err, errs.ErrOperationFailed) } tagResps := make(models.TransactionTagInfoResponseSlice, len(tags)) @@ -58,7 +58,7 @@ func (a *TransactionTagsApi) TagGetHandler(c *core.Context) (interface{}, *errs. if err != nil { log.ErrorfWithRequestId(c, "[transaction_tags.TagGetHandler] failed to get tag \"id:%d\" for user \"uid:%d\", because %s", tagGetReq.Id, uid, err.Error()) - return nil, errs.ErrOperationFailed + return nil, errs.Or(err, errs.ErrOperationFailed) } tagResp := tag.ToTransactionTagInfoResponse() @@ -82,7 +82,7 @@ func (a *TransactionTagsApi) TagCreateHandler(c *core.Context) (interface{}, *er if err != nil { log.ErrorfWithRequestId(c, "[transaction_tags.TagCreateHandler] failed to get max display order for user \"uid:%d\", because %s", uid, err.Error()) - return nil, errs.ErrOperationFailed + return nil, errs.Or(err, errs.ErrOperationFailed) } tag := a.createNewTagModel(uid, &tagCreateReq, maxOrderId+1) @@ -116,7 +116,7 @@ func (a *TransactionTagsApi) TagModifyHandler(c *core.Context) (interface{}, *er if err != nil { log.ErrorfWithRequestId(c, "[transaction_tags.TagModifyHandler] failed to get tag \"id:%d\" for user \"uid:%d\", because %s", tagModifyReq.Id, uid, err.Error()) - return nil, errs.ErrOperationFailed + return nil, errs.Or(err, errs.ErrOperationFailed) } newTag := &models.TransactionTag{ diff --git a/pkg/api/transactions.go b/pkg/api/transactions.go index 6961329f..ab2ef1c0 100644 --- a/pkg/api/transactions.go +++ b/pkg/api/transactions.go @@ -50,14 +50,14 @@ func (a *TransactionsApi) TransactionCountHandler(c *core.Context) (interface{}, if err != nil { log.WarnfWithRequestId(c, "[transactions.TransactionCountHandler] get account error, because %s", err.Error()) - return nil, errs.ErrOperationFailed + return nil, errs.Or(err, errs.ErrOperationFailed) } allCategoryIds, err := a.getCategoryOrSubCategoryIds(transactionCountReq.CategoryId, uid) if err != nil { log.WarnfWithRequestId(c, "[transactions.TransactionCountHandler] get transaction category error, because %s", err.Error()) - return nil, errs.ErrOperationFailed + return nil, errs.Or(err, errs.ErrOperationFailed) } totalCount, err := a.transactions.GetTransactionCount(uid, transactionCountReq.MaxTime, transactionCountReq.MinTime, transactionCountReq.Type, allCategoryIds, allAccountIds, transactionCountReq.Keyword) @@ -101,21 +101,21 @@ func (a *TransactionsApi) TransactionListHandler(c *core.Context) (interface{}, if err != nil { log.WarnfWithRequestId(c, "[transactions.TransactionListHandler] get account error, because %s", err.Error()) - return nil, errs.ErrOperationFailed + return nil, errs.Or(err, errs.ErrOperationFailed) } allCategoryIds, err := a.getCategoryOrSubCategoryIds(transactionListReq.CategoryId, uid) if err != nil { log.WarnfWithRequestId(c, "[transactions.TransactionListHandler] get transaction category error, because %s", err.Error()) - return nil, errs.ErrOperationFailed + return nil, errs.Or(err, errs.ErrOperationFailed) } transactions, err := a.transactions.GetTransactionsByMaxTime(uid, transactionListReq.MaxTime, transactionListReq.MinTime, transactionListReq.Type, allCategoryIds, allAccountIds, transactionListReq.Keyword, transactionListReq.Count+1, true) if err != nil { log.ErrorfWithRequestId(c, "[transactions.TransactionListHandler] failed to get transactions earlier than \"%d\" for user \"uid:%d\", because %s", transactionListReq.MaxTime, uid, err.Error()) - return nil, errs.ErrOperationFailed + return nil, errs.Or(err, errs.ErrOperationFailed) } hasMore := false @@ -177,28 +177,28 @@ func (a *TransactionsApi) TransactionMonthListHandler(c *core.Context) (interfac if err != nil { log.WarnfWithRequestId(c, "[transactions.TransactionMonthListHandler] get account error, because %s", err.Error()) - return nil, errs.ErrOperationFailed + return nil, errs.Or(err, errs.ErrOperationFailed) } allCategoryIds, err := a.getCategoryOrSubCategoryIds(transactionListReq.CategoryId, uid) if err != nil { log.WarnfWithRequestId(c, "[transactions.TransactionMonthListHandler] get transaction category error, because %s", err.Error()) - return nil, errs.ErrOperationFailed + return nil, errs.Or(err, errs.ErrOperationFailed) } transactions, err := a.transactions.GetTransactionsInMonthByPage(uid, transactionListReq.Year, transactionListReq.Month, transactionListReq.Type, allCategoryIds, allAccountIds, transactionListReq.Keyword, transactionListReq.Page, transactionListReq.Count, utcOffset) if err != nil { log.ErrorfWithRequestId(c, "[transactions.TransactionMonthListHandler] failed to get transactions in month \"%d-%d\" for user \"uid:%d\", because %s", transactionListReq.Year, transactionListReq.Month, uid, err.Error()) - return nil, errs.ErrOperationFailed + return nil, errs.Or(err, errs.ErrOperationFailed) } totalCount, err := a.transactions.GetMonthTransactionCount(uid, transactionListReq.Year, transactionListReq.Month, transactionListReq.Type, allCategoryIds, allAccountIds, transactionListReq.Keyword, utcOffset) if err != nil { log.ErrorfWithRequestId(c, "[transactions.TransactionMonthListHandler] failed to get transaction count in month \"%d-%d\" for user \"uid:%d\", because %s", transactionListReq.Year, transactionListReq.Month, uid, err.Error()) - return nil, errs.ErrOperationFailed + return nil, errs.Or(err, errs.ErrOperationFailed) } transactionResult, err := a.getTransactionListResult(c, user, transactions, utcOffset, transactionListReq.TrimAccount, transactionListReq.TrimCategory, transactionListReq.TrimTag) @@ -282,7 +282,7 @@ func (a *TransactionsApi) TransactionAmountsHandler(c *core.Context) (interface{ if err != nil { log.ErrorfWithRequestId(c, "[transactions.TransactionAmountsHandler] failed to get all accounts for user \"uid:%d\", because %s", uid, err.Error()) - return nil, errs.ErrOperationFailed + return nil, errs.Or(err, errs.ErrOperationFailed) } amountsResp := make(map[string]*models.TransactionAmountsResponseItem) @@ -294,7 +294,7 @@ func (a *TransactionsApi) TransactionAmountsHandler(c *core.Context) (interface{ if err != nil { log.ErrorfWithRequestId(c, "[transactions.TransactionAmountsHandler] failed to get transaction amounts item for user \"uid:%d\", because %s", uid, err.Error()) - return nil, errs.ErrOperationFailed + return nil, errs.Or(err, errs.ErrOperationFailed) } amountsMap := make(map[string]*models.TransactionAmountsResponseItemAmountInfo) @@ -390,7 +390,7 @@ func (a *TransactionsApi) TransactionMonthAmountsHandler(c *core.Context) (inter if err != nil { log.ErrorfWithRequestId(c, "[transactions.TransactionMonthAmountsHandler] failed to get all accounts for user \"uid:%d\", because %s", uid, err.Error()) - return nil, errs.ErrOperationFailed + return nil, errs.Or(err, errs.ErrOperationFailed) } totalAmounts, err := a.transactions.GetAccountsMonthTotalIncomeAndExpense(uid, startTime, endTime, pageCountForLoadTransactionAmounts) @@ -497,7 +497,7 @@ func (a *TransactionsApi) TransactionGetHandler(c *core.Context) (interface{}, * if err != nil { log.ErrorfWithRequestId(c, "[transactions.TransactionGetHandler] failed to get transaction \"id:%d\" for user \"uid:%d\", because %s", transactionGetReq.Id, uid, err.Error()) - return nil, errs.ErrOperationFailed + return nil, errs.Or(err, errs.ErrOperationFailed) } if transaction.Type == models.TRANSACTION_DB_TYPE_TRANSFER_IN { @@ -530,7 +530,7 @@ func (a *TransactionsApi) TransactionGetHandler(c *core.Context) (interface{}, * if err != nil { log.ErrorfWithRequestId(c, "[transactions.TransactionGetHandler] failed to get transactions tag ids for user \"uid:%d\", because %s", uid, err.Error()) - return nil, errs.ErrOperationFailed + return nil, errs.Or(err, errs.ErrOperationFailed) } var category *models.TransactionCategory @@ -541,7 +541,7 @@ func (a *TransactionsApi) TransactionGetHandler(c *core.Context) (interface{}, * if err != nil { log.ErrorfWithRequestId(c, "[transactions.TransactionGetHandler] failed to get transactions category for user \"uid:%d\", because %s", uid, err.Error()) - return nil, errs.ErrOperationFailed + return nil, errs.Or(err, errs.ErrOperationFailed) } } @@ -550,7 +550,7 @@ func (a *TransactionsApi) TransactionGetHandler(c *core.Context) (interface{}, * if err != nil { log.ErrorfWithRequestId(c, "[transactions.TransactionGetHandler] failed to get transactions tags for user \"uid:%d\", because %s", uid, err.Error()) - return nil, errs.ErrOperationFailed + return nil, errs.Or(err, errs.ErrOperationFailed) } } @@ -697,7 +697,7 @@ func (a *TransactionsApi) TransactionModifyHandler(c *core.Context) (interface{} if err != nil { log.ErrorfWithRequestId(c, "[transactions.TransactionModifyHandler] failed to get transactions tag ids for user \"uid:%d\", because %s", uid, err.Error()) - return nil, errs.ErrOperationFailed + return nil, errs.Or(err, errs.ErrOperationFailed) } transactionTagIds := allTransactionTagIds[transaction.TransactionId]