Skip to content

Commit d9e9627

Browse files
mtojekmtojek
committed
Rename GetAppearanceSettings to GetUserThemePreferences
1 parent c309664 commit d9e9627

File tree

19 files changed

+294
-174
lines changed

19 files changed

+294
-174
lines changed

‎cli/testdata/TestProvisioners_Golden/list.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ID CREATED AT LAST SEEN AT NAME VERSION TAGS KEY NAME STATUS CURRENT JOB ID CURRENT JOB STATUS PREVIOUS JOB ID PREVIOUS JOB STATUS ORGANIZATION
1+
ID CREATED AT LAST SEEN AT NAME VERSION TAGS KEY NAME STATUS CURRENT JOB ID CURRENT JOB STATUS PREVIOUS JOB ID PREVIOUS JOB STATUS ORGANIZATION
22
00000000-0000-0000-aaaa-000000000000 ====[timestamp]===== ====[timestamp]===== default-provisioner v0.0.0-devel map[owner: scope:organization] built-in idle <nil> <nil> 00000000-0000-0000-bbbb-000000000001 succeeded Coder
33
00000000-0000-0000-aaaa-000000000001 ====[timestamp]===== ====[timestamp]===== provisioner-1 v0.0.0 map[foo:bar owner: scope:organization] built-in busy 00000000-0000-0000-bbbb-000000000002 running <nil> <nil> Coder
44
00000000-0000-0000-aaaa-000000000002 ====[timestamp]===== ====[timestamp]===== provisioner-2 v0.0.0 map[owner: scope:organization] built-in offline <nil> <nil> 00000000-0000-0000-bbbb-000000000003 succeeded Coder

‎cli/testdata/coder_provisioner_list.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
CREATED AT LAST SEEN AT KEY NAME NAME VERSION STATUS TAGS
1+
CREATED AT LAST SEEN AT KEY NAME NAME VERSION STATUS TAGS
22
====[timestamp]===== ====[timestamp]===== built-in test v0.0.0-devel idle map[owner: scope:organization]

‎coderd/apidoc/docs.go

Lines changed: 36 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/apidoc/swagger.json

Lines changed: 26 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/dbauthz/dbauthz.go

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1061,6 +1061,28 @@ func (q *querier) customRoleCheck(ctx context.Context, role database.CustomRole)
10611061
return nil
10621062
}
10631063

1064+
func (q *querier) GetUserThemePreference(ctx context.Context, userID uuid.UUID) (string, error) {
1065+
u, err := q.db.GetUserByID(ctx, userID)
1066+
if err != nil {
1067+
return "", err
1068+
}
1069+
if err := q.authorizeContext(ctx, policy.ActionReadPersonal, u); err != nil {
1070+
return "", err
1071+
}
1072+
return q.db.GetUserThemePreference(ctx, userID)
1073+
}
1074+
1075+
func (q *querier) UpdateUserThemePreference(ctx context.Context, arg database.UpdateUserThemePreferenceParams) (database.UserConfig, error) {
1076+
u, err := q.db.GetUserByID(ctx, arg.UserID)
1077+
if err != nil {
1078+
return database.UserConfig{}, err
1079+
}
1080+
if err := q.authorizeContext(ctx, policy.ActionUpdatePersonal, u); err != nil {
1081+
return database.UserConfig{}, err
1082+
}
1083+
return q.db.UpdateUserThemePreference(ctx, arg)
1084+
}
1085+
10641086
func (q *querier) AcquireLock(ctx context.Context, id int64) error {
10651087
return q.db.AcquireLock(ctx, id)
10661088
}
@@ -2711,17 +2733,6 @@ func (q *querier) GetUserActivityInsights(ctx context.Context, arg database.GetU
27112733
return q.db.GetUserActivityInsights(ctx, arg)
27122734
}
27132735

2714-
func (q *querier) GetUserAppearanceSettings(ctx context.Context, userID uuid.UUID) (string, error) {
2715-
u, err := q.db.GetUserByID(ctx, userID)
2716-
if err != nil {
2717-
return "", err
2718-
}
2719-
if err := q.authorizeContext(ctx, policy.ActionReadPersonal, u); err != nil {
2720-
return "", err
2721-
}
2722-
return q.db.GetUserAppearanceSettings(ctx, userID)
2723-
}
2724-
27252736
func (q *querier) GetUserByEmailOrUsername(ctx context.Context, arg database.GetUserByEmailOrUsernameParams) (database.User, error) {
27262737
return fetch(q.log, q.auth, q.db.GetUserByEmailOrUsername)(ctx, arg)
27272738
}
@@ -4311,17 +4322,6 @@ func (q *querier) UpdateTemplateWorkspacesLastUsedAt(ctx context.Context, arg da
43114322
return fetchAndExec(q.log, q.auth, policy.ActionUpdate, fetch, q.db.UpdateTemplateWorkspacesLastUsedAt)(ctx, arg)
43124323
}
43134324

4314-
func (q *querier) UpdateUserAppearanceSettings(ctx context.Context, arg database.UpdateUserAppearanceSettingsParams) (database.UserConfig, error) {
4315-
u, err := q.db.GetUserByID(ctx, arg.UserID)
4316-
if err != nil {
4317-
return database.UserConfig{}, err
4318-
}
4319-
if err := q.authorizeContext(ctx, policy.ActionUpdatePersonal, u); err != nil {
4320-
return database.UserConfig{}, err
4321-
}
4322-
return q.db.UpdateUserAppearanceSettings(ctx, arg)
4323-
}
4324-
43254325
func (q *querier) UpdateUserDeletedByID(ctx context.Context, id uuid.UUID) error {
43264326
return deleteQ(q.log, q.auth, q.db.GetUserByID, q.db.UpdateUserDeletedByID)(ctx, id)
43274327
}

‎coderd/database/dbauthz/dbauthz_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1630,23 +1630,23 @@ func (s *MethodTestSuite) TestUser() {
16301630
[]database.GetUserWorkspaceBuildParametersRow{},
16311631
)
16321632
}))
1633-
s.Run("GetUserAppearanceSettings", s.Subtest(func(db database.Store, check *expects) {
1633+
s.Run("GetUserThemePreference", s.Subtest(func(db database.Store, check *expects) {
16341634
ctx := context.Background()
16351635
u := dbgen.User(s.T(), db, database.User{})
1636-
db.UpdateUserAppearanceSettings(ctx, database.UpdateUserAppearanceSettingsParams{
1636+
db.UpdateUserThemePreference(ctx, database.UpdateUserThemePreferenceParams{
16371637
UserID: u.ID,
16381638
ThemePreference: "light",
16391639
})
16401640
check.Args(u.ID).Asserts(u, policy.ActionReadPersonal).Returns("light")
16411641
}))
1642-
s.Run("UpdateUserAppearanceSettings", s.Subtest(func(db database.Store, check *expects) {
1642+
s.Run("UpdateUserThemePreference", s.Subtest(func(db database.Store, check *expects) {
16431643
u := dbgen.User(s.T(), db, database.User{})
16441644
uc := database.UserConfig{
16451645
UserID: u.ID,
16461646
Key: "theme_preference",
16471647
Value: "dark",
16481648
}
1649-
check.Args(database.UpdateUserAppearanceSettingsParams{
1649+
check.Args(database.UpdateUserThemePreferenceParams{
16501650
UserID: u.ID,
16511651
ThemePreference: uc.Value,
16521652
}).Asserts(u, policy.ActionUpdatePersonal).Returns(uc)

‎coderd/database/dbmem/dbmem.go

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1379,6 +1379,47 @@ func (q *FakeQuerier) getProvisionerJobsByIDsWithQueuePositionLockedGlobalQueue(
13791379
return jobs, nil
13801380
}
13811381

1382+
func (q *FakeQuerier) GetUserThemePreference(_ context.Context, userID uuid.UUID) (string, error) {
1383+
q.mutex.RLock()
1384+
defer q.mutex.RUnlock()
1385+
1386+
for _, uc := range q.userConfigs {
1387+
if uc.UserID != userID || uc.Key != "theme_preference" {
1388+
continue
1389+
}
1390+
return uc.Value, nil
1391+
}
1392+
1393+
return "", sql.ErrNoRows
1394+
}
1395+
1396+
func (q *FakeQuerier) UpdateUserThemePreference(_ context.Context, arg database.UpdateUserThemePreferenceParams) (database.UserConfig, error) {
1397+
err := validateDatabaseType(arg)
1398+
if err != nil {
1399+
return database.UserConfig{}, err
1400+
}
1401+
1402+
q.mutex.Lock()
1403+
defer q.mutex.Unlock()
1404+
1405+
for i, uc := range q.userConfigs {
1406+
if uc.UserID != arg.UserID || uc.Key != "theme_preference" {
1407+
continue
1408+
}
1409+
uc.Value = arg.ThemePreference
1410+
q.userConfigs[i] = uc
1411+
return uc, nil
1412+
}
1413+
1414+
uc := database.UserConfig{
1415+
UserID: arg.UserID,
1416+
Key: "theme_preference",
1417+
Value: arg.ThemePreference,
1418+
}
1419+
q.userConfigs = append(q.userConfigs, uc)
1420+
return uc, nil
1421+
}
1422+
13821423
func (*FakeQuerier) AcquireLock(_ context.Context, _ int64) error {
13831424
return xerrors.New("AcquireLock must only be called within a transaction")
13841425
}
@@ -6434,20 +6475,6 @@ func (q *FakeQuerier) GetUserActivityInsights(_ context.Context, arg database.Ge
64346475
return rows, nil
64356476
}
64366477

6437-
func (q *FakeQuerier) GetUserAppearanceSettings(_ context.Context, userID uuid.UUID) (string, error) {
6438-
q.mutex.RLock()
6439-
defer q.mutex.RUnlock()
6440-
6441-
for _, uc := range q.userConfigs {
6442-
if uc.UserID != userID || uc.Key != "theme_preference" {
6443-
continue
6444-
}
6445-
return uc.Value, nil
6446-
}
6447-
6448-
return "", sql.ErrNoRows
6449-
}
6450-
64516478
func (q *FakeQuerier) GetUserByEmailOrUsername(_ context.Context, arg database.GetUserByEmailOrUsernameParams) (database.User, error) {
64526479
if err := validateDatabaseType(arg); err != nil {
64536480
return database.User{}, err
@@ -10996,33 +11023,6 @@ func (q *FakeQuerier) UpdateTemplateWorkspacesLastUsedAt(_ context.Context, arg
1099611023
return nil
1099711024
}
1099811025

10999-
func (q *FakeQuerier) UpdateUserAppearanceSettings(_ context.Context, arg database.UpdateUserAppearanceSettingsParams) (database.UserConfig, error) {
11000-
err := validateDatabaseType(arg)
11001-
if err != nil {
11002-
return database.UserConfig{}, err
11003-
}
11004-
11005-
q.mutex.Lock()
11006-
defer q.mutex.Unlock()
11007-
11008-
for i, uc := range q.userConfigs {
11009-
if uc.UserID != arg.UserID || uc.Key != "theme_preference" {
11010-
continue
11011-
}
11012-
uc.Value = arg.ThemePreference
11013-
q.userConfigs[i] = uc
11014-
return uc, nil
11015-
}
11016-
11017-
uc := database.UserConfig{
11018-
UserID: arg.UserID,
11019-
Key: "theme_preference",
11020-
Value: arg.ThemePreference,
11021-
}
11022-
q.userConfigs = append(q.userConfigs, uc)
11023-
return uc, nil
11024-
}
11025-
1102611026
func (q *FakeQuerier) UpdateUserDeletedByID(_ context.Context, id uuid.UUID) error {
1102711027
q.mutex.Lock()
1102811028
defer q.mutex.Unlock()

‎coderd/database/dbmetrics/querymetrics.go

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)