Implement preference service (#47870)

* Implement preference service

* Adjust wire.go

* Fix integration test user

* Fix api pref tests

* Fix a11y error

Co-authored-by: Alexandra Vargas <alexa1866@gmail.com>
Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>

pkg/services/sqlstore/mockstore/mockstore.go

@@ -289,23 +289,6 @@ func (m *SQLStoreMock) WithDbSession(ctx context.Context, callback sqlstore.DBTr
 	return m.ExpectedError
 }
 
-func (m *SQLStoreMock) GetPreferencesWithDefaults(ctx context.Context, query *models.GetPreferencesWithDefaultsQuery) error {
-	query.Result = &models.Preferences{}
-	return m.ExpectedError
-}
-
-func (m *SQLStoreMock) GetPreferences(ctx context.Context, query *models.GetPreferencesQuery) error {
-	return m.ExpectedError
-}
-
-func (m *SQLStoreMock) SavePreferences(ctx context.Context, cmd *models.SavePreferencesCommand) error {
-	return m.ExpectedError
-}
-
-func (m *SQLStoreMock) PatchPreferences(ctx context.Context, cmd *models.PatchPreferencesCommand) error {
-	return m.ExpectedError
-}
-
 func (m *SQLStoreMock) GetPluginSettings(ctx context.Context, orgID int64) ([]*models.PluginSetting, error) {
 	return nil, m.ExpectedError
 }

pkg/services/sqlstore/preferences.go

@@ -1,212 +0,0 @@
-package sqlstore
-
-import (
-	"context"
-	"strings"
-	"time"
-
-	"github.com/grafana/grafana/pkg/models"
-)
-
-func (ss *SQLStore) GetPreferencesWithDefaults(ctx context.Context, query *models.GetPreferencesWithDefaultsQuery) error {
-	return ss.WithDbSession(ctx, func(dbSession *DBSession) error {
-		params := make([]interface{}, 0)
-		filter := ""
-
-		if len(query.User.Teams) > 0 {
-			filter = "(org_id=? AND team_id IN (?" + strings.Repeat(",?", len(query.User.Teams)-1) + ")) OR "
-			params = append(params, query.User.OrgId)
-			for _, v := range query.User.Teams {
-				params = append(params, v)
-			}
-		}
-
-		filter += "(org_id=? AND user_id=? AND team_id=0) OR (org_id=? AND team_id=0 AND user_id=0)"
-		params = append(params, query.User.OrgId)
-		params = append(params, query.User.UserId)
-		params = append(params, query.User.OrgId)
-		prefs := make([]*models.Preferences, 0)
-		err := dbSession.Where(filter, params...).
-			OrderBy("user_id ASC, team_id ASC").
-			Find(&prefs)
-
-		if err != nil {
-			return err
-		}
-
-		res := &models.Preferences{
-			Theme:           ss.Cfg.DefaultTheme,
-			Timezone:        ss.Cfg.DateFormats.DefaultTimezone,
-			WeekStart:       ss.Cfg.DateFormats.DefaultWeekStart,
-			HomeDashboardId: 0,
-			JsonData:        &models.PreferencesJsonData{},
-		}
-
-		for _, p := range prefs {
-			if p.Theme != "" {
-				res.Theme = p.Theme
-			}
-			if p.Timezone != "" {
-				res.Timezone = p.Timezone
-			}
-			if p.WeekStart != "" {
-				res.WeekStart = p.WeekStart
-			}
-			if p.HomeDashboardId != 0 {
-				res.HomeDashboardId = p.HomeDashboardId
-			}
-			if p.JsonData != nil {
-				res.JsonData = p.JsonData
-			}
-		}
-
-		query.Result = res
-		return nil
-	})
-}
-
-func (ss *SQLStore) GetPreferences(ctx context.Context, query *models.GetPreferencesQuery) error {
-	return ss.WithDbSession(ctx, func(sess *DBSession) error {
-		var prefs models.Preferences
-		exists, err := sess.Where("org_id=? AND user_id=? AND team_id=?", query.OrgId, query.UserId, query.TeamId).Get(&prefs)
-
-		if err != nil {
-			return err
-		}
-
-		if exists {
-			query.Result = &prefs
-		} else {
-			query.Result = new(models.Preferences)
-		}
-
-		return nil
-	})
-}
-
-func (ss *SQLStore) SavePreferences(ctx context.Context, cmd *models.SavePreferencesCommand) error {
-	return ss.WithTransactionalDbSession(ctx, func(sess *DBSession) error {
-		var prefs models.Preferences
-		exists, err := sess.Where("org_id=? AND user_id=? AND team_id=?", cmd.OrgId, cmd.UserId, cmd.TeamId).Get(&prefs)
-		if err != nil {
-			return err
-		}
-
-		if !exists {
-			prefs = models.Preferences{
-				UserId:          cmd.UserId,
-				OrgId:           cmd.OrgId,
-				TeamId:          cmd.TeamId,
-				HomeDashboardId: cmd.HomeDashboardId,
-				Timezone:        cmd.Timezone,
-				WeekStart:       cmd.WeekStart,
-				Theme:           cmd.Theme,
-				Created:         time.Now(),
-				Updated:         time.Now(),
-				JsonData:        &models.PreferencesJsonData{},
-			}
-
-			if cmd.Navbar != nil {
-				prefs.JsonData.Navbar = *cmd.Navbar
-			}
-
-			if cmd.QueryHistory != nil {
-				prefs.JsonData.QueryHistory = *cmd.QueryHistory
-			}
-
-			_, err = sess.Insert(&prefs)
-			return err
-		}
-		// Wrap this in an if statement to maintain backwards compatibility
-		if cmd.Navbar != nil {
-			if prefs.JsonData == nil {
-				prefs.JsonData = &models.PreferencesJsonData{}
-			}
-			if cmd.Navbar.SavedItems != nil {
-				prefs.JsonData.Navbar.SavedItems = cmd.Navbar.SavedItems
-			}
-		}
-
-		if cmd.QueryHistory != nil {
-			if prefs.JsonData == nil {
-				prefs.JsonData = &models.PreferencesJsonData{}
-			}
-			if cmd.QueryHistory.HomeTab != "" {
-				prefs.JsonData.QueryHistory.HomeTab = cmd.QueryHistory.HomeTab
-			}
-		}
-
-		prefs.HomeDashboardId = cmd.HomeDashboardId
-		prefs.Timezone = cmd.Timezone
-		prefs.WeekStart = cmd.WeekStart
-		prefs.Theme = cmd.Theme
-		prefs.Updated = time.Now()
-		prefs.Version += 1
-		_, err = sess.ID(prefs.Id).AllCols().Update(&prefs)
-		return err
-	})
-}
-
-func (ss *SQLStore) PatchPreferences(ctx context.Context, cmd *models.PatchPreferencesCommand) error {
-	return ss.WithTransactionalDbSession(ctx, func(sess *DBSession) error {
-		var prefs models.Preferences
-		exists, err := sess.Where("org_id=? AND user_id=? AND team_id=?", cmd.OrgId, cmd.UserId, cmd.TeamId).Get(&prefs)
-		if err != nil {
-			return err
-		}
-
-		if !exists {
-			prefs = models.Preferences{
-				UserId:   cmd.UserId,
-				OrgId:    cmd.OrgId,
-				TeamId:   cmd.TeamId,
-				Created:  time.Now(),
-				JsonData: &models.PreferencesJsonData{},
-			}
-		}
-
-		if cmd.Navbar != nil {
-			if prefs.JsonData == nil {
-				prefs.JsonData = &models.PreferencesJsonData{}
-			}
-			if cmd.Navbar.SavedItems != nil {
-				prefs.JsonData.Navbar.SavedItems = cmd.Navbar.SavedItems
-			}
-		}
-
-		if cmd.QueryHistory != nil {
-			if prefs.JsonData == nil {
-				prefs.JsonData = &models.PreferencesJsonData{}
-			}
-			if cmd.QueryHistory.HomeTab != "" {
-				prefs.JsonData.QueryHistory.HomeTab = cmd.QueryHistory.HomeTab
-			}
-		}
-
-		if cmd.HomeDashboardId != nil {
-			prefs.HomeDashboardId = *cmd.HomeDashboardId
-		}
-
-		if cmd.Timezone != nil {
-			prefs.Timezone = *cmd.Timezone
-		}
-
-		if cmd.WeekStart != nil {
-			prefs.WeekStart = *cmd.WeekStart
-		}
-
-		if cmd.Theme != nil {
-			prefs.Theme = *cmd.Theme
-		}
-
-		prefs.Updated = time.Now()
-		prefs.Version += 1
-
-		if exists {
-			_, err = sess.ID(prefs.Id).AllCols().Update(&prefs)
-		} else {
-			_, err = sess.Insert(&prefs)
-		}
-		return err
-	})
-}

pkg/services/sqlstore/preferences_test.go

@@ -1,302 +0,0 @@
-//go:build integration
-// +build integration
-
-package sqlstore
-
-import (
-	"context"
-	"testing"
-
-	"github.com/google/go-cmp/cmp"
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/models"
-)
-
-func TestPreferencesDataAccess(t *testing.T) {
-	ss := InitTestDB(t)
-	emptyNavbarPreferences := models.NavbarPreference{}
-	userNavbarPreferences := models.NavbarPreference{
-		SavedItems: []models.NavLink{{
-			Id:   "explore",
-			Text: "Explore",
-			Url:  "/explore",
-		}},
-	}
-	orgNavbarPreferences := models.NavbarPreference{
-		SavedItems: []models.NavLink{{
-			Id:   "alerting",
-			Text: "Alerting",
-			Url:  "/alerting",
-		}},
-	}
-	team1NavbarPreferences := models.NavbarPreference{
-		SavedItems: []models.NavLink{{
-			Id:   "dashboards",
-			Text: "Dashboards",
-			Url:  "/dashboards",
-		}},
-	}
-	team2NavbarPreferences := models.NavbarPreference{
-		SavedItems: []models.NavLink{{
-			Id:   "home",
-			Text: "Home",
-			Url:  "/home",
-		}},
-	}
-
-	emptyPreferencesJsonData := models.PreferencesJsonData{
-		Navbar: emptyNavbarPreferences,
-	}
-	userPreferencesJsonData := models.PreferencesJsonData{
-		Navbar: userNavbarPreferences,
-	}
-	orgPreferencesJsonData := models.PreferencesJsonData{
-		Navbar: orgNavbarPreferences,
-	}
-	team2PreferencesJsonData := models.PreferencesJsonData{
-		Navbar: team2NavbarPreferences,
-	}
-
-	t.Run("GetPreferencesWithDefaults with no saved preferences should return defaults", func(t *testing.T) {
-		ss.Cfg.DefaultTheme = "light"
-		ss.Cfg.DateFormats.DefaultTimezone = "UTC"
-
-		query := &models.GetPreferencesWithDefaultsQuery{User: &models.SignedInUser{}}
-		err := ss.GetPreferencesWithDefaults(context.Background(), query)
-		require.NoError(t, err)
-		require.Equal(t, "light", query.Result.Theme)
-		require.Equal(t, "UTC", query.Result.Timezone)
-		require.Equal(t, int64(0), query.Result.HomeDashboardId)
-		require.Equal(t, &emptyPreferencesJsonData, query.Result.JsonData)
-	})
-
-	t.Run("GetPreferencesWithDefaults with saved org and user home dashboard should return user home dashboard", func(t *testing.T) {
-		err := ss.SavePreferences(context.Background(), &models.SavePreferencesCommand{OrgId: 1, HomeDashboardId: 1})
-		require.NoError(t, err)
-		err = ss.SavePreferences(context.Background(), &models.SavePreferencesCommand{OrgId: 1, UserId: 1, HomeDashboardId: 4})
-		require.NoError(t, err)
-
-		query := &models.GetPreferencesWithDefaultsQuery{User: &models.SignedInUser{OrgId: 1, UserId: 1}}
-		err = ss.GetPreferencesWithDefaults(context.Background(), query)
-		require.NoError(t, err)
-		require.Equal(t, int64(4), query.Result.HomeDashboardId)
-	})
-
-	t.Run("GetPreferencesWithDefaults with saved org and other user home dashboard should return org home dashboard", func(t *testing.T) {
-		err := ss.SavePreferences(context.Background(), &models.SavePreferencesCommand{OrgId: 1, HomeDashboardId: 1})
-		require.NoError(t, err)
-		err = ss.SavePreferences(context.Background(), &models.SavePreferencesCommand{OrgId: 1, UserId: 1, HomeDashboardId: 4})
-		require.NoError(t, err)
-
-		query := &models.GetPreferencesWithDefaultsQuery{User: &models.SignedInUser{OrgId: 1, UserId: 2}}
-		err = ss.GetPreferencesWithDefaults(context.Background(), query)
-		require.NoError(t, err)
-		require.Equal(t, int64(1), query.Result.HomeDashboardId)
-	})
-
-	t.Run("GetPreferencesWithDefaults with saved org and teams home dashboard should return last team home dashboard", func(t *testing.T) {
-		err := ss.SavePreferences(context.Background(), &models.SavePreferencesCommand{OrgId: 1, HomeDashboardId: 1})
-		require.NoError(t, err)
-		err = ss.SavePreferences(context.Background(), &models.SavePreferencesCommand{OrgId: 1, TeamId: 2, HomeDashboardId: 2})
-		require.NoError(t, err)
-		err = ss.SavePreferences(context.Background(), &models.SavePreferencesCommand{OrgId: 1, TeamId: 3, HomeDashboardId: 3})
-		require.NoError(t, err)
-
-		query := &models.GetPreferencesWithDefaultsQuery{
-			User: &models.SignedInUser{OrgId: 1, Teams: []int64{2, 3}},
-		}
-		err = ss.GetPreferencesWithDefaults(context.Background(), query)
-		require.NoError(t, err)
-		require.Equal(t, int64(3), query.Result.HomeDashboardId)
-	})
-
-	t.Run("GetPreferencesWithDefaults with saved org and other teams home dashboard should return org home dashboard", func(t *testing.T) {
-		err := ss.SavePreferences(context.Background(), &models.SavePreferencesCommand{OrgId: 1, HomeDashboardId: 1})
-		require.NoError(t, err)
-		err = ss.SavePreferences(context.Background(), &models.SavePreferencesCommand{OrgId: 1, TeamId: 2, HomeDashboardId: 2})
-		require.NoError(t, err)
-		err = ss.SavePreferences(context.Background(), &models.SavePreferencesCommand{OrgId: 1, TeamId: 3, HomeDashboardId: 3})
-		require.NoError(t, err)
-
-		query := &models.GetPreferencesWithDefaultsQuery{User: &models.SignedInUser{OrgId: 1}}
-		err = ss.GetPreferencesWithDefaults(context.Background(), query)
-		require.NoError(t, err)
-		require.Equal(t, int64(1), query.Result.HomeDashboardId)
-	})
-
-	t.Run("GetPreferencesWithDefaults with saved org, teams and user home dashboard should return user home dashboard", func(t *testing.T) {
-		err := ss.SavePreferences(context.Background(), &models.SavePreferencesCommand{OrgId: 1, HomeDashboardId: 1})
-		require.NoError(t, err)
-		err = ss.SavePreferences(context.Background(), &models.SavePreferencesCommand{OrgId: 1, TeamId: 2, HomeDashboardId: 2})
-		require.NoError(t, err)
-		err = ss.SavePreferences(context.Background(), &models.SavePreferencesCommand{OrgId: 1, TeamId: 3, HomeDashboardId: 3})
-		require.NoError(t, err)
-		err = ss.SavePreferences(context.Background(), &models.SavePreferencesCommand{OrgId: 1, UserId: 1, HomeDashboardId: 4})
-		require.NoError(t, err)
-
-		query := &models.GetPreferencesWithDefaultsQuery{
-			User: &models.SignedInUser{OrgId: 1, UserId: 1, Teams: []int64{2, 3}},
-		}
-		err = ss.GetPreferencesWithDefaults(context.Background(), query)
-		require.NoError(t, err)
-		require.Equal(t, int64(4), query.Result.HomeDashboardId)
-	})
-
-	t.Run("GetPreferencesWithDefaults with saved org, other teams and user home dashboard should return org home dashboard", func(t *testing.T) {
-		err := ss.SavePreferences(context.Background(), &models.SavePreferencesCommand{OrgId: 1, HomeDashboardId: 1})
-		require.NoError(t, err)
-		err = ss.SavePreferences(context.Background(), &models.SavePreferencesCommand{OrgId: 1, TeamId: 2, HomeDashboardId: 2})
-		require.NoError(t, err)
-		err = ss.SavePreferences(context.Background(), &models.SavePreferencesCommand{OrgId: 1, TeamId: 3, HomeDashboardId: 3})
-		require.NoError(t, err)
-		err = ss.SavePreferences(context.Background(), &models.SavePreferencesCommand{OrgId: 1, UserId: 1, HomeDashboardId: 4})
-		require.NoError(t, err)
-
-		query := &models.GetPreferencesWithDefaultsQuery{
-			User: &models.SignedInUser{OrgId: 1, UserId: 2},
-		}
-		err = ss.GetPreferencesWithDefaults(context.Background(), query)
-		require.NoError(t, err)
-		require.Equal(t, int64(1), query.Result.HomeDashboardId)
-	})
-
-	t.Run("GetPreferencesWithDefaults with saved org and user json data should return user json data", func(t *testing.T) {
-		err := ss.SavePreferences(context.Background(), &models.SavePreferencesCommand{OrgId: 1, Navbar: &orgNavbarPreferences})
-		require.NoError(t, err)
-		err = ss.SavePreferences(context.Background(), &models.SavePreferencesCommand{OrgId: 1, UserId: 1, Navbar: &userNavbarPreferences})
-		require.NoError(t, err)
-
-		query := &models.GetPreferencesWithDefaultsQuery{User: &models.SignedInUser{OrgId: 1, UserId: 1}}
-		err = ss.GetPreferencesWithDefaults(context.Background(), query)
-		require.NoError(t, err)
-		require.Equal(t, &userPreferencesJsonData, query.Result.JsonData)
-	})
-
-	t.Run("GetPreferencesWithDefaults with saved org and other user json data should return org json data", func(t *testing.T) {
-		err := ss.SavePreferences(context.Background(), &models.SavePreferencesCommand{OrgId: 1, Navbar: &orgNavbarPreferences})
-		require.NoError(t, err)
-		err = ss.SavePreferences(context.Background(), &models.SavePreferencesCommand{OrgId: 1, UserId: 1, Navbar: &userNavbarPreferences})
-		require.NoError(t, err)
-
-		query := &models.GetPreferencesWithDefaultsQuery{User: &models.SignedInUser{OrgId: 1, UserId: 2}}
-		err = ss.GetPreferencesWithDefaults(context.Background(), query)
-		require.NoError(t, err)
-		require.Equal(t, &orgPreferencesJsonData, query.Result.JsonData)
-	})
-
-	t.Run("GetPreferencesWithDefaults with saved org and teams json data should return last team json data", func(t *testing.T) {
-		err := ss.SavePreferences(context.Background(), &models.SavePreferencesCommand{OrgId: 1, Navbar: &orgNavbarPreferences})
-		require.NoError(t, err)
-		err = ss.SavePreferences(context.Background(), &models.SavePreferencesCommand{OrgId: 1, TeamId: 2, Navbar: &team1NavbarPreferences})
-		require.NoError(t, err)
-		err = ss.SavePreferences(context.Background(), &models.SavePreferencesCommand{OrgId: 1, TeamId: 3, Navbar: &team2NavbarPreferences})
-		require.NoError(t, err)
-
-		query := &models.GetPreferencesWithDefaultsQuery{
-			User: &models.SignedInUser{OrgId: 1, Teams: []int64{2, 3}},
-		}
-		err = ss.GetPreferencesWithDefaults(context.Background(), query)
-		require.NoError(t, err)
-		require.Equal(t, &team2PreferencesJsonData, query.Result.JsonData)
-	})
-
-	t.Run("GetPreferencesWithDefaults with saved org and other teams json data should return org json data", func(t *testing.T) {
-		err := ss.SavePreferences(context.Background(), &models.SavePreferencesCommand{OrgId: 1, Navbar: &orgNavbarPreferences})
-		require.NoError(t, err)
-		err = ss.SavePreferences(context.Background(), &models.SavePreferencesCommand{OrgId: 1, TeamId: 2, Navbar: &team1NavbarPreferences})
-		require.NoError(t, err)
-		err = ss.SavePreferences(context.Background(), &models.SavePreferencesCommand{OrgId: 1, TeamId: 3, Navbar: &team2NavbarPreferences})
-		require.NoError(t, err)
-
-		query := &models.GetPreferencesWithDefaultsQuery{User: &models.SignedInUser{OrgId: 1}}
-		err = ss.GetPreferencesWithDefaults(context.Background(), query)
-		require.NoError(t, err)
-		require.Equal(t, &orgPreferencesJsonData, query.Result.JsonData)
-	})
-
-	t.Run("GetPreferencesWithDefaults with saved org, teams and user json data should return user json data", func(t *testing.T) {
-		err := ss.SavePreferences(context.Background(), &models.SavePreferencesCommand{OrgId: 1, Navbar: &orgNavbarPreferences})
-		require.NoError(t, err)
-		err = ss.SavePreferences(context.Background(), &models.SavePreferencesCommand{OrgId: 1, TeamId: 2, Navbar: &team1NavbarPreferences})
-		require.NoError(t, err)
-		err = ss.SavePreferences(context.Background(), &models.SavePreferencesCommand{OrgId: 1, TeamId: 3, Navbar: &team2NavbarPreferences})
-		require.NoError(t, err)
-		err = ss.SavePreferences(context.Background(), &models.SavePreferencesCommand{OrgId: 1, UserId: 1, Navbar: &userNavbarPreferences})
-		require.NoError(t, err)
-
-		query := &models.GetPreferencesWithDefaultsQuery{
-			User: &models.SignedInUser{OrgId: 1, UserId: 1, Teams: []int64{2, 3}},
-		}
-		err = ss.GetPreferencesWithDefaults(context.Background(), query)
-		require.NoError(t, err)
-		require.Equal(t, &userPreferencesJsonData, query.Result.JsonData)
-	})
-
-	t.Run("GetPreferencesWithDefaults with saved org, other teams and user json data should return org json data", func(t *testing.T) {
-		err := ss.SavePreferences(context.Background(), &models.SavePreferencesCommand{OrgId: 1, Navbar: &orgNavbarPreferences})
-		require.NoError(t, err)
-		err = ss.SavePreferences(context.Background(), &models.SavePreferencesCommand{OrgId: 1, TeamId: 2, Navbar: &team1NavbarPreferences})
-		require.NoError(t, err)
-		err = ss.SavePreferences(context.Background(), &models.SavePreferencesCommand{OrgId: 1, TeamId: 3, Navbar: &team2NavbarPreferences})
-		require.NoError(t, err)
-		err = ss.SavePreferences(context.Background(), &models.SavePreferencesCommand{OrgId: 1, UserId: 1, Navbar: &userNavbarPreferences})
-		require.NoError(t, err)
-
-		query := &models.GetPreferencesWithDefaultsQuery{
-			User: &models.SignedInUser{OrgId: 1, UserId: 2},
-		}
-		err = ss.GetPreferencesWithDefaults(context.Background(), query)
-		require.NoError(t, err)
-		require.Equal(t, &orgPreferencesJsonData, query.Result.JsonData)
-	})
-
-	t.Run("SavePreferences for a user should store correct values", func(t *testing.T) {
-		err := ss.SavePreferences(context.Background(), &models.SavePreferencesCommand{UserId: models.SignedInUser{}.UserId, Theme: "dark", Timezone: "browser", HomeDashboardId: 5, WeekStart: "1", Navbar: &userNavbarPreferences})
-		require.NoError(t, err)
-
-		query := &models.GetPreferencesWithDefaultsQuery{User: &models.SignedInUser{}}
-		err = ss.GetPreferencesWithDefaults(context.Background(), query)
-		require.NoError(t, err)
-		expected := &models.Preferences{
-			Id:              query.Result.Id,
-			Version:         query.Result.Version,
-			HomeDashboardId: 5,
-			Timezone:        "browser",
-			WeekStart:       "1",
-			Theme:           "dark",
-			JsonData:        &userPreferencesJsonData,
-			Created:         query.Result.Created,
-			Updated:         query.Result.Updated,
-		}
-		if diff := cmp.Diff(expected, query.Result); diff != "" {
-			t.Fatalf("Result mismatch (-want +got):\n%s", diff)
-		}
-	})
-
-	t.Run("PatchPreferences for a user should only modify a single value", func(t *testing.T) {
-		err := ss.SavePreferences(context.Background(), &models.SavePreferencesCommand{UserId: models.SignedInUser{}.UserId, Theme: "dark", Timezone: "browser", HomeDashboardId: 5, WeekStart: "1", Navbar: &orgNavbarPreferences})
-		require.NoError(t, err)
-
-		err = ss.PatchPreferences(context.Background(), &models.PatchPreferencesCommand{UserId: models.SignedInUser{}.UserId, Navbar: &userNavbarPreferences})
-		require.NoError(t, err)
-
-		query := &models.GetPreferencesWithDefaultsQuery{User: &models.SignedInUser{}}
-		err = ss.GetPreferencesWithDefaults(context.Background(), query)
-		require.NoError(t, err)
-		expected := &models.Preferences{
-			Id:              query.Result.Id,
-			Version:         query.Result.Version,
-			HomeDashboardId: 5,
-			Timezone:        "browser",
-			WeekStart:       "1",
-			Theme:           "dark",
-			JsonData:        &userPreferencesJsonData,
-			Created:         query.Result.Created,
-			Updated:         query.Result.Updated,
-		}
-		if diff := cmp.Diff(expected, query.Result); diff != "" {
-			t.Fatalf("Result mismatch (-want +got):\n%s", diff)
-		}
-	})
-}

pkg/services/sqlstore/store.go

@@ -60,10 +60,6 @@ type Store interface {
 	GetTeamMembers(ctx context.Context, query *models.GetTeamMembersQuery) error
 	NewSession(ctx context.Context) *DBSession
 	WithDbSession(ctx context.Context, callback DBTransactionFunc) error
-	GetPreferencesWithDefaults(ctx context.Context, query *models.GetPreferencesWithDefaultsQuery) error
-	GetPreferences(ctx context.Context, query *models.GetPreferencesQuery) error
-	SavePreferences(ctx context.Context, cmd *models.SavePreferencesCommand) error
-	PatchPreferences(ctx context.Context, cmd *models.PatchPreferencesCommand) error
 	GetPluginSettings(ctx context.Context, orgID int64) ([]*models.PluginSetting, error)
 	GetPluginSettingById(ctx context.Context, query *models.GetPluginSettingByIdQuery) error
 	UpdatePluginSetting(ctx context.Context, cmd *models.UpdatePluginSettingCmd) error

pkg/services/sqlstore/user_test.go

@@ -245,11 +245,6 @@ func TestUserDataAccess(t *testing.T) {
 		})
 		require.Nil(t, err)
 
-		err = ss.SavePreferences(context.Background(), &models.SavePreferencesCommand{
-			UserId: users[1].Id, OrgId: users[0].OrgId, HomeDashboardId: 1, Theme: "dark",
-		})
-		require.Nil(t, err)
-
 		// When the user is deleted
 		err = ss.DeleteUser(context.Background(), &models.DeleteUserCommand{UserId: users[1].Id})
 		require.Nil(t, err)
@@ -266,13 +261,6 @@ func TestUserDataAccess(t *testing.T) {
 
 		require.Len(t, permQuery.Result, 0)
 
-		prefsQuery := &models.GetPreferencesQuery{OrgId: users[0].OrgId, UserId: users[1].Id}
-		err = ss.GetPreferences(context.Background(), prefsQuery)
-		require.Nil(t, err)
-
-		require.EqualValues(t, prefsQuery.Result.OrgId, 0)
-		require.EqualValues(t, prefsQuery.Result.UserId, 0)
-
 		// A user is an org member and has been assigned permissions
 		// Re-init DB
 		ss = InitTestDB(t)
@@ -296,11 +284,6 @@ func TestUserDataAccess(t *testing.T) {
 		})
 		require.Nil(t, err)
 
-		err = ss.SavePreferences(context.Background(), &models.SavePreferencesCommand{
-			UserId: users[1].Id, OrgId: users[0].OrgId, HomeDashboardId: 1, Theme: "dark",
-		})
-		require.Nil(t, err)
-
 		ss.CacheService.Flush()
 
 		query3 := &models.GetSignedInUserQuery{OrgId: users[1].OrgId, UserId: users[1].Id}
@@ -351,13 +334,6 @@ func TestUserDataAccess(t *testing.T) {
 		require.Nil(t, err)
 
 		require.Len(t, permQuery.Result, 0)
-
-		prefsQuery = &models.GetPreferencesQuery{OrgId: users[0].OrgId, UserId: users[1].Id}
-		err = ss.GetPreferences(context.Background(), prefsQuery)
-		require.Nil(t, err)
-
-		require.EqualValues(t, prefsQuery.Result.OrgId, 0)
-		require.EqualValues(t, prefsQuery.Result.UserId, 0)
 	})
 
 	ss = InitTestDB(t)