p90524618
/
answer
mirror of https://gitee.com/answerdev/answer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update userinfo show user set avatar

This commit is contained in:
aichy126 2022-10-28 15:43:37 +08:00
parent 9b6a35d88b
commit 5ecac4dda3
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
internal/schema/user_schema.go
View File

@ -82,6 +82,27 @@ func (r *GetUserResp) GetFromUserEntity(userInfo *entity.User) {
} }
} }
type GetUserToSetShowResp struct {
*GetUserResp
Avatar *AvatarInfo `json:"avatar"`
}
func (r *GetUserToSetShowResp) GetFromUserEntity(userInfo *entity.User) {
_ = copier.Copy(r, userInfo)
r.CreatedAt = userInfo.CreatedAt.Unix()
r.LastLoginDate = userInfo.LastLoginDate.Unix()
statusShow, ok := UserStatusShow[userInfo.Status]
if ok {
r.Status = statusShow
}
AvatarInfo := &AvatarInfo{}
err := json.Unmarshal([]byte(userInfo.Avatar), AvatarInfo)
if err != nil {
log.Error("AvatarInfo json.Unmarshal Error", err)
}
r.Avatar = AvatarInfo
}
func (us *GetUserResp) AvatarInfo(avatarJson string) string { func (us *GetUserResp) AvatarInfo(avatarJson string) string {
if avatarJson == "" { if avatarJson == "" {
return "" return ""

4
internal/service/user_service.go
View File

@ -51,7 +51,7 @@ func NewUserService(userRepo usercommon.UserRepo,
} }
// GetUserInfoByUserID get user info by user id // GetUserInfoByUserID get user info by user id
func (us *UserService) GetUserInfoByUserID(ctx context.Context, token, userID string) (resp *schema.GetUserResp, err error) { func (us *UserService) GetUserInfoByUserID(ctx context.Context, token, userID string) (resp *schema.GetUserToSetShowResp, err error) {
userInfo, exist, err := us.userRepo.GetByUserID(ctx, userID) userInfo, exist, err := us.userRepo.GetByUserID(ctx, userID)
if err != nil { if err != nil {
return nil, err return nil, err
@ -59,7 +59,7 @@ func (us *UserService) GetUserInfoByUserID(ctx context.Context, token, userID st
if !exist { if !exist {
return nil, errors.BadRequest(reason.UserNotFound) return nil, errors.BadRequest(reason.UserNotFound)
} }
resp = &schema.GetUserResp{} resp = &schema.GetUserToSetShowResp{}
resp.GetFromUserEntity(userInfo) resp.GetFromUserEntity(userInfo)
resp.AccessToken = token resp.AccessToken = token
return resp, nil return resp, nil