From 8273e06e431414e3bf74e53e0c7191fc8b2eba28 Mon Sep 17 00:00:00 2001
From: MaysWind <i@mayswind.net>
Date: Mon, 29 Jul 2024 23:08:04 +0800
Subject: [PATCH] code refactor

---
 pkg/models/user.go | 28 +++-------------------------
 1 file changed, 3 insertions(+), 25 deletions(-)

diff --git a/pkg/models/user.go b/pkg/models/user.go
index 380ee3ea..078d8fc0 100644
--- a/pkg/models/user.go
+++ b/pkg/models/user.go
@@ -204,7 +204,7 @@ type UserProfileUpdateResponse struct {
 
 // UserProfileResponse represents a view-object of user profile
 type UserProfileResponse struct {
-	UserBasicInfo
+	*UserBasicInfo
 	LastLoginAt int64 `json:"lastLoginAt"`
 }
 
@@ -280,30 +280,8 @@ func (u *User) ToUserBasicInfo() *UserBasicInfo {
 // ToUserProfileResponse returns a user profile view-object according to database model
 func (u *User) ToUserProfileResponse() *UserProfileResponse {
 	return &UserProfileResponse{
-		UserBasicInfo: UserBasicInfo{
-			Username:             u.Username,
-			Email:                u.Email,
-			Nickname:             u.Nickname,
-			AvatarUrl:            u.getAvatarUrl(),
-			AvatarProvider:       u.getAvatarProvider(),
-			DefaultAccountId:     u.DefaultAccountId,
-			TransactionEditScope: u.TransactionEditScope,
-			Language:             u.Language,
-			DefaultCurrency:      u.DefaultCurrency,
-			FirstDayOfWeek:       u.FirstDayOfWeek,
-			LongDateFormat:       u.LongDateFormat,
-			ShortDateFormat:      u.ShortDateFormat,
-			LongTimeFormat:       u.LongTimeFormat,
-			ShortTimeFormat:      u.ShortTimeFormat,
-			DecimalSeparator:     u.DecimalSeparator,
-			DigitGroupingSymbol:  u.DigitGroupingSymbol,
-			DigitGrouping:        u.DigitGrouping,
-			CurrencyDisplayType:  u.CurrencyDisplayType,
-			ExpenseAmountColor:   u.ExpenseAmountColor,
-			IncomeAmountColor:    u.IncomeAmountColor,
-			EmailVerified:        u.EmailVerified,
-		},
-		LastLoginAt: u.LastLoginUnixTime,
+		UserBasicInfo: u.ToUserBasicInfo(),
+		LastLoginAt:   u.LastLoginUnixTime,
 	}
 }