use codersdk.MinimalUser instead

coder · Emyrk · Aug 25, 2025 · Aug 15, 2025 · Aug 15, 2025 · Aug 15, 2025
commit 365f616d6c840fd82f7fda2ee1fc938e33feefc5
diff --git a/coderd/database/db2sdk/db2sdk.go b/coderd/database/db2sdk/db2sdk.go
@@ -184,20 +184,24 @@ func TemplateVersionParameter(param database.TemplateVersionParameter) (codersdk
 	}, nil
 }
 
+func MinimalUser(user database.User) codersdk.MinimalUser {
+	return codersdk.MinimalUser{
+		ID:        user.ID,
+		Username:  user.Username,
+		AvatarURL: user.AvatarURL,
+	}
+}
+
 func ReducedUser(user database.User) codersdk.ReducedUser {
 	return codersdk.ReducedUser{
-		MinimalUser: codersdk.MinimalUser{
-			ID:        user.ID,
-			Username:  user.Username,
-			AvatarURL: user.AvatarURL,
-		},
-		Email:      user.Email,
-		Name:       user.Name,
-		CreatedAt:  user.CreatedAt,
-		UpdatedAt:  user.UpdatedAt,
-		LastSeenAt: user.LastSeenAt,
-		Status:     codersdk.UserStatus(user.Status),
-		LoginType:  codersdk.LoginType(user.LoginType),
+		MinimalUser: MinimalUser(user),
+		Email:       user.Email,
+		Name:        user.Name,
+		CreatedAt:   user.CreatedAt,
+		UpdatedAt:   user.UpdatedAt,
+		LastSeenAt:  user.LastSeenAt,
+		Status:      codersdk.UserStatus(user.Status),
+		LoginType:   codersdk.LoginType(user.LoginType),
 	}
 }
 

diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -2204,24 +2204,12 @@ func (api *API) workspaceACL(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	// For context see https://github.com/coder/coder/pull/19375
-	// nolint:gocritic
-	orgIDsByMemberIDsRows, err := api.Database.GetOrganizationIDsByMemberIDs(dbauthz.AsSystemRestricted(ctx), userIDs)
-	if err != nil && !xerrors.Is(err, sql.ErrNoRows) {
-		httpapi.InternalServerError(rw, err)
-		return
-	}
-	organizationIDsByUserID := map[uuid.UUID][]uuid.UUID{}
-	for _, organizationIDsByMemberIDsRow := range orgIDsByMemberIDsRows {
-		organizationIDsByUserID[organizationIDsByMemberIDsRow.UserID] = organizationIDsByMemberIDsRow.OrganizationIDs
-	}
-
 	// Convert the db types to the codersdk.WorkspaceUser type
 	users := make([]codersdk.WorkspaceUser, 0, len(dbUsers))
 	for _, it := range dbUsers {
 		users = append(users, codersdk.WorkspaceUser{
-			User: db2sdk.User(it, organizationIDsByUserID[it.ID]),
-			Role: convertToWorkspaceRole(workspaceACL.Users[it.ID.String()].Permissions),
+			MinimalUser: db2sdk.MinimalUser(it),
+			Role:        convertToWorkspaceRole(workspaceACL.Users[it.ID.String()].Permissions),
 		})
 	}
 

diff --git a/codersdk/workspaces.go b/codersdk/workspaces.go
@@ -674,7 +674,7 @@ type WorkspaceGroup struct {
 }
 
 type WorkspaceUser struct {
-	User
+	MinimalUser
 	Role WorkspaceRole `json:"role" enums:"admin,use"`
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -674,7 +674,7 @@ type WorkspaceGroup struct { @@
     }
     type WorkspaceUser struct {
-    	User
+    	MinimalUser
     	Role WorkspaceRole `json:"role" enums:"admin,use"`
     }
@@ Expand Down @@