Chore: Remove methods from sqlstore (#57545)

* Remove methods from sqlstore

* Remove commented out code

* Remove GetUserById from tests

* Adjust fake for get user profile

* Adjust test

* Adjust go mod files

* Try fix test

* Test adjustment

* Adjust test 2

* Remove commented out code

pkg/cmd/grafana-cli/commands/conflict_user_command_test.go

@@ -11,7 +11,6 @@ import (
 	"github.com/urfave/cli/v2"
 
 	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
 	"github.com/grafana/grafana/pkg/services/team/teamimpl"
 	"github.com/grafana/grafana/pkg/services/user"
@@ -629,11 +628,6 @@ func TestMergeUser(t *testing.T) {
 			// test starts here
 			err = r.MergeConflictingUsers(context.Background())
 			require.NoError(t, err)
-
-			// user with uppercaseemail should not exist
-			query := &models.GetUserByIdQuery{Id: userWithUpperCase.ID}
-			err = sqlStore.GetUserById(context.Background(), query)
-			require.Error(t, user.ErrUserNotFound, err)
 		}
 	})
 }