zhengchen.tao/ezbookkeeping
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

code refactor

Browse Source
This commit is contained in:
MaysWind
2024-07-14 18:07:13 +08:00
parent 55249e07a3
commit 46a7cd441f
1 changed files with 26 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/models/user.go
+26 -44
View File
@@ -203,28 +203,8 @@ type UserProfileUpdateResponse struct {
// UserProfileResponse represents a view-object of user profile // UserProfileResponse represents a view-object of user profile
type UserProfileResponse struct { type UserProfileResponse struct {
Username string `json:"username"` UserBasicInfo
Email string `json:"email"` LastLoginAt int64 `json:"lastLoginAt"`
Nickname string `json:"nickname"`
AvatarUrl string `json:"avatar"`
AvatarProvider string `json:"avatarProvider,omitempty"`
DefaultAccountId int64 `json:"defaultAccountId,string"`
TransactionEditScope TransactionEditScope `json:"transactionEditScope"`
Language string `json:"language"`
DefaultCurrency string `json:"defaultCurrency"`
FirstDayOfWeek WeekDay `json:"firstDayOfWeek"`
LongDateFormat LongDateFormat `json:"longDateFormat"`
ShortDateFormat ShortDateFormat `json:"shortDateFormat"`
LongTimeFormat LongTimeFormat `json:"longTimeFormat"`
ShortTimeFormat ShortTimeFormat `json:"shortTimeFormat"`
DecimalSeparator DecimalSeparator `json:"decimalSeparator"`
DigitGroupingSymbol DigitGroupingSymbol `json:"digitGroupingSymbol"`
DigitGrouping DigitGroupingType `json:"digitGrouping"`
CurrencyDisplayType CurrencyDisplayType `json:"currencyDisplayType"`
ExpenseAmountColor AmountColorType `json:"expenseAmountColor"`
IncomeAmountColor AmountColorType `json:"incomeAmountColor"`
EmailVerified bool `json:"emailVerified"`
LastLoginAt int64 `json:"lastLoginAt"`
} }
// CanEditTransactionByTransactionTime returns whether this user can edit transaction with specified transaction time // CanEditTransactionByTransactionTime returns whether this user can edit transaction with specified transaction time
@@ -299,28 +279,30 @@ func (u *User) ToUserBasicInfo() *UserBasicInfo {
// ToUserProfileResponse returns a user profile view-object according to database model // ToUserProfileResponse returns a user profile view-object according to database model
func (u *User) ToUserProfileResponse() *UserProfileResponse { func (u *User) ToUserProfileResponse() *UserProfileResponse {
return &UserProfileResponse{ return &UserProfileResponse{
Username: u.Username, UserBasicInfo: UserBasicInfo{
Email: u.Email, Username: u.Username,
Nickname: u.Nickname, Email: u.Email,
AvatarUrl: u.getAvatarUrl(), Nickname: u.Nickname,
AvatarProvider: u.getAvatarProvider(), AvatarUrl: u.getAvatarUrl(),
DefaultAccountId: u.DefaultAccountId, AvatarProvider: u.getAvatarProvider(),
TransactionEditScope: u.TransactionEditScope, DefaultAccountId: u.DefaultAccountId,
Language: u.Language, TransactionEditScope: u.TransactionEditScope,
DefaultCurrency: u.DefaultCurrency, Language: u.Language,
FirstDayOfWeek: u.FirstDayOfWeek, DefaultCurrency: u.DefaultCurrency,
LongDateFormat: u.LongDateFormat, FirstDayOfWeek: u.FirstDayOfWeek,
ShortDateFormat: u.ShortDateFormat, LongDateFormat: u.LongDateFormat,
LongTimeFormat: u.LongTimeFormat, ShortDateFormat: u.ShortDateFormat,
ShortTimeFormat: u.ShortTimeFormat, LongTimeFormat: u.LongTimeFormat,
DecimalSeparator: u.DecimalSeparator, ShortTimeFormat: u.ShortTimeFormat,
DigitGroupingSymbol: u.DigitGroupingSymbol, DecimalSeparator: u.DecimalSeparator,
DigitGrouping: u.DigitGrouping, DigitGroupingSymbol: u.DigitGroupingSymbol,
CurrencyDisplayType: u.CurrencyDisplayType, DigitGrouping: u.DigitGrouping,
ExpenseAmountColor: u.ExpenseAmountColor, CurrencyDisplayType: u.CurrencyDisplayType,
IncomeAmountColor: u.IncomeAmountColor, ExpenseAmountColor: u.ExpenseAmountColor,
EmailVerified: u.EmailVerified, IncomeAmountColor: u.IncomeAmountColor,
LastLoginAt: u.LastLoginUnixTime, EmailVerified: u.EmailVerified,
},
LastLoginAt: u.LastLoginUnixTime,
} }
} }