From dfe1b853d1841564c7406b98df7854ff9a027bd9 Mon Sep 17 00:00:00 2001 From: MaysWind Date: Mon, 2 Sep 2024 23:36:54 +0800 Subject: [PATCH] code refactor --- pkg/api/users.go | 2 +- pkg/{models => core}/currency.go | 2 +- pkg/models/user.go | 6 +++--- pkg/services/users.go | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) rename pkg/{models => core}/currency.go (99%) diff --git a/pkg/api/users.go b/pkg/api/users.go index f1a79811..0ed76fbc 100644 --- a/pkg/api/users.go +++ b/pkg/api/users.go @@ -394,7 +394,7 @@ func (a *UsersApi) UserUpdateProfileHandler(c *core.WebContext) (any, *errs.Erro userNew.CurrencyDisplayType = *userUpdateReq.CurrencyDisplayType anythingUpdate = true } else { - userNew.CurrencyDisplayType = models.CURRENCY_DISPLAY_TYPE_INVALID + userNew.CurrencyDisplayType = core.CURRENCY_DISPLAY_TYPE_INVALID } if userUpdateReq.ExpenseAmountColor != nil && *userUpdateReq.ExpenseAmountColor != user.ExpenseAmountColor { diff --git a/pkg/models/currency.go b/pkg/core/currency.go similarity index 99% rename from pkg/models/currency.go rename to pkg/core/currency.go index f78828bf..7351c1db 100644 --- a/pkg/models/currency.go +++ b/pkg/core/currency.go @@ -1,4 +1,4 @@ -package models +package core import "fmt" diff --git a/pkg/models/user.go b/pkg/models/user.go index 423657e6..fdd7ea04 100644 --- a/pkg/models/user.go +++ b/pkg/models/user.go @@ -101,7 +101,7 @@ type User struct { DecimalSeparator core.DecimalSeparator `xorm:"TINYINT"` DigitGroupingSymbol core.DigitGroupingSymbol `xorm:"TINYINT"` DigitGrouping core.DigitGroupingType `xorm:"TINYINT"` - CurrencyDisplayType CurrencyDisplayType `xorm:"TINYINT"` + CurrencyDisplayType core.CurrencyDisplayType `xorm:"TINYINT"` ExpenseAmountColor AmountColorType `xorm:"TINYINT"` IncomeAmountColor AmountColorType `xorm:"TINYINT"` Disabled bool @@ -132,7 +132,7 @@ type UserBasicInfo struct { DecimalSeparator core.DecimalSeparator `json:"decimalSeparator"` DigitGroupingSymbol core.DigitGroupingSymbol `json:"digitGroupingSymbol"` DigitGrouping core.DigitGroupingType `json:"digitGrouping"` - CurrencyDisplayType CurrencyDisplayType `json:"currencyDisplayType"` + CurrencyDisplayType core.CurrencyDisplayType `json:"currencyDisplayType"` ExpenseAmountColor AmountColorType `json:"expenseAmountColor"` IncomeAmountColor AmountColorType `json:"incomeAmountColor"` EmailVerified bool `json:"emailVerified"` @@ -192,7 +192,7 @@ type UserProfileUpdateRequest struct { DecimalSeparator *core.DecimalSeparator `json:"decimalSeparator" binding:"omitempty,min=0,max=3"` DigitGroupingSymbol *core.DigitGroupingSymbol `json:"digitGroupingSymbol" binding:"omitempty,min=0,max=4"` DigitGrouping *core.DigitGroupingType `json:"digitGrouping" binding:"omitempty,min=0,max=2"` - CurrencyDisplayType *CurrencyDisplayType `json:"currencyDisplayType" binding:"omitempty,min=0,max=11"` + CurrencyDisplayType *core.CurrencyDisplayType `json:"currencyDisplayType" binding:"omitempty,min=0,max=11"` ExpenseAmountColor *AmountColorType `json:"expenseAmountColor" binding:"omitempty,min=0,max=4"` IncomeAmountColor *AmountColorType `json:"incomeAmountColor" binding:"omitempty,min=0,max=4"` } diff --git a/pkg/services/users.go b/pkg/services/users.go index e30ee795..091a4cae 100644 --- a/pkg/services/users.go +++ b/pkg/services/users.go @@ -313,7 +313,7 @@ func (s *UserService) UpdateUser(c core.Context, user *models.User, modifyUserLa updateCols = append(updateCols, "digit_grouping") } - if models.CURRENCY_DISPLAY_TYPE_DEFAULT <= user.CurrencyDisplayType && user.CurrencyDisplayType <= models.CURRENCY_DISPLAY_TYPE_NAME_AFTER_AMOUNT { + if core.CURRENCY_DISPLAY_TYPE_DEFAULT <= user.CurrencyDisplayType && user.CurrencyDisplayType <= core.CURRENCY_DISPLAY_TYPE_NAME_AFTER_AMOUNT { updateCols = append(updateCols, "currency_display_type") }