diff --git a/pkg/api/accounts.go b/pkg/api/accounts.go index 4832fa51..4b60bbbc 100644 --- a/pkg/api/accounts.go +++ b/pkg/api/accounts.go @@ -24,7 +24,7 @@ var ( ) // AccountListHandler returns accounts list of current user -func (a *AccountsApi) AccountListHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *AccountsApi) AccountListHandler(c *core.Context) (any, *errs.Error) { var accountListReq models.AccountListRequest err := c.ShouldBindQuery(&accountListReq) @@ -84,7 +84,7 @@ func (a *AccountsApi) AccountListHandler(c *core.Context) (interface{}, *errs.Er } // AccountGetHandler returns one specific account of current user -func (a *AccountsApi) AccountGetHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *AccountsApi) AccountGetHandler(c *core.Context) (any, *errs.Error) { var accountGetReq models.AccountGetRequest err := c.ShouldBindQuery(&accountGetReq) @@ -127,7 +127,7 @@ func (a *AccountsApi) AccountGetHandler(c *core.Context) (interface{}, *errs.Err } // AccountCreateHandler saves a new account by request parameters for current user -func (a *AccountsApi) AccountCreateHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *AccountsApi) AccountCreateHandler(c *core.Context) (any, *errs.Error) { var accountCreateReq models.AccountCreateRequest err := c.ShouldBindJSON(&accountCreateReq) @@ -226,7 +226,7 @@ func (a *AccountsApi) AccountCreateHandler(c *core.Context) (interface{}, *errs. } // AccountModifyHandler saves an existed account by request parameters for current user -func (a *AccountsApi) AccountModifyHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *AccountsApi) AccountModifyHandler(c *core.Context) (any, *errs.Error) { var accountModifyReq models.AccountModifyRequest err := c.ShouldBindJSON(&accountModifyReq) @@ -332,7 +332,7 @@ func (a *AccountsApi) AccountModifyHandler(c *core.Context) (interface{}, *errs. } // AccountHideHandler hides an existed account by request parameters for current user -func (a *AccountsApi) AccountHideHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *AccountsApi) AccountHideHandler(c *core.Context) (any, *errs.Error) { var accountHideReq models.AccountHideRequest err := c.ShouldBindJSON(&accountHideReq) @@ -354,7 +354,7 @@ func (a *AccountsApi) AccountHideHandler(c *core.Context) (interface{}, *errs.Er } // AccountMoveHandler moves display order of existed accounts by request parameters for current user -func (a *AccountsApi) AccountMoveHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *AccountsApi) AccountMoveHandler(c *core.Context) (any, *errs.Error) { var accountMoveReq models.AccountMoveRequest err := c.ShouldBindJSON(&accountMoveReq) @@ -389,7 +389,7 @@ func (a *AccountsApi) AccountMoveHandler(c *core.Context) (interface{}, *errs.Er } // AccountDeleteHandler deletes an existed account by request parameters for current user -func (a *AccountsApi) AccountDeleteHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *AccountsApi) AccountDeleteHandler(c *core.Context) (any, *errs.Error) { var accountDeleteReq models.AccountDeleteRequest err := c.ShouldBindJSON(&accountDeleteReq) diff --git a/pkg/api/authorizations.go b/pkg/api/authorizations.go index 2f517346..94a8d99c 100644 --- a/pkg/api/authorizations.go +++ b/pkg/api/authorizations.go @@ -28,7 +28,7 @@ var ( ) // AuthorizeHandler verifies and authorizes current login request -func (a *AuthorizationsApi) AuthorizeHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *AuthorizationsApi) AuthorizeHandler(c *core.Context) (any, *errs.Error) { var credential models.UserLoginRequest err := c.ShouldBindJSON(&credential) @@ -109,7 +109,7 @@ func (a *AuthorizationsApi) AuthorizeHandler(c *core.Context) (interface{}, *err } // TwoFactorAuthorizeHandler verifies and authorizes current 2fa login by passcode -func (a *AuthorizationsApi) TwoFactorAuthorizeHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *AuthorizationsApi) TwoFactorAuthorizeHandler(c *core.Context) (any, *errs.Error) { var credential models.TwoFactorLoginRequest err := c.ShouldBindJSON(&credential) @@ -172,7 +172,7 @@ func (a *AuthorizationsApi) TwoFactorAuthorizeHandler(c *core.Context) (interfac } // TwoFactorAuthorizeByRecoveryCodeHandler verifies and authorizes current 2fa login by recovery code -func (a *AuthorizationsApi) TwoFactorAuthorizeByRecoveryCodeHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *AuthorizationsApi) TwoFactorAuthorizeByRecoveryCodeHandler(c *core.Context) (any, *errs.Error) { var credential models.TwoFactorRecoveryCodeLoginRequest err := c.ShouldBindJSON(&credential) diff --git a/pkg/api/data_managements.go b/pkg/api/data_managements.go index b8b42788..a69948ae 100644 --- a/pkg/api/data_managements.go +++ b/pkg/api/data_managements.go @@ -119,7 +119,7 @@ func (a *DataManagementsApi) ExportDataHandler(c *core.Context) ([]byte, string, } // DataStatisticsHandler returns user data statistics -func (a *DataManagementsApi) DataStatisticsHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *DataManagementsApi) DataStatisticsHandler(c *core.Context) (any, *errs.Error) { uid := c.GetCurrentUid() totalAccountCount, err := a.accounts.GetTotalAccountCountByUid(c, uid) @@ -160,7 +160,7 @@ func (a *DataManagementsApi) DataStatisticsHandler(c *core.Context) (interface{} } // ClearDataHandler deletes all user data -func (a *DataManagementsApi) ClearDataHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *DataManagementsApi) ClearDataHandler(c *core.Context) (any, *errs.Error) { var clearDataReq models.ClearDataRequest err := c.ShouldBindJSON(&clearDataReq) diff --git a/pkg/api/default.go b/pkg/api/default.go index 66d73d10..a48038d7 100644 --- a/pkg/api/default.go +++ b/pkg/api/default.go @@ -14,11 +14,11 @@ var ( ) // ApiNotFound returns api not found error -func (a *DefaultApi) ApiNotFound(c *core.Context) (interface{}, *errs.Error) { +func (a *DefaultApi) ApiNotFound(c *core.Context) (any, *errs.Error) { return nil, errs.ErrApiNotFound } // MethodNotAllowed returns method not allowed error -func (a *DefaultApi) MethodNotAllowed(c *core.Context) (interface{}, *errs.Error) { +func (a *DefaultApi) MethodNotAllowed(c *core.Context) (any, *errs.Error) { return nil, errs.ErrMethodNotAllowed } diff --git a/pkg/api/exchange_rates.go b/pkg/api/exchange_rates.go index 049115a0..1550c838 100644 --- a/pkg/api/exchange_rates.go +++ b/pkg/api/exchange_rates.go @@ -24,7 +24,7 @@ var ( ) // LatestExchangeRateHandler returns latest exchange rate data -func (a *ExchangeRatesApi) LatestExchangeRateHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *ExchangeRatesApi) LatestExchangeRateHandler(c *core.Context) (any, *errs.Error) { dataSource := exchangerates.Container.Current if dataSource == nil { diff --git a/pkg/api/forget_passwords.go b/pkg/api/forget_passwords.go index f3899420..777dc4ff 100644 --- a/pkg/api/forget_passwords.go +++ b/pkg/api/forget_passwords.go @@ -28,7 +28,7 @@ var ( ) // UserForgetPasswordRequestHandler generates password reset link and send user an email with this link -func (a *ForgetPasswordsApi) UserForgetPasswordRequestHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *ForgetPasswordsApi) UserForgetPasswordRequestHandler(c *core.Context) (any, *errs.Error) { var request models.ForgetPasswordRequest err := c.ShouldBindJSON(&request) @@ -80,7 +80,7 @@ func (a *ForgetPasswordsApi) UserForgetPasswordRequestHandler(c *core.Context) ( } // UserResetPasswordHandler resets user password by request parameters -func (a *ForgetPasswordsApi) UserResetPasswordHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *ForgetPasswordsApi) UserResetPasswordHandler(c *core.Context) (any, *errs.Error) { var request models.PasswordResetRequest err := c.ShouldBindJSON(&request) diff --git a/pkg/api/healths.go b/pkg/api/healths.go index cd64c6e5..f7d54b76 100644 --- a/pkg/api/healths.go +++ b/pkg/api/healths.go @@ -15,7 +15,7 @@ var ( ) // HealthStatusHandler returns the health status of current service -func (a *HealthsApi) HealthStatusHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *HealthsApi) HealthStatusHandler(c *core.Context) (any, *errs.Error) { result := make(map[string]string) result["version"] = settings.Version diff --git a/pkg/api/tokens.go b/pkg/api/tokens.go index fc294fa7..cc850f31 100644 --- a/pkg/api/tokens.go +++ b/pkg/api/tokens.go @@ -26,7 +26,7 @@ var ( ) // TokenListHandler returns available token list of current user -func (a *TokensApi) TokenListHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *TokensApi) TokenListHandler(c *core.Context) (any, *errs.Error) { uid := c.GetCurrentUid() tokens, err := a.tokens.GetAllUnexpiredNormalTokensByUid(c, uid) @@ -61,7 +61,7 @@ func (a *TokensApi) TokenListHandler(c *core.Context) (interface{}, *errs.Error) } // TokenRevokeCurrentHandler revokes current token of current user -func (a *TokensApi) TokenRevokeCurrentHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *TokensApi) TokenRevokeCurrentHandler(c *core.Context) (any, *errs.Error) { _, claims, err := a.tokens.ParseTokenByHeader(c) if err != nil { @@ -94,7 +94,7 @@ func (a *TokensApi) TokenRevokeCurrentHandler(c *core.Context) (interface{}, *er } // TokenRevokeHandler revokes specific token of current user -func (a *TokensApi) TokenRevokeHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *TokensApi) TokenRevokeHandler(c *core.Context) (any, *errs.Error) { var tokenRevokeReq models.TokenRevokeRequest err := c.ShouldBindJSON(&tokenRevokeReq) @@ -132,7 +132,7 @@ func (a *TokensApi) TokenRevokeHandler(c *core.Context) (interface{}, *errs.Erro } // TokenRevokeAllHandler revokes all tokens of current user except current token -func (a *TokensApi) TokenRevokeAllHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *TokensApi) TokenRevokeAllHandler(c *core.Context) (any, *errs.Error) { uid := c.GetCurrentUid() tokens, err := a.tokens.GetAllTokensByUid(c, uid) @@ -167,7 +167,7 @@ func (a *TokensApi) TokenRevokeAllHandler(c *core.Context) (interface{}, *errs.E } // TokenRefreshHandler refresh current token of current user -func (a *TokensApi) TokenRefreshHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *TokensApi) TokenRefreshHandler(c *core.Context) (any, *errs.Error) { uid := c.GetCurrentUid() user, err := a.users.GetUserById(c, uid) diff --git a/pkg/api/transaction_categories.go b/pkg/api/transaction_categories.go index c7cc9f79..2d1ca547 100644 --- a/pkg/api/transaction_categories.go +++ b/pkg/api/transaction_categories.go @@ -25,7 +25,7 @@ var ( ) // CategoryListHandler returns transaction category list of current user -func (a *TransactionCategoriesApi) CategoryListHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *TransactionCategoriesApi) CategoryListHandler(c *core.Context) (any, *errs.Error) { var categoryListReq models.TransactionCategoryListRequest err := c.ShouldBindQuery(&categoryListReq) @@ -46,7 +46,7 @@ func (a *TransactionCategoriesApi) CategoryListHandler(c *core.Context) (interfa } // CategoryGetHandler returns one specific transaction category of current user -func (a *TransactionCategoriesApi) CategoryGetHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *TransactionCategoriesApi) CategoryGetHandler(c *core.Context) (any, *errs.Error) { var categoryGetReq models.TransactionCategoryGetRequest err := c.ShouldBindQuery(&categoryGetReq) @@ -69,7 +69,7 @@ func (a *TransactionCategoriesApi) CategoryGetHandler(c *core.Context) (interfac } // CategoryCreateHandler saves a new transaction category by request parameters for current user -func (a *TransactionCategoriesApi) CategoryCreateHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *TransactionCategoriesApi) CategoryCreateHandler(c *core.Context) (any, *errs.Error) { var categoryCreateReq models.TransactionCategoryCreateRequest err := c.ShouldBindJSON(&categoryCreateReq) @@ -134,7 +134,7 @@ func (a *TransactionCategoriesApi) CategoryCreateHandler(c *core.Context) (inter } // CategoryCreateBatchHandler saves some new transaction category by request parameters for current user -func (a *TransactionCategoriesApi) CategoryCreateBatchHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *TransactionCategoriesApi) CategoryCreateBatchHandler(c *core.Context) (any, *errs.Error) { var categoryCreateBatchReq models.TransactionCategoryCreateBatchRequest err := c.ShouldBindBodyWith(&categoryCreateBatchReq, binding.JSON) @@ -155,7 +155,7 @@ func (a *TransactionCategoriesApi) CategoryCreateBatchHandler(c *core.Context) ( } // CategoryModifyHandler saves an existed transaction category by request parameters for current user -func (a *TransactionCategoriesApi) CategoryModifyHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *TransactionCategoriesApi) CategoryModifyHandler(c *core.Context) (any, *errs.Error) { var categoryModifyReq models.TransactionCategoryModifyRequest err := c.ShouldBindJSON(&categoryModifyReq) @@ -208,7 +208,7 @@ func (a *TransactionCategoriesApi) CategoryModifyHandler(c *core.Context) (inter } // CategoryHideHandler hides an existed transaction category by request parameters for current user -func (a *TransactionCategoriesApi) CategoryHideHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *TransactionCategoriesApi) CategoryHideHandler(c *core.Context) (any, *errs.Error) { var categoryHideReq models.TransactionCategoryHideRequest err := c.ShouldBindJSON(&categoryHideReq) @@ -230,7 +230,7 @@ func (a *TransactionCategoriesApi) CategoryHideHandler(c *core.Context) (interfa } // CategoryMoveHandler moves display order of existed transaction categories by request parameters for current user -func (a *TransactionCategoriesApi) CategoryMoveHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *TransactionCategoriesApi) CategoryMoveHandler(c *core.Context) (any, *errs.Error) { var categoryMoveReq models.TransactionCategoryMoveRequest err := c.ShouldBindJSON(&categoryMoveReq) @@ -265,7 +265,7 @@ func (a *TransactionCategoriesApi) CategoryMoveHandler(c *core.Context) (interfa } // CategoryDeleteHandler deletes an existed transaction category by request parameters for current user -func (a *TransactionCategoriesApi) CategoryDeleteHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *TransactionCategoriesApi) CategoryDeleteHandler(c *core.Context) (any, *errs.Error) { var categoryDeleteReq models.TransactionCategoryDeleteRequest err := c.ShouldBindJSON(&categoryDeleteReq) diff --git a/pkg/api/transaction_tags.go b/pkg/api/transaction_tags.go index ebe6c2d3..fb1595c8 100644 --- a/pkg/api/transaction_tags.go +++ b/pkg/api/transaction_tags.go @@ -23,7 +23,7 @@ var ( ) // TagListHandler returns transaction tag list of current user -func (a *TransactionTagsApi) TagListHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *TransactionTagsApi) TagListHandler(c *core.Context) (any, *errs.Error) { uid := c.GetCurrentUid() tags, err := a.tags.GetAllTagsByUid(c, uid) @@ -44,7 +44,7 @@ func (a *TransactionTagsApi) TagListHandler(c *core.Context) (interface{}, *errs } // TagGetHandler returns one specific transaction tag of current user -func (a *TransactionTagsApi) TagGetHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *TransactionTagsApi) TagGetHandler(c *core.Context) (any, *errs.Error) { var tagGetReq models.TransactionTagGetRequest err := c.ShouldBindQuery(&tagGetReq) @@ -67,7 +67,7 @@ func (a *TransactionTagsApi) TagGetHandler(c *core.Context) (interface{}, *errs. } // TagCreateHandler saves a new transaction tag by request parameters for current user -func (a *TransactionTagsApi) TagCreateHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *TransactionTagsApi) TagCreateHandler(c *core.Context) (any, *errs.Error) { var tagCreateReq models.TransactionTagCreateRequest err := c.ShouldBindJSON(&tagCreateReq) @@ -102,7 +102,7 @@ func (a *TransactionTagsApi) TagCreateHandler(c *core.Context) (interface{}, *er } // TagModifyHandler saves an existed transaction tag by request parameters for current user -func (a *TransactionTagsApi) TagModifyHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *TransactionTagsApi) TagModifyHandler(c *core.Context) (any, *errs.Error) { var tagModifyReq models.TransactionTagModifyRequest err := c.ShouldBindJSON(&tagModifyReq) @@ -145,7 +145,7 @@ func (a *TransactionTagsApi) TagModifyHandler(c *core.Context) (interface{}, *er } // TagHideHandler hides an transaction tag by request parameters for current user -func (a *TransactionTagsApi) TagHideHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *TransactionTagsApi) TagHideHandler(c *core.Context) (any, *errs.Error) { var tagHideReq models.TransactionTagHideRequest err := c.ShouldBindJSON(&tagHideReq) @@ -167,7 +167,7 @@ func (a *TransactionTagsApi) TagHideHandler(c *core.Context) (interface{}, *errs } // TagMoveHandler moves display order of existed transaction tags by request parameters for current user -func (a *TransactionTagsApi) TagMoveHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *TransactionTagsApi) TagMoveHandler(c *core.Context) (any, *errs.Error) { var tagMoveReq models.TransactionTagMoveRequest err := c.ShouldBindJSON(&tagMoveReq) @@ -202,7 +202,7 @@ func (a *TransactionTagsApi) TagMoveHandler(c *core.Context) (interface{}, *errs } // TagDeleteHandler deletes an existed transaction tag by request parameters for current user -func (a *TransactionTagsApi) TagDeleteHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *TransactionTagsApi) TagDeleteHandler(c *core.Context) (any, *errs.Error) { var tagDeleteReq models.TransactionTagDeleteRequest err := c.ShouldBindJSON(&tagDeleteReq) diff --git a/pkg/api/transactions.go b/pkg/api/transactions.go index e579fb2e..283ab9e7 100644 --- a/pkg/api/transactions.go +++ b/pkg/api/transactions.go @@ -37,7 +37,7 @@ var ( ) // TransactionCountHandler returns transaction total count of current user -func (a *TransactionsApi) TransactionCountHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *TransactionsApi) TransactionCountHandler(c *core.Context) (any, *errs.Error) { var transactionCountReq models.TransactionCountRequest err := c.ShouldBindQuery(&transactionCountReq) @@ -77,7 +77,7 @@ func (a *TransactionsApi) TransactionCountHandler(c *core.Context) (interface{}, } // TransactionListHandler returns transaction list of current user -func (a *TransactionsApi) TransactionListHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *TransactionsApi) TransactionListHandler(c *core.Context) (any, *errs.Error) { var transactionListReq models.TransactionListByMaxTimeRequest err := c.ShouldBindQuery(&transactionListReq) @@ -168,7 +168,7 @@ func (a *TransactionsApi) TransactionListHandler(c *core.Context) (interface{}, } // TransactionMonthListHandler returns all transaction list of current user by month -func (a *TransactionsApi) TransactionMonthListHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *TransactionsApi) TransactionMonthListHandler(c *core.Context) (any, *errs.Error) { var transactionListReq models.TransactionListInMonthByPageRequest err := c.ShouldBindQuery(&transactionListReq) @@ -232,7 +232,7 @@ func (a *TransactionsApi) TransactionMonthListHandler(c *core.Context) (interfac } // TransactionStatisticsHandler returns transaction statistics of current user -func (a *TransactionsApi) TransactionStatisticsHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *TransactionsApi) TransactionStatisticsHandler(c *core.Context) (any, *errs.Error) { var statisticReq models.TransactionStatisticRequest err := c.ShouldBindQuery(&statisticReq) @@ -269,7 +269,7 @@ func (a *TransactionsApi) TransactionStatisticsHandler(c *core.Context) (interfa } // TransactionAmountsHandler returns transaction amounts of current user -func (a *TransactionsApi) TransactionAmountsHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *TransactionsApi) TransactionAmountsHandler(c *core.Context) (any, *errs.Error) { var transactionAmountsReq models.TransactionAmountsRequest err := c.ShouldBindQuery(&transactionAmountsReq) @@ -382,7 +382,7 @@ func (a *TransactionsApi) TransactionAmountsHandler(c *core.Context) (interface{ } // TransactionMonthAmountsHandler returns every month transaction amounts of current user -func (a *TransactionsApi) TransactionMonthAmountsHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *TransactionsApi) TransactionMonthAmountsHandler(c *core.Context) (any, *errs.Error) { var transactionAmountsReq models.TransactionMonthAmountsRequest err := c.ShouldBindQuery(&transactionAmountsReq) @@ -496,7 +496,7 @@ func (a *TransactionsApi) TransactionMonthAmountsHandler(c *core.Context) (inter } // TransactionGetHandler returns one specific transaction of current user -func (a *TransactionsApi) TransactionGetHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *TransactionsApi) TransactionGetHandler(c *core.Context) (any, *errs.Error) { var transactionGetReq models.TransactionGetRequest err := c.ShouldBindQuery(&transactionGetReq) @@ -612,7 +612,7 @@ func (a *TransactionsApi) TransactionGetHandler(c *core.Context) (interface{}, * } // TransactionCreateHandler saves a new transaction by request parameters for current user -func (a *TransactionsApi) TransactionCreateHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *TransactionsApi) TransactionCreateHandler(c *core.Context) (any, *errs.Error) { var transactionCreateReq models.TransactionCreateRequest err := c.ShouldBindJSON(&transactionCreateReq) @@ -684,7 +684,7 @@ func (a *TransactionsApi) TransactionCreateHandler(c *core.Context) (interface{} } // TransactionModifyHandler saves an existed transaction by request parameters for current user -func (a *TransactionsApi) TransactionModifyHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *TransactionsApi) TransactionModifyHandler(c *core.Context) (any, *errs.Error) { var transactionModifyReq models.TransactionModifyRequest err := c.ShouldBindJSON(&transactionModifyReq) @@ -804,7 +804,7 @@ func (a *TransactionsApi) TransactionModifyHandler(c *core.Context) (interface{} } // TransactionDeleteHandler deletes an existed transaction by request parameters for current user -func (a *TransactionsApi) TransactionDeleteHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *TransactionsApi) TransactionDeleteHandler(c *core.Context) (any, *errs.Error) { var transactionDeleteReq models.TransactionDeleteRequest err := c.ShouldBindJSON(&transactionDeleteReq) diff --git a/pkg/api/twofactor_authorizations.go b/pkg/api/twofactor_authorizations.go index 3fa8e9c1..c85558f6 100644 --- a/pkg/api/twofactor_authorizations.go +++ b/pkg/api/twofactor_authorizations.go @@ -32,7 +32,7 @@ var ( ) // TwoFactorStatusHandler returns 2fa status of current user -func (a *TwoFactorAuthorizationsApi) TwoFactorStatusHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *TwoFactorAuthorizationsApi) TwoFactorStatusHandler(c *core.Context) (any, *errs.Error) { uid := c.GetCurrentUid() twoFactorSetting, err := a.twoFactorAuthorizations.GetUserTwoFactorSettingByUid(c, uid) @@ -58,7 +58,7 @@ func (a *TwoFactorAuthorizationsApi) TwoFactorStatusHandler(c *core.Context) (in } // TwoFactorEnableRequestHandler returns a new 2fa secret and qr code for current user to set 2fa and verify passcode next -func (a *TwoFactorAuthorizationsApi) TwoFactorEnableRequestHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *TwoFactorAuthorizationsApi) TwoFactorEnableRequestHandler(c *core.Context) (any, *errs.Error) { uid := c.GetCurrentUid() enabled, err := a.twoFactorAuthorizations.ExistsTwoFactorSetting(c, uid) @@ -110,7 +110,7 @@ func (a *TwoFactorAuthorizationsApi) TwoFactorEnableRequestHandler(c *core.Conte } // TwoFactorEnableConfirmHandler enables 2fa for current user -func (a *TwoFactorAuthorizationsApi) TwoFactorEnableConfirmHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *TwoFactorAuthorizationsApi) TwoFactorEnableConfirmHandler(c *core.Context) (any, *errs.Error) { var confirmReq models.TwoFactorEnableConfirmRequest err := c.ShouldBindJSON(&confirmReq) @@ -209,7 +209,7 @@ func (a *TwoFactorAuthorizationsApi) TwoFactorEnableConfirmHandler(c *core.Conte } // TwoFactorDisableHandler disables 2fa for current user -func (a *TwoFactorAuthorizationsApi) TwoFactorDisableHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *TwoFactorAuthorizationsApi) TwoFactorDisableHandler(c *core.Context) (any, *errs.Error) { var disableReq models.TwoFactorDisableRequest err := c.ShouldBindJSON(&disableReq) @@ -264,7 +264,7 @@ func (a *TwoFactorAuthorizationsApi) TwoFactorDisableHandler(c *core.Context) (i } // TwoFactorRecoveryCodeRegenerateHandler returns new 2fa recovery codes and revokes old recovery codes for current user -func (a *TwoFactorAuthorizationsApi) TwoFactorRecoveryCodeRegenerateHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *TwoFactorAuthorizationsApi) TwoFactorRecoveryCodeRegenerateHandler(c *core.Context) (any, *errs.Error) { var regenerateReq models.TwoFactorRegenerateRecoveryCodeRequest err := c.ShouldBindJSON(®enerateReq) diff --git a/pkg/api/users.go b/pkg/api/users.go index 347aa090..2285f311 100644 --- a/pkg/api/users.go +++ b/pkg/api/users.go @@ -32,7 +32,7 @@ var ( ) // UserRegisterHandler saves a new user by request parameters -func (a *UsersApi) UserRegisterHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *UsersApi) UserRegisterHandler(c *core.Context) (any, *errs.Error) { if !settings.Container.Current.EnableUserRegister { return nil, errs.ErrUserRegistrationNotAllowed } @@ -130,7 +130,7 @@ func (a *UsersApi) UserRegisterHandler(c *core.Context) (interface{}, *errs.Erro } // UserEmailVerifyHandler sets user email address verified -func (a *UsersApi) UserEmailVerifyHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *UsersApi) UserEmailVerifyHandler(c *core.Context) (any, *errs.Error) { var userVerifyEmailReq models.UserVerifyEmailRequest err := c.ShouldBindJSON(&userVerifyEmailReq) @@ -192,7 +192,7 @@ func (a *UsersApi) UserEmailVerifyHandler(c *core.Context) (interface{}, *errs.E } // UserProfileHandler returns user profile of current user -func (a *UsersApi) UserProfileHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *UsersApi) UserProfileHandler(c *core.Context) (any, *errs.Error) { uid := c.GetCurrentUid() user, err := a.users.GetUserById(c, uid) @@ -209,7 +209,7 @@ func (a *UsersApi) UserProfileHandler(c *core.Context) (interface{}, *errs.Error } // UserUpdateProfileHandler saves user profile by request parameters for current user -func (a *UsersApi) UserUpdateProfileHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *UsersApi) UserUpdateProfileHandler(c *core.Context) (any, *errs.Error) { var userUpdateReq models.UserProfileUpdateRequest err := c.ShouldBindJSON(&userUpdateReq) @@ -409,7 +409,7 @@ func (a *UsersApi) UserUpdateProfileHandler(c *core.Context) (interface{}, *errs } // UserSendVerifyEmailByUnloginUserHandler sends unlogin user verify email -func (a *UsersApi) UserSendVerifyEmailByUnloginUserHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *UsersApi) UserSendVerifyEmailByUnloginUserHandler(c *core.Context) (any, *errs.Error) { if !settings.Container.Current.EnableUserVerifyEmail { return nil, errs.ErrEmailValidationNotAllowed } @@ -465,7 +465,7 @@ func (a *UsersApi) UserSendVerifyEmailByUnloginUserHandler(c *core.Context) (int } // UserSendVerifyEmailByLoginedUserHandler sends logined user verify email -func (a *UsersApi) UserSendVerifyEmailByLoginedUserHandler(c *core.Context) (interface{}, *errs.Error) { +func (a *UsersApi) UserSendVerifyEmailByLoginedUserHandler(c *core.Context) (any, *errs.Error) { if !settings.Container.Current.EnableUserVerifyEmail { return nil, errs.ErrEmailValidationNotAllowed } diff --git a/pkg/core/handler.go b/pkg/core/handler.go index 9a88140a..69268f27 100644 --- a/pkg/core/handler.go +++ b/pkg/core/handler.go @@ -10,7 +10,7 @@ import ( type MiddlewareHandlerFunc func(*Context) // ApiHandlerFunc represents the api handler function -type ApiHandlerFunc func(*Context) (interface{}, *errs.Error) +type ApiHandlerFunc func(*Context) (any, *errs.Error) // DataHandlerFunc represents the handler function that returns byte array type DataHandlerFunc func(*Context) ([]byte, string, *errs.Error) diff --git a/pkg/datastore/datastore.go b/pkg/datastore/datastore.go index 1b3832ac..adfa412f 100644 --- a/pkg/datastore/datastore.go +++ b/pkg/datastore/datastore.go @@ -28,7 +28,7 @@ func (s *DataStore) DoTransaction(key int64, c *core.Context, fn func(sess *xorm } // SyncStructs updates database structs by database models -func (s *DataStore) SyncStructs(beans ...interface{}) error { +func (s *DataStore) SyncStructs(beans ...any) error { var err error for i := 0; i < len(s.databases); i++ { diff --git a/pkg/datastore/query_log.go b/pkg/datastore/query_log.go index cee670b4..4137cf8a 100644 --- a/pkg/datastore/query_log.go +++ b/pkg/datastore/query_log.go @@ -14,42 +14,42 @@ type XOrmLoggerAdapter struct { } // Debug logs debug log -func (logger XOrmLoggerAdapter) Debug(v ...interface{}) { +func (logger XOrmLoggerAdapter) Debug(v ...any) { log.SqlQuery(v...) } // Debugf logs debug log with custom format -func (logger XOrmLoggerAdapter) Debugf(format string, v ...interface{}) { +func (logger XOrmLoggerAdapter) Debugf(format string, v ...any) { log.SqlQueryf(format, v...) } // Info logs info log -func (logger XOrmLoggerAdapter) Info(v ...interface{}) { +func (logger XOrmLoggerAdapter) Info(v ...any) { log.SqlQuery(v...) } // Infof logs info log with custom format -func (logger XOrmLoggerAdapter) Infof(format string, v ...interface{}) { +func (logger XOrmLoggerAdapter) Infof(format string, v ...any) { log.SqlQueryf(format, v...) } // Warn logs warn log -func (logger XOrmLoggerAdapter) Warn(v ...interface{}) { +func (logger XOrmLoggerAdapter) Warn(v ...any) { log.SqlQuery(v...) } // Warnf logs warn log with custom format -func (logger XOrmLoggerAdapter) Warnf(format string, v ...interface{}) { +func (logger XOrmLoggerAdapter) Warnf(format string, v ...any) { log.SqlQueryf(format, v...) } // Error logs error log -func (logger XOrmLoggerAdapter) Error(v ...interface{}) { +func (logger XOrmLoggerAdapter) Error(v ...any) { log.SqlQuery(v...) } // Errorf logs error log with custom format -func (logger XOrmLoggerAdapter) Errorf(format string, v ...interface{}) { +func (logger XOrmLoggerAdapter) Errorf(format string, v ...any) { log.SqlQueryf(format, v...) } diff --git a/pkg/errs/error.go b/pkg/errs/error.go index 11c546c0..292c431e 100644 --- a/pkg/errs/error.go +++ b/pkg/errs/error.go @@ -38,7 +38,7 @@ type Error struct { HttpStatusCode int Message string BaseError []error - Context interface{} + Context any } // Error returns the error message @@ -83,7 +83,7 @@ func NewIncompleteOrIncorrectSubmissionError(err error) *Error { } // NewErrorWithContext returns a new error instance with specified context -func NewErrorWithContext(baseError *Error, context interface{}) *Error { +func NewErrorWithContext(baseError *Error, context any) *Error { return &Error{ Category: baseError.Category, SubCategory: baseError.SubCategory, diff --git a/pkg/exchangerates/bank_of_canada_datasource.go b/pkg/exchangerates/bank_of_canada_datasource.go index e67ea8f7..09fd014f 100644 --- a/pkg/exchangerates/bank_of_canada_datasource.go +++ b/pkg/exchangerates/bank_of_canada_datasource.go @@ -33,7 +33,7 @@ type BankOfCanadaExchangeRateData struct { } // BankOfCanadaObservationData represents the observation data from bank of Canada -type BankOfCanadaObservationData map[string]interface{} +type BankOfCanadaObservationData map[string]any // ToLatestExchangeRateResponse returns a view-object according to original data from bank of Canada func (e *BankOfCanadaExchangeRateData) ToLatestExchangeRateResponse(c *core.Context) *models.LatestExchangeRateResponse { @@ -62,7 +62,7 @@ func (e *BankOfCanadaExchangeRateData) ToLatestExchangeRateResponse(c *core.Cont currencyCode := utils.SubString(typeName, 2, 3) - if data, ok := exchangeRateData.(map[string]interface{}); ok { + if data, ok := exchangeRateData.(map[string]any); ok { exchangeRate := data["v"] if exchangeRateValue, ok2 := exchangeRate.(string); ok2 { diff --git a/pkg/log/logger.go b/pkg/log/logger.go index 02bcbaba..990e82eb 100644 --- a/pkg/log/logger.go +++ b/pkg/log/logger.go @@ -99,93 +99,93 @@ func SetLoggerConfiguration(config *settings.Config, isDisableBootLog bool) erro } // Debugf logs debug log with custom format -func Debugf(format string, args ...interface{}) { +func Debugf(format string, args ...any) { defaultLogger.Debug(getFinalLog(format, args...)) } // DebugfWithRequestId logs debug log with custom format and request id -func DebugfWithRequestId(c *core.Context, format string, args ...interface{}) { +func DebugfWithRequestId(c *core.Context, format string, args ...any) { defaultLogger.WithField(logFieldRequestId, c.GetRequestId()).Debug(getFinalLog(format, args...)) } // Infof logs info log with custom format -func Infof(format string, args ...interface{}) { +func Infof(format string, args ...any) { defaultLogger.Info(getFinalLog(format, args...)) } // InfofWithRequestId logs info log with custom format and request id -func InfofWithRequestId(c *core.Context, format string, args ...interface{}) { +func InfofWithRequestId(c *core.Context, format string, args ...any) { defaultLogger.WithField(logFieldRequestId, c.GetRequestId()).Info(getFinalLog(format, args...)) } // Warnf logs warn log with custom format -func Warnf(format string, args ...interface{}) { +func Warnf(format string, args ...any) { defaultLogger.Warn(getFinalLog(format, args...)) } // WarnfWithRequestId logs warn log with custom format and request id -func WarnfWithRequestId(c *core.Context, format string, args ...interface{}) { +func WarnfWithRequestId(c *core.Context, format string, args ...any) { defaultLogger.WithField(logFieldRequestId, c.GetRequestId()).Warn(getFinalLog(format, args...)) } // Errorf logs error log with custom format -func Errorf(format string, args ...interface{}) { +func Errorf(format string, args ...any) { defaultLogger.Error(getFinalLog(format, args...)) } // ErrorfWithRequestId logs error log with custom format and request id -func ErrorfWithRequestId(c *core.Context, format string, args ...interface{}) { +func ErrorfWithRequestId(c *core.Context, format string, args ...any) { defaultLogger.WithField(logFieldRequestId, c.GetRequestId()).Error(getFinalLog(format, args...)) } // ErrorfWithRequestIdAndExtra logs error log with custom format and request id and extra info -func ErrorfWithRequestIdAndExtra(c *core.Context, extraString string, format string, args ...interface{}) { +func ErrorfWithRequestIdAndExtra(c *core.Context, extraString string, format string, args ...any) { defaultLogger.WithField(logFieldRequestId, c.GetRequestId()).WithField(logFieldExtra, extraString).Error(getFinalLog(format, args...)) } // BootInfof logs boot info log -func BootInfof(format string, args ...interface{}) { +func BootInfof(format string, args ...any) { if bootLogger != nil { bootLogger.Info(getFinalLog(format, args...)) } } // BootWarnf logs boot warn log -func BootWarnf(format string, args ...interface{}) { +func BootWarnf(format string, args ...any) { if bootLogger != nil { bootLogger.Warn(getFinalLog(format, args...)) } } // BootErrorf logs boot error log -func BootErrorf(format string, args ...interface{}) { +func BootErrorf(format string, args ...any) { if bootLogger != nil { bootLogger.Error(getFinalLog(format, args...)) } } // Requestf logs http request log with custom format -func Requestf(c *core.Context, format string, args ...interface{}) { +func Requestf(c *core.Context, format string, args ...any) { if requestLogger != nil { requestLogger.WithField(logFieldRequestId, c.GetRequestId()).Info(getFinalLog(format, args...)) } } // SqlQuery logs sql query log -func SqlQuery(args ...interface{}) { +func SqlQuery(args ...any) { if sqlQueryLogger != nil { sqlQueryLogger.Info(args...) } } // SqlQueryf logs sql query log with custom format -func SqlQueryf(format string, args ...interface{}) { +func SqlQueryf(format string, args ...any) { if sqlQueryLogger != nil { sqlQueryLogger.Info(getFinalLog(format, args...)) } } -func getFinalLog(format string, args ...interface{}) string { +func getFinalLog(format string, args ...any) string { result := fmt.Sprintf(format, args...) result = strings.Replace(result, "\n", " ", -1) diff --git a/pkg/services/forget_passwords.go b/pkg/services/forget_passwords.go index 36658366..9480ed89 100644 --- a/pkg/services/forget_passwords.go +++ b/pkg/services/forget_passwords.go @@ -58,9 +58,9 @@ func (s *ForgetPasswordService) SendPasswordResetEmail(c *core.Context, user *mo return err } - templateParams := map[string]interface{}{ + templateParams := map[string]any{ "AppName": s.CurrentConfig().AppName, - "ForgetPasswordMail": map[string]interface{}{ + "ForgetPasswordMail": map[string]any{ "Title": forgetPasswordTextItems.Title, "Salutation": fmt.Sprintf(forgetPasswordTextItems.SalutationFormat, user.Nickname), "DescriptionAboveBtn": forgetPasswordTextItems.DescriptionAboveBtn, diff --git a/pkg/services/tokens.go b/pkg/services/tokens.go index b17e57b2..3b162cb1 100644 --- a/pkg/services/tokens.go +++ b/pkg/services/tokens.go @@ -237,7 +237,7 @@ func (s *TokenService) parseToken(c *core.Context, extractor request.Extractor) claims := &core.UserTokenClaims{} token, err := request.ParseFromRequest(c.Request, extractor, - func(token *jwt.Token) (interface{}, error) { + func(token *jwt.Token) (any, error) { now := time.Now().Unix() userTokenId, err := utils.StringToInt64(claims.UserTokenId) diff --git a/pkg/services/transaction_categories.go b/pkg/services/transaction_categories.go index ac6b273b..a215998c 100644 --- a/pkg/services/transaction_categories.go +++ b/pkg/services/transaction_categories.go @@ -48,7 +48,7 @@ func (s *TransactionCategoryService) GetAllCategoriesByUid(c *core.Context, uid } condition := "uid=? AND deleted=?" - conditionParams := make([]interface{}, 0, 8) + conditionParams := make([]any, 0, 8) conditionParams = append(conditionParams, uid) conditionParams = append(conditionParams, false) diff --git a/pkg/services/transactions.go b/pkg/services/transactions.go index e3f5d03e..73cf6010 100644 --- a/pkg/services/transactions.go +++ b/pkg/services/transactions.go @@ -1115,7 +1115,7 @@ func (s *TransactionService) GetAccountsAndCategoriesTotalIncomeAndExpense(c *co } condition := "uid=? AND deleted=? AND (type=? OR type=?)" - conditionParams := make([]interface{}, 0, 8) + conditionParams := make([]any, 0, 8) conditionParams = append(conditionParams, uid) conditionParams = append(conditionParams, false) conditionParams = append(conditionParams, models.TRANSACTION_DB_TYPE_INCOME) @@ -1153,9 +1153,9 @@ func (s *TransactionService) GetTransactionMapByList(transactions []*models.Tran return transactionMap } -func (s *TransactionService) getTransactionQueryCondition(uid int64, maxTransactionTime int64, minTransactionTime int64, transactionType models.TransactionDbType, categoryIds []int64, accountIds []int64, keyword string, noDuplicated bool) (string, []interface{}) { +func (s *TransactionService) getTransactionQueryCondition(uid int64, maxTransactionTime int64, minTransactionTime int64, transactionType models.TransactionDbType, categoryIds []int64, accountIds []int64, keyword string, noDuplicated bool) (string, []any) { condition := "uid=? AND deleted=?" - conditionParams := make([]interface{}, 0, 16) + conditionParams := make([]any, 0, 16) conditionParams = append(conditionParams, uid) conditionParams = append(conditionParams, false) diff --git a/pkg/services/users.go b/pkg/services/users.go index 0354b76d..44105310 100644 --- a/pkg/services/users.go +++ b/pkg/services/users.go @@ -439,9 +439,9 @@ func (s *UserService) SendVerifyEmail(user *models.User, verifyEmailToken string return err } - templateParams := map[string]interface{}{ + templateParams := map[string]any{ "AppName": s.CurrentConfig().AppName, - "VerifyEmail": map[string]interface{}{ + "VerifyEmail": map[string]any{ "Title": verifyEmailTextItems.Title, "Salutation": fmt.Sprintf(verifyEmailTextItems.SalutationFormat, user.Nickname), "DescriptionAboveBtn": verifyEmailTextItems.DescriptionAboveBtn, diff --git a/pkg/utils/api.go b/pkg/utils/api.go index d884d036..9492357b 100644 --- a/pkg/utils/api.go +++ b/pkg/utils/api.go @@ -12,7 +12,7 @@ import ( ) // PrintJsonSuccessResult writes success response in json format to current http context -func PrintJsonSuccessResult(c *core.Context, result interface{}) { +func PrintJsonSuccessResult(c *core.Context, result any) { c.JSON(http.StatusOK, gin.H{ "success": true, "result": result, diff --git a/pkg/utils/object.go b/pkg/utils/object.go index 0bcef62e..0959e5f9 100644 --- a/pkg/utils/object.go +++ b/pkg/utils/object.go @@ -8,7 +8,7 @@ import ( ) // Clone deep-clones src object to dst object -func Clone(src, dst interface{}) error { +func Clone(src, dst any) error { var buf bytes.Buffer if err := gob.NewEncoder(&buf).Encode(src); err != nil { @@ -25,7 +25,7 @@ func Clone(src, dst interface{}) error { } // PrintObjectFields prints all fields in specified object -func PrintObjectFields(obj interface{}) { +func PrintObjectFields(obj any) { if obj == nil { return }