coder · Emyrk · Jul 10, 2024 · Jul 9, 2024 · Jul 9, 2024 · Jul 9, 2024
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -558,6 +558,8 @@ func (q *FakeQuerier) templateWithNameNoLock(tpl database.TemplateTable) databas
 	withNames.CreatedByUsername = user.Username
 	withNames.CreatedByAvatarURL = user.AvatarURL
 	withNames.OrganizationName = org.Name
+	withNames.OrganizationDisplayName = org.DisplayName
+	withNames.OrganizationIcon = org.Icon
 	return withNames
 }
 

diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000224_template_display_name.down.sql b/coderd/database/migrations/000224_template_display_name.down.sql
@@ -0,0 +1,22 @@
+DROP VIEW template_with_names;
+
+CREATE VIEW
+	template_with_names
+AS
+SELECT
+	templates.*,
+	coalesce(visible_users.avatar_url, '') AS created_by_avatar_url,
+	coalesce(visible_users.username, '') AS created_by_username,
+	coalesce(organizations.name, '') AS organization_name
+FROM
+	templates
+		LEFT JOIN
+	visible_users
+	ON
+		templates.created_by = visible_users.id
+		LEFT JOIN
+	organizations
+	ON templates.organization_id = organizations.id
+;
+
+COMMENT ON VIEW template_with_names IS 'Joins in the display name information such as username, avatar, and organization name.';
diff --git a/coderd/database/migrations/000224_template_display_name.up.sql b/coderd/database/migrations/000224_template_display_name.up.sql
@@ -0,0 +1,24 @@
+-- Update the template_with_names view by recreating it.
+DROP VIEW template_with_names;
+CREATE VIEW
+	template_with_names
+AS
+SELECT
+	templates.*,
+	coalesce(visible_users.avatar_url, '') AS created_by_avatar_url,
+	coalesce(visible_users.username, '') AS created_by_username,
+	coalesce(organizations.name, '') AS organization_name,
+	coalesce(organizations.display_name, '') AS organization_display_name,
+	coalesce(organizations.icon, '') AS organization_icon
+FROM
+	templates
+		LEFT JOIN
+	visible_users
+	ON
+		templates.created_by = visible_users.id
+		LEFT JOIN
+	organizations
+	ON templates.organization_id = organizations.id
+;
+
+COMMENT ON VIEW template_with_names IS 'Joins in the display name information such as username, avatar, and organization name.';
diff --git a/coderd/database/modelqueries.go b/coderd/database/modelqueries.go
@@ -117,6 +117,8 @@ func (q *sqlQuerier) GetAuthorizedTemplates(ctx context.Context, arg GetTemplate
 			&i.CreatedByAvatarURL,
 			&i.CreatedByUsername,
 			&i.OrganizationName,
+			&i.OrganizationDisplayName,
+			&i.OrganizationIcon,
 		); err != nil {
 			return nil, err
 		}

diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/templates.go b/coderd/templates.go
@@ -886,6 +886,8 @@ func (api *API) convertTemplate(
 		UpdatedAt:                      template.UpdatedAt,
 		OrganizationID:                 template.OrganizationID,
 		OrganizationName:               template.OrganizationName,
+		OrganizationDisplayName:        template.OrganizationDisplayName,
+		OrganizationIcon:               template.OrganizationIcon,
 		Name:                           template.Name,
 		DisplayName:                    template.DisplayName,
 		Provisioner:                    codersdk.ProvisionerType(template.Provisioner),

diff --git a/coderd/templates_test.go b/coderd/templates_test.go
@@ -451,6 +451,8 @@ func TestTemplatesByOrganization(t *testing.T) {
 		for _, tmpl := range templates {
 			require.Equal(t, tmpl.OrganizationID, user.OrganizationID, "organization ID")
 			require.Equal(t, tmpl.OrganizationName, org.Name, "organization name")
+			require.Equal(t, tmpl.OrganizationDisplayName, org.DisplayName, "organization display name")
+			require.Equal(t, tmpl.OrganizationIcon, org.Icon, "organization display name")
 		}
 	})
 	t.Run("MultipleOrganizations", func(t *testing.T) {

diff --git a/codersdk/templates.go b/codersdk/templates.go
@@ -15,15 +15,17 @@ import (
 // Template is the JSON representation of a Coder template. This type matches the
 // database object for now, but is abstracted for ease of change later on.
 type Template struct {
-	ID               uuid.UUID       `json:"id" format:"uuid"`
-	CreatedAt        time.Time       `json:"created_at" format:"date-time"`
-	UpdatedAt        time.Time       `json:"updated_at" format:"date-time"`
-	OrganizationID   uuid.UUID       `json:"organization_id" format:"uuid"`
-	OrganizationName string          `json:"organization_name" format:"url"`
-	Name             string          `json:"name"`
-	DisplayName      string          `json:"display_name"`
-	Provisioner      ProvisionerType `json:"provisioner" enums:"terraform"`
-	ActiveVersionID  uuid.UUID       `json:"active_version_id" format:"uuid"`
+	ID                      uuid.UUID       `json:"id" format:"uuid"`
+	CreatedAt               time.Time       `json:"created_at" format:"date-time"`
+	UpdatedAt               time.Time       `json:"updated_at" format:"date-time"`
+	OrganizationID          uuid.UUID       `json:"organization_id" format:"uuid"`
+	OrganizationName        string          `json:"organization_name" format:"url"`
+	OrganizationDisplayName string          `json:"organization_display_name"`
+	OrganizationIcon        string          `json:"organization_icon"`
+	Name                    string          `json:"name"`
+	DisplayName             string          `json:"display_name"`
+	Provisioner             ProvisionerType `json:"provisioner" enums:"terraform"`
+	ActiveVersionID         uuid.UUID       `json:"active_version_id" format:"uuid"`
 	// ActiveUserCount is set to -1 when loading.
 	ActiveUserCount    int                    `json:"active_user_count"`
 	BuildTimeStats     TemplateBuildTimeStats `json:"build_time_stats"`