refactor: merge standardConstants and standard in team plan by FinleyGe · Pull Request #6549 · labring/FastGPT

FinleyGe · 2026-03-12T08:58:25Z

No description provided.

github-actions · 2026-03-12T09:00:07Z

Preview sandbox Image:

registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-pr:fatsgpt_sandbox_31255e61db8d27309148bed3a560f7ebd4c4d0ea

github-actions · 2026-03-12T09:01:10Z

Preview mcp_server Image:

registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-pr:fatsgpt_mcp_server_31255e61db8d27309148bed3a560f7ebd4c4d0ea

github-actions · 2026-03-12T09:07:59Z

Preview fastgpt Image:

registry.cn-hangzhou.aliyuncs.com/fastgpt/fastgpt-pr:fatsgpt_31255e61db8d27309148bed3a560f7ebd4c4d0ea

Copilot

Pull request overview

This PR refactors “team plan status” consumption across the app/service by replacing the standardConstants field with a unified standard plan object that represents effective limits (plan config defaults merged with DB overrides).

Changes:

Introduces TeamPlanStandardSchema / TeamPlanStandardType and updates TeamPlanStatusSchema to expose [standard] as the merged plan object (removing standardConstants).
Adds a buildStandardPlan helper to compute effective plan fields and updates service-level limit checks to use standard.* fields.
Updates multiple API routes and UI components that read plan limits (upload counts/sizes, quotas) to use teamPlanStatus.standard.

Reviewed changes

Copilot reviewed 18 out of 18 changed files in this pull request and generated 4 comments.

Show a summary per file

File	Description
projects/app/src/pages/api/core/dataset/presignDatasetFilePostUrl.ts	Switches dataset upload presign limits to `planStatus.standard.*`.
projects/app/src/pages/api/core/dataset/data/insertImages.ts	Switches image insert upload frequency limits to `planStatus.standard.*`.
projects/app/src/pages/api/core/dataset/collection/create/images.ts	Switches collection image upload frequency limits to `planStatus.standard.*`.
projects/app/src/pages/api/core/chat/file/presignChatFilePostUrl.ts	Switches chat file presign limits to `planStatus.standard.*`.
projects/app/src/pages/api/common/file/presignTempFilePostUrl.ts	Switches temp file presign limits to `planStatus.standard.*`.
projects/app/src/pages/api/admin/support/appRegistration/create.ts	Reads app registration quota from `teamPlanStatus.standard.*`.
projects/app/src/pages/account/info/index.tsx	Updates plan/usage UI computations to reference `teamPlanStatus.standard.*`.
projects/app/src/pages/account/customDomain/index.tsx	Updates custom domain quota display to `teamPlanStatus.standard.*`.
projects/app/src/pageComponents/dataset/detail/Import/components/FileSelector.tsx	Updates dataset import file constraints to `teamPlanStatus.standard.*`.
projects/app/src/pageComponents/dashboard/TeamPlanStatusCard.tsx	Updates rendering guard from `standardConstants` to `standard`.
projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/nodes/NodePluginIO/InputTypeConfig.tsx	Updates node file selection constraints to `teamPlanStatus.standard.*`.
projects/app/src/components/Select/FileSelectorBox.tsx	Updates max size/count display/limits to `teamPlanStatus.standard.*`.
projects/app/src/components/core/chat/ChatContainer/ChatBox/hooks/useFileUpload.tsx	Updates chat upload constraints to `teamPlanStatus.standard.*`.
projects/app/src/components/core/app/FileSelector/index.tsx	Updates app file selector constraints to `teamPlanStatus.standard.*`.
projects/app/src/components/core/app/FileSelect.tsx	Updates app chat file selection constraints to `teamPlanStatus.standard.*`.
packages/service/support/wallet/sub/utils.ts	Adds merged-plan builder and changes plan status shape/derivations.
packages/service/support/permission/teamLimit.ts	Updates quota enforcement to use `standard.*` from new plan shape.
packages/global/support/wallet/sub/type.ts	Adds `TeamPlanStandardSchema` and updates plan status schema accordingly.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

You can also share your feedback on Copilot code review. Take the survey.

packages/service/support/wallet/sub/utils.ts

c121914yu · 2026-03-13T10:27:53Z

测试内容：

用户套餐显示正常
定制版套餐显示正常
admin 配置，可覆盖标准套餐
价格页正常，只显示配置内容。

c121914yu · 2026-03-14T14:04:31Z

PR Review: refactor: merge standardConstants and standard in team plan

📊 变更概览

PR 编号: refactor: merge standardConstants and standard in team plan #6549
作者: @FinleyGe
分支: main ← refactor/plan
变更统计: +130 -137 行
涉及文件: 18 个文件

✅ 优点

1. 代码质量提升

✨ 消除了约 80 行重复的字段映射逻辑
✨ 提取了 buildStandardPlan 函数,提高了代码复用性
✨ 类型定义更加清晰,合并了分散的类型信息

2. 可维护性改进

🎯 统一的数据结构减少了维护成本
🎯 新增套餐字段时只需修改一处
🎯 减少了 API 调用方的理解成本

3. 一致性增强

🔄 所有代码使用统一的 standard 访问套餐信息
🔄 消除了 standard vs standardConstants 的混淆

⚠️ 问题汇总

🟡 问题 1: 类型断言存在风险 (必须修复)

位置: packages/service/support/wallet/sub/utils.ts:164

问题: standard 可能为 undefined,直接使用类型断言和展开操作符不安全

// ❌ 当前代码
return {
  ...(standard as TeamPlanStandardType),  // 不安全
  name: standardConstants.name,
  // ...
};

建议修复:

// ✅ 安全的实现
const baseFields = standard ? {
  _id: standard._id,
  teamId: standard.teamId,
  type: standard.type,
  startTime: standard.startTime,
  expiredTime: standard.expiredTime,
  currentMode: standard.currentMode,
  nextMode: standard.nextMode,
  currentSubLevel: standard.currentSubLevel,
  nextSubLevel: standard.nextSubLevel,
  totalPoints: standard.totalPoints,
  annualBonusPoints: standard.annualBonusPoints,
  surplusPoints: standard.surplusPoints,
  currentExtraDatasetSize: standard.currentExtraDatasetSize
} : {} as any;

return {
  ...baseFields,
  name: standardConstants.name,
  // ... 其他字段
};

🟡 问题 2: 逻辑运算符使用不一致 (必须修复)

位置: packages/service/support/wallet/sub/utils.ts:180

问题: websiteSyncPerDataset 使用 || 而其他字段使用 ??,当值为 0 时会有问题

// ❌ 当前代码
websiteSyncPerDataset:
  standard?.websiteSyncPerDataset || standardConstants.websiteSyncPerDataset,

影响: 如果 standard.websiteSyncPerDataset 为 0,会错误地使用 standardConstants 的值

建议修复:

// ✅ 统一使用 ??
websiteSyncPerDataset:
  standard?.websiteSyncPerDataset ?? standardConstants.websiteSyncPerDataset,

🟢 问题 3: 缺少单元测试 (建议添加)

建议: 为 buildStandardPlan 函数添加单元测试,覆盖以下场景:

✅ standard 存在时,正确合并字段
✅ standard 为 undefined 时,使用默认值
✅ 字段优先级正确 (DB 覆盖配置)
✅ websiteSyncPerDataset 为 0 时的边界情况

💬 总体评价

代码质量: ⭐⭐⭐⭐☆ (4/5)
安全性: ⭐⭐⭐⭐⭐ (5/5)
性能: ⭐⭐⭐⭐⭐ (5/5)
可维护性: ⭐⭐⭐⭐⭐ (5/5)

🚀 审查结论

✅ 建议通过,但需要修复 🟡 问题

这是一个高质量的重构 PR,核心思路正确,代码改进明显。建议修复以下问题后合并:

🟡 修复 buildStandardPlan 中的类型断言问题
🟡 统一使用 ?? 运算符,修复 websiteSyncPerDataset 的逻辑
🟢 为 buildStandardPlan 函数添加单元测试

审查人: Claude Code
审查时间: 2026-03-14

packages/global/support/wallet/sub/type.ts

packages/service/support/wallet/sub/utils.ts

projects/app/src/pageComponents/price/Standard.tsx

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

c121914yu · 2026-03-15T10:39:58Z

PR Review: refactor: merge standardConstants and standard in team plan

📊 变更概览

PR 编号: refactor: merge standardConstants and standard in team plan #6549
作者: @FinleyGe
分支: main ← refactor/plan
变更统计: +360 -151 行
涉及文件: 21 个文件
CI 状态: 测试和构建正在进行中

✅ 优点

优秀的重构设计: 通过引入 TeamPlanStandardSchema 合并了 standard 和 standardConstants 两个字段，简化了类型结构，消除了数据冗余
完善的测试覆盖: 新增了 242 行测试代码，覆盖了 buildStandardPlan 函数的所有场景，包括字段映射、回退逻辑、边界情况
系统性重构: 在整个代码库中一致性地更新了所有引用，包括前端组件、API 路由、权限检查等
代码复用: 提取了 buildStandardPlan 函数，消除了重复的字段合并逻辑
改进的文档: 为 Schema 添加了清晰的 JSDoc 注释，说明了各个类型的用途

⚠️ 问题汇总

🔴 严重问题 (1 个，必须修复)

类型安全问题: buildStandardPlan 函数的第二个参数类型定义不够严格

🟡 建议改进 (3 个)

字段命名不一致: maxApp → maxAppAmount 和 maxDataset → maxDatasetAmount 的映射增加了理解成本
可选链使用: 部分代码可以使用可选链简化
测试文件位置: 测试文件应该放在 packages/service/ 对应的测试目录

🟢 可选优化 (2 个)

类型导出: 可以考虑导出更多中间类型以提高可维护性
注释补充: 部分复杂逻辑可以添加更多注释

🧪 测试建议

集成测试: 建议添加端到端测试，验证套餐信息在前端正确显示
边界测试: 测试 standardConstants 为 undefined 的情况
回归测试: 验证所有使用套餐信息的功能（文件上传、成员限制、应用限制等）

💬 总体评价

代码质量: ⭐⭐⭐⭐☆ (4/5)
安全性: ⭐⭐⭐⭐⭐ (5/5)
性能: ⭐⭐⭐⭐⭐ (5/5)
可维护性: ⭐⭐⭐⭐☆ (4/5)

🚀 审查结论

建议: 修复严重问题后通过

这是一个高质量的重构 PR，设计合理，测试完善。主要问题是类型定义需要加强，以及字段命名映射可以优化。修复严重问题后可以合并。

📍 详细代码评论位置

以下位置已添加具体的行级评论：

packages/service/support/wallet/sub/utils.ts:153-179 - buildStandardPlan 函数类型定义
packages/global/support/wallet/sub/type.ts:32-43 - TeamPlanStandardSchema 定义
projects/app/src/components/support/wallet/StandardPlanContentList.tsx:404-407 - 字段名映射

c121914yu · 2026-03-15T10:40:07Z

详细代码审查评论

🔴 严重问题

1. packages/service/support/wallet/sub/utils.ts:153-179

问题: buildStandardPlan 函数的第二个参数类型定义不够严格

当前代码:

export const buildStandardPlan = (
  standard: TeamSubSchemaType,
  standardConstants: NonNullable<ReturnType<typeof getStandardPlanConfig>>
): TeamPlanStandardType => {

问题分析:

使用 NonNullable<ReturnType<typeof getStandardPlanConfig>> 依赖于函数的返回类型，这种间接依赖增加了维护成本
如果 getStandardPlanConfig 函数的返回类型发生变化，这里的类型会自动变化，可能导致隐藏的类型错误
类型不够明确，阅读代码时需要跳转到 getStandardPlanConfig 才能理解参数类型

建议修复:

export const buildStandardPlan = (
  standard: TeamSubSchemaType,
  standardConstants: TeamStandardSubPlanItemType
): TeamPlanStandardType => {

理由:

使用明确的类型 TeamStandardSubPlanItemType 更清晰
减少类型推导链，提高代码可读性
如果类型不匹配，TypeScript 会在调用处报错，而不是在函数定义处

🟡 建议改进

2. packages/global/support/wallet/sub/type.ts:32-43

问题: Schema 合并使用了 spread 操作符，但缺少字段冲突的处理说明

当前代码:

export const TeamPlanStandardSchema = z.object({
  ...TeamSubSchema.omit({
    maxApp: true,
    maxDataset: true
  }).shape,
  ...TeamStandardSubPlanItemSchema.omit({
    pointPrice: true
  }).shape,
  price: z.number().optional()
});

建议:
添加注释说明为什么要 omit 这些字段，以及字段合并的优先级：

/** 
 * Merged plan type: combines DB subscription record metadata with effective plan limits
 * 
 * Omits:
 * - maxApp/maxDataset from TeamSubSchema: 这些字段在 DB 中存储，但在合并后的类型中使用 maxAppAmount/maxDatasetAmount
 * - pointPrice from TeamStandardSubPlanItemSchema: 避免与 price 字段冲突
 * 
 * Field priority: TeamStandardSubPlanItemSchema fields override TeamSubSchema fields when both exist
 */
export const TeamPlanStandardSchema = z.object({
  ...TeamSubSchema.omit({
    maxApp: true,
    maxDataset: true
  }).shape,
  ...TeamStandardSubPlanItemSchema.omit({
    pointPrice: true
  }).shape,
  price: z.number().optional()
});

3. projects/app/src/components/support/wallet/StandardPlanContentList.tsx:404-407

问题: 字段名映射不一致，增加理解成本

当前代码:

maxAppAmount: standplan?.maxAppAmount ?? plan.maxAppAmount,
maxDatasetAmount: standplan?.maxDatasetAmount ?? plan.maxDatasetAmount,

背景: 在 buildStandardPlan 中，standard.maxApp 被映射到 result.maxAppAmount，但在这里又需要使用 standplan?.maxAppAmount

建议: 考虑在数据库层面统一字段命名，或者在类型定义中添加更清晰的注释说明这种映射关系。

替代方案: 如果无法修改数据库字段名，建议在 TeamSubSchema 的注释中明确说明：

/**
 * TeamSub Schema in DB.
 * Configs are optional
 * 
 * Note: maxApp maps to maxAppAmount in merged plan, maxDataset maps to maxDatasetAmount
 */

4. packages/service/support/permission/teamLimit.ts

建议: 使用可选链简化代码

当前代码:

if (standard && newCount + memberCount > standard.maxTeamMember) {
  return Promise.reject(TeamErrEnum.teamOverSize);
}

建议优化:

if (standard?.maxTeamMember && newCount + memberCount > standard.maxTeamMember) {
  return Promise.reject(TeamErrEnum.teamOverSize);
}

这样可以避免 standard 存在但 maxTeamMember 为 undefined 的情况导致的逻辑错误。

🟢 可选优化

5. test/cases/service/support/wallet/sub/utils.test.ts

建议: 测试文件位置优化

当前位置: test/cases/service/support/wallet/sub/utils.test.ts

建议位置: packages/service/support/wallet/sub/__tests__/utils.test.ts 或 packages/service/test/support/wallet/sub/utils.test.ts

理由:

将测试文件放在被测试代码附近，更容易维护
符合常见的 monorepo 测试组织模式
便于 IDE 自动发现和运行测试

6. packages/service/support/wallet/sub/utils.ts:216-233

建议: 添加注释说明复杂的业务逻辑

当前代码:

/** 配置里的套餐 */
const standardPlans = global.subPlans?.standard;
// ...
/** 数据库里的，用户目前 active 的套餐 */
const standardPlan = teamStandardPlans[0];
// ...
/** 静态的套餐配置，如果是 custom 则返回 advanced */
const standardConstants = ...

优点: 已经添加了中文注释，这很好！

建议: 可以进一步补充说明为什么 custom 套餐要返回 advanced 配置：

/** 
 * 静态的套餐配置
 * 如果是 custom 套餐，返回 advanced 配置作为基础模板
 * 因为 custom 套餐通常是在 advanced 基础上定制的
 */

📋 测试覆盖分析

测试文件 utils.test.ts 的覆盖情况：

✅ 已覆盖:

展示字段从 standardConstants 获取
DB 元数据从 standard spread
限制字段的 DB override 逻辑
字段名映射 (maxApp → maxAppAmount)
所有可选字段的回退逻辑

⚠️ 建议补充:

getTeamStandPlan 函数的测试
getTeamPlanStatus 函数的测试
边界情况：standardConstants 为 undefined
集成测试：验证前端组件正确显示合并后的数据

🎯 重构影响范围分析

类型变更影响:

✅ TeamPlanStatusType 中 standardConstants 字段被移除
✅ 所有使用 teamPlanStatus.standardConstants 的地方已更新为 teamPlanStatus.standard
✅ 前端组件、API 路由、权限检查全部更新

潜在风险:

⚠️ 如果有外部系统或插件依赖 standardConstants 字段，需要更新
⚠️ 如果有缓存的 TeamPlanStatusType 数据，需要清理缓存

建议:

在发布说明中明确说明这是一个 breaking change
提供迁移指南，说明如何从 standardConstants 迁移到 standard
考虑添加运行时警告，如果检测到使用了旧的 standardConstants 字段

pull-request-size bot added the size/L label Mar 12, 2026

c121914yu marked this pull request as ready for review March 12, 2026 12:37

Copilot AI review requested due to automatic review settings March 12, 2026 12:37

Copilot started reviewing on behalf of c121914yu March 12, 2026 12:38 View session

Copilot AI reviewed Mar 12, 2026

View reviewed changes

FinleyGe force-pushed the refactor/plan branch from fcf4fba to fc2eea2 Compare March 15, 2026 06:44

c121914yu reviewed Mar 15, 2026

View reviewed changes

packages/global/support/wallet/sub/type.ts Outdated Show resolved Hide resolved

packages/service/support/wallet/sub/utils.ts Outdated Show resolved Hide resolved

c121914yu previously approved these changes Mar 15, 2026

View reviewed changes

FinleyGe dismissed c121914yu’s stale review via 5cb6be9 March 15, 2026 09:59

pull-request-size bot added size/XL and removed size/L labels Mar 15, 2026

FinleyGe force-pushed the refactor/plan branch from 5cb6be9 to 7005da8 Compare March 15, 2026 10:15

c121914yu reviewed Mar 15, 2026

View reviewed changes

projects/app/src/pageComponents/price/Standard.tsx Outdated Show resolved Hide resolved

FinleyGe and others added 6 commits March 15, 2026 18:26

refactor: merge standardConstants and standard in team plan

446e7a5

Update packages/service/support/wallet/sub/utils.ts

5d45b4a

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

fix: remove type assertion

870fd2a

chore: type

564e4ef

test: test buildStandardPlan

92cda00

fix: type

e7e3e47

FinleyGe force-pushed the refactor/plan branch from 7005da8 to 74cb38a Compare March 15, 2026 10:30

perf: code perf

702e739

c121914yu force-pushed the refactor/plan branch from 74cb38a to 702e739 Compare March 15, 2026 10:36

add test code

31255e6

pull-request-size bot added size/XXL and removed size/XL labels Mar 15, 2026

c121914yu merged commit 21b3f85 into labring:main Mar 15, 2026
5 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor: merge standardConstants and standard in team plan#6549

refactor: merge standardConstants and standard in team plan#6549
c121914yu merged 8 commits intolabring:mainfrom
FinleyGe:refactor/plan

FinleyGe commented Mar 12, 2026

Uh oh!

github-actions bot commented Mar 12, 2026 •

edited

Loading

Uh oh!

github-actions bot commented Mar 12, 2026 •

edited

Loading

Uh oh!

github-actions bot commented Mar 12, 2026 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

c121914yu commented Mar 13, 2026

Uh oh!

c121914yu commented Mar 14, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

c121914yu commented Mar 15, 2026

Uh oh!

c121914yu commented Mar 15, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

FinleyGe commented Mar 12, 2026

Uh oh!

github-actions bot commented Mar 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Preview sandbox Image:

Uh oh!

github-actions bot commented Mar 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Preview mcp_server Image:

Uh oh!

github-actions bot commented Mar 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Preview fastgpt Image:

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

c121914yu commented Mar 13, 2026

Uh oh!

c121914yu commented Mar 14, 2026

PR Review: refactor: merge standardConstants and standard in team plan

📊 变更概览

✅ 优点

1. 代码质量提升

2. 可维护性改进

3. 一致性增强

⚠️ 问题汇总

🟡 问题 1: 类型断言存在风险 (必须修复)

🟡 问题 2: 逻辑运算符使用不一致 (必须修复)

🟢 问题 3: 缺少单元测试 (建议添加)

💬 总体评价

🚀 审查结论

Uh oh!

Uh oh!

Uh oh!

Uh oh!

c121914yu commented Mar 15, 2026

PR Review: refactor: merge standardConstants and standard in team plan

📊 变更概览

✅ 优点

⚠️ 问题汇总

🔴 严重问题 (1 个，必须修复)

🟡 建议改进 (3 个)

🟢 可选优化 (2 个)

🧪 测试建议

💬 总体评价

🚀 审查结论

📍 详细代码评论位置

Uh oh!

c121914yu commented Mar 15, 2026

详细代码审查评论

🔴 严重问题

1. packages/service/support/wallet/sub/utils.ts:153-179

🟡 建议改进

2. packages/global/support/wallet/sub/type.ts:32-43

3. projects/app/src/components/support/wallet/StandardPlanContentList.tsx:404-407

4. packages/service/support/permission/teamLimit.ts

🟢 可选优化

5. test/cases/service/support/wallet/sub/utils.test.ts

6. packages/service/support/wallet/sub/utils.ts:216-233

📋 测试覆盖分析

🎯 重构影响范围分析

类型变更影响:

潜在风险:

建议:

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

github-actions bot commented Mar 12, 2026 •

edited

Loading

github-actions bot commented Mar 12, 2026 •

edited

Loading

github-actions bot commented Mar 12, 2026 •

edited

Loading