chore: include organization name when fetching templates

coder · Emyrk · Jul 2, 2024 · Jun 28, 2024 · Jul 1, 2024 · Jul 1, 2024
commit df2acd3a9673a7b13ee3d1516cf9328c14c60960
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000222_template_organization_name.down.sql b/coderd/database/migrations/000222_template_organization_name.down.sql
@@ -0,0 +1,14 @@
+CREATE VIEW
+	template_with_users
+AS
+SELECT
+	templates.*,
+	coalesce(visible_users.avatar_url, '') AS created_by_avatar_url,
+	coalesce(visible_users.username, '') AS created_by_username
+FROM
+	templates
+		LEFT JOIN
+	visible_users
+	ON
+		templates.created_by = visible_users.id;
+COMMENT ON VIEW template_with_users IS 'Joins in the username + avatar url of the created by user.';
diff --git a/coderd/database/migrations/000222_template_organization_name.up.sql b/coderd/database/migrations/000222_template_organization_name.up.sql
@@ -0,0 +1,23 @@
+-- Update the template_with_users view by recreating it.
+DROP VIEW template_with_users;
+
+CREATE VIEW
+	template_with_users
+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_users 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
@@ -116,6 +116,7 @@ func (q *sqlQuerier) GetAuthorizedTemplates(ctx context.Context, arg GetTemplate
 			&i.MaxPortSharingLevel,
 			&i.CreatedByAvatarURL,
 			&i.CreatedByUsername,
+			&i.OrganizationName,
 		); 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