Chore: Remove x from health, alert notification, dashboard, stats, user (#45265)

* Chore: Remove x from health

* Chore: Remove x from dashboard and user

* Chore: Remove x from alert notification

* Chore: Remove x from stats

* Fix: Update func signature in stats test

* Refactor: Remove x from GetDashboardTags

* Chore: Remove x from dashboard

* Chore: Remove x from Stats

* Fix: Update refs of HasAdminPermissionInFolders

* Fix: Adjust funcs in tests to be sqlStore methods

* Fix: Fix database folder test sqlstore methods

pkg/api/api.go

@@ -26,7 +26,7 @@ func (hs *HTTPServer) registerRoutes() {
 	reqGrafanaAdmin := middleware.ReqGrafanaAdmin
 	reqEditorRole := middleware.ReqEditorRole
 	reqOrgAdmin := middleware.ReqOrgAdmin
-	reqOrgAdminFolderAdminOrTeamAdmin := middleware.OrgAdminFolderAdminOrTeamAdmin
+	reqOrgAdminFolderAdminOrTeamAdmin := middleware.OrgAdminFolderAdminOrTeamAdmin(hs.SQLStore)
 	reqCanAccessTeams := middleware.AdminOrEditorAndFeatureEnabled(hs.Cfg.EditorsCanAdmin)
 	reqSnapshotPublicModeOrSignedIn := middleware.SnapshotPublicModeOrSignedIn(hs.Cfg)
 	redirectFromLegacyPanelEditURL := middleware.RedirectFromLegacyPanelEditURL(hs.Cfg)

pkg/middleware/auth.go

@@ -191,13 +191,14 @@ func shouldForceLogin(c *models.ReqContext) bool {
 	return forceLogin
 }
 
-func OrgAdminFolderAdminOrTeamAdmin(c *models.ReqContext) {
+func OrgAdminFolderAdminOrTeamAdmin(ss sqlstore.Store) func(c *models.ReqContext) {
+	return func(c *models.ReqContext) {
 		if c.OrgRole == models.ROLE_ADMIN {
 			return
 		}
 
 		hasAdminPermissionInFoldersQuery := models.HasAdminPermissionInFoldersQuery{SignedInUser: c.SignedInUser}
-	if err := sqlstore.HasAdminPermissionInFolders(c.Req.Context(), &hasAdminPermissionInFoldersQuery); err != nil {
+		if err := ss.HasAdminPermissionInFolders(c.Req.Context(), &hasAdminPermissionInFoldersQuery); err != nil {
 			c.JsonApiErr(500, "Failed to check if user is a folder admin", err)
 		}
 
@@ -216,3 +217,4 @@ func OrgAdminFolderAdminOrTeamAdmin(c *models.ReqContext) {
 
 		accessForbidden(c)
 	}
+}

pkg/services/dashboards/database/database_dashboard_test.go

@@ -421,7 +421,7 @@ func TestDashboardDataAccessGivenPluginWithImportedDashboards(t *testing.T) {
 		OrgId:    1,
 	}
 
-	err := sqlstore.GetDashboardsByPluginId(context.Background(), &query)
+	err := sqlStore.GetDashboardsByPluginId(context.Background(), &query)
 	require.NoError(t, err)
 	require.Equal(t, len(query.Result), 2)
 }

pkg/services/dashboards/database/database_folder_test.go

@@ -317,7 +317,7 @@ func TestDashboardFolderDataAccess(t *testing.T) {
 						OrgRole:      models.ROLE_ADMIN,
 					}
 
-					err := sqlstore.GetDashboardPermissionsForUser(context.Background(), &query)
+					err := sqlStore.GetDashboardPermissionsForUser(context.Background(), &query)
 					require.NoError(t, err)
 
 					require.Equal(t, len(query.Result), 2)
@@ -340,7 +340,7 @@ func TestDashboardFolderDataAccess(t *testing.T) {
 					query := &models.HasAdminPermissionInFoldersQuery{
 						SignedInUser: &models.SignedInUser{UserId: adminUser.Id, OrgId: 1, OrgRole: models.ROLE_ADMIN},
 					}
-					err := sqlstore.HasAdminPermissionInFolders(context.Background(), query)
+					err := sqlStore.HasAdminPermissionInFolders(context.Background(), query)
 					require.NoError(t, err)
 					require.True(t, query.Result)
 				})
@@ -370,7 +370,7 @@ func TestDashboardFolderDataAccess(t *testing.T) {
 						OrgRole:      models.ROLE_EDITOR,
 					}
 
-					err := sqlstore.GetDashboardPermissionsForUser(context.Background(), &query)
+					err := sqlStore.GetDashboardPermissionsForUser(context.Background(), &query)
 					require.NoError(t, err)
 
 					require.Equal(t, len(query.Result), 2)
@@ -406,7 +406,7 @@ func TestDashboardFolderDataAccess(t *testing.T) {
 					query := &models.HasAdminPermissionInFoldersQuery{
 						SignedInUser: &models.SignedInUser{UserId: adminUser.Id, OrgId: 1, OrgRole: models.ROLE_EDITOR},
 					}
-					err := sqlstore.HasAdminPermissionInFolders(context.Background(), query)
+					err := sqlStore.HasAdminPermissionInFolders(context.Background(), query)
 					require.NoError(t, err)
 					require.False(t, query.Result)
 				})
@@ -436,7 +436,7 @@ func TestDashboardFolderDataAccess(t *testing.T) {
 						OrgRole:      models.ROLE_VIEWER,
 					}
 
-					err := sqlstore.GetDashboardPermissionsForUser(context.Background(), &query)
+					err := sqlStore.GetDashboardPermissionsForUser(context.Background(), &query)
 					require.NoError(t, err)
 
 					require.Equal(t, len(query.Result), 2)
@@ -474,7 +474,7 @@ func TestDashboardFolderDataAccess(t *testing.T) {
 					query := &models.HasAdminPermissionInFoldersQuery{
 						SignedInUser: &models.SignedInUser{UserId: adminUser.Id, OrgId: 1, OrgRole: models.ROLE_VIEWER},
 					}
-					err := sqlstore.HasAdminPermissionInFolders(context.Background(), query)
+					err := sqlStore.HasAdminPermissionInFolders(context.Background(), query)
 					require.NoError(t, err)
 					require.False(t, query.Result)
 				})

pkg/services/sqlstore/alert_notification.go

@@ -513,7 +513,7 @@ func (ss *SQLStore) SetAlertNotificationStateToCompleteCommand(ctx context.Conte
 }
 
 func (ss *SQLStore) SetAlertNotificationStateToPendingCommand(ctx context.Context, cmd *models.SetAlertNotificationStateToPendingCommand) error {
-	return withDbSession(ctx, x, func(sess *DBSession) error {
+	return ss.WithDbSession(ctx, func(sess *DBSession) error {
 		newVersion := cmd.Version + 1
 		sql := `UPDATE alert_notification_state SET
 			state = ?,

pkg/services/sqlstore/dashboard.go

@@ -23,11 +23,6 @@ var shadowSearchCounter = prometheus.NewCounterVec(
 )
 
 func init() {
-	bus.AddHandler("sql", GetDashboardSlugById)
-	bus.AddHandler("sql", GetDashboardsByPluginId)
-	bus.AddHandler("sql", GetDashboardPermissionsForUser)
-	bus.AddHandler("sql", HasAdminPermissionInFolders)
-
 	prometheus.MustRegister(shadowSearchCounter)
 }
 
@@ -39,12 +34,16 @@ func (ss *SQLStore) addDashboardQueryAndCommandHandlers() {
 	bus.AddHandler("sql", ss.DeleteDashboard)
 	bus.AddHandler("sql", ss.GetDashboards)
 	bus.AddHandler("sql", ss.HasEditPermissionInFolders)
+	bus.AddHandler("sql", ss.GetDashboardPermissionsForUser)
+	bus.AddHandler("sql", ss.GetDashboardsByPluginId)
+	bus.AddHandler("sql", ss.GetDashboardSlugById)
+	bus.AddHandler("sql", ss.HasAdminPermissionInFolders)
 }
 
 var generateNewUid func() string = util.GenerateShortUID
 
 func (ss *SQLStore) GetDashboard(ctx context.Context, query *models.GetDashboardQuery) error {
-	return withDbSession(ctx, x, func(dbSession *DBSession) error {
+	return ss.WithDbSession(ctx, func(dbSession *DBSession) error {
 		if query.Id == 0 && len(query.Slug) == 0 && len(query.Uid) == 0 {
 			return models.ErrDashboardIdentifierNotSet
 		}
@@ -211,6 +210,7 @@ func makeQueryResult(query *search.FindPersistedDashboardsQuery, res []Dashboard
 }
 
 func (ss *SQLStore) GetDashboardTags(ctx context.Context, query *models.GetDashboardTagsQuery) error {
+	return ss.WithDbSession(ctx, func(dbSession *DBSession) error {
 		sql := `SELECT
 					  COUNT(*) as count,
 						term
@@ -221,9 +221,10 @@ func (ss *SQLStore) GetDashboardTags(ctx context.Context, query *models.GetDashb
 					ORDER BY term`
 
 		query.Result = make([]*models.DashboardTagCloudItem, 0)
-	sess := x.SQL(sql, query.OrgId)
+		sess := dbSession.SQL(sql, query.OrgId)
 		err := sess.Find(&query.Result)
 		return err
+	})
 }
 
 func (ss *SQLStore) DeleteDashboard(ctx context.Context, cmd *models.DeleteDashboardCommand) error {
@@ -326,20 +327,23 @@ func deleteDashboard(cmd *models.DeleteDashboardCommand, sess *DBSession) error
 }
 
 func (ss *SQLStore) GetDashboards(ctx context.Context, query *models.GetDashboardsQuery) error {
+	return ss.WithDbSession(ctx, func(dbSession *DBSession) error {
 		if len(query.DashboardIds) == 0 {
 			return models.ErrCommandValidationFailed
 		}
 
 		var dashboards = make([]*models.Dashboard, 0)
 
-	err := x.In("id", query.DashboardIds).Find(&dashboards)
+		err := dbSession.In("id", query.DashboardIds).Find(&dashboards)
 		query.Result = dashboards
 		return err
+	})
 }
 
 // GetDashboardPermissionsForUser returns the maximum permission the specified user has for a dashboard(s)
 // The function takes in a list of dashboard ids and the user id and role
-func GetDashboardPermissionsForUser(ctx context.Context, query *models.GetDashboardPermissionsForUserQuery) error {
+func (ss *SQLStore) GetDashboardPermissionsForUser(ctx context.Context, query *models.GetDashboardPermissionsForUserQuery) error {
+	return ss.WithDbSession(ctx, func(dbSession *DBSession) error {
 		if len(query.DashboardIds) == 0 {
 			return models.ErrCommandValidationFailed
 		}
@@ -398,33 +402,37 @@ func GetDashboardPermissionsForUser(ctx context.Context, query *models.GetDashbo
 		params = append(params, query.UserId)
 		params = append(params, dialect.BooleanStr(false))
 
-	err := x.SQL(sql, params...).Find(&query.Result)
+		err := dbSession.SQL(sql, params...).Find(&query.Result)
 
 		for _, p := range query.Result {
 			p.PermissionName = p.Permission.String()
 		}
 
 		return err
+	})
 }
 
-func GetDashboardsByPluginId(ctx context.Context, query *models.GetDashboardsByPluginIdQuery) error {
+func (ss *SQLStore) GetDashboardsByPluginId(ctx context.Context, query *models.GetDashboardsByPluginIdQuery) error {
+	return ss.WithDbSession(ctx, func(dbSession *DBSession) error {
 		var dashboards = make([]*models.Dashboard, 0)
 		whereExpr := "org_id=? AND plugin_id=? AND is_folder=" + dialect.BooleanStr(false)
 
-	err := x.Where(whereExpr, query.OrgId, query.PluginId).Find(&dashboards)
+		err := dbSession.Where(whereExpr, query.OrgId, query.PluginId).Find(&dashboards)
 		query.Result = dashboards
 		return err
+	})
 }
 
 type DashboardSlugDTO struct {
 	Slug string
 }
 
-func GetDashboardSlugById(ctx context.Context, query *models.GetDashboardSlugByIdQuery) error {
+func (ss *SQLStore) GetDashboardSlugById(ctx context.Context, query *models.GetDashboardSlugByIdQuery) error {
+	return ss.WithDbSession(ctx, func(dbSession *DBSession) error {
 		var rawSQL = `SELECT slug from dashboard WHERE Id=?`
 		var slug = DashboardSlugDTO{}
 
-	exists, err := x.SQL(rawSQL, query.Id).Get(&slug)
+		exists, err := dbSession.SQL(rawSQL, query.Id).Get(&slug)
 
 		if err != nil {
 			return err
@@ -434,6 +442,7 @@ func GetDashboardSlugById(ctx context.Context, query *models.GetDashboardSlugByI
 
 		query.Result = slug.Slug
 		return nil
+	})
 }
 
 func (ss *SQLStore) GetDashboardUIDById(ctx context.Context, query *models.GetDashboardRefByIdQuery) error {
@@ -457,7 +466,7 @@ func (ss *SQLStore) GetDashboardUIDById(ctx context.Context, query *models.GetDa
 
 // HasEditPermissionInFolders validates that an user have access to a certain folder
 func (ss *SQLStore) HasEditPermissionInFolders(ctx context.Context, query *models.HasEditPermissionInFoldersQuery) error {
-	return withDbSession(ctx, x, func(dbSession *DBSession) error {
+	return ss.WithDbSession(ctx, func(dbSession *DBSession) error {
 		if query.SignedInUser.HasRole(models.ROLE_EDITOR) {
 			query.Result = true
 			return nil
@@ -483,7 +492,8 @@ func (ss *SQLStore) HasEditPermissionInFolders(ctx context.Context, query *model
 	})
 }
 
-func HasAdminPermissionInFolders(ctx context.Context, query *models.HasAdminPermissionInFoldersQuery) error {
+func (ss *SQLStore) HasAdminPermissionInFolders(ctx context.Context, query *models.HasAdminPermissionInFoldersQuery) error {
+	return ss.WithDbSession(ctx, func(dbSession *DBSession) error {
 		if query.SignedInUser.HasRole(models.ROLE_ADMIN) {
 			query.Result = true
 			return nil
@@ -498,11 +508,12 @@ func HasAdminPermissionInFolders(ctx context.Context, query *models.HasAdminPerm
 		}
 
 		resp := make([]*folderCount, 0)
-	if err := x.SQL(builder.GetSQLString(), builder.params...).Find(&resp); err != nil {
+		if err := dbSession.SQL(builder.GetSQLString(), builder.params...).Find(&resp); err != nil {
 			return err
 		}
 
 		query.Result = len(resp) > 0 && resp[0].Count > 0
 
 		return nil
+	})
 }

pkg/services/sqlstore/health.go

@@ -9,7 +9,7 @@ import (
 // GetDBHealthQuery executes a query to check
 // the availability of the database.
 func (ss *SQLStore) GetDBHealthQuery(ctx context.Context, query *models.GetDBHealthQuery) error {
-	return withDbSession(ctx, x, func(session *DBSession) error {
+	return ss.WithDbSession(ctx, func(session *DBSession) error {
 		_, err := session.Exec("SELECT 1")
 		return err
 	})

pkg/services/sqlstore/mockstore/mockstore.go

@@ -637,3 +637,7 @@ func (m *SQLStoreMock) SearchOrgs(ctx context.Context, query *models.SearchOrgsQ
 	query.Result = m.ExpectedSearchOrgList
 	return m.ExpectedError
 }
+
+func (m *SQLStoreMock) HasAdminPermissionInFolders(ctx context.Context, query *models.HasAdminPermissionInFoldersQuery) error {
+	return m.ExpectedError
+}

pkg/services/sqlstore/stats.go

@@ -9,12 +9,9 @@ import (
 	"github.com/grafana/grafana/pkg/models"
 )
 
-func init() {
-	bus.AddHandler("sql", GetSystemUserCountStats)
-}
-
 func (ss *SQLStore) addStatsQueryAndCommandHandlers() {
 	bus.AddHandler("sql", ss.GetAdminStats)
+	bus.AddHandler("sql", ss.GetSystemUserCountStats)
 	bus.AddHandler("sql", ss.GetAlertNotifiersUsageStats)
 	bus.AddHandler("sql", ss.GetDataSourceAccessStats)
 	bus.AddHandler("sql", ss.GetDataSourceStats)
@@ -25,27 +22,34 @@ const activeUserTimeLimit = time.Hour * 24 * 30
 const dailyActiveUserTimeLimit = time.Hour * 24
 
 func (ss *SQLStore) GetAlertNotifiersUsageStats(ctx context.Context, query *models.GetAlertNotifierUsageStatsQuery) error {
+	return ss.WithDbSession(ctx, func(dbSession *DBSession) error {
 		var rawSQL = `SELECT COUNT(*) AS count, type FROM ` + dialect.Quote("alert_notification") + ` GROUP BY type`
 		query.Result = make([]*models.NotifierUsageStats, 0)
-	err := x.SQL(rawSQL).Find(&query.Result)
+		err := dbSession.SQL(rawSQL).Find(&query.Result)
 		return err
+	})
 }
 
 func (ss *SQLStore) GetDataSourceStats(ctx context.Context, query *models.GetDataSourceStatsQuery) error {
+	return ss.WithDbSession(ctx, func(dbSession *DBSession) error {
 		var rawSQL = `SELECT COUNT(*) AS count, type FROM ` + dialect.Quote("data_source") + ` GROUP BY type`
 		query.Result = make([]*models.DataSourceStats, 0)
-	err := x.SQL(rawSQL).Find(&query.Result)
+		err := dbSession.SQL(rawSQL).Find(&query.Result)
 		return err
+	})
 }
 
 func (ss *SQLStore) GetDataSourceAccessStats(ctx context.Context, query *models.GetDataSourceAccessStatsQuery) error {
+	return ss.WithDbSession(ctx, func(dbSession *DBSession) error {
 		var rawSQL = `SELECT COUNT(*) AS count, type, access FROM ` + dialect.Quote("data_source") + ` GROUP BY type, access`
 		query.Result = make([]*models.DataSourceAccessStats, 0)
-	err := x.SQL(rawSQL).Find(&query.Result)
+		err := dbSession.SQL(rawSQL).Find(&query.Result)
 		return err
+	})
 }
 
 func (ss *SQLStore) GetSystemStats(ctx context.Context, query *models.GetSystemStatsQuery) error {
+	return ss.WithDbSession(ctx, func(dbSession *DBSession) error {
 		sb := &SQLBuilder{}
 		sb.Write("SELECT ")
 		sb.Write(`(SELECT COUNT(*) FROM ` + dialect.Quote("user") + `) AS users,`)
@@ -100,10 +104,10 @@ func (ss *SQLStore) GetSystemStats(ctx context.Context, query *models.GetSystemS
 		sb.Write(`(SELECT COUNT(id) FROM `+dialect.Quote("library_element")+` WHERE kind = ?) AS library_panels,`, models.PanelElement)
 		sb.Write(`(SELECT COUNT(id) FROM `+dialect.Quote("library_element")+` WHERE kind = ?) AS library_variables,`, models.VariableElement)
 
-	sb.Write(roleCounterSQL(ctx))
+		sb.Write(ss.roleCounterSQL(ctx))
 
 		var stats models.SystemStats
-	_, err := x.SQL(sb.GetSQLString(), sb.params...).Get(&stats)
+		_, err := dbSession.SQL(sb.GetSQLString(), sb.params...).Get(&stats)
 		if err != nil {
 			return err
 		}
@@ -111,13 +115,14 @@ func (ss *SQLStore) GetSystemStats(ctx context.Context, query *models.GetSystemS
 		query.Result = &stats
 
 		return nil
+	})
 }
 
-func roleCounterSQL(ctx context.Context) string {
+func (ss *SQLStore) roleCounterSQL(ctx context.Context) string {
 	const roleCounterTimeout = 20 * time.Second
 	ctx, cancel := context.WithTimeout(ctx, roleCounterTimeout)
 	defer cancel()
-	_ = updateUserRoleCountsIfNecessary(ctx, false)
+	_ = ss.updateUserRoleCountsIfNecessary(ctx, false)
 	sqlQuery :=
 		strconv.FormatInt(userStatsCache.total.Admins, 10) + ` AS admins, ` +
 			strconv.FormatInt(userStatsCache.total.Editors, 10) + ` AS editors, ` +
@@ -145,6 +150,7 @@ func viewersPermissionsCounterSQL(statName string, isFolder bool, permission mod
 }
 
 func (ss *SQLStore) GetAdminStats(ctx context.Context, query *models.GetAdminStatsQuery) error {
+	return ss.WithDbSession(ctx, func(dbSession *DBSession) error {
 		now := time.Now()
 		activeEndDate := now.Add(-activeUserTimeLimit)
 		dailyActiveEndDate := now.Add(-dailyActiveUserTimeLimit)
@@ -199,7 +205,7 @@ func (ss *SQLStore) GetAdminStats(ctx context.Context, query *models.GetAdminSta
 			SELECT COUNT(*)
 			FROM ` + dialect.Quote("user") + ` WHERE last_seen_at > ?
 		) AS monthly_active_users,
-		` + roleCounterSQL(ctx) + `,
+		` + ss.roleCounterSQL(ctx) + `,
 		(
 			SELECT COUNT(*)
 			FROM ` + dialect.Quote("user_auth_token") + ` WHERE rotated_at > ?
@@ -210,17 +216,18 @@ func (ss *SQLStore) GetAdminStats(ctx context.Context, query *models.GetAdminSta
 		) AS daily_active_sessions`
 
 		var stats models.AdminStats
-	_, err := x.SQL(rawSQL, activeEndDate, dailyActiveEndDate, monthlyActiveEndDate, activeEndDate.Unix(), dailyActiveEndDate.Unix()).Get(&stats)
+		_, err := dbSession.SQL(rawSQL, activeEndDate, dailyActiveEndDate, monthlyActiveEndDate, activeEndDate.Unix(), dailyActiveEndDate.Unix()).Get(&stats)
 		if err != nil {
 			return err
 		}
 
 		query.Result = &stats
 		return nil
+	})
 }
 
-func GetSystemUserCountStats(ctx context.Context, query *models.GetSystemUserCountStatsQuery) error {
+func (ss *SQLStore) GetSystemUserCountStats(ctx context.Context, query *models.GetSystemUserCountStatsQuery) error {
-	return withDbSession(ctx, x, func(sess *DBSession) error {
+	return ss.WithDbSession(ctx, func(sess *DBSession) error {
 		var rawSQL = `SELECT COUNT(id) AS Count FROM ` + dialect.Quote("user")
 		var stats models.SystemUserCountStats
 		_, err := sess.SQL(rawSQL).Get(&stats)
@@ -234,10 +241,10 @@ func GetSystemUserCountStats(ctx context.Context, query *models.GetSystemUserCou
 	})
 }
 
-func updateUserRoleCountsIfNecessary(ctx context.Context, forced bool) error {
+func (ss *SQLStore) updateUserRoleCountsIfNecessary(ctx context.Context, forced bool) error {
 	memoizationPeriod := time.Now().Add(-userStatsCacheLimetime)
 	if forced || userStatsCache.memoized.Before(memoizationPeriod) {
-		err := updateUserRoleCounts(ctx)
+		err := ss.updateUserRoleCounts(ctx)
 		if err != nil {
 			return err
 		}
@@ -258,7 +265,8 @@ var (
 	userStatsCacheLimetime = 5 * time.Minute
 )
 
-func updateUserRoleCounts(ctx context.Context) error {
+func (ss *SQLStore) updateUserRoleCounts(ctx context.Context) error {
+	return ss.WithDbSession(ctx, func(dbSession *DBSession) error {
 		query := `
 SELECT role AS bitrole, active, COUNT(role) AS count FROM
   (SELECT last_seen_at>? AS active, last_seen_at>? AS daily_active, SUM(role) AS role
@@ -286,7 +294,7 @@ GROUP BY active, daily_active, role;`
 		}
 
 		bitmap := []rolebitmap{}
-	err := x.Context(ctx).SQL(query, activeUserDeadline, dailyActiveUserDeadline).Find(&bitmap)
+		err := dbSession.Context(ctx).SQL(query, activeUserDeadline, dailyActiveUserDeadline).Find(&bitmap)
 		if err != nil {
 			return err
 		}
@@ -311,6 +319,7 @@ GROUP BY active, daily_active, role;`
 
 		userStatsCache = memo
 		return nil
+	})
 }
 
 func addToStats(base models.UserStats, role models.RoleType, count int64) models.UserStats {

pkg/services/sqlstore/stats_test.go

@@ -32,7 +32,7 @@ func TestStatsDataAccess(t *testing.T) {
 
 	t.Run("Get system user count stats should not results in error", func(t *testing.T) {
 		query := models.GetSystemUserCountStatsQuery{}
-		err := GetSystemUserCountStats(context.Background(), &query)
+		err := sqlStore.GetSystemUserCountStats(context.Background(), &query)
 		assert.NoError(t, err)
 	})
 
@@ -124,7 +124,7 @@ func populateDB(t *testing.T, sqlStore *SQLStore) {
 	require.NoError(t, err)
 
 	// force renewal of user stats
-	err = updateUserRoleCountsIfNecessary(context.Background(), true)
+	err = sqlStore.updateUserRoleCountsIfNecessary(context.Background(), true)
 	require.NoError(t, err)
 
 	// add 1st api key

pkg/services/sqlstore/store.go

@@ -147,4 +147,5 @@ type Store interface {
 	ExpireOldUserInvites(ctx context.Context, cmd *models.ExpireTempUsersCommand) error
 	GetDBHealthQuery(ctx context.Context, query *models.GetDBHealthQuery) error
 	SearchOrgs(ctx context.Context, query *models.SearchOrgsQuery) error
+	HasAdminPermissionInFolders(ctx context.Context, query *models.HasAdminPermissionInFoldersQuery) error
 }

pkg/services/sqlstore/user.go

@@ -321,7 +321,7 @@ func (ss *SQLStore) CreateUser(ctx context.Context, cmd models.CreateUserCommand
 }
 
 func (ss SQLStore) GetUserById(ctx context.Context, query *models.GetUserByIdQuery) error {
-	return withDbSession(ctx, x, func(sess *DBSession) error {
+	return ss.WithDbSession(ctx, func(sess *DBSession) error {
 		user := new(models.User)
 		has, err := sess.ID(query.Id).Get(user)