fix: 用户信息更新返回类型与关注建表缺陷

updateMeLogic 更新后重新查询并返回 User 类型,修复 converter 转换
空响应的错误。proto_string 不再丢弃含空格的字符串。userfollows
ent schema 补上 created_at 的 Default(time.Now)。
This commit is contained in:
zetaloop
2026-04-05 17:04:48 +08:00
parent 4625363d5a
commit de32143b6d
5 changed files with 49 additions and 7 deletions
@@ -10,11 +10,13 @@ import (
"juwan-backend/common/converter"
"juwan-backend/common/utils/contextj"
"strings"
"time"
"juwan-backend/app/users/api/internal/svc"
"juwan-backend/app/users/api/internal/types"
"github.com/zeromicro/go-zero/core/logx"
"k8s.io/apimachinery/pkg/util/json"
)
type UpdateMeLogic struct {
@@ -32,12 +34,12 @@ func NewUpdateMeLogic(ctx context.Context, svcCtx *svc.ServiceContext) *UpdateMe
}
}
func (l *UpdateMeLogic) UpdateMe(req *types.UpdateUserProfileReq) (resp *types.UpdateUserProfileReq, err error) {
func (l *UpdateMeLogic) UpdateMe(req *types.UpdateUserProfileReq) (resp *types.User, err error) {
userId, err := contextj.UserIDFrom(l.ctx)
if err != nil {
return nil, err
}
res, err := l.svcCtx.UserRpc.UpdateUsers(l.ctx, &usercenter.UpdateUsersReq{
_, err = l.svcCtx.UserRpc.UpdateUsers(l.ctx, &usercenter.UpdateUsersReq{
Id: userId,
Nickname: proto_string(req.Nickname),
Avatar: proto_string(req.Avatar),
@@ -47,16 +49,35 @@ func (l *UpdateMeLogic) UpdateMe(req *types.UpdateUserProfileReq) (resp *types.U
if err != nil {
return nil, errors.New("update info failed")
}
err = converter.StructToStruct(res, &resp)
user, err := l.svcCtx.UserRpc.GetUsersById(l.ctx, &usercenter.GetUsersByIdReq{
Id: userId,
})
if err != nil {
logx.Errorf("unmarshal user info failed, err:%v.", err)
return nil, errors.New("unmarshal user info failed")
logx.Errorf("UpdateMeLogic.GetUsersById err: %v", err)
return nil, errors.New("get user failed")
}
resp = &types.User{}
err = converter.StructToStruct(user.Users, resp)
if err != nil {
logx.Errorf("struct to user info failed, err:%v.", err)
return nil, errors.New("get user failed")
}
var verificationStatus map[string]string
err = json.Unmarshal([]byte(user.Users.VerificationStatus), &verificationStatus)
if err != nil {
logx.Errorf("json.Unmarshal err: %v", err)
}
resp.VerifiedRoles = user.Users.VerifiedRoles
resp.VerificationStatus = verificationStatus
resp.Role = user.Users.CurrentRole
resp.CreatedAt = time.Unix(user.Users.CreatedAt, 0).Format(time.DateTime)
return
}
func proto_string(s string) *string {
if len(s) == 0 || strings.Contains(s, " ") {
if strings.TrimSpace(s) == "" {
return nil
}
return &s