From 5dfc92cdec9b9408c64cb080a7151ce888723a58 Mon Sep 17 00:00:00 2001 From: Misi Date: Wed, 1 May 2024 10:12:22 +0200 Subject: [PATCH] [v10.4.x] Chore: Remove extra sql select from the Insert function of userimpl.store (#87164) Chore: Remove extra sql select from the Insert function of userimpl.store (#87060) Remove getAnyUserType (cherry picked from commit 1cb3f332a17923f58cfa75cdb9d5eaab7ed66f45) --- pkg/services/user/userimpl/store.go | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/pkg/services/user/userimpl/store.go b/pkg/services/user/userimpl/store.go index 8923e446348..2c57c290495 100644 --- a/pkg/services/user/userimpl/store.go +++ b/pkg/services/user/userimpl/store.go @@ -83,11 +83,6 @@ func (ss *sqlStore) Insert(ctx context.Context, cmd *user.User) (int64, error) { return 0, err } - // verify that user was created and cmd.ID was updated with the actual new userID - _, err = ss.getAnyUserType(ctx, cmd.ID) - if err != nil { - return 0, err - } return cmd.ID, nil } @@ -735,19 +730,3 @@ func (ss *sqlStore) Search(ctx context.Context, query *user.SearchUsersQuery) (* }) return &result, err } - -// getAnyUserType searches for a user record by ID. The user account may be a service account. -func (ss *sqlStore) getAnyUserType(ctx context.Context, userID int64) (*user.User, error) { - usr := user.User{ID: userID} - err := ss.db.WithDbSession(ctx, func(sess *db.Session) error { - has, err := sess.Get(&usr) - if err != nil { - return err - } - if !has { - return user.ErrUserNotFound - } - return nil - }) - return &usr, err -}