coder
diff --git a/‎coderd/database/queries.sql.go
Lines changed: 3 additions & 10 deletions b/‎coderd/database/queries.sql.go
Lines changed: 3 additions & 10 deletions
diff --git a/‎coderd/database/queries/quotas.sql
Lines changed: 3 additions & 10 deletions b/‎coderd/database/queries/quotas.sql
Lines changed: 3 additions & 10 deletions
@@ -28,6 +28,8 @@ FROM
 INNER JOIN
 	workspaces on wb.workspace_id = workspaces.id
 WHERE
+	-- Only return workspaces that match the user + organization.
+	-- Quotas are calculated per user per organization.
 	workspaces.owner_id = @owner_id AND
 	workspaces.organization_id = @organization_id
 ORDER BY
@@ -37,14 +39,5 @@ ORDER BY
 SELECT
 	coalesce(SUM(daily_cost), 0)::BIGINT
 FROM
-	workspaces
-INNER JOIN latest_builds ON
-	latest_builds.workspace_id = workspaces.id
-WHERE
-	NOT deleted AND
-	-- We can likely remove these conditions since we check above.
-	-- But it does not hurt to be defensive and make sure future query changes
-	-- do not break anything.
-	workspaces.owner_id = @owner_id AND
-	workspaces.organization_id = @organization_id
+	latest_builds
 ;