use query over route logic

f0ssel · f0ssel · commit f3b7b9ad2902 · 2023-12-07T17:49:43.000Z
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -3704,6 +3704,9 @@ func (q *FakeQuerier) GetWorkspaceAgentAndOwnerByAuthToken(_ context.Context, au
 					if build.WorkspaceID != ws.ID {
 						continue
 					}
+					if ws.Deleted {
+						continue
+					}
 					var row database.GetWorkspaceAgentAndOwnerByAuthTokenRow
 					row.WorkspaceID = ws.ID
 					usr, err := q.getUserByIDNoLock(ws.OwnerID)
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/workspaceagents.sql b/coderd/database/queries/workspaceagents.sql
@@ -252,9 +252,10 @@ FROM users
 WHERE
 	-- TODO: we can add more conditions here, such as:
 	-- 1) The user must be active
-	-- 2) The user must not be deleted
-	-- 3) The workspace must be running
+	-- 2) The workspace must be running
 	workspace_agents.auth_token = @auth_token
+AND
+	workspaces.deleted = FALSE
 GROUP BY
 	workspace_agents.id,
 	workspaces.id,
diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go
@@ -1653,13 +1653,6 @@ func (api *API) workspaceAgentReportStats(rw http.ResponseWriter, r *http.Reques
 		return
 	}
 
-	if workspace.Deleted {
-		httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
-			Message: "Workspace has been deleted.",
-		})
-		return
-	}
-
 	var req agentsdk.Stats
 	if !httpapi.Read(ctx, rw, r, &req) {
 		return
diff --git a/coderd/workspaceagents_test.go b/coderd/workspaceagents_test.go
@@ -929,7 +929,7 @@ func TestWorkspaceAgentReportStats(t *testing.T) {
 			SessionCountSSH:             0,
 			ConnectionMedianLatencyMS:   10,
 		})
-		require.ErrorContains(t, err, "Workspace has been deleted.")
+		require.ErrorContains(t, err, "agent is invalid")
 	})
 }
 

Original file line number	Diff line number	Diff line change
`@@ -929,7 +929,7 @@ func TestWorkspaceAgentReportStats(t *testing.T) {`
`929`	`929`	`SessionCountSSH: 0,`
`930`	`930`	`ConnectionMedianLatencyMS: 10,`
`931`	`931`	`})`
`932`		`- require.ErrorContains(t, err, "Workspace has been deleted.")`
	`932`	`+ require.ErrorContains(t, err, "agent is invalid")`
`933`	`933`	`})`
`934`	`934`	`}`
`935`	`935`