Merge branch 'dev' into test

apache · Dec 9, 2024 · 1aed48a · 1aed48a
2 parents 21655f6 + 2cc7b33
commit 1aed48a
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 6 deletions.
diff --git a/cmd/wire_gen.go b/cmd/wire_gen.go
diff --git a/docs/docs.go b/docs/docs.go
@@ -7831,7 +7831,7 @@ const docTemplate = `{
                 "display_name": {
                     "type": "string",
                     "maxLength": 30,
-                    "minLength": 4
+                    "minLength": 2
                 },
                 "email": {
                     "type": "string",

diff --git a/docs/swagger.json b/docs/swagger.json
@@ -7804,7 +7804,7 @@
                 "display_name": {
                     "type": "string",
                     "maxLength": 30,
-                    "minLength": 4
+                    "minLength": 2
                 },
                 "email": {
                     "type": "string",

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
@@ -270,7 +270,7 @@ definitions:
     properties:
       display_name:
         maxLength: 30
-        minLength: 4
+        minLength: 2
         type: string
       email:
         maxLength: 500

diff --git a/internal/repo/user_external_login/user_external_login_repo.go b/internal/repo/user_external_login/user_external_login_repo.go
@@ -104,6 +104,16 @@ func (ur *userExternalLoginRepo) DeleteUserExternalLogin(ctx context.Context, us
 	return
 }
 
+// DeleteUserExternalLoginByUserID delete external user login info by user ID
+func (ur *userExternalLoginRepo) DeleteUserExternalLoginByUserID(ctx context.Context, userID string) (err error) {
+	cond := &entity.UserExternalLogin{}
+	_, err = ur.data.DB.Context(ctx).Where("user_id = ?", userID).Delete(cond)
+	if err != nil {
+		err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()
+	}
+	return
+}
+
 // SetCacheUserExternalLoginInfo cache user info for external login
 func (ur *userExternalLoginRepo) SetCacheUserExternalLoginInfo(
 	ctx context.Context, key string, info *schema.ExternalLoginUserInfoCache) (err error) {

diff --git a/internal/schema/backyard_user_schema.go b/internal/schema/backyard_user_schema.go
@@ -120,7 +120,7 @@ type EditUserProfileReq struct {
 
 // AddUserReq add user request
 type AddUserReq struct {
-	DisplayName string `validate:"required,gte=4,lte=30" json:"display_name"`
+	DisplayName string `validate:"required,gte=2,lte=30" json:"display_name"`
 	Email       string `validate:"required,email,gt=0,lte=500" json:"email"`
 	Password    string `validate:"required,gte=8,lte=32" json:"password"`
 	LoginUserID string `json:"-"`

diff --git a/internal/service/user_admin/user_backyard.go b/internal/service/user_admin/user_backyard.go
@@ -45,6 +45,7 @@ import (
 	"github.com/apache/incubator-answer/internal/service/role"
 	"github.com/apache/incubator-answer/internal/service/siteinfo_common"
 	usercommon "github.com/apache/incubator-answer/internal/service/user_common"
+	"github.com/apache/incubator-answer/internal/service/user_external_login"
 	"github.com/apache/incubator-answer/pkg/checker"
 	"github.com/jinzhu/copier"
 	"github.com/segmentfault/pacman/errors"
@@ -76,6 +77,7 @@ type UserAdminService struct {
 	questionCommonRepo    questioncommon.QuestionRepo
 	answerCommonRepo      answercommon.AnswerRepo
 	commentCommonRepo     comment_common.CommentCommonRepo
+	userExternalLoginRepo user_external_login.UserExternalLoginRepo
 }
 
 // NewUserAdminService new user admin service
@@ -90,6 +92,7 @@ func NewUserAdminService(
 	questionCommonRepo questioncommon.QuestionRepo,
 	answerCommonRepo answercommon.AnswerRepo,
 	commentCommonRepo comment_common.CommentCommonRepo,
+	userExternalLoginRepo user_external_login.UserExternalLoginRepo,
 ) *UserAdminService {
 	return &UserAdminService{
 		userRepo:              userRepo,
@@ -102,6 +105,7 @@ func NewUserAdminService(
 		questionCommonRepo:    questionCommonRepo,
 		answerCommonRepo:      answerCommonRepo,
 		commentCommonRepo:     commentCommonRepo,
+		userExternalLoginRepo: userExternalLoginRepo,
 	}
 }
 
@@ -148,6 +152,13 @@ func (us *UserAdminService) UpdateUserStatus(ctx context.Context, req *schema.Up
 		us.removeAllUserCreatedContent(ctx, userInfo.ID)
 	}
 
+	if req.IsDeleted() {
+		err := us.userExternalLoginRepo.DeleteUserExternalLoginByUserID(ctx, userInfo.ID)
+		if err != nil {
+			log.Errorf("remove all user external login error: %v", err)
+		}
+	}
+
 	// if user reputation is zero means this user is inactive, so try to activate this user.
 	if req.IsNormal() && userInfo.Rank == 0 {
 		return us.userActivity.UserActive(ctx, userInfo.ID)

diff --git a/internal/service/user_external_login/user_external_login_service.go b/internal/service/user_external_login/user_external_login_service.go
@@ -51,6 +51,7 @@ type UserExternalLoginRepo interface {
 	GetByUserID(ctx context.Context, provider, userID string) (userInfo *entity.UserExternalLogin, exist bool, err error)
 	GetUserExternalLoginList(ctx context.Context, userID string) (resp []*entity.UserExternalLogin, err error)
 	DeleteUserExternalLogin(ctx context.Context, userID, externalID string) (err error)
+	DeleteUserExternalLoginByUserID(ctx context.Context, userID string) (err error)
 	SetCacheUserExternalLoginInfo(ctx context.Context, key string, info *schema.ExternalLoginUserInfoCache) (err error)
 	GetCacheUserExternalLoginInfo(ctx context.Context, key string) (info *schema.ExternalLoginUserInfoCache, err error)
 }

diff --git a/pkg/gravatar/gravatar_test.go b/pkg/gravatar/gravatar_test.go
@@ -38,7 +38,7 @@ func TestGetAvatarURL(t *testing.T) {
 		{
 			name: "[email protected]",
 			args: args{email: "[email protected]"},
-			want: "https://www.gravatar.com/avatar/b2be4e4438f08a5e885be8de5f41fdd7",
+			want: "https://www.gravatar.com/avatar/7296942c1f63d97f6c124705142009867638f7b3dbcdadd0cb1bcb40e427eb8e",
 		},
 	}
 	for _, tt := range tests {