coder · mtojek · Jan 17, 2024 · Jan 16, 2024 · Jan 16, 2024 · Jan 16, 2024
diff --git a/cli/testdata/coder_users_list_--output_json.golden b/cli/testdata/coder_users_list_--output_json.golden
@@ -2,6 +2,7 @@
   {
     "id": "[first user ID]",
     "username": "testuser",
+    "name": "",
     "email": "testuser@coder.com",
     "created_at": "[timestamp]",
     "last_seen_at": "[timestamp]",
@@ -22,6 +23,7 @@
   {
     "id": "[second user ID]",
     "username": "testuser2",
+    "name": "",
     "email": "testuser2@coder.com",
     "created_at": "[timestamp]",
     "last_seen_at": "[timestamp]",

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/db2sdk/db2sdk.go b/coderd/database/db2sdk/db2sdk.go
@@ -120,6 +120,7 @@ func User(user database.User, organizationIDs []uuid.UUID) codersdk.User {
 	convertedUser := codersdk.User{
 		ID:              user.ID,
 		Email:           user.Email,
+		Name:            user.Name,
 		CreatedAt:       user.CreatedAt,
 		LastSeenAt:      user.LastSeenAt,
 		Username:        user.Username,

diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -6693,6 +6693,7 @@ func (q *FakeQuerier) UpdateUserProfile(_ context.Context, arg database.UpdateUs
 		user.Email = arg.Email
 		user.Username = arg.Username
 		user.AvatarURL = arg.AvatarURL
+		user.Name = arg.Name
 		q.users[index] = user
 		return user, nil
 	}

diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000185_add_user_name.down.sql b/coderd/database/migrations/000185_add_user_name.down.sql
@@ -0,0 +1 @@
+ALTER TABLE users DROP COLUMN name;
diff --git a/coderd/database/migrations/000185_add_user_name.up.sql b/coderd/database/migrations/000185_add_user_name.up.sql
@@ -0,0 +1,4 @@
+ALTER TABLE users ADD COLUMN name text NOT NULL DEFAULT '';
+
+COMMENT ON COLUMN users.name IS 'Name of the Coder user';
+
diff --git a/coderd/database/modelqueries.go b/coderd/database/modelqueries.go
@@ -318,6 +318,7 @@ func (q *sqlQuerier) GetAuthorizedUsers(ctx context.Context, arg GetUsersParams,
 			&i.LastSeenAt,
 			&i.QuietHoursSchedule,
 			&i.ThemePreference,
+			&i.Name,
 			&i.Count,
 		); 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/database/queries/users.sql b/coderd/database/queries/users.sql
@@ -78,7 +78,8 @@ SET
 	email = $2,
 	username = $3,
 	avatar_url = $4,
-	updated_at = $5
+	updated_at = $5,
+	name = $6
 WHERE
 	id = $1
 RETURNING *;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,4 @@
		ALTER TABLE users ADD COLUMN name text NOT NULL DEFAULT '';
johnstcn marked this conversation as resolved. Show resolved Hide resolved

		COMMENT ON COLUMN users.name IS 'Name of the Coder user';