fix: Fix workspace count to exclude deleted workspaces (#2916)

Emyrk · web-flow · commit c07a45e61090 · 2022-07-12T12:52:28.000-05:00
diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go
@@ -527,7 +527,7 @@ func (q *fakeQuerier) GetWorkspaceOwnerCountsByTemplateIDs(_ context.Context, te
 
 	counts := map[uuid.UUID]map[uuid.UUID]struct{}{}
 	for _, templateID := range templateIDs {
-		found := false
+		counts[templateID] = map[uuid.UUID]struct{}{}
 		for _, workspace := range q.workspaces {
 			if workspace.TemplateID != templateID {
 				continue
@@ -541,11 +541,6 @@ func (q *fakeQuerier) GetWorkspaceOwnerCountsByTemplateIDs(_ context.Context, te
 			}
 			countByOwnerID[workspace.OwnerID] = struct{}{}
 			counts[templateID] = countByOwnerID
-			found = true
-			break
-		}
-		if !found {
-			counts[templateID] = map[uuid.UUID]struct{}{}
 		}
 	}
 	res := make([]database.GetWorkspaceOwnerCountsByTemplateIDsRow, 0)
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
@@ -83,6 +83,8 @@ FROM
 	workspaces
 WHERE
 	template_id = ANY(@ids :: uuid [ ])
+	-- Ignore deleted workspaces
+	AND deleted != true
 GROUP BY
 	template_id;
 
diff --git a/coderd/templates_test.go b/coderd/templates_test.go
@@ -11,6 +11,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/coder/coder/coderd/coderdtest"
+	"github.com/coder/coder/coderd/rbac"
 	"github.com/coder/coder/coderd/util/ptr"
 	"github.com/coder/coder/codersdk"
 )
@@ -27,6 +28,37 @@ func TestTemplate(t *testing.T) {
 		_, err := client.Template(context.Background(), template.ID)
 		require.NoError(t, err)
 	})
+
+	t.Run("WorkspaceCount", func(t *testing.T) {
+		t.Parallel()
+		ctx := context.Background()
+		client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerD: true})
+		user := coderdtest.CreateFirstUser(t, client)
+		member := coderdtest.CreateAnotherUser(t, client, user.OrganizationID, rbac.RoleAdmin())
+		memberWithDeleted := coderdtest.CreateAnotherUser(t, client, user.OrganizationID, rbac.RoleAdmin())
+		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
+		template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
+		coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
+
+		// Create 3 workspaces with 3 users. 2 workspaces exist, 1 is deleted
+		workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID)
+		coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID)
+
+		memberWorkspace := coderdtest.CreateWorkspace(t, member, user.OrganizationID, template.ID)
+		coderdtest.AwaitWorkspaceBuildJob(t, member, memberWorkspace.LatestBuild.ID)
+
+		deletedWorkspace := coderdtest.CreateWorkspace(t, memberWithDeleted, user.OrganizationID, template.ID)
+		coderdtest.AwaitWorkspaceBuildJob(t, client, deletedWorkspace.LatestBuild.ID)
+		build, err := client.CreateWorkspaceBuild(ctx, deletedWorkspace.ID, codersdk.CreateWorkspaceBuildRequest{
+			Transition: codersdk.WorkspaceTransitionDelete,
+		})
+		require.NoError(t, err)
+		coderdtest.AwaitWorkspaceBuildJob(t, client, build.ID)
+
+		template, err = client.Template(context.Background(), template.ID)
+		require.NoError(t, err)
+		require.Equal(t, 2, int(template.WorkspaceOwnerCount), "workspace count")
+	})
 }
 
 func TestPostTemplateByOrganization(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -527,7 +527,7 @@ func (q *fakeQuerier) GetWorkspaceOwnerCountsByTemplateIDs(_ context.Context, te`
`527`	`527`
`528`	`528`	`counts := map[uuid.UUID]map[uuid.UUID]struct{}{}`
`529`	`529`	`for _, templateID := range templateIDs {`
`530`		`- found := false`
	`530`	`+ counts[templateID] = map[uuid.UUID]struct{}{}`
`531`	`531`	`for _, workspace := range q.workspaces {`
`532`	`532`	`if workspace.TemplateID != templateID {`
`533`	`533`	`continue`
`@@ -541,11 +541,6 @@ func (q *fakeQuerier) GetWorkspaceOwnerCountsByTemplateIDs(_ context.Context, te`
`541`	`541`	`}`
`542`	`542`	`countByOwnerID[workspace.OwnerID] = struct{}{}`
`543`	`543`	`counts[templateID] = countByOwnerID`
`544`		`- found = true`
`545`		`- break`
`546`		`- }`
`547`		`- if !found {`
`548`		`- counts[templateID] = map[uuid.UUID]struct{}{}`
`549`	`544`	`}`
`550`	`545`	`}`
`551`	`546`	`res := make([]database.GetWorkspaceOwnerCountsByTemplateIDsRow, 0)`