address comments/nits

johnstcn · johnstcn · commit 868fc521eeca · 2024-01-24T12:43:58.000Z
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -7754,10 +7754,10 @@ func (q *FakeQuerier) GetAuthorizedWorkspaces(ctx context.Context, arg database.
 		w2 := workspaces[j]
 
 		// Order by: favorite first
-		if arg.OrderByFavorite == w1.OwnerID && w1.Favorite {
+		if arg.RequesterID == w1.OwnerID && w1.Favorite {
 			return true
 		}
-		if arg.OrderByFavorite == w2.OwnerID && w2.Favorite {
+		if arg.RequesterID == w2.OwnerID && w2.Favorite {
 			return false
 		}
 
diff --git a/coderd/database/modelqueries.go b/coderd/database/modelqueries.go
@@ -226,7 +226,7 @@ func (q *sqlQuerier) GetAuthorizedWorkspaces(ctx context.Context, arg GetWorkspa
 		arg.LastUsedBefore,
 		arg.LastUsedAfter,
 		arg.UsingActive,
-		arg.OrderByFavorite,
+		arg.RequesterID,
 		arg.Offset,
 		arg.Limit,
 	)
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/workspaces.sql b/coderd/database/queries/workspaces.sql
@@ -267,7 +267,8 @@ WHERE
 	-- Authorize Filter clause will be injected below in GetAuthorizedWorkspaces
 	-- @authorize_filter
 ORDER BY
-	CASE WHEN workspaces.owner_id = @order_by_favorite AND workspaces.favorite THEN 0 ELSE 1 END ASC,
+	-- To ensure that 'favorite' workspaces show up first in the list only for their owner.
+	CASE WHEN workspaces.owner_id = @requester_id AND workspaces.favorite THEN 0 ELSE 1 END ASC,
 	(latest_build.completed_at IS NOT NULL AND
 		latest_build.canceled_at IS NULL AND
 		latest_build.error IS NULL AND
diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -159,9 +159,9 @@ func (api *API) workspaces(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	// To show the user's favorite workspaces first, we pass their userID and compare it to
-	// column favorite_of when ordering the rows.
-	filter.OrderByFavorite = apiKey.UserID
+	// To show the requester's favorite workspaces first, we pass their userID and compare it to
+	// the workspace owner_id when ordering the rows.
+	filter.RequesterID = apiKey.UserID
 
 	workspaceRows, err := api.Database.GetAuthorizedWorkspaces(ctx, filter, prepared)
 	if err != nil {
@@ -1049,7 +1049,7 @@ func (api *API) putFavoriteWorkspace(rw http.ResponseWriter, r *http.Request) {
 
 	if apiKey.UserID != workspace.OwnerID {
 		httpapi.Write(ctx, rw, http.StatusForbidden, codersdk.Response{
-			Message: "You can only favorite workspaces that you own",
+			Message: "You can only favorite workspaces that you own.",
 		})
 		return
 	}
@@ -1095,7 +1095,7 @@ func (api *API) deleteFavoriteWorkspace(rw http.ResponseWriter, r *http.Request)
 
 	if apiKey.UserID != workspace.OwnerID {
 		httpapi.Write(ctx, rw, http.StatusForbidden, codersdk.Response{
-			Message: "You can only un-favorite workspaces that you own",
+			Message: "You can only un-favorite workspaces that you own.",
 		})
 		return
 	}

Original file line number	Diff line number	Diff line change
`@@ -7754,10 +7754,10 @@ func (q *FakeQuerier) GetAuthorizedWorkspaces(ctx context.Context, arg database.`
`7754`	`7754`	`w2 := workspaces[j]`
`7755`	`7755`
`7756`	`7756`	`// Order by: favorite first`
`7757`		`- if arg.OrderByFavorite == w1.OwnerID && w1.Favorite {`
	`7757`	`+ if arg.RequesterID == w1.OwnerID && w1.Favorite {`
`7758`	`7758`	`return true`
`7759`	`7759`	`}`
`7760`		`- if arg.OrderByFavorite == w2.OwnerID && w2.Favorite {`
	`7760`	`+ if arg.RequesterID == w2.OwnerID && w2.Favorite {`
`7761`	`7761`	`return false`
`7762`	`7762`	`}`
`7763`	`7763`
Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ func (q *sqlQuerier) GetAuthorizedWorkspaces(ctx context.Context, arg GetWorkspa`
`226`	`226`	`arg.LastUsedBefore,`
`227`	`227`	`arg.LastUsedAfter,`
`228`	`228`	`arg.UsingActive,`
`229`		`- arg.OrderByFavorite,`
	`229`	`+ arg.RequesterID,`
`230`	`230`	`arg.Offset,`
`231`	`231`	`arg.Limit,`
`232`	`232`	`)`