From ea9f240445d9a4a293cdb74b4f2f1224850e9767 Mon Sep 17 00:00:00 2001 From: Presley Pizzo Date: Mon, 17 Oct 2022 20:50:45 +0000 Subject: [PATCH] Fix params type --- coderd/database/databasefake/databasefake.go | 2 +- coderd/workspaces.go | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go index a25f35e604..e7a2fbd363 100644 --- a/coderd/database/databasefake/databasefake.go +++ b/coderd/database/databasefake/databasefake.go @@ -717,7 +717,7 @@ func (q *fakeQuerier) GetWorkspaceCount(ctx context.Context, arg database.GetWor } //nolint:gocyclo -func (q *fakeQuerier) GetAuthorizedWorkspaceCount(ctx context.Context, arg database.GetWorkspacesParams, authorizedFilter rbac.AuthorizeFilter) (int64, error) { +func (q *fakeQuerier) GetAuthorizedWorkspaceCount(ctx context.Context, arg database.GetWorkspaceCountParams, authorizedFilter rbac.AuthorizeFilter) (int64, error) { q.mutex.RLock() defer q.mutex.RUnlock() diff --git a/coderd/workspaces.go b/coderd/workspaces.go index 614a7ba905..e089673597 100644 --- a/coderd/workspaces.go +++ b/coderd/workspaces.go @@ -185,7 +185,17 @@ func (api *API) workspaceCount(rw http.ResponseWriter, r *http.Request) { return } - count, err := api.Database.GetAuthorizedWorkspaceCount(ctx, filter, sqlFilter) + countFilter := database.GetWorkspaceCountParams{ + Deleted: filter.Deleted, + OwnerUsername: filter.OwnerUsername, + OwnerID: filter.OwnerID, + Name: filter.Name, + Status: filter.Status, + TemplateIds: filter.TemplateIds, + TemplateName: filter.TemplateName, + } + + count, err := api.Database.GetAuthorizedWorkspaceCount(ctx, countFilter, sqlFilter) if err != nil { httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{ Message: "Internal error fetching workspace count.",