add owner id

ethanndickson · ethanndickson · commit aacd023ca246 · 2024-09-27T04:57:22.000Z
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -11135,11 +11135,12 @@ func (q *FakeQuerier) GetAuthorizedWorkspacesAndAgents(ctx context.Context, prep
 		}
 
 		out = append(out, database.GetWorkspacesAndAgentsRow{
-			WorkspaceID:   w.ID,
-			WorkspaceName: w.Name,
-			JobStatus:     job.JobStatus,
-			Transition:    build.Transition,
-			Agents:        outAgents,
+			ID:         w.ID,
+			Name:       w.Name,
+			OwnerID:    w.OwnerID,
+			JobStatus:  job.JobStatus,
+			Transition: build.Transition,
+			Agents:     outAgents,
 		})
 	}
 
diff --git a/coderd/database/modelqueries.go b/coderd/database/modelqueries.go
@@ -333,8 +333,9 @@ func (q *sqlQuerier) GetAuthorizedWorkspacesAndAgents(ctx context.Context, prepa
 	for rows.Next() {
 		var i GetWorkspacesAndAgentsRow
 		if err := rows.Scan(
-			&i.WorkspaceID,
-			&i.WorkspaceName,
+			&i.ID,
+			&i.Name,
+			&i.OwnerID,
 			&i.JobStatus,
 			&i.Transition,
 			pq.Array(&i.Agents),
diff --git a/coderd/database/querier_test.go b/coderd/database/querier_test.go
@@ -689,7 +689,7 @@ func TestGetAuthorizedWorkspacesAndAgents(t *testing.T) {
 	require.NoError(t, err)
 	require.Len(t, ownerRows, 4)
 	for _, row := range ownerRows {
-		switch row.WorkspaceID {
+		switch row.ID {
 		case pendingID:
 			require.Len(t, row.Agents, 1)
 			require.Equal(t, database.ProvisionerJobStatusPending, row.JobStatus)
@@ -705,7 +705,7 @@ func TestGetAuthorizedWorkspacesAndAgents(t *testing.T) {
 			require.Equal(t, database.ProvisionerJobStatusSucceeded, row.JobStatus)
 			require.Equal(t, database.WorkspaceTransitionDelete, row.Transition)
 		default:
-			t.Fatalf("unexpected workspace ID: %s", row.WorkspaceID)
+			t.Fatalf("unexpected workspace ID: %s", row.ID)
 		}
 	}
 }
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
@@ -690,8 +690,9 @@ UPDATE workspaces SET favorite = false WHERE id = @id;
 
 -- name: GetWorkspacesAndAgents :many
 SELECT
-	workspaces.id as workspace_id,
-	workspaces.name as workspace_name,
+	workspaces.id as id,
+	workspaces.name as name,
+	workspaces.owner_id as owner_id,
 	job_status,
 	transition,
 	(array_agg(ROW(agent_id, agent_name)::agent_id_name_pair) FILTER (WHERE agent_id IS NOT NULL))::agent_id_name_pair[] as agents
diff --git a/coderd/database/types.go b/coderd/database/types.go
@@ -4,6 +4,7 @@ import (
 	"database/sql/driver"
 	"encoding/json"
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/google/uuid"
@@ -182,13 +183,25 @@ type AgentIDNamePair struct {
 }
 
 func (p *AgentIDNamePair) Scan(src interface{}) error {
-	switch v := src.(type) {
+	var v string
+	switch a := src.(type) {
 	case []byte:
-		return json.Unmarshal(v, &p)
+		v = string(a)
 	case string:
-		return json.Unmarshal([]byte(v), &p)
+		v = a
+	default:
+		return xerrors.Errorf("unexpected type %T", src)
 	}
-	return xerrors.Errorf("unexpected type %T", src)
+	parts := strings.Split(strings.Trim(v, "()"), ",")
+	if len(parts) != 2 {
+		return xerrors.New("invalid format for AgentIDNamePair")
+	}
+	id, err := uuid.Parse(strings.TrimSpace(parts[0]))
+	if err != nil {
+		return err
+	}
+	p.ID, p.Name = id, strings.TrimSpace(parts[1])
+	return nil
 }
 
 func (p AgentIDNamePair) Value() (driver.Value, error) {

Original file line number	Diff line number	Diff line change
`@@ -689,7 +689,7 @@ func TestGetAuthorizedWorkspacesAndAgents(t *testing.T) {`
`689`	`689`	`require.NoError(t, err)`
`690`	`690`	`require.Len(t, ownerRows, 4)`
`691`	`691`	`for _, row := range ownerRows {`
`692`		`- switch row.WorkspaceID {`
	`692`	`+ switch row.ID {`
`693`	`693`	`case pendingID:`
`694`	`694`	`require.Len(t, row.Agents, 1)`
`695`	`695`	`require.Equal(t, database.ProvisionerJobStatusPending, row.JobStatus)`
`@@ -705,7 +705,7 @@ func TestGetAuthorizedWorkspacesAndAgents(t *testing.T) {`
`705`	`705`	`require.Equal(t, database.ProvisionerJobStatusSucceeded, row.JobStatus)`
`706`	`706`	`require.Equal(t, database.WorkspaceTransitionDelete, row.Transition)`
`707`	`707`	`default:`
`708`		`- t.Fatalf("unexpected workspace ID: %s", row.WorkspaceID)`
	`708`	`+ t.Fatalf("unexpected workspace ID: %s", row.ID)`
`709`	`709`	`}`
`710`	`710`	`}`
`711`	`711`	`}`