Skip to content

Commit 030c520

Browse files
johnstcnjohnstcn
committed
s/favored/favorite/g
1 parent 7f185fe commit 030c520

File tree

13 files changed

+93
-92
lines changed

13 files changed

+93
-92
lines changed

‎coderd/apidoc/docs.go

Lines changed: 3 additions & 3 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: 3 additions & 3 deletions
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: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -656,20 +656,6 @@ func authorizedTemplateVersionFromJob(ctx context.Context, q *querier, job datab
656656
}
657657
}
658658

659-
func (q *querier) FavoriteWorkspace(ctx context.Context, arg database.FavoriteWorkspaceParams) error {
660-
if _, err := q.GetWorkspaceByID(ctx, arg.WorkspaceID); err != nil {
661-
return err
662-
}
663-
return q.db.FavoriteWorkspace(ctx, arg)
664-
}
665-
666-
func (q *querier) UnfavoriteWorkspace(ctx context.Context, arg database.UnfavoriteWorkspaceParams) error {
667-
if _, err := q.GetWorkspaceByID(ctx, arg.WorkspaceID); err != nil {
668-
return err
669-
}
670-
return q.db.UnfavoriteWorkspace(ctx, arg)
671-
}
672-
673659
func (q *querier) AcquireLock(ctx context.Context, id int64) error {
674660
return q.db.AcquireLock(ctx, id)
675661
}
@@ -905,6 +891,13 @@ func (q *querier) DeleteTailnetTunnel(ctx context.Context, arg database.DeleteTa
905891
return q.db.DeleteTailnetTunnel(ctx, arg)
906892
}
907893

894+
func (q *querier) FavoriteWorkspace(ctx context.Context, arg database.FavoriteWorkspaceParams) error {
895+
if _, err := q.GetWorkspaceByID(ctx, arg.WorkspaceID); err != nil {
896+
return err
897+
}
898+
return q.db.FavoriteWorkspace(ctx, arg)
899+
}
900+
908901
func (q *querier) GetAPIKeyByID(ctx context.Context, id string) (database.APIKey, error) {
909902
return fetch(q.log, q.auth, q.db.GetAPIKeyByID)(ctx, id)
910903
}
@@ -2523,6 +2516,13 @@ func (q *querier) UnarchiveTemplateVersion(ctx context.Context, arg database.Una
25232516
return q.db.UnarchiveTemplateVersion(ctx, arg)
25242517
}
25252518

2519+
func (q *querier) UnfavoriteWorkspace(ctx context.Context, arg database.UnfavoriteWorkspaceParams) error {
2520+
if _, err := q.GetWorkspaceByID(ctx, arg.WorkspaceID); err != nil {
2521+
return err
2522+
}
2523+
return q.db.UnfavoriteWorkspace(ctx, arg)
2524+
}
2525+
25262526
func (q *querier) UpdateAPIKeyByID(ctx context.Context, arg database.UpdateAPIKeyByIDParams) error {
25272527
fetch := func(ctx context.Context, arg database.UpdateAPIKeyByIDParams) (database.APIKey, error) {
25282528
return q.db.GetAPIKeyByID(ctx, arg.ID)

‎coderd/database/dbmem/dbmem.go

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -732,47 +732,6 @@ func isNotNull(v interface{}) bool {
732732
return reflect.ValueOf(v).FieldByName("Valid").Bool()
733733
}
734734

735-
func (q *FakeQuerier) FavoriteWorkspace(_ context.Context, arg database.FavoriteWorkspaceParams) error {
736-
err := validateDatabaseType(arg)
737-
if err != nil {
738-
return err
739-
}
740-
741-
q.mutex.Lock()
742-
defer q.mutex.Unlock()
743-
744-
for _, upw := range q.favoriteWorkspaces {
745-
if arg.UserID == upw.UserID && arg.WorkspaceID == upw.WorkspaceID {
746-
return errDuplicateKey
747-
}
748-
}
749-
return nil
750-
}
751-
752-
func (q *FakeQuerier) UnfavoriteWorkspace(_ context.Context, arg database.UnfavoriteWorkspaceParams) error {
753-
err := validateDatabaseType(arg)
754-
if err != nil {
755-
return err
756-
}
757-
758-
q.mutex.Lock()
759-
defer q.mutex.Unlock()
760-
761-
for index, upw := range q.favoriteWorkspaces {
762-
if upw.UserID != arg.UserID {
763-
continue
764-
}
765-
if upw.WorkspaceID != arg.WorkspaceID {
766-
continue
767-
}
768-
q.favoriteWorkspaces[index] = q.favoriteWorkspaces[len(q.apiKeys)-1]
769-
q.favoriteWorkspaces = q.favoriteWorkspaces[:len(q.favoriteWorkspaces)-1]
770-
return nil
771-
}
772-
773-
return nil
774-
}
775-
776735
func (*FakeQuerier) AcquireLock(_ context.Context, _ int64) error {
777736
return xerrors.New("AcquireLock must only be called within a transaction")
778737
}
@@ -1358,6 +1317,23 @@ func (*FakeQuerier) DeleteTailnetTunnel(_ context.Context, arg database.DeleteTa
13581317
return database.DeleteTailnetTunnelRow{}, ErrUnimplemented
13591318
}
13601319

1320+
func (q *FakeQuerier) FavoriteWorkspace(_ context.Context, arg database.FavoriteWorkspaceParams) error {
1321+
err := validateDatabaseType(arg)
1322+
if err != nil {
1323+
return err
1324+
}
1325+
1326+
q.mutex.Lock()
1327+
defer q.mutex.Unlock()
1328+
1329+
for _, upw := range q.favoriteWorkspaces {
1330+
if arg.UserID == upw.UserID && arg.WorkspaceID == upw.WorkspaceID {
1331+
return errDuplicateKey
1332+
}
1333+
}
1334+
return nil
1335+
}
1336+
13611337
func (q *FakeQuerier) GetAPIKeyByID(_ context.Context, id string) (database.APIKey, error) {
13621338
q.mutex.RLock()
13631339
defer q.mutex.RUnlock()
@@ -6027,6 +6003,30 @@ func (q *FakeQuerier) UnarchiveTemplateVersion(_ context.Context, arg database.U
60276003
return sql.ErrNoRows
60286004
}
60296005

6006+
func (q *FakeQuerier) UnfavoriteWorkspace(_ context.Context, arg database.UnfavoriteWorkspaceParams) error {
6007+
err := validateDatabaseType(arg)
6008+
if err != nil {
6009+
return err
6010+
}
6011+
6012+
q.mutex.Lock()
6013+
defer q.mutex.Unlock()
6014+
6015+
for index, upw := range q.favoriteWorkspaces {
6016+
if upw.UserID != arg.UserID {
6017+
continue
6018+
}
6019+
if upw.WorkspaceID != arg.WorkspaceID {
6020+
continue
6021+
}
6022+
q.favoriteWorkspaces[index] = q.favoriteWorkspaces[len(q.apiKeys)-1]
6023+
q.favoriteWorkspaces = q.favoriteWorkspaces[:len(q.favoriteWorkspaces)-1]
6024+
return nil
6025+
}
6026+
6027+
return nil
6028+
}
6029+
60306030
func (q *FakeQuerier) UpdateAPIKeyByID(_ context.Context, arg database.UpdateAPIKeyByIDParams) error {
60316031
if err := validateDatabaseType(arg); err != nil {
60326032
return err

‎coderd/database/modelqueries.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ func (q *sqlQuerier) GetAuthorizedWorkspaces(ctx context.Context, arg GetWorkspa
253253
&i.TemplateName,
254254
&i.TemplateVersionID,
255255
&i.TemplateVersionName,
256-
&i.Favored,
256+
&i.Favorite,
257257
&i.Count,
258258
); err != nil {
259259
return nil, err

‎coderd/database/queries.sql.go

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

‎coderd/database/queries/workspaces.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ SELECT
8282
COALESCE(template_name.template_name, 'unknown') as template_name,
8383
latest_build.template_version_id,
8484
latest_build.template_version_name,
85-
(fws.user_id IS NOT NULL)::boolean AS favored,
85+
(fws.user_id IS NOT NULL)::boolean AS favorite,
8686
COUNT(*) OVER () as count
8787
FROM
8888
workspaces
@@ -276,7 +276,7 @@ WHERE
276276
-- Authorize Filter clause will be injected below in GetAuthorizedWorkspaces
277277
-- @authorize_filter
278278
ORDER BY
279-
favored DESC,
279+
favorite DESC,
280280
(latest_build.completed_at IS NOT NULL AND
281281
latest_build.canceled_at IS NULL AND
282282
latest_build.error IS NULL AND

‎coderd/workspaces_test.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2950,17 +2950,17 @@ func TestWorkspaceFavoriteUnfavorite(t *testing.T) {
29502950
workspaces, err := memberClient.Workspaces(ctx, codersdk.WorkspaceFilter{})
29512951
require.NoError(t, err)
29522952
require.Len(t, workspaces.Workspaces, 1)
2953-
require.False(t, workspaces.Workspaces[0].Favored)
2953+
require.False(t, workspaces.Workspaces[0].Favorite)
29542954
ws, err := memberClient.Workspace(ctx, wsb1.Workspace.ID)
29552955
require.NoError(t, err)
2956-
require.False(t, ws.Favored)
2956+
require.False(t, ws.Favorite)
29572957

29582958
// Also not for owner.
29592959
workspaces, err = client.Workspaces(ctx, codersdk.WorkspaceFilter{})
29602960
require.NoError(t, err)
29612961
require.Len(t, workspaces.Workspaces, 2)
2962-
require.False(t, workspaces.Workspaces[0].Favored)
2963-
require.False(t, workspaces.Workspaces[1].Favored)
2962+
require.False(t, workspaces.Workspaces[0].Favorite)
2963+
require.False(t, workspaces.Workspaces[1].Favorite)
29642964

29652965
// When member pins workspace
29662966
err = memberClient.FavoriteWorkspace(ctx, wsb1.Workspace.ID)
@@ -2970,20 +2970,20 @@ func TestWorkspaceFavoriteUnfavorite(t *testing.T) {
29702970
workspaces, err = memberClient.Workspaces(ctx, codersdk.WorkspaceFilter{})
29712971
require.NoError(t, err)
29722972
require.Len(t, workspaces.Workspaces, 1)
2973-
require.True(t, workspaces.Workspaces[0].Favored)
2973+
require.True(t, workspaces.Workspaces[0].Favorite)
29742974
ws, err = memberClient.Workspace(ctx, wsb1.Workspace.ID)
29752975
require.NoError(t, err)
2976-
require.True(t, ws.Favored)
2976+
require.True(t, ws.Favorite)
29772977

29782978
// But not for someone else
29792979
workspaces, err = client.Workspaces(ctx, codersdk.WorkspaceFilter{})
29802980
require.NoError(t, err)
29812981
require.Len(t, workspaces.Workspaces, 2)
2982-
require.False(t, workspaces.Workspaces[0].Favored)
2983-
require.False(t, workspaces.Workspaces[1].Favored)
2982+
require.False(t, workspaces.Workspaces[0].Favorite)
2983+
require.False(t, workspaces.Workspaces[1].Favorite)
29842984
ws, err = client.Workspace(ctx, wsb1.Workspace.ID)
29852985
require.NoError(t, err)
2986-
require.False(t, ws.Favored)
2986+
require.False(t, ws.Favorite)
29872987

29882988
// When member unpins workspace
29892989
err = memberClient.UnfavoriteWorkspace(ctx, wsb1.Workspace.ID)
@@ -2993,18 +2993,18 @@ func TestWorkspaceFavoriteUnfavorite(t *testing.T) {
29932993
workspaces, err = memberClient.Workspaces(ctx, codersdk.WorkspaceFilter{})
29942994
require.NoError(t, err)
29952995
require.Len(t, workspaces.Workspaces, 1)
2996-
require.False(t, workspaces.Workspaces[0].Favored)
2996+
require.False(t, workspaces.Workspaces[0].Favorite)
29972997
ws, err = memberClient.Workspace(ctx, wsb1.Workspace.ID)
29982998
require.NoError(t, err)
2999-
require.False(t, ws.Favored)
2999+
require.False(t, ws.Favorite)
30003000

30013001
// Assert invariant: workspace should remain unpinned for a different user
30023002
workspaces, err = client.Workspaces(ctx, codersdk.WorkspaceFilter{})
30033003
require.NoError(t, err)
30043004
require.Len(t, workspaces.Workspaces, 2)
3005-
require.False(t, workspaces.Workspaces[0].Favored)
3006-
require.False(t, workspaces.Workspaces[1].Favored)
3005+
require.False(t, workspaces.Workspaces[0].Favorite)
3006+
require.False(t, workspaces.Workspaces[1].Favorite)
30073007
ws, err = client.Workspace(ctx, wsb1.Workspace.ID)
30083008
require.NoError(t, err)
3009-
require.False(t, ws.Favored)
3009+
require.False(t, ws.Favorite)
30103010
}

‎codersdk/workspaces.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ type Workspace struct {
5858
Health WorkspaceHealth `json:"health"`
5959
AutomaticUpdates AutomaticUpdates `json:"automatic_updates" enums:"always,never"`
6060
AllowRenames bool `json:"allow_renames"`
61-
Favored bool `json:"favored"`
61+
Favorite bool `json:"favorite"`
6262
}
6363

6464
func (w Workspace) FullName() string {

‎docs/api/schemas.md

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

0 commit comments

Comments
 (0)