structs 4 u

aslilac · aslilac · commit 6b75cbf7cda0 · 2024-07-30T14:30:47.000Z
diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -386,13 +386,13 @@ func (api *API) postWorkspacesByOrganization(rw http.ResponseWriter, r *http.Req
 		return
 	}
 
-	user := database.User{
+	owner := workspaceOwner{
 		ID:        member.UserID,
 		Username:  member.Username,
 		AvatarURL: member.AvatarURL,
 	}
 
-	createWorkspace(ctx, aReq, apiKey.UserID, api, user, req, rw, r)
+	createWorkspace(ctx, aReq, apiKey.UserID, api, owner, req, rw, r)
 }
 
 // Create a new workspace for the currently authenticated user.
@@ -436,15 +436,26 @@ func (api *API) postUserWorkspaces(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	createWorkspace(ctx, aReq, apiKey.UserID, api, user, req, rw, r)
+	owner := workspaceOwner{
+		ID:        user.ID,
+		Username:  user.Username,
+		AvatarURL: user.AvatarURL,
+	}
+	createWorkspace(ctx, aReq, apiKey.UserID, api, owner, req, rw, r)
+}
+
+type workspaceOwner struct {
+	ID        uuid.UUID
+	Username  string
+	AvatarURL string
 }
 
 func createWorkspace(
 	ctx context.Context,
 	auditReq *audit.Request[database.Workspace],
 	initiatorID uuid.UUID,
 	api *API,
-	user database.User,
+	owner workspaceOwner,
 	req codersdk.CreateWorkspaceRequest,
 	rw http.ResponseWriter,
 	r *http.Request,
