From 9b6a35d88bc13561d2de598190e064f3184b071b Mon Sep 17 00:00:00 2001
From: aichy126 <16996097+aichy126@users.noreply.github.com>
Date: Fri, 28 Oct 2022 15:21:23 +0800
Subject: [PATCH] update set user avatar

---
 i18n/en_US.yaml                  | 2 ++
 i18n/zh_CN.yaml                  | 2 ++
 internal/base/reason/reason.go   | 1 +
 internal/schema/user_schema.go   | 6 +++---
 internal/service/user_service.go | 3 ++-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index 2d08b02a..cc863635 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -86,6 +86,8 @@ error:
       other: "username is invalid"
     username_duplicate:
       other: "username is already in use"
+    set_avatar:
+      other: "avatar set failure"
 
 report:
   spam:
diff --git a/i18n/zh_CN.yaml b/i18n/zh_CN.yaml
index 15c95126..7d76cc06 100644
--- a/i18n/zh_CN.yaml
+++ b/i18n/zh_CN.yaml
@@ -86,6 +86,8 @@ error:
       other: "用户名无效"
     username_duplicate:
       other: "用户名已被使用"
+    set_avatar:
+      other: "头像设置错误"
 
 report:
   spam:
diff --git a/internal/base/reason/reason.go b/internal/base/reason/reason.go
index fb64cd78..f9fd7a66 100644
--- a/internal/base/reason/reason.go
+++ b/internal/base/reason/reason.go
@@ -26,6 +26,7 @@ const (
 	UserNotFound                 = "error.user.not_found"
 	UsernameInvalid              = "error.user.username_invalid"
 	UsernameDuplicate            = "error.user.username_duplicate"
+	UserSetAvatar                = "error.user.set_avatar"
 	EmailDuplicate               = "error.email.duplicate"
 	EmailVerifyUrlExpired        = "error.email.verify_url_expired"
 	EmailNeedToBeVerified        = "error.email.need_to_be_verified"
diff --git a/internal/schema/user_schema.go b/internal/schema/user_schema.go
index aff28858..951e18b1 100644
--- a/internal/schema/user_schema.go
+++ b/internal/schema/user_schema.go
@@ -82,12 +82,12 @@ func (r *GetUserResp) GetFromUserEntity(userInfo *entity.User) {
 	}
 }
 
-func (us *GetUserResp) AvatarInfo(AvatarJson string) string {
-	if AvatarJson == "" {
+func (us *GetUserResp) AvatarInfo(avatarJson string) string {
+	if avatarJson == "" {
 		return ""
 	}
 	AvatarInfo := &AvatarInfo{}
-	err := json.Unmarshal([]byte(AvatarJson), AvatarInfo)
+	err := json.Unmarshal([]byte(avatarJson), AvatarInfo)
 	if err != nil {
 		log.Error("AvatarInfo json.Unmarshal Error", err)
 		return ""
diff --git a/internal/service/user_service.go b/internal/service/user_service.go
index 580d8bda..7af14d55 100644
--- a/internal/service/user_service.go
+++ b/internal/service/user_service.go
@@ -258,6 +258,7 @@ func (us *UserService) UpdateInfo(ctx context.Context, req *schema.UpdateInfoReq
 	}
 	Avatar, err := json.Marshal(req.Avatar)
 	if err != nil {
+		err = errors.BadRequest(reason.UserSetAvatar).WithError(err).WithStack()
 		return err
 	}
 	userInfo := entity.User{}
@@ -548,7 +549,7 @@ func (us *UserService) UserChangeEmailVerify(ctx context.Context, content string
 	}
 	err = us.userRepo.UpdateEmail(ctx, data.UserID, data.Email)
 	if err != nil {
-		return err
+		return errors.BadRequest(reason.UserNotFound)
 	}
 	return nil
 }