Chore: Add user service method SetUsingOrg and GetSignedInUserWithCacheCtx (#53343)
* Chore: Add user service method SetUsingOrg * Chore: Add user service method GetSignedInUserWithCacheCtx * Use method GetSignedInUserWithCacheCtx from user service * Fix lint after rebase * Fix lint * Fix lint error * roll back some changes * Roll back changes in api and middleware * Add xorm tags to SignedInUser ID fields
This commit is contained in:
@@ -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: user.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: user.SignedInUser{}.UserId,
|
||||
UserID: user.SignedInUser{}.UserID,
|
||||
Created: time.Now(),
|
||||
Updated: time.Now(),
|
||||
JSONData: &pref.PreferenceJSONData{},
|
||||
|
||||
Reference in New Issue
Block a user