coder · Emyrk · Aug 2, 2023 · Jul 26, 2023 · Jul 26, 2023 · Jul 26, 2023
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/dbfake/dbfake.go b/coderd/database/dbfake/dbfake.go
@@ -3402,6 +3402,7 @@ func (q *FakeQuerier) InsertAllUsersGroup(ctx context.Context, orgID uuid.UUID)
 	return q.InsertGroup(ctx, database.InsertGroupParams{
 		ID:             orgID,
 		Name:           database.AllUsersGroup,
+		DisplayName:    "",
 		OrganizationID: orgID,
 	})
 }
@@ -3521,6 +3522,7 @@ func (q *FakeQuerier) InsertGroup(_ context.Context, arg database.InsertGroupPar
 	group := database.Group{
 		ID:             arg.ID,
 		Name:           arg.Name,
+		DisplayName:    arg.DisplayName,
 		OrganizationID: arg.OrganizationID,
 		AvatarURL:      arg.AvatarURL,
 		QuotaAllowance: arg.QuotaAllowance,
@@ -4327,6 +4329,7 @@ func (q *FakeQuerier) UpdateGroupByID(_ context.Context, arg database.UpdateGrou
 
 	for i, group := range q.groups {
 		if group.ID == arg.ID {
+			group.DisplayName = arg.DisplayName
 			group.Name = arg.Name
 			group.AvatarURL = arg.AvatarURL
 			group.QuotaAllowance = arg.QuotaAllowance

diff --git a/coderd/database/dbgen/dbgen.go b/coderd/database/dbgen/dbgen.go
@@ -272,9 +272,11 @@ func OrganizationMember(t testing.TB, db database.Store, orig database.Organizat
 }
 
 func Group(t testing.TB, db database.Store, orig database.Group) database.Group {
+	name := takeFirst(orig.Name, namesgenerator.GetRandomName(1))
 	group, err := db.InsertGroup(genCtx, database.InsertGroupParams{
 		ID:             takeFirst(orig.ID, uuid.New()),
-		Name:           takeFirst(orig.Name, namesgenerator.GetRandomName(1)),
+		Name:           name,
+		DisplayName:    takeFirst(orig.DisplayName, name),
 		OrganizationID: takeFirst(orig.OrganizationID, uuid.New()),
 		AvatarURL:      takeFirst(orig.AvatarURL, "https://logo.example.com"),
 		QuotaAllowance: takeFirst(orig.QuotaAllowance, 0),

diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000144_group_display_name.down.sql b/coderd/database/migrations/000144_group_display_name.down.sql
@@ -0,0 +1,6 @@
+BEGIN;
+
+ALTER TABLE groups
+	DROP COLUMN display_name;
+
+COMMIT;
diff --git a/coderd/database/migrations/000144_group_display_name.up.sql b/coderd/database/migrations/000144_group_display_name.up.sql
@@ -0,0 +1,8 @@
+BEGIN;
+
+ALTER TABLE groups
+	ADD COLUMN display_name TEXT NOT NULL DEFAULT '';
+
+COMMENT ON COLUMN groups.display_name IS 'Display name is a custom, human-friendly group name that user can set. This is not required to be unique and can be the empty string.';
+
+COMMIT;
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/database/queries/groups.sql b/coderd/database/queries/groups.sql
@@ -34,12 +34,13 @@ AND
 INSERT INTO groups (
 	id,
 	name,
+	display_name,
 	organization_id,
 	avatar_url,
 	quota_allowance
 )
 VALUES
-	($1, $2, $3, $4, $5) RETURNING *;
+	($1, $2, $3, $4, $5, $6) RETURNING *;
 
 -- We use the organization_id as the id
 -- for simplicity since all users is
@@ -57,11 +58,12 @@ VALUES
 UPDATE
 	groups
 SET
-	name = $1,
-	avatar_url = $2,
-	quota_allowance = $3
+	name = @name,
+	display_name = @display_name,
+	avatar_url = @avatar_url,
+	quota_allowance = @quota_allowance
 WHERE
-	id = $4
+	id = @id
 RETURNING *;
 
 -- name: DeleteGroupByID :exec

diff --git a/codersdk/groups.go b/codersdk/groups.go
@@ -12,13 +12,15 @@ import (
 
 type CreateGroupRequest struct {
 	Name           string `json:"name"`
+	DisplayName    string `json:"display_name"`
 	AvatarURL      string `json:"avatar_url"`
 	QuotaAllowance int    `json:"quota_allowance"`
 }
 
 type Group struct {
 	ID             uuid.UUID `json:"id" format:"uuid"`
 	Name           string    `json:"name"`
+	DisplayName    string    `json:"display_name"`
 	OrganizationID uuid.UUID `json:"organization_id" format:"uuid"`
 	Members        []User    `json:"members"`
 	AvatarURL      string    `json:"avatar_url"`
@@ -98,6 +100,7 @@ type PatchGroupRequest struct {
 	AddUsers       []string `json:"add_users"`
 	RemoveUsers    []string `json:"remove_users"`
 	Name           string   `json:"name"`
+	DisplayName    *string  `json:"display_name"`
 	AvatarURL      *string  `json:"avatar_url"`
 	QuotaAllowance *int     `json:"quota_allowance"`
 }