A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.
feat(user): add user email duplication check
LinkinStar12180e475bf2
diff --git a/internal/repo/user/user_backyard_repo.go b/internal/repo/user/user_backyard_repo.goindex bffe18ac..9c050999 100644--- a/internal/repo/user/user_backyard_repo.go+++ b/internal/repo/user/user_backyard_repo.go@@ -89,6 +89,17 @@ func (ur *userBackyardRepo) GetUserInfo(ctx context.Context, userID string) (usereturn}+// GetUserInfoByEmail get user info+func (ur *userBackyardRepo) GetUserInfoByEmail(ctx context.Context, email string) (user *entity.User, exist bool, err error) {+ userInfo := &entity.User{}+ exist, err = ur.data.DB.Where("e_mail = ?", email).+ Where("status != ?", entity.UserStatusDeleted).Get(userInfo)+ if err != nil {+ err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()+ }+ return+}+// GetUserPage get user pagefunc (ur *userBackyardRepo) GetUserPage(ctx context.Context, page, pageSize int, user *entity.User,usernameOrDisplayName string, isStaff bool) (users []*entity.User, total int64, err error) {diff --git a/internal/repo/user/user_repo.go b/internal/repo/user/user_repo.goindex fb93c53c..e5a33314 100644--- a/internal/repo/user/user_repo.go+++ b/internal/repo/user/user_repo.go@@ -151,7 +151,8 @@ func (ur *userRepo) GetByUsername(ctx context.Context, username string) (userInf// GetByEmail get user by emailfunc (ur *userRepo) GetByEmail(ctx context.Context, email string) (userInfo *entity.User, exist bool, err error) {userInfo = &entity.User{}- exist, err = ur.data.DB.Where("e_mail = ?", email).Get(userInfo)+ exist, err = ur.data.DB.Where("e_mail = ?", email).+ Where("status != ?", entity.UserStatusDeleted).Get(userInfo)if err != nil {err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()}diff --git a/internal/service/user_backyard/user_backyard.go b/internal/service/user_backyard/user_backyard.goindex 84907501..a00198b1 100644--- a/internal/service/user_backyard/user_backyard.go+++ b/internal/service/user_backyard/user_backyard.go@@ -25,6 +25,7 @@ import (type UserBackyardRepo interface {UpdateUserStatus(ctx context.Context, userID string, userStatus, mailStatus int, email string) (err error)GetUserInfo(ctx context.Context, userID string) (user *entity.User, exist bool, err error)+ GetUserInfoByEmail(ctx context.Context, email string) (user *entity.User, exist bool, err error)GetUserPage(ctx context.Context, page, pageSize int, user *entity.User,usernameOrDisplayName string, isStaff bool) (users []*entity.User, total int64, err error)AddUser(ctx context.Context, user *entity.User) (err error)@@ -103,6 +104,14 @@ func (us *UserBackyardService) UpdateUserRole(ctx context.Context, req *schema.U// AddUser add userfunc (us *UserBackyardService) AddUser(ctx context.Context, req *schema.AddUserReq) (err error) {+ _, has, err := us.userRepo.GetUserInfoByEmail(ctx, req.Email)+ if err != nil {+ return err+ }+ if has {+ return errors.BadRequest(reason.EmailDuplicate)+ }+hashPwd, err := bcrypt.GenerateFromPassword([]byte(req.Password), bcrypt.DefaultCost)if err != nil {return err