populate sdk workspace

Emyrk · Emyrk · commit 50638c7b5c2c · 2024-10-22T09:01:15.000-05:00
diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go
@@ -123,7 +123,7 @@ func TestNew(t *testing.T) {
 
 	w, err := az.GetWorkspaceByID(ctx, exp.ID)
 	require.NoError(t, err, "must not error")
-	require.Equal(t, exp, w, "must be equal")
+	require.Equal(t, exp, w.WorkspaceTable(), "must be equal")
 
 	rec.AssertActor(t, subj, rec.Pair(policy.ActionRead, exp))
 	require.NoError(t, rec.AllAsserted(), "should only be 1 rbac call")
diff --git a/coderd/database/modelmethods.go b/coderd/database/modelmethods.go
@@ -413,21 +413,31 @@ func ConvertWorkspaceRows(rows []GetWorkspacesRow) []Workspace {
 	workspaces := make([]Workspace, len(rows))
 	for i, r := range rows {
 		workspaces[i] = Workspace{
-			ID:                r.ID,
-			CreatedAt:         r.CreatedAt,
-			UpdatedAt:         r.UpdatedAt,
-			OwnerID:           r.OwnerID,
-			OrganizationID:    r.OrganizationID,
-			TemplateID:        r.TemplateID,
-			Deleted:           r.Deleted,
-			Name:              r.Name,
-			AutostartSchedule: r.AutostartSchedule,
-			Ttl:               r.Ttl,
-			LastUsedAt:        r.LastUsedAt,
-			DormantAt:         r.DormantAt,
-			DeletingAt:        r.DeletingAt,
-			AutomaticUpdates:  r.AutomaticUpdates,
-			Favorite:          r.Favorite,
+			ID:                      r.ID,
+			CreatedAt:               r.CreatedAt,
+			UpdatedAt:               r.UpdatedAt,
+			OwnerID:                 r.OwnerID,
+			OrganizationID:          r.OrganizationID,
+			TemplateID:              r.TemplateID,
+			Deleted:                 r.Deleted,
+			Name:                    r.Name,
+			AutostartSchedule:       r.AutostartSchedule,
+			Ttl:                     r.Ttl,
+			LastUsedAt:              r.LastUsedAt,
+			DormantAt:               r.DormantAt,
+			DeletingAt:              r.DeletingAt,
+			AutomaticUpdates:        r.AutomaticUpdates,
+			Favorite:                r.Favorite,
+			OwnerAvatarUrl:          r.OwnerAvatarUrl,
+			OwnerUsername:           r.OwnerUsername,
+			OrganizationName:        r.OrganizationName,
+			OrganizationDisplayName: r.OrganizationDisplayName,
+			OrganizationIcon:        r.OrganizationIcon,
+			OrganizationDescription: r.OrganizationDescription,
+			TemplateName:            r.TemplateName,
+			TemplateDisplayName:     r.TemplateDisplayName,
+			TemplateIcon:            r.TemplateIcon,
+			TemplateDescription:     r.TemplateDescription,
 		}
 	}
 
