Skip to content

fix(cloudbeaver): optimize cloudbeaver user existence check #519

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
littleniannian merged 1 commit into from
Aug 27, 2025
Merged

fix(cloudbeaver): optimize cloudbeaver user existence check #519

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 21 additions & 4 deletions internal/dms/biz/cloudbeaver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -858,15 +858,13 @@ func (cu *CloudbeaverUsecase) createUserIfNotExist(ctx context.Context, cloudbea
return err
}

checkExistReq := cloudbeaver.NewRequest(cu.graphQl.IsUserExistQuery(cloudbeaverUserId))
cloudbeaverUserList := UserList{}
err = graphQLClient.Run(ctx, checkExistReq, &cloudbeaverUserList)
userExist, err := cu.checkCloudBeaverUserExist(ctx, graphQLClient, cloudbeaverUserId)
if err != nil {
return fmt.Errorf("check cloudbeaver user exist failed: %v", err)
}

// 用户不存在则创建CloudBeaver用户
if len(cloudbeaverUserList.ListUsers) == 0 {
if !userExist {
// 创建用户
createUserReq := cloudbeaver.NewRequest(cu.graphQl.CreateUserQuery(), map[string]interface{}{
"userId": cloudbeaverUserId,
Expand Down Expand Up @@ -918,6 +916,25 @@ func (cu *CloudbeaverUsecase) createUserIfNotExist(ctx context.Context, cloudbea
return cu.repo.UpdateCloudbeaverUserCache(ctx, cloudbeaverUser)
}

func (cu *CloudbeaverUsecase) checkCloudBeaverUserExist(ctx context.Context, graphQLClient *cloudbeaver.Client, cloudbeaverUserId string) (bool, error) {
if graphQLClient == nil {
return false, fmt.Errorf("graphQLClient is nil")
}

checkExistReq := cloudbeaver.NewRequest(cu.graphQl.IsUserExistQuery(cloudbeaverUserId))
cloudbeaverUserList := UserList{}
err := graphQLClient.Run(ctx, checkExistReq, &cloudbeaverUserList)
if err != nil {
return false, err
}
for _, cloudBeaverUser := range cloudbeaverUserList.ListUsers {
if cloudBeaverUser.UserID == cloudbeaverUserId {
return true, nil
}
}
return false, nil
}

func (cu *CloudbeaverUsecase) connectManagement(ctx context.Context, cloudbeaverUserId string, dmsUser *User) error {
activeDBServices, err := cu.dbServiceUsecase.GetActiveDBServices(ctx, nil)
if err != nil {
Expand Down