Move SignedInUser to user service and RoleType and Roles to org (#53445)
* Move SignedInUser to user service and RoleType and Roles to org * Use go naming convention for roles * Fix some imports and leftovers * Fix ldap debug test * Fix lint * Fix lint 2 * Fix lint 3 * Fix type and not needed conversion * Clean up messages in api tests * Clean up api tests 2
This commit is contained in:
@@ -6,9 +6,9 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/google/go-cmp/cmp"
|
||||
"github.com/grafana/grafana/pkg/models"
|
||||
pref "github.com/grafana/grafana/pkg/services/preference"
|
||||
"github.com/grafana/grafana/pkg/services/sqlstore"
|
||||
"github.com/grafana/grafana/pkg/services/user"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
@@ -117,7 +117,7 @@ func TestIntegrationPreferencesDataAccess(t *testing.T) {
|
||||
ss := sqlstore.InitTestDB(t)
|
||||
prefStore := sqlStore{db: ss}
|
||||
id, err := prefStore.Insert(context.Background(), &pref.Preference{
|
||||
UserID: models.SignedInUser{}.UserId,
|
||||
UserID: user.SignedInUser{}.UserId,
|
||||
Theme: "dark",
|
||||
Timezone: "browser",
|
||||
HomeDashboardID: 5,
|
||||
@@ -160,7 +160,7 @@ func TestIntegrationPreferencesDataAccess(t *testing.T) {
|
||||
t.Run("insert preference that does not exist", func(t *testing.T) {
|
||||
_, err := prefStore.Insert(context.Background(),
|
||||
&pref.Preference{
|
||||
UserID: models.SignedInUser{}.UserId,
|
||||
UserID: user.SignedInUser{}.UserId,
|
||||
Created: time.Now(),
|
||||
Updated: time.Now(),
|
||||
JSONData: &pref.PreferenceJSONData{},
|
||||
|
||||
Reference in New Issue
Block a user