diff --git a/.claude/commands/opsx/apply.md b/.claude/commands/opsx/apply.md index 645bbdb..bf23721 100644 --- a/.claude/commands/opsx/apply.md +++ b/.claude/commands/opsx/apply.md @@ -111,7 +111,7 @@ Working on task 4/7: - [x] Task 2 ... -All tasks complete! Ready to archive this change. +All tasks complete! You can archive this change with `/opsx:archive`. ``` **Output On Pause (Issue Encountered)** diff --git a/.claude/commands/opsx/continue.md b/.claude/commands/opsx/continue.md index 49daaa7..af255c6 100644 --- a/.claude/commands/opsx/continue.md +++ b/.claude/commands/opsx/continue.md @@ -41,7 +41,7 @@ Continue working on a change by creating the next artifact. **If all artifacts are complete (`isComplete: true`)**: - Congratulate the user - Show final status including the schema used - - Suggest: "All artifacts created! You can now implement this change or archive it." + - Suggest: "All artifacts created! You can now implement this change with `/opsx:apply` or archive it with `/opsx:archive`." - STOP --- diff --git a/.claude/commands/opsx/gen-tests.md b/.claude/commands/opsx/gen-tests.md deleted file mode 100644 index 62172c9..0000000 --- a/.claude/commands/opsx/gen-tests.md +++ /dev/null @@ -1,133 +0,0 @@ ---- -description: 从 Spec 的 Scenarios 和 Business Flows 自动生成验收测试和流程测试 ---- - -从 Spec 文档自动生成两类测试： -1. **验收测试**（Acceptance Tests）：从 Scenarios 生成，验证单 API 契约 -2. **流程测试**（Flow Tests）：从 Business Flows 生成，验证多 API 业务场景 - -**Input**: 可选指定 change 名称（如 `/opsx:gen-tests add-auth`）。如果省略，从上下文推断或提示选择。 - -**Steps** - -1. **选择 change** - - 如果提供了名称，使用它。否则： - - 从对话上下文推断 - - 如果只有一个活跃 change，自动选择 - - 如果模糊，运行 `openspec list --json` 让用户选择 - -2. **检查 change 状态** - ```bash - openspec status --change "" --json - ``` - 确认 specs artifact 已完成（`status: "done"`） - -3. **读取 spec 文件** - - 读取 `openspec/changes//specs/*/spec.md` 下的所有 spec 文件。 - -4. **解析 Scenarios** - - 从每个 spec 文件中提取 `#### Scenario:` 块： - ```markdown - #### Scenario: 成功创建套餐 - - **GIVEN** 用户已登录且有创建权限 - - **WHEN** POST /api/admin/packages with valid data - - **THEN** 返回 200 和套餐详情 - ``` - -5. **解析 Business Flows**（如果存在） - - 从 spec 文件中提取 `### Flow:` 块，包含多步骤业务场景。 - -6. **生成验收测试** - - 输出路径：`tests/acceptance/_acceptance_test.go` - - 模板结构： - ```go - func Test{Capability}_Acceptance(t *testing.T) { - env := testutils.NewIntegrationTestEnv(t) - - t.Run("Scenario_{name}", func(t *testing.T) { - // GIVEN: ... - // WHEN: ... - // THEN: ... - // 破坏点：... - }) - } - ``` - -7. **生成流程测试** - - 输出路径：`tests/flows/__flow_test.go` - - 模板结构： - ```go - func TestFlow_{FlowName}(t *testing.T) { - env := testutils.NewIntegrationTestEnv(t) - - var ( - // 流程级共享状态 - ) - - t.Run("Step1_{name}", func(t *testing.T) { - // 依赖：... - // 破坏点：... - }) - } - ``` - -8. **运行测试验证** - - ```bash - source .env.local && go test -v ./tests/acceptance/... ./tests/flows/... 2>&1 | head -50 - ``` - - **预期**：全部 FAIL（功能未实现，证明测试有效） - - **如果测试 PASS**：说明测试写得太弱，需要加强 - -**Output** - -``` -## 测试生成完成 - -**Change:** -**来源:** specs//spec.md - -### 生成的测试文件 - -**验收测试** (tests/acceptance/): -- _acceptance_test.go - - Scenario_xxx - - Scenario_yyy - -**流程测试** (tests/flows/): -- __flow_test.go - - Step1_xxx - - Step2_yyy - -### 验证结果 - -$ source .env.local && go test -v ./tests/acceptance/... ./tests/flows/... - ---- FAIL: TestXxx_Acceptance (0.00s) - --- FAIL: TestXxx_Acceptance/Scenario_xxx (0.00s) - xxx_acceptance_test.go:45: 404 != 200 - -✓ 所有测试预期 FAIL（功能未实现） -✓ 测试生成完成 - -下一步: 开始实现 tasks，每完成一个功能单元运行相关测试验证 -``` - -**Guardrails** - -- 每个 Scenario 必须生成一个测试用例（不要跳过） -- 每个测试必须包含"破坏点"注释 -- 流程测试的 step 必须声明依赖 -- 使用 IntegrationTestEnv，不要 mock 依赖 -- 测试必须在功能缺失时 FAIL（不要写永远 PASS 的测试） -- 详细模板参考：`.opencode/skills/openspec-generate-acceptance-tests/SKILL.md` diff --git a/.claude/settings.json b/.claude/settings.json new file mode 100644 index 0000000..7725b8a --- /dev/null +++ b/.claude/settings.json @@ -0,0 +1,5 @@ +{ + "enabledPlugins": { + "ralph-loop@claude-plugins-official": true + } +} diff --git a/.claude/skills/openspec-apply-change/SKILL.md b/.claude/skills/openspec-apply-change/SKILL.md index bc95df4..47d4bc2 100644 --- a/.claude/skills/openspec-apply-change/SKILL.md +++ b/.claude/skills/openspec-apply-change/SKILL.md @@ -6,7 +6,7 @@ compatibility: Requires openspec CLI. metadata: author: openspec version: "1.0" - generatedBy: "1.0.2" + generatedBy: "1.1.1" --- Implement tasks from an OpenSpec change. diff --git a/.claude/skills/openspec-archive-change/SKILL.md b/.claude/skills/openspec-archive-change/SKILL.md index 9ea63e8..8fa4b23 100644 --- a/.claude/skills/openspec-archive-change/SKILL.md +++ b/.claude/skills/openspec-archive-change/SKILL.md @@ -6,7 +6,7 @@ compatibility: Requires openspec CLI. metadata: author: openspec version: "1.0" - generatedBy: "1.0.2" + generatedBy: "1.1.1" --- Archive a completed change in the experimental workflow. diff --git a/.claude/skills/openspec-bulk-archive-change/SKILL.md b/.claude/skills/openspec-bulk-archive-change/SKILL.md index 5ce056a..719b279 100644 --- a/.claude/skills/openspec-bulk-archive-change/SKILL.md +++ b/.claude/skills/openspec-bulk-archive-change/SKILL.md @@ -6,7 +6,7 @@ compatibility: Requires openspec CLI. metadata: author: openspec version: "1.0" - generatedBy: "1.0.2" + generatedBy: "1.1.1" --- Archive multiple completed changes in a single operation. diff --git a/.claude/skills/openspec-continue-change/SKILL.md b/.claude/skills/openspec-continue-change/SKILL.md index 79aaac4..5060b2f 100644 --- a/.claude/skills/openspec-continue-change/SKILL.md +++ b/.claude/skills/openspec-continue-change/SKILL.md @@ -6,7 +6,7 @@ compatibility: Requires openspec CLI. metadata: author: openspec version: "1.0" - generatedBy: "1.0.2" + generatedBy: "1.1.1" --- Continue working on a change by creating the next artifact. diff --git a/.claude/skills/openspec-explore/SKILL.md b/.claude/skills/openspec-explore/SKILL.md index 49d051d..8ed4a76 100644 --- a/.claude/skills/openspec-explore/SKILL.md +++ b/.claude/skills/openspec-explore/SKILL.md @@ -6,7 +6,7 @@ compatibility: Requires openspec CLI. metadata: author: openspec version: "1.0" - generatedBy: "1.0.2" + generatedBy: "1.1.1" --- Enter explore mode. Think deeply. Visualize freely. Follow the conversation wherever it goes. diff --git a/.claude/skills/openspec-ff-change/SKILL.md b/.claude/skills/openspec-ff-change/SKILL.md index 64f058c..d586012 100644 --- a/.claude/skills/openspec-ff-change/SKILL.md +++ b/.claude/skills/openspec-ff-change/SKILL.md @@ -6,7 +6,7 @@ compatibility: Requires openspec CLI. metadata: author: openspec version: "1.0" - generatedBy: "1.0.2" + generatedBy: "1.1.1" --- Fast-forward through artifact creation - generate everything needed to start implementation in one go. diff --git a/.claude/skills/openspec-generate-acceptance-tests/SKILL.md b/.claude/skills/openspec-generate-acceptance-tests/SKILL.md deleted file mode 100644 index 4833adf..0000000 --- a/.claude/skills/openspec-generate-acceptance-tests/SKILL.md +++ /dev/null @@ -1,442 +0,0 @@ ---- -name: openspec-generate-acceptance-tests -description: 从 Spec 的 Scenarios 和 Business Flows 自动生成验收测试和流程测试。测试在实现前生成，预期全部 FAIL，证明测试有效。 -license: MIT -compatibility: Requires openspec CLI. -metadata: - author: junhong - version: "1.0" ---- - -# 测试生成 Skill - -从 Spec 文档自动生成两类测试： -1. **验收测试**（Acceptance Tests）：从 Scenarios 生成，验证单 API 契约 -2. **流程测试**（Flow Tests）：从 Business Flows 生成，验证多 API 业务场景 - -## 触发方式 - -``` -/opsx:gen-tests [change-name] -``` - -如果不指定 change-name，自动检测当前活跃的 change。 - ---- - -## 前置条件 - -1. Change 必须存在且包含 spec 文件 -2. Spec 必须包含 `## Scenarios` 部分 -3. Spec 建议包含 `## Business Flows` 部分（如果有跨 API 场景） - -检查命令： -```bash -openspec list --json -# 确认 change 存在且有 specs -``` - ---- - -## 工作流程 - -### Step 1: 读取 Spec 文件 - -```bash -# 读取 change 的所有 spec 文件 -cat openspec/changes//specs//spec.md -``` - -### Step 2: 解析 Scenarios - -从 Spec 中提取所有 Scenario： - -```markdown -#### Scenario: 成功创建套餐 -- **GIVEN** 用户已登录且有创建权限 -- **WHEN** POST /api/admin/packages with valid data -- **THEN** 返回 201 和套餐详情 -- **AND** 数据库中存在该套餐记录 -``` - -解析为结构： -```json -{ - "name": "成功创建套餐", - "given": ["用户已登录且有创建权限"], - "when": {"method": "POST", "path": "/api/admin/packages", "condition": "valid data"}, - "then": ["返回 201 和套餐详情"], - "and": ["数据库中存在该套餐记录"] -} -``` - -### Step 3: 解析 Business Flows - -从 Spec 中提取 Business Flow： - -```markdown -### Flow: 套餐完整生命周期 - -**参与者**: 平台管理员, 代理商 - -**流程步骤**: - -1. **创建套餐** - - 角色: 平台管理员 - - 调用: POST /api/admin/packages - - 预期: 返回套餐 ID - -2. **分配给代理商** - - 角色: 平台管理员 - - 调用: POST /api/admin/shop-packages - - 输入: 套餐 ID + 店铺 ID - - 预期: 分配成功 - -3. **代理商查看可售套餐** - - 角色: 代理商 - - 调用: GET /api/admin/shop-packages - - 预期: 列表包含刚分配的套餐 -``` - -### Step 4: 生成验收测试 - -**输出路径**: `tests/acceptance/_acceptance_test.go` - -```go -package acceptance - -import ( - "testing" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - - "junhong_cmp_fiber/tests/testutils" -) - -// ============================================================ -// 验收测试：套餐管理 -// 来源：openspec/changes/package-management/specs/package/spec.md -// ============================================================ - -func TestPackage_Acceptance(t *testing.T) { - env := testutils.NewIntegrationTestEnv(t) - - // ------------------------------------------------------------ - // Scenario: 成功创建套餐 - // GIVEN: 用户已登录且有创建权限 - // WHEN: POST /api/admin/packages with valid data - // THEN: 返回 201 和套餐详情 - // AND: 数据库中存在该套餐记录 - // - // 破坏点：如果删除 handler.Create 中的 store.Create 调用，此测试将失败 - // ------------------------------------------------------------ - t.Run("Scenario_成功创建套餐", func(t *testing.T) { - // GIVEN: 用户已登录且有创建权限 - client := env.AsSuperAdmin() - - // WHEN: POST /api/admin/packages with valid data - body := map[string]interface{}{ - "name": "测试套餐", - "description": "测试描述", - "price": 9900, - "duration": 30, - } - resp, err := client.Request("POST", "/api/admin/packages", body) - require.NoError(t, err) - - // THEN: 返回 201 和套餐详情 - assert.Equal(t, 201, resp.StatusCode) - - var result map[string]interface{} - err = resp.JSON(&result) - require.NoError(t, err) - assert.Equal(t, 0, int(result["code"].(float64))) - - data := result["data"].(map[string]interface{}) - packageID := uint(data["id"].(float64)) - assert.NotZero(t, packageID) - - // AND: 数据库中存在该套餐记录 - // TODO: 实现后取消注释 - // pkg, err := env.DB().Package.FindByID(ctx, packageID) - // require.NoError(t, err) - // assert.Equal(t, "测试套餐", pkg.Name) - }) - - // ------------------------------------------------------------ - // Scenario: 创建套餐参数校验失败 - // GIVEN: 用户已登录 - // WHEN: POST /api/admin/packages with invalid data (name empty) - // THEN: 返回 400 和错误信息 - // - // 破坏点：如果删除 handler 中的参数校验，此测试将失败 - // ------------------------------------------------------------ - t.Run("Scenario_创建套餐参数校验失败", func(t *testing.T) { - // GIVEN: 用户已登录 - client := env.AsSuperAdmin() - - // WHEN: POST /api/admin/packages with invalid data - body := map[string]interface{}{ - "name": "", // 空名称 - "price": -1, // 负价格 - } - resp, err := client.Request("POST", "/api/admin/packages", body) - require.NoError(t, err) - - // THEN: 返回 400 和错误信息 - assert.Equal(t, 400, resp.StatusCode) - }) -} -``` - -### Step 5: 生成流程测试 - -**输出路径**: `tests/flows/__flow_test.go` - -```go -package flows - -import ( - "testing" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - - "junhong_cmp_fiber/tests/testutils" -) - -// ============================================================ -// 流程测试：套餐完整生命周期 -// 来源：openspec/changes/package-management/specs/package/spec.md -// 参与者：平台管理员, 代理商 -// ============================================================ - -func TestFlow_PackageLifecycle(t *testing.T) { - env := testutils.NewIntegrationTestEnv(t) - - // 流程级共享状态 - var ( - packageID uint - shopID uint = 1 // 测试店铺 ID - ) - - // ------------------------------------------------------------ - // Step 1: 创建套餐 - // 角色: 平台管理员 - // 调用: POST /api/admin/packages - // 预期: 返回套餐 ID - // - // 破坏点：如果套餐创建 API 不返回 ID，后续步骤无法执行 - // ------------------------------------------------------------ - t.Run("Step1_平台管理员创建套餐", func(t *testing.T) { - client := env.AsSuperAdmin() - - body := map[string]interface{}{ - "name": "流程测试套餐", - "description": "用于流程测试", - "price": 19900, - "duration": 30, - } - resp, err := client.Request("POST", "/api/admin/packages", body) - require.NoError(t, err) - require.Equal(t, 201, resp.StatusCode) - - var result map[string]interface{} - err = resp.JSON(&result) - require.NoError(t, err) - - data := result["data"].(map[string]interface{}) - packageID = uint(data["id"].(float64)) - require.NotZero(t, packageID, "套餐 ID 不能为空") - }) - - // ------------------------------------------------------------ - // Step 2: 分配给代理商 - // 角色: 平台管理员 - // 调用: POST /api/admin/shop-packages - // 输入: 套餐 ID + 店铺 ID - // 预期: 分配成功 - // - // 依赖: Step 1 的 packageID - // 破坏点：如果分配 API 不检查套餐是否存在，可能分配无效套餐 - // ------------------------------------------------------------ - t.Run("Step2_分配套餐给代理商", func(t *testing.T) { - if packageID == 0 { - t.Skip("依赖 Step 1 创建的 packageID") - } - - client := env.AsSuperAdmin() - - body := map[string]interface{}{ - "package_id": packageID, - "shop_id": shopID, - } - resp, err := client.Request("POST", "/api/admin/shop-packages", body) - require.NoError(t, err) - require.Equal(t, 200, resp.StatusCode) - }) - - // ------------------------------------------------------------ - // Step 3: 代理商查看可售套餐 - // 角色: 代理商 - // 调用: GET /api/admin/shop-packages - // 预期: 列表包含刚分配的套餐 - // - // 依赖: Step 2 的分配操作 - // 破坏点：如果查询不按店铺过滤，代理商会看到其他店铺的套餐 - // ------------------------------------------------------------ - t.Run("Step3_代理商查看可售套餐", func(t *testing.T) { - if packageID == 0 { - t.Skip("依赖 Step 1 创建的 packageID") - } - - // 以代理商身份请求 - client := env.AsShopAgent(shopID) - - resp, err := client.Request("GET", "/api/admin/shop-packages", nil) - require.NoError(t, err) - require.Equal(t, 200, resp.StatusCode) - - var result map[string]interface{} - err = resp.JSON(&result) - require.NoError(t, err) - - // 验证列表包含刚分配的套餐 - data := result["data"].(map[string]interface{}) - list := data["list"].([]interface{}) - - found := false - for _, item := range list { - pkg := item.(map[string]interface{}) - if uint(pkg["package_id"].(float64)) == packageID { - found = true - break - } - } - assert.True(t, found, "代理商应该能看到刚分配的套餐") - }) -} -``` - -### Step 6: 运行测试验证 - -生成测试后，立即运行验证： - -```bash -# 预期全部 FAIL（因为功能尚未实现） -source .env.local && go test -v ./tests/acceptance/... ./tests/flows/... 2>&1 | head -50 -``` - -**如果测试 PASS**： -- 说明测试写得太弱，没有真正验证功能 -- 需要加强测试或检查是否功能已存在 - ---- - -## 测试模板规范 - -### 验收测试必须包含 - -1. **来源注释**：标明从哪个 spec 文件生成 -2. **Scenario 注释**：完整的 GIVEN/WHEN/THEN/AND -3. **破坏点注释**：说明什么代码变更会导致测试失败 -4. **清晰的结构**：GIVEN → WHEN → THEN → AND 分块 - -### 流程测试必须包含 - -1. **来源注释**：标明从哪个 spec 文件生成 -2. **参与者注释**：涉及哪些角色 -3. **共享状态声明**：流程中需要传递的数据 -4. **依赖声明**：每个 step 依赖哪些前置 step -5. **破坏点注释**：说明什么代码变更会导致测试失败 - -### 破坏点注释示例 - -```go -// 破坏点：如果删除 handler.Create 中的 store.Create 调用，此测试将失败 -// 破坏点：如果移除参数校验中的 name 必填检查，此测试将失败 -// 破坏点：如果查询不按 shop_id 过滤，此测试将失败（会返回其他店铺数据） -// 破坏点：如果状态机允许 "已使用" → "未分配" 的转换，此测试将失败 -``` - ---- - -## 输出文件 - -| 来源 | 输出 | -|------|------| -| Spec Scenarios | `tests/acceptance/_acceptance_test.go` | -| Spec Business Flows | `tests/flows/__flow_test.go` | - ---- - -## Guardrails - -- **不要跳过 Scenario** - 每个 Scenario 必须对应一个测试用例 -- **不要省略破坏点** - 每个测试必须有破坏点注释 -- **不要硬编码 ID** - 使用共享变量传递流程中的 ID -- **不要忽略依赖** - 流程测试的 step 必须声明依赖 -- **不要写永远 PASS 的测试** - 测试必须在功能缺失时 FAIL - ---- - -## 与其他 Skills 的关系 - -| Skill | 关系 | -|-------|------| -| `openspec-continue-change` | 生成 spec 后可触发 gen-tests | -| `openspec-apply-change` | 实现时参考生成的测试 | -| `openspec-verify-change` | 验证时运行生成的测试 | - ---- - -## 示例交互 - -``` -User: /opsx:gen-tests package-management - -AI: 正在分析 change: package-management - -找到 spec 文件: openspec/changes/package-management/specs/package/spec.md - -解析结果: -- Scenarios: 5 个 -- Business Flows: 2 个 - -生成测试文件: - -1. tests/acceptance/package_acceptance_test.go - - Scenario_成功创建套餐 - - Scenario_创建套餐参数校验失败 - - Scenario_成功更新套餐 - - Scenario_成功删除套餐 - - Scenario_删除已分配套餐失败 - -2. tests/flows/package_lifecycle_flow_test.go - - Step1_平台管理员创建套餐 - - Step2_分配套餐给代理商 - - Step3_代理商查看可售套餐 - - Step4_代理商创建订单 - - Step5_套餐使用统计更新 - -3. tests/flows/package_allocation_flow_test.go - - Step1_批量分配套餐 - - Step2_验证分配结果 - - Step3_撤销部分分配 - -运行验证: -$ source .env.local && go test -v ./tests/acceptance/package_... ./tests/flows/package_... - ---- FAIL: TestPackage_Acceptance (0.00s) - --- FAIL: TestPackage_Acceptance/Scenario_成功创建套餐 (0.00s) - package_acceptance_test.go:45: 404 != 201 ---- FAIL: TestFlow_PackageLifecycle (0.00s) - --- FAIL: TestFlow_PackageLifecycle/Step1_平台管理员创建套餐 (0.00s) - package_lifecycle_flow_test.go:38: 404 != 201 - -✓ 所有测试预期 FAIL（功能未实现） -✓ 测试生成完成 - -下一步: /opsx:continue 生成 design 和 tasks -``` diff --git a/.claude/skills/openspec-new-change/SKILL.md b/.claude/skills/openspec-new-change/SKILL.md index 53d96b9..37ac7ba 100644 --- a/.claude/skills/openspec-new-change/SKILL.md +++ b/.claude/skills/openspec-new-change/SKILL.md @@ -6,7 +6,7 @@ compatibility: Requires openspec CLI. metadata: author: openspec version: "1.0" - generatedBy: "1.0.2" + generatedBy: "1.1.1" --- Start a new change using the experimental artifact-driven approach. diff --git a/.claude/skills/openspec-onboard/SKILL.md b/.claude/skills/openspec-onboard/SKILL.md index 40080aa..4a03038 100644 --- a/.claude/skills/openspec-onboard/SKILL.md +++ b/.claude/skills/openspec-onboard/SKILL.md @@ -6,7 +6,7 @@ compatibility: Requires openspec CLI. metadata: author: openspec version: "1.0" - generatedBy: "1.0.2" + generatedBy: "1.1.1" --- Guide the user through their first complete OpenSpec workflow cycle. This is a teaching experience—you'll do real work in their codebase while explaining each step. diff --git a/.claude/skills/openspec-sync-specs/SKILL.md b/.claude/skills/openspec-sync-specs/SKILL.md index 632681c..4c7e3aa 100644 --- a/.claude/skills/openspec-sync-specs/SKILL.md +++ b/.claude/skills/openspec-sync-specs/SKILL.md @@ -6,7 +6,7 @@ compatibility: Requires openspec CLI. metadata: author: openspec version: "1.0" - generatedBy: "1.0.2" + generatedBy: "1.1.1" --- Sync delta specs from a change to main specs. diff --git a/.claude/skills/openspec-verify-change/SKILL.md b/.claude/skills/openspec-verify-change/SKILL.md index 21cbc50..443ac5f 100644 --- a/.claude/skills/openspec-verify-change/SKILL.md +++ b/.claude/skills/openspec-verify-change/SKILL.md @@ -6,7 +6,7 @@ compatibility: Requires openspec CLI. metadata: author: openspec version: "1.0" - generatedBy: "1.0.2" + generatedBy: "1.1.1" --- Verify that an implementation matches the change artifacts (specs, tasks, design). diff --git a/.codex/skills/openspec-apply-change/SKILL.md b/.codex/skills/openspec-apply-change/SKILL.md index bc95df4..47d4bc2 100644 --- a/.codex/skills/openspec-apply-change/SKILL.md +++ b/.codex/skills/openspec-apply-change/SKILL.md @@ -6,7 +6,7 @@ compatibility: Requires openspec CLI. metadata: author: openspec version: "1.0" - generatedBy: "1.0.2" + generatedBy: "1.1.1" --- Implement tasks from an OpenSpec change. diff --git a/.codex/skills/openspec-archive-change/SKILL.md b/.codex/skills/openspec-archive-change/SKILL.md index 9ea63e8..8fa4b23 100644 --- a/.codex/skills/openspec-archive-change/SKILL.md +++ b/.codex/skills/openspec-archive-change/SKILL.md @@ -6,7 +6,7 @@ compatibility: Requires openspec CLI. metadata: author: openspec version: "1.0" - generatedBy: "1.0.2" + generatedBy: "1.1.1" --- Archive a completed change in the experimental workflow. diff --git a/.codex/skills/openspec-bulk-archive-change/SKILL.md b/.codex/skills/openspec-bulk-archive-change/SKILL.md index 5ce056a..719b279 100644 --- a/.codex/skills/openspec-bulk-archive-change/SKILL.md +++ b/.codex/skills/openspec-bulk-archive-change/SKILL.md @@ -6,7 +6,7 @@ compatibility: Requires openspec CLI. metadata: author: openspec version: "1.0" - generatedBy: "1.0.2" + generatedBy: "1.1.1" --- Archive multiple completed changes in a single operation. diff --git a/.codex/skills/openspec-continue-change/SKILL.md b/.codex/skills/openspec-continue-change/SKILL.md index 79aaac4..5060b2f 100644 --- a/.codex/skills/openspec-continue-change/SKILL.md +++ b/.codex/skills/openspec-continue-change/SKILL.md @@ -6,7 +6,7 @@ compatibility: Requires openspec CLI. metadata: author: openspec version: "1.0" - generatedBy: "1.0.2" + generatedBy: "1.1.1" --- Continue working on a change by creating the next artifact. diff --git a/.codex/skills/openspec-explore/SKILL.md b/.codex/skills/openspec-explore/SKILL.md index 49d051d..8ed4a76 100644 --- a/.codex/skills/openspec-explore/SKILL.md +++ b/.codex/skills/openspec-explore/SKILL.md @@ -6,7 +6,7 @@ compatibility: Requires openspec CLI. metadata: author: openspec version: "1.0" - generatedBy: "1.0.2" + generatedBy: "1.1.1" --- Enter explore mode. Think deeply. Visualize freely. Follow the conversation wherever it goes. diff --git a/.codex/skills/openspec-ff-change/SKILL.md b/.codex/skills/openspec-ff-change/SKILL.md index 64f058c..d586012 100644 --- a/.codex/skills/openspec-ff-change/SKILL.md +++ b/.codex/skills/openspec-ff-change/SKILL.md @@ -6,7 +6,7 @@ compatibility: Requires openspec CLI. metadata: author: openspec version: "1.0" - generatedBy: "1.0.2" + generatedBy: "1.1.1" --- Fast-forward through artifact creation - generate everything needed to start implementation in one go. diff --git a/.codex/skills/openspec-new-change/SKILL.md b/.codex/skills/openspec-new-change/SKILL.md index 53d96b9..37ac7ba 100644 --- a/.codex/skills/openspec-new-change/SKILL.md +++ b/.codex/skills/openspec-new-change/SKILL.md @@ -6,7 +6,7 @@ compatibility: Requires openspec CLI. metadata: author: openspec version: "1.0" - generatedBy: "1.0.2" + generatedBy: "1.1.1" --- Start a new change using the experimental artifact-driven approach. diff --git a/.codex/skills/openspec-onboard/SKILL.md b/.codex/skills/openspec-onboard/SKILL.md index 40080aa..4a03038 100644 --- a/.codex/skills/openspec-onboard/SKILL.md +++ b/.codex/skills/openspec-onboard/SKILL.md @@ -6,7 +6,7 @@ compatibility: Requires openspec CLI. metadata: author: openspec version: "1.0" - generatedBy: "1.0.2" + generatedBy: "1.1.1" --- Guide the user through their first complete OpenSpec workflow cycle. This is a teaching experience—you'll do real work in their codebase while explaining each step. diff --git a/.codex/skills/openspec-sync-specs/SKILL.md b/.codex/skills/openspec-sync-specs/SKILL.md index 632681c..4c7e3aa 100644 --- a/.codex/skills/openspec-sync-specs/SKILL.md +++ b/.codex/skills/openspec-sync-specs/SKILL.md @@ -6,7 +6,7 @@ compatibility: Requires openspec CLI. metadata: author: openspec version: "1.0" - generatedBy: "1.0.2" + generatedBy: "1.1.1" --- Sync delta specs from a change to main specs. diff --git a/.codex/skills/openspec-verify-change/SKILL.md b/.codex/skills/openspec-verify-change/SKILL.md index 21cbc50..443ac5f 100644 --- a/.codex/skills/openspec-verify-change/SKILL.md +++ b/.codex/skills/openspec-verify-change/SKILL.md @@ -6,7 +6,7 @@ compatibility: Requires openspec CLI. metadata: author: openspec version: "1.0" - generatedBy: "1.0.2" + generatedBy: "1.1.1" --- Verify that an implementation matches the change artifacts (specs, tasks, design). diff --git a/.opencode/command/opsx-apply.md b/.opencode/command/opsx-apply.md index 89fb9ed..94b8c1e 100644 --- a/.opencode/command/opsx-apply.md +++ b/.opencode/command/opsx-apply.md @@ -4,7 +4,7 @@ description: Implement tasks from an OpenSpec change (Experimental) Implement tasks from an OpenSpec change. -**Input**: Optionally specify a change name (e.g., `/opsx:apply add-auth`). If omitted, check if it can be inferred from conversation context. If vague or ambiguous you MUST prompt for available changes. +**Input**: Optionally specify a change name (e.g., `/opsx-apply add-auth`). If omitted, check if it can be inferred from conversation context. If vague or ambiguous you MUST prompt for available changes. **Steps** @@ -15,7 +15,7 @@ Implement tasks from an OpenSpec change. - Auto-select if only one active change exists - If ambiguous, run `openspec list --json` to get available changes and use the **AskUserQuestion tool** to let the user select - Always announce: "Using change: " and how to override (e.g., `/opsx:apply `). + Always announce: "Using change: " and how to override (e.g., `/opsx-apply `). 2. **Check status to understand the schema** ```bash @@ -38,7 +38,7 @@ Implement tasks from an OpenSpec change. - Dynamic instruction based on current state **Handle states:** - - If `state: "blocked"` (missing artifacts): show message, suggest using `/opsx:continue` + - If `state: "blocked"` (missing artifacts): show message, suggest using `/opsx-continue` - If `state: "all_done"`: congratulate, suggest archive - Otherwise: proceed to implementation @@ -108,7 +108,7 @@ Working on task 4/7: - [x] Task 2 ... -All tasks complete! Ready to archive this change. +All tasks complete! You can archive this change with `/opsx-archive`. ``` **Output On Pause (Issue Encountered)** diff --git a/.opencode/command/opsx-archive.md b/.opencode/command/opsx-archive.md index 4e2ee18..20ad82b 100644 --- a/.opencode/command/opsx-archive.md +++ b/.opencode/command/opsx-archive.md @@ -4,7 +4,7 @@ description: Archive a completed change in the experimental workflow Archive a completed change in the experimental workflow. -**Input**: Optionally specify a change name after `/opsx:archive` (e.g., `/opsx:archive add-auth`). If omitted, check if it can be inferred from conversation context. If vague or ambiguous you MUST prompt for available changes. +**Input**: Optionally specify a change name after `/opsx-archive` (e.g., `/opsx-archive add-auth`). If omitted, check if it can be inferred from conversation context. If vague or ambiguous you MUST prompt for available changes. **Steps** @@ -56,7 +56,7 @@ Archive a completed change in the experimental workflow. - If changes needed: "Sync now (recommended)", "Archive without syncing" - If already synced: "Archive now", "Sync anyway", "Cancel" - If user chooses sync, execute `/opsx:sync` logic. Proceed to archive regardless of choice. + If user chooses sync, execute `/opsx-sync` logic. Proceed to archive regardless of choice. 5. **Perform the archive** @@ -150,5 +150,5 @@ Target archive directory already exists. - Don't block archive on warnings - just inform and confirm - Preserve .openspec.yaml when moving to archive (it moves with the directory) - Show clear summary of what happened -- If sync is requested, use /opsx:sync approach (agent-driven) +- If sync is requested, use /opsx-sync approach (agent-driven) - If delta specs exist, always run the sync assessment and show the combined summary before prompting diff --git a/.opencode/command/opsx-bulk-archive.md b/.opencode/command/opsx-bulk-archive.md index f8e773f..05fdf8d 100644 --- a/.opencode/command/opsx-bulk-archive.md +++ b/.opencode/command/opsx-bulk-archive.md @@ -222,7 +222,7 @@ Failed K changes: ``` ## No Changes to Archive -No active changes found. Use `/opsx:new` to create a new change. +No active changes found. Use `/opsx-new` to create a new change. ``` **Guardrails** diff --git a/.opencode/command/opsx-continue.md b/.opencode/command/opsx-continue.md index f91ec4b..1a64810 100644 --- a/.opencode/command/opsx-continue.md +++ b/.opencode/command/opsx-continue.md @@ -4,7 +4,7 @@ description: Continue working on a change - create the next artifact (Experiment Continue working on a change by creating the next artifact. -**Input**: Optionally specify a change name after `/opsx:continue` (e.g., `/opsx:continue add-auth`). If omitted, check if it can be inferred from conversation context. If vague or ambiguous you MUST prompt for available changes. +**Input**: Optionally specify a change name after `/opsx-continue` (e.g., `/opsx-continue add-auth`). If omitted, check if it can be inferred from conversation context. If vague or ambiguous you MUST prompt for available changes. **Steps** @@ -38,7 +38,7 @@ Continue working on a change by creating the next artifact. **If all artifacts are complete (`isComplete: true`)**: - Congratulate the user - Show final status including the schema used - - Suggest: "All artifacts created! You can now implement this change or archive it." + - Suggest: "All artifacts created! You can now implement this change with `/opsx-apply` or archive it with `/opsx-archive`." - STOP --- @@ -82,7 +82,7 @@ After each invocation, show: - Schema workflow being used - Current progress (N/M complete) - What artifacts are now unlocked -- Prompt: "Run `/opsx:continue` to create the next artifact" +- Prompt: "Run `/opsx-continue` to create the next artifact" **Artifact Creation Guidelines** diff --git a/.opencode/command/opsx-explore.md b/.opencode/command/opsx-explore.md index fd58862..01ee33c 100644 --- a/.opencode/command/opsx-explore.md +++ b/.opencode/command/opsx-explore.md @@ -4,11 +4,11 @@ description: Enter explore mode - think through ideas, investigate problems, cla Enter explore mode. Think deeply. Visualize freely. Follow the conversation wherever it goes. -**IMPORTANT: Explore mode is for thinking, not implementing.** You may read files, search code, and investigate the codebase, but you must NEVER write code or implement features. If the user asks you to implement something, remind them to exit explore mode first (e.g., start a change with `/opsx:new` or `/opsx:ff`). You MAY create OpenSpec artifacts (proposals, designs, specs) if the user asks—that's capturing thinking, not implementing. +**IMPORTANT: Explore mode is for thinking, not implementing.** You may read files, search code, and investigate the codebase, but you must NEVER write code or implement features. If the user asks you to implement something, remind them to exit explore mode first (e.g., start a change with `/opsx-new` or `/opsx-ff`). You MAY create OpenSpec artifacts (proposals, designs, specs) if the user asks—that's capturing thinking, not implementing. **This is a stance, not a workflow.** There are no fixed steps, no required sequence, no mandatory outputs. You're a thinking partner helping the user explore. -**Input**: The argument after `/opsx:explore` is whatever the user wants to think about. Could be: +**Input**: The argument after `/opsx-explore` is whatever the user wants to think about. Could be: - A vague idea: "real-time collaboration" - A specific problem: "the auth system is getting unwieldy" - A change name: "add-dark-mode" (to explore in context of that change) @@ -98,7 +98,7 @@ If the user mentioned a specific change name, read its artifacts for context. Think freely. When insights crystallize, you might offer: - "This feels solid enough to start a change. Want me to create one?" - → Can transition to `/opsx:new` or `/opsx:ff` + → Can transition to `/opsx-new` or `/opsx-ff` - Or keep exploring - no pressure to formalize ### When a change exists @@ -150,7 +150,7 @@ If the user mentions a change or you detect one is relevant: There's no required ending. Discovery might: -- **Flow into action**: "Ready to start? `/opsx:new` or `/opsx:ff`" +- **Flow into action**: "Ready to start? `/opsx-new` or `/opsx-ff`" - **Result in artifact updates**: "Updated design.md with these decisions" - **Just provide clarity**: User has what they need, moves on - **Continue later**: "We can pick this up anytime" diff --git a/.opencode/command/opsx-ff.md b/.opencode/command/opsx-ff.md index 6b3dc00..33190e0 100644 --- a/.opencode/command/opsx-ff.md +++ b/.opencode/command/opsx-ff.md @@ -4,7 +4,7 @@ description: Create a change and generate all artifacts needed for implementatio Fast-forward through artifact creation - generate everything needed to start implementation. -**Input**: The argument after `/opsx:ff` is the change name (kebab-case), OR a description of what the user wants to build. +**Input**: The argument after `/opsx-ff` is the change name (kebab-case), OR a description of what the user wants to build. **Steps** @@ -74,7 +74,7 @@ After completing all artifacts, summarize: - Change name and location - List of artifacts created with brief descriptions - What's ready: "All artifacts created! Ready for implementation." -- Prompt: "Run `/opsx:apply` to start implementing." +- Prompt: "Run `/opsx-apply` to start implementing." **Artifact Creation Guidelines** diff --git a/.opencode/command/opsx-gen-tests.md b/.opencode/command/opsx-gen-tests.md deleted file mode 100644 index 62172c9..0000000 --- a/.opencode/command/opsx-gen-tests.md +++ /dev/null @@ -1,133 +0,0 @@ ---- -description: 从 Spec 的 Scenarios 和 Business Flows 自动生成验收测试和流程测试 ---- - -从 Spec 文档自动生成两类测试： -1. **验收测试**（Acceptance Tests）：从 Scenarios 生成，验证单 API 契约 -2. **流程测试**（Flow Tests）：从 Business Flows 生成，验证多 API 业务场景 - -**Input**: 可选指定 change 名称（如 `/opsx:gen-tests add-auth`）。如果省略，从上下文推断或提示选择。 - -**Steps** - -1. **选择 change** - - 如果提供了名称，使用它。否则： - - 从对话上下文推断 - - 如果只有一个活跃 change，自动选择 - - 如果模糊，运行 `openspec list --json` 让用户选择 - -2. **检查 change 状态** - ```bash - openspec status --change "" --json - ``` - 确认 specs artifact 已完成（`status: "done"`） - -3. **读取 spec 文件** - - 读取 `openspec/changes//specs/*/spec.md` 下的所有 spec 文件。 - -4. **解析 Scenarios** - - 从每个 spec 文件中提取 `#### Scenario:` 块： - ```markdown - #### Scenario: 成功创建套餐 - - **GIVEN** 用户已登录且有创建权限 - - **WHEN** POST /api/admin/packages with valid data - - **THEN** 返回 200 和套餐详情 - ``` - -5. **解析 Business Flows**（如果存在） - - 从 spec 文件中提取 `### Flow:` 块，包含多步骤业务场景。 - -6. **生成验收测试** - - 输出路径：`tests/acceptance/_acceptance_test.go` - - 模板结构： - ```go - func Test{Capability}_Acceptance(t *testing.T) { - env := testutils.NewIntegrationTestEnv(t) - - t.Run("Scenario_{name}", func(t *testing.T) { - // GIVEN: ... - // WHEN: ... - // THEN: ... - // 破坏点：... - }) - } - ``` - -7. **生成流程测试** - - 输出路径：`tests/flows/__flow_test.go` - - 模板结构： - ```go - func TestFlow_{FlowName}(t *testing.T) { - env := testutils.NewIntegrationTestEnv(t) - - var ( - // 流程级共享状态 - ) - - t.Run("Step1_{name}", func(t *testing.T) { - // 依赖：... - // 破坏点：... - }) - } - ``` - -8. **运行测试验证** - - ```bash - source .env.local && go test -v ./tests/acceptance/... ./tests/flows/... 2>&1 | head -50 - ``` - - **预期**：全部 FAIL（功能未实现，证明测试有效） - - **如果测试 PASS**：说明测试写得太弱，需要加强 - -**Output** - -``` -## 测试生成完成 - -**Change:** -**来源:** specs//spec.md - -### 生成的测试文件 - -**验收测试** (tests/acceptance/): -- _acceptance_test.go - - Scenario_xxx - - Scenario_yyy - -**流程测试** (tests/flows/): -- __flow_test.go - - Step1_xxx - - Step2_yyy - -### 验证结果 - -$ source .env.local && go test -v ./tests/acceptance/... ./tests/flows/... - ---- FAIL: TestXxx_Acceptance (0.00s) - --- FAIL: TestXxx_Acceptance/Scenario_xxx (0.00s) - xxx_acceptance_test.go:45: 404 != 200 - -✓ 所有测试预期 FAIL（功能未实现） -✓ 测试生成完成 - -下一步: 开始实现 tasks，每完成一个功能单元运行相关测试验证 -``` - -**Guardrails** - -- 每个 Scenario 必须生成一个测试用例（不要跳过） -- 每个测试必须包含"破坏点"注释 -- 流程测试的 step 必须声明依赖 -- 使用 IntegrationTestEnv，不要 mock 依赖 -- 测试必须在功能缺失时 FAIL（不要写永远 PASS 的测试） -- 详细模板参考：`.opencode/skills/openspec-generate-acceptance-tests/SKILL.md` diff --git a/.opencode/command/opsx-new.md b/.opencode/command/opsx-new.md index ec2253d..0f30abd 100644 --- a/.opencode/command/opsx-new.md +++ b/.opencode/command/opsx-new.md @@ -4,7 +4,7 @@ description: Start a new change using the experimental artifact workflow (OPSX) Start a new change using the experimental artifact-driven approach. -**Input**: The argument after `/opsx:new` is the change name (kebab-case), OR a description of what the user wants to build. +**Input**: The argument after `/opsx-new` is the change name (kebab-case), OR a description of what the user wants to build. **Steps** @@ -56,11 +56,11 @@ After completing the steps, summarize: - Schema/workflow being used and its artifact sequence - Current status (0/N artifacts complete) - The template for the first artifact -- Prompt: "Ready to create the first artifact? Run `/opsx:continue` or just describe what this change is about and I'll draft it." +- Prompt: "Ready to create the first artifact? Run `/opsx-continue` or just describe what this change is about and I'll draft it." **Guardrails** - Do NOT create any artifacts yet - just show the instructions - Do NOT advance beyond showing the first artifact template - If the name is invalid (not kebab-case), ask for a valid name -- If a change with that name already exists, suggest using `/opsx:continue` instead +- If a change with that name already exists, suggest using `/opsx-continue` instead - Pass --schema if using a non-default workflow diff --git a/.opencode/command/opsx-onboard.md b/.opencode/command/opsx-onboard.md index 1414f1e..50b4b82 100644 --- a/.opencode/command/opsx-onboard.md +++ b/.opencode/command/opsx-onboard.md @@ -15,7 +15,7 @@ openspec status --json 2>&1 || echo "NOT_INITIALIZED" ``` **If not initialized:** -> OpenSpec isn't set up in this project yet. Run `openspec init` first, then come back to `/opsx:onboard`. +> OpenSpec isn't set up in this project yet. Run `openspec init` first, then come back to `/opsx-onboard`. Stop here if not initialized. @@ -139,7 +139,7 @@ Spend 1-2 minutes investigating the relevant code: │ [Optional: ASCII diagram if helpful] │ └─────────────────────────────────────────┘ -Explore mode (`/opsx:explore`) is for this kind of thinking—investigating before implementing. You can use it anytime you need to think through a problem. +Explore mode (`/opsx-explore`) is for this kind of thinking—investigating before implementing. You can use it anytime you need to think through a problem. Now let's create a change to hold our work. ``` @@ -452,19 +452,19 @@ This same rhythm works for any size change—a small fix or a major feature. | Command | What it does | |---------|--------------| -| `/opsx:explore` | Think through problems before/during work | -| `/opsx:new` | Start a new change, step through artifacts | -| `/opsx:ff` | Fast-forward: create all artifacts at once | -| `/opsx:continue` | Continue working on an existing change | -| `/opsx:apply` | Implement tasks from a change | -| `/opsx:verify` | Verify implementation matches artifacts | -| `/opsx:archive` | Archive a completed change | +| `/opsx-explore` | Think through problems before/during work | +| `/opsx-new` | Start a new change, step through artifacts | +| `/opsx-ff` | Fast-forward: create all artifacts at once | +| `/opsx-continue` | Continue working on an existing change | +| `/opsx-apply` | Implement tasks from a change | +| `/opsx-verify` | Verify implementation matches artifacts | +| `/opsx-archive` | Archive a completed change | --- ## What's Next? -Try `/opsx:new` or `/opsx:ff` on something you actually want to build. You've got the rhythm now! +Try `/opsx-new` or `/opsx-ff` on something you actually want to build. You've got the rhythm now! ``` --- @@ -479,8 +479,8 @@ If the user says they need to stop, want to pause, or seem disengaged: No problem! Your change is saved at `openspec/changes//`. To pick up where we left off later: -- `/opsx:continue ` - Resume artifact creation -- `/opsx:apply ` - Jump to implementation (if tasks exist) +- `/opsx-continue ` - Resume artifact creation +- `/opsx-apply ` - Jump to implementation (if tasks exist) The work won't be lost. Come back whenever you're ready. ``` @@ -496,15 +496,15 @@ If the user says they just want to see the commands or skip the tutorial: | Command | What it does | |---------|--------------| -| `/opsx:explore` | Think through problems (no code changes) | -| `/opsx:new ` | Start a new change, step by step | -| `/opsx:ff ` | Fast-forward: all artifacts at once | -| `/opsx:continue ` | Continue an existing change | -| `/opsx:apply ` | Implement tasks | -| `/opsx:verify ` | Verify implementation | -| `/opsx:archive ` | Archive when done | +| `/opsx-explore` | Think through problems (no code changes) | +| `/opsx-new ` | Start a new change, step by step | +| `/opsx-ff ` | Fast-forward: all artifacts at once | +| `/opsx-continue ` | Continue an existing change | +| `/opsx-apply ` | Implement tasks | +| `/opsx-verify ` | Verify implementation | +| `/opsx-archive ` | Archive when done | -Try `/opsx:new` to start your first change, or `/opsx:ff` if you want to move fast. +Try `/opsx-new` to start your first change, or `/opsx-ff` if you want to move fast. ``` Exit gracefully. diff --git a/.opencode/command/opsx-sync.md b/.opencode/command/opsx-sync.md index 56b5b33..1208c4b 100644 --- a/.opencode/command/opsx-sync.md +++ b/.opencode/command/opsx-sync.md @@ -6,7 +6,7 @@ Sync delta specs from a change to main specs. This is an **agent-driven** operation - you will read delta specs and directly edit main specs to apply the changes. This allows intelligent merging (e.g., adding a scenario without copying the entire requirement). -**Input**: Optionally specify a change name after `/opsx:sync` (e.g., `/opsx:sync add-auth`). If omitted, check if it can be inferred from conversation context. If vague or ambiguous you MUST prompt for available changes. +**Input**: Optionally specify a change name after `/opsx-sync` (e.g., `/opsx-sync add-auth`). If omitted, check if it can be inferred from conversation context. If vague or ambiguous you MUST prompt for available changes. **Steps** diff --git a/.opencode/command/opsx-verify.md b/.opencode/command/opsx-verify.md index 8111873..7bd3aba 100644 --- a/.opencode/command/opsx-verify.md +++ b/.opencode/command/opsx-verify.md @@ -4,7 +4,7 @@ description: Verify implementation matches change artifacts before archiving Verify that an implementation matches the change artifacts (specs, tasks, design). -**Input**: Optionally specify a change name after `/opsx:verify` (e.g., `/opsx:verify add-auth`). If omitted, check if it can be inferred from conversation context. If vague or ambiguous you MUST prompt for available changes. +**Input**: Optionally specify a change name after `/opsx-verify` (e.g., `/opsx-verify add-auth`). If omitted, check if it can be inferred from conversation context. If vague or ambiguous you MUST prompt for available changes. **Steps** diff --git a/.opencode/skills/openspec-apply-change/SKILL.md b/.opencode/skills/openspec-apply-change/SKILL.md index bc95df4..628c56e 100644 --- a/.opencode/skills/openspec-apply-change/SKILL.md +++ b/.opencode/skills/openspec-apply-change/SKILL.md @@ -6,7 +6,7 @@ compatibility: Requires openspec CLI. metadata: author: openspec version: "1.0" - generatedBy: "1.0.2" + generatedBy: "1.1.1" --- Implement tasks from an OpenSpec change. @@ -22,7 +22,7 @@ Implement tasks from an OpenSpec change. - Auto-select if only one active change exists - If ambiguous, run `openspec list --json` to get available changes and use the **AskUserQuestion tool** to let the user select - Always announce: "Using change: " and how to override (e.g., `/opsx:apply `). + Always announce: "Using change: " and how to override (e.g., `/opsx-apply `). 2. **Check status to understand the schema** ```bash diff --git a/.opencode/skills/openspec-archive-change/SKILL.md b/.opencode/skills/openspec-archive-change/SKILL.md index 9ea63e8..07e9df4 100644 --- a/.opencode/skills/openspec-archive-change/SKILL.md +++ b/.opencode/skills/openspec-archive-change/SKILL.md @@ -6,7 +6,7 @@ compatibility: Requires openspec CLI. metadata: author: openspec version: "1.0" - generatedBy: "1.0.2" + generatedBy: "1.1.1" --- Archive a completed change in the experimental workflow. @@ -63,7 +63,7 @@ Archive a completed change in the experimental workflow. - If changes needed: "Sync now (recommended)", "Archive without syncing" - If already synced: "Archive now", "Sync anyway", "Cancel" - If user chooses sync, execute /opsx:sync logic (use the openspec-sync-specs skill). Proceed to archive regardless of choice. + If user chooses sync, execute /opsx-sync logic (use the openspec-sync-specs skill). Proceed to archive regardless of choice. 5. **Perform the archive** diff --git a/.opencode/skills/openspec-bulk-archive-change/SKILL.md b/.opencode/skills/openspec-bulk-archive-change/SKILL.md index 5ce056a..bf4214f 100644 --- a/.opencode/skills/openspec-bulk-archive-change/SKILL.md +++ b/.opencode/skills/openspec-bulk-archive-change/SKILL.md @@ -6,7 +6,7 @@ compatibility: Requires openspec CLI. metadata: author: openspec version: "1.0" - generatedBy: "1.0.2" + generatedBy: "1.1.1" --- Archive multiple completed changes in a single operation. @@ -229,7 +229,7 @@ Failed K changes: ``` ## No Changes to Archive -No active changes found. Use `/opsx:new` to create a new change. +No active changes found. Use `/opsx-new` to create a new change. ``` **Guardrails** diff --git a/.opencode/skills/openspec-continue-change/SKILL.md b/.opencode/skills/openspec-continue-change/SKILL.md index dc7d250..5060b2f 100644 --- a/.opencode/skills/openspec-continue-change/SKILL.md +++ b/.opencode/skills/openspec-continue-change/SKILL.md @@ -6,7 +6,7 @@ compatibility: Requires openspec CLI. metadata: author: openspec version: "1.0" - generatedBy: "1.0.2" + generatedBy: "1.1.1" --- Continue working on a change by creating the next artifact. @@ -102,35 +102,7 @@ Common artifact patterns: - The Capabilities section is critical - each capability listed will need a spec file. - **specs//spec.md**: Create one spec per capability listed in the proposal's Capabilities section (use the capability name, not the change name). - **design.md**: Document technical decisions, architecture, and implementation approach. -- **tasks.md**: Break down implementation into checkboxed tasks, following TDD workflow structure: - - **TDD Tasks Structure (MUST follow)**: - ```markdown - ## 0. 测试准备（实现前执行） - - [ ] 0.1 生成验收测试和流程测试（/opsx:gen-tests） - - [ ] 0.2 运行测试确认全部 FAIL（证明测试有效） - - ## 1. 基础设施（数据库 + Model） - - [ ] 1.x 创建迁移、Model、DTO - - [ ] 1.y 验证：编译通过 - - ## 2. 功能单元 A（完整垂直切片） - - [ ] 2.1 Store 层 - - [ ] 2.2 Service 层 - - [ ] 2.3 Handler 层 + 路由 - - [ ] 2.4 **验证：功能 A 相关验收测试 PASS** - - ## N. 最终验证 - - [ ] N.1 全部验收测试 PASS - - [ ] N.2 全部流程测试 PASS - - [ ] N.3 完整测试套件无回归 - ``` - - **Key principles**: - - Task group 0 MUST be test preparation (generate tests + confirm all FAIL) - - Organize by functional units, NOT by technical layers (Store/Service/Handler) - - Each functional unit MUST end with "verify related tests PASS" - - Final validation MUST include all acceptance + flow tests passing +- **tasks.md**: Break down implementation into checkboxed tasks. For other schemas, follow the `instruction` field from the CLI output. diff --git a/.opencode/skills/openspec-explore/SKILL.md b/.opencode/skills/openspec-explore/SKILL.md index 3dc8303..147c7ef 100644 --- a/.opencode/skills/openspec-explore/SKILL.md +++ b/.opencode/skills/openspec-explore/SKILL.md @@ -6,12 +6,12 @@ compatibility: Requires openspec CLI. metadata: author: openspec version: "1.0" - generatedBy: "1.0.2" + generatedBy: "1.1.1" --- Enter explore mode. Think deeply. Visualize freely. Follow the conversation wherever it goes. -**IMPORTANT: Explore mode is for thinking, not implementing.** You may read files, search code, and investigate the codebase, but you must NEVER write code or implement features. If the user asks you to implement something, remind them to exit explore mode first (e.g., start a change with `/opsx:new` or `/opsx:ff`). You MAY create OpenSpec artifacts (proposals, designs, specs) if the user asks—that's capturing thinking, not implementing. +**IMPORTANT: Explore mode is for thinking, not implementing.** You may read files, search code, and investigate the codebase, but you must NEVER write code or implement features. If the user asks you to implement something, remind them to exit explore mode first (e.g., start a change with `/opsx-new` or `/opsx-ff`). You MAY create OpenSpec artifacts (proposals, designs, specs) if the user asks—that's capturing thinking, not implementing. **This is a stance, not a workflow.** There are no fixed steps, no required sequence, no mandatory outputs. You're a thinking partner helping the user explore. @@ -96,7 +96,7 @@ This tells you: Think freely. When insights crystallize, you might offer: - "This feels solid enough to start a change. Want me to create one?" - → Can transition to `/opsx:new` or `/opsx:ff` + → Can transition to `/opsx-new` or `/opsx-ff` - Or keep exploring - no pressure to formalize ### When a change exists @@ -202,7 +202,7 @@ You: [reads codebase] **User is stuck mid-implementation:** ``` -User: /opsx:explore add-auth-system +User: /opsx-explore add-auth-system The OAuth integration is more complex than expected You: [reads change artifacts] @@ -252,28 +252,11 @@ You: That changes everything. There's no required ending. Discovery might: -- **Lock consensus first**: "讨论已经比较清晰了，要锁定共识吗？" → `/opsx:lock ` -- **Flow into action**: "Ready to start? /opsx:new or /opsx:ff" +- **Flow into action**: "Ready to start? /opsx-new or /opsx-ff" - **Result in artifact updates**: "Updated design.md with these decisions" - **Just provide clarity**: User has what they need, moves on - **Continue later**: "We can pick this up anytime" -### 推荐流程 - -当讨论涉及重要决策时，**建议先锁定共识再创建变更**： - -``` -探索讨论 → /opsx:lock → /opsx:new 或 /opsx:ff -``` - -锁定共识会生成 `consensus.md`，记录： -- 要做什么 -- 不做什么 -- 关键约束 -- 验收标准 - -后续生成 proposal 时会自动验证是否符合共识。 - When it feels like things are crystallizing, you might summarize: ``` @@ -286,9 +269,8 @@ When it feels like things are crystallizing, you might summarize: **Open questions**: [if any remain] **Next steps** (if ready): -- Lock consensus: /opsx:lock (推荐先锁定) -- Create a change: /opsx:new -- Fast-forward to tasks: /opsx:ff +- Create a change: /opsx-new +- Fast-forward to tasks: /opsx-ff - Keep exploring: just keep talking ``` diff --git a/.opencode/skills/openspec-ff-change/SKILL.md b/.opencode/skills/openspec-ff-change/SKILL.md index 64f058c..519f356 100644 --- a/.opencode/skills/openspec-ff-change/SKILL.md +++ b/.opencode/skills/openspec-ff-change/SKILL.md @@ -6,7 +6,7 @@ compatibility: Requires openspec CLI. metadata: author: openspec version: "1.0" - generatedBy: "1.0.2" + generatedBy: "1.1.1" --- Fast-forward through artifact creation - generate everything needed to start implementation in one go. @@ -81,7 +81,7 @@ After completing all artifacts, summarize: - Change name and location - List of artifacts created with brief descriptions - What's ready: "All artifacts created! Ready for implementation." -- Prompt: "Run `/opsx:apply` or ask me to implement to start working on the tasks." +- Prompt: "Run `/opsx-apply` or ask me to implement to start working on the tasks." **Artifact Creation Guidelines** diff --git a/.opencode/skills/openspec-generate-acceptance-tests/SKILL.md b/.opencode/skills/openspec-generate-acceptance-tests/SKILL.md deleted file mode 100644 index 4833adf..0000000 --- a/.opencode/skills/openspec-generate-acceptance-tests/SKILL.md +++ /dev/null @@ -1,442 +0,0 @@ ---- -name: openspec-generate-acceptance-tests -description: 从 Spec 的 Scenarios 和 Business Flows 自动生成验收测试和流程测试。测试在实现前生成，预期全部 FAIL，证明测试有效。 -license: MIT -compatibility: Requires openspec CLI. -metadata: - author: junhong - version: "1.0" ---- - -# 测试生成 Skill - -从 Spec 文档自动生成两类测试： -1. **验收测试**（Acceptance Tests）：从 Scenarios 生成，验证单 API 契约 -2. **流程测试**（Flow Tests）：从 Business Flows 生成，验证多 API 业务场景 - -## 触发方式 - -``` -/opsx:gen-tests [change-name] -``` - -如果不指定 change-name，自动检测当前活跃的 change。 - ---- - -## 前置条件 - -1. Change 必须存在且包含 spec 文件 -2. Spec 必须包含 `## Scenarios` 部分 -3. Spec 建议包含 `## Business Flows` 部分（如果有跨 API 场景） - -检查命令： -```bash -openspec list --json -# 确认 change 存在且有 specs -``` - ---- - -## 工作流程 - -### Step 1: 读取 Spec 文件 - -```bash -# 读取 change 的所有 spec 文件 -cat openspec/changes//specs//spec.md -``` - -### Step 2: 解析 Scenarios - -从 Spec 中提取所有 Scenario： - -```markdown -#### Scenario: 成功创建套餐 -- **GIVEN** 用户已登录且有创建权限 -- **WHEN** POST /api/admin/packages with valid data -- **THEN** 返回 201 和套餐详情 -- **AND** 数据库中存在该套餐记录 -``` - -解析为结构： -```json -{ - "name": "成功创建套餐", - "given": ["用户已登录且有创建权限"], - "when": {"method": "POST", "path": "/api/admin/packages", "condition": "valid data"}, - "then": ["返回 201 和套餐详情"], - "and": ["数据库中存在该套餐记录"] -} -``` - -### Step 3: 解析 Business Flows - -从 Spec 中提取 Business Flow： - -```markdown -### Flow: 套餐完整生命周期 - -**参与者**: 平台管理员, 代理商 - -**流程步骤**: - -1. **创建套餐** - - 角色: 平台管理员 - - 调用: POST /api/admin/packages - - 预期: 返回套餐 ID - -2. **分配给代理商** - - 角色: 平台管理员 - - 调用: POST /api/admin/shop-packages - - 输入: 套餐 ID + 店铺 ID - - 预期: 分配成功 - -3. **代理商查看可售套餐** - - 角色: 代理商 - - 调用: GET /api/admin/shop-packages - - 预期: 列表包含刚分配的套餐 -``` - -### Step 4: 生成验收测试 - -**输出路径**: `tests/acceptance/_acceptance_test.go` - -```go -package acceptance - -import ( - "testing" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - - "junhong_cmp_fiber/tests/testutils" -) - -// ============================================================ -// 验收测试：套餐管理 -// 来源：openspec/changes/package-management/specs/package/spec.md -// ============================================================ - -func TestPackage_Acceptance(t *testing.T) { - env := testutils.NewIntegrationTestEnv(t) - - // ------------------------------------------------------------ - // Scenario: 成功创建套餐 - // GIVEN: 用户已登录且有创建权限 - // WHEN: POST /api/admin/packages with valid data - // THEN: 返回 201 和套餐详情 - // AND: 数据库中存在该套餐记录 - // - // 破坏点：如果删除 handler.Create 中的 store.Create 调用，此测试将失败 - // ------------------------------------------------------------ - t.Run("Scenario_成功创建套餐", func(t *testing.T) { - // GIVEN: 用户已登录且有创建权限 - client := env.AsSuperAdmin() - - // WHEN: POST /api/admin/packages with valid data - body := map[string]interface{}{ - "name": "测试套餐", - "description": "测试描述", - "price": 9900, - "duration": 30, - } - resp, err := client.Request("POST", "/api/admin/packages", body) - require.NoError(t, err) - - // THEN: 返回 201 和套餐详情 - assert.Equal(t, 201, resp.StatusCode) - - var result map[string]interface{} - err = resp.JSON(&result) - require.NoError(t, err) - assert.Equal(t, 0, int(result["code"].(float64))) - - data := result["data"].(map[string]interface{}) - packageID := uint(data["id"].(float64)) - assert.NotZero(t, packageID) - - // AND: 数据库中存在该套餐记录 - // TODO: 实现后取消注释 - // pkg, err := env.DB().Package.FindByID(ctx, packageID) - // require.NoError(t, err) - // assert.Equal(t, "测试套餐", pkg.Name) - }) - - // ------------------------------------------------------------ - // Scenario: 创建套餐参数校验失败 - // GIVEN: 用户已登录 - // WHEN: POST /api/admin/packages with invalid data (name empty) - // THEN: 返回 400 和错误信息 - // - // 破坏点：如果删除 handler 中的参数校验，此测试将失败 - // ------------------------------------------------------------ - t.Run("Scenario_创建套餐参数校验失败", func(t *testing.T) { - // GIVEN: 用户已登录 - client := env.AsSuperAdmin() - - // WHEN: POST /api/admin/packages with invalid data - body := map[string]interface{}{ - "name": "", // 空名称 - "price": -1, // 负价格 - } - resp, err := client.Request("POST", "/api/admin/packages", body) - require.NoError(t, err) - - // THEN: 返回 400 和错误信息 - assert.Equal(t, 400, resp.StatusCode) - }) -} -``` - -### Step 5: 生成流程测试 - -**输出路径**: `tests/flows/__flow_test.go` - -```go -package flows - -import ( - "testing" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - - "junhong_cmp_fiber/tests/testutils" -) - -// ============================================================ -// 流程测试：套餐完整生命周期 -// 来源：openspec/changes/package-management/specs/package/spec.md -// 参与者：平台管理员, 代理商 -// ============================================================ - -func TestFlow_PackageLifecycle(t *testing.T) { - env := testutils.NewIntegrationTestEnv(t) - - // 流程级共享状态 - var ( - packageID uint - shopID uint = 1 // 测试店铺 ID - ) - - // ------------------------------------------------------------ - // Step 1: 创建套餐 - // 角色: 平台管理员 - // 调用: POST /api/admin/packages - // 预期: 返回套餐 ID - // - // 破坏点：如果套餐创建 API 不返回 ID，后续步骤无法执行 - // ------------------------------------------------------------ - t.Run("Step1_平台管理员创建套餐", func(t *testing.T) { - client := env.AsSuperAdmin() - - body := map[string]interface{}{ - "name": "流程测试套餐", - "description": "用于流程测试", - "price": 19900, - "duration": 30, - } - resp, err := client.Request("POST", "/api/admin/packages", body) - require.NoError(t, err) - require.Equal(t, 201, resp.StatusCode) - - var result map[string]interface{} - err = resp.JSON(&result) - require.NoError(t, err) - - data := result["data"].(map[string]interface{}) - packageID = uint(data["id"].(float64)) - require.NotZero(t, packageID, "套餐 ID 不能为空") - }) - - // ------------------------------------------------------------ - // Step 2: 分配给代理商 - // 角色: 平台管理员 - // 调用: POST /api/admin/shop-packages - // 输入: 套餐 ID + 店铺 ID - // 预期: 分配成功 - // - // 依赖: Step 1 的 packageID - // 破坏点：如果分配 API 不检查套餐是否存在，可能分配无效套餐 - // ------------------------------------------------------------ - t.Run("Step2_分配套餐给代理商", func(t *testing.T) { - if packageID == 0 { - t.Skip("依赖 Step 1 创建的 packageID") - } - - client := env.AsSuperAdmin() - - body := map[string]interface{}{ - "package_id": packageID, - "shop_id": shopID, - } - resp, err := client.Request("POST", "/api/admin/shop-packages", body) - require.NoError(t, err) - require.Equal(t, 200, resp.StatusCode) - }) - - // ------------------------------------------------------------ - // Step 3: 代理商查看可售套餐 - // 角色: 代理商 - // 调用: GET /api/admin/shop-packages - // 预期: 列表包含刚分配的套餐 - // - // 依赖: Step 2 的分配操作 - // 破坏点：如果查询不按店铺过滤，代理商会看到其他店铺的套餐 - // ------------------------------------------------------------ - t.Run("Step3_代理商查看可售套餐", func(t *testing.T) { - if packageID == 0 { - t.Skip("依赖 Step 1 创建的 packageID") - } - - // 以代理商身份请求 - client := env.AsShopAgent(shopID) - - resp, err := client.Request("GET", "/api/admin/shop-packages", nil) - require.NoError(t, err) - require.Equal(t, 200, resp.StatusCode) - - var result map[string]interface{} - err = resp.JSON(&result) - require.NoError(t, err) - - // 验证列表包含刚分配的套餐 - data := result["data"].(map[string]interface{}) - list := data["list"].([]interface{}) - - found := false - for _, item := range list { - pkg := item.(map[string]interface{}) - if uint(pkg["package_id"].(float64)) == packageID { - found = true - break - } - } - assert.True(t, found, "代理商应该能看到刚分配的套餐") - }) -} -``` - -### Step 6: 运行测试验证 - -生成测试后，立即运行验证： - -```bash -# 预期全部 FAIL（因为功能尚未实现） -source .env.local && go test -v ./tests/acceptance/... ./tests/flows/... 2>&1 | head -50 -``` - -**如果测试 PASS**： -- 说明测试写得太弱，没有真正验证功能 -- 需要加强测试或检查是否功能已存在 - ---- - -## 测试模板规范 - -### 验收测试必须包含 - -1. **来源注释**：标明从哪个 spec 文件生成 -2. **Scenario 注释**：完整的 GIVEN/WHEN/THEN/AND -3. **破坏点注释**：说明什么代码变更会导致测试失败 -4. **清晰的结构**：GIVEN → WHEN → THEN → AND 分块 - -### 流程测试必须包含 - -1. **来源注释**：标明从哪个 spec 文件生成 -2. **参与者注释**：涉及哪些角色 -3. **共享状态声明**：流程中需要传递的数据 -4. **依赖声明**：每个 step 依赖哪些前置 step -5. **破坏点注释**：说明什么代码变更会导致测试失败 - -### 破坏点注释示例 - -```go -// 破坏点：如果删除 handler.Create 中的 store.Create 调用，此测试将失败 -// 破坏点：如果移除参数校验中的 name 必填检查，此测试将失败 -// 破坏点：如果查询不按 shop_id 过滤，此测试将失败（会返回其他店铺数据） -// 破坏点：如果状态机允许 "已使用" → "未分配" 的转换，此测试将失败 -``` - ---- - -## 输出文件 - -| 来源 | 输出 | -|------|------| -| Spec Scenarios | `tests/acceptance/_acceptance_test.go` | -| Spec Business Flows | `tests/flows/__flow_test.go` | - ---- - -## Guardrails - -- **不要跳过 Scenario** - 每个 Scenario 必须对应一个测试用例 -- **不要省略破坏点** - 每个测试必须有破坏点注释 -- **不要硬编码 ID** - 使用共享变量传递流程中的 ID -- **不要忽略依赖** - 流程测试的 step 必须声明依赖 -- **不要写永远 PASS 的测试** - 测试必须在功能缺失时 FAIL - ---- - -## 与其他 Skills 的关系 - -| Skill | 关系 | -|-------|------| -| `openspec-continue-change` | 生成 spec 后可触发 gen-tests | -| `openspec-apply-change` | 实现时参考生成的测试 | -| `openspec-verify-change` | 验证时运行生成的测试 | - ---- - -## 示例交互 - -``` -User: /opsx:gen-tests package-management - -AI: 正在分析 change: package-management - -找到 spec 文件: openspec/changes/package-management/specs/package/spec.md - -解析结果: -- Scenarios: 5 个 -- Business Flows: 2 个 - -生成测试文件: - -1. tests/acceptance/package_acceptance_test.go - - Scenario_成功创建套餐 - - Scenario_创建套餐参数校验失败 - - Scenario_成功更新套餐 - - Scenario_成功删除套餐 - - Scenario_删除已分配套餐失败 - -2. tests/flows/package_lifecycle_flow_test.go - - Step1_平台管理员创建套餐 - - Step2_分配套餐给代理商 - - Step3_代理商查看可售套餐 - - Step4_代理商创建订单 - - Step5_套餐使用统计更新 - -3. tests/flows/package_allocation_flow_test.go - - Step1_批量分配套餐 - - Step2_验证分配结果 - - Step3_撤销部分分配 - -运行验证: -$ source .env.local && go test -v ./tests/acceptance/package_... ./tests/flows/package_... - ---- FAIL: TestPackage_Acceptance (0.00s) - --- FAIL: TestPackage_Acceptance/Scenario_成功创建套餐 (0.00s) - package_acceptance_test.go:45: 404 != 201 ---- FAIL: TestFlow_PackageLifecycle (0.00s) - --- FAIL: TestFlow_PackageLifecycle/Step1_平台管理员创建套餐 (0.00s) - package_lifecycle_flow_test.go:38: 404 != 201 - -✓ 所有测试预期 FAIL（功能未实现） -✓ 测试生成完成 - -下一步: /opsx:continue 生成 design 和 tasks -``` diff --git a/.opencode/skills/openspec-new-change/SKILL.md b/.opencode/skills/openspec-new-change/SKILL.md index 53d96b9..37ac7ba 100644 --- a/.opencode/skills/openspec-new-change/SKILL.md +++ b/.opencode/skills/openspec-new-change/SKILL.md @@ -6,7 +6,7 @@ compatibility: Requires openspec CLI. metadata: author: openspec version: "1.0" - generatedBy: "1.0.2" + generatedBy: "1.1.1" --- Start a new change using the experimental artifact-driven approach. diff --git a/.opencode/skills/openspec-onboard/SKILL.md b/.opencode/skills/openspec-onboard/SKILL.md index 40080aa..8ee6cdc 100644 --- a/.opencode/skills/openspec-onboard/SKILL.md +++ b/.opencode/skills/openspec-onboard/SKILL.md @@ -6,7 +6,7 @@ compatibility: Requires openspec CLI. metadata: author: openspec version: "1.0" - generatedBy: "1.0.2" + generatedBy: "1.1.1" --- Guide the user through their first complete OpenSpec workflow cycle. This is a teaching experience—you'll do real work in their codebase while explaining each step. @@ -22,7 +22,7 @@ openspec status --json 2>&1 || echo "NOT_INITIALIZED" ``` **If not initialized:** -> OpenSpec isn't set up in this project yet. Run `openspec init` first, then come back to `/opsx:onboard`. +> OpenSpec isn't set up in this project yet. Run `openspec init` first, then come back to `/opsx-onboard`. Stop here if not initialized. @@ -146,7 +146,7 @@ Spend 1-2 minutes investigating the relevant code: │ [Optional: ASCII diagram if helpful] │ └─────────────────────────────────────────┘ -Explore mode (`/opsx:explore`) is for this kind of thinking—investigating before implementing. You can use it anytime you need to think through a problem. +Explore mode (`/opsx-explore`) is for this kind of thinking—investigating before implementing. You can use it anytime you need to think through a problem. Now let's create a change to hold our work. ``` @@ -459,19 +459,19 @@ This same rhythm works for any size change—a small fix or a major feature. | Command | What it does | |---------|--------------| -| `/opsx:explore` | Think through problems before/during work | -| `/opsx:new` | Start a new change, step through artifacts | -| `/opsx:ff` | Fast-forward: create all artifacts at once | -| `/opsx:continue` | Continue working on an existing change | -| `/opsx:apply` | Implement tasks from a change | -| `/opsx:verify` | Verify implementation matches artifacts | -| `/opsx:archive` | Archive a completed change | +| `/opsx-explore` | Think through problems before/during work | +| `/opsx-new` | Start a new change, step through artifacts | +| `/opsx-ff` | Fast-forward: create all artifacts at once | +| `/opsx-continue` | Continue working on an existing change | +| `/opsx-apply` | Implement tasks from a change | +| `/opsx-verify` | Verify implementation matches artifacts | +| `/opsx-archive` | Archive a completed change | --- ## What's Next? -Try `/opsx:new` or `/opsx:ff` on something you actually want to build. You've got the rhythm now! +Try `/opsx-new` or `/opsx-ff` on something you actually want to build. You've got the rhythm now! ``` --- @@ -486,8 +486,8 @@ If the user says they need to stop, want to pause, or seem disengaged: No problem! Your change is saved at `openspec/changes//`. To pick up where we left off later: -- `/opsx:continue ` - Resume artifact creation -- `/opsx:apply ` - Jump to implementation (if tasks exist) +- `/opsx-continue ` - Resume artifact creation +- `/opsx-apply ` - Jump to implementation (if tasks exist) The work won't be lost. Come back whenever you're ready. ``` @@ -503,15 +503,15 @@ If the user says they just want to see the commands or skip the tutorial: | Command | What it does | |---------|--------------| -| `/opsx:explore` | Think through problems (no code changes) | -| `/opsx:new ` | Start a new change, step by step | -| `/opsx:ff ` | Fast-forward: all artifacts at once | -| `/opsx:continue ` | Continue an existing change | -| `/opsx:apply ` | Implement tasks | -| `/opsx:verify ` | Verify implementation | -| `/opsx:archive ` | Archive when done | +| `/opsx-explore` | Think through problems (no code changes) | +| `/opsx-new ` | Start a new change, step by step | +| `/opsx-ff ` | Fast-forward: all artifacts at once | +| `/opsx-continue ` | Continue an existing change | +| `/opsx-apply ` | Implement tasks | +| `/opsx-verify ` | Verify implementation | +| `/opsx-archive ` | Archive when done | -Try `/opsx:new` to start your first change, or `/opsx:ff` if you want to move fast. +Try `/opsx-new` to start your first change, or `/opsx-ff` if you want to move fast. ``` Exit gracefully. diff --git a/.opencode/skills/openspec-sync-specs/SKILL.md b/.opencode/skills/openspec-sync-specs/SKILL.md index 632681c..4c7e3aa 100644 --- a/.opencode/skills/openspec-sync-specs/SKILL.md +++ b/.opencode/skills/openspec-sync-specs/SKILL.md @@ -6,7 +6,7 @@ compatibility: Requires openspec CLI. metadata: author: openspec version: "1.0" - generatedBy: "1.0.2" + generatedBy: "1.1.1" --- Sync delta specs from a change to main specs. diff --git a/.opencode/skills/openspec-verify-change/SKILL.md b/.opencode/skills/openspec-verify-change/SKILL.md index 21cbc50..443ac5f 100644 --- a/.opencode/skills/openspec-verify-change/SKILL.md +++ b/.opencode/skills/openspec-verify-change/SKILL.md @@ -6,7 +6,7 @@ compatibility: Requires openspec CLI. metadata: author: openspec version: "1.0" - generatedBy: "1.0.2" + generatedBy: "1.1.1" --- Verify that an implementation matches the change artifacts (specs, tasks, design). diff --git a/CLAUDE.md b/CLAUDE.md index 7664288..10c31c1 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -132,147 +132,33 @@ Handler → Service → Store → Model - 异常处理（panic/recover） - 类型前缀（IService、AbstractBase、ServiceImpl） -## 测试要求 +## ⚠️ 测试禁令（强制执行） -### 测试金字塔（新） +**本项目不使用任何形式的自动化测试代码。** -``` - ┌─────────────┐ - │ E2E 测试 │ ← 手动/自动化 UI（很少） - ─┴─────────────┴─ - ┌─────────────────┐ - │ 业务流程测试 │ ← 15%：多 API 组合验证 - │ tests/flows/ │ 来源：Spec Business Flow - ─┴─────────────────┴─ - ┌─────────────────────┐ - │ 验收测试 │ ← 30%：单 API 契约验证 - │ tests/acceptance/ │ 来源：Spec Scenario - ─┴─────────────────────┴─ - ┌───────────────────────────┐ - │ 集成测试 │ ← 25%：组件集成 - ─┴───────────────────────────┴─ - ┌─────────────────────────────────┐ - │ 单元测试（精简） │ ← 30%：仅复杂逻辑 - └─────────────────────────────────┘ -``` +**绝对禁止：** +- ❌ **禁止编写单元测试** - 无论任何场景 +- ❌ **禁止编写集成测试** - 无论任何场景 +- ❌ **禁止编写验收测试** - 无论任何场景 +- ❌ **禁止编写流程测试** - 无论任何场景 +- ❌ **禁止编写 E2E 测试** - 无论任何场景 +- ❌ **禁止创建 `*_test.go` 文件** - 除非用户明确要求 +- ❌ **禁止在任务中包含测试相关工作** - 规划和实现均不涉及测试 +- ❌ **禁止在文档中提及测试要求** - 规范、设计文档均不讨论测试 -### 三层测试体系 +**唯一例外：** +- ✅ **仅当用户明确要求**时才编写测试代码 +- ✅ 用户必须主动说明"请写测试"或"需要测试" -| 层级 | 测试类型 | 来源 | 验证什么 | 位置 | -|------|---------|------|---------|------| -| **L1** | 验收测试 | Spec Scenario | 单 API 契约 | `tests/acceptance/` | -| **L2** | 流程测试 | Spec Business Flow | 业务场景完整性 | `tests/flows/` | -| **L3** | 单元测试 | 复杂逻辑 | 算法/规则正确性 | 模块内 `*_test.go` | +**原因说明：** +- 业务系统的正确性通过人工验证和生产环境监控保证 +- 测试代码的维护成本高于价值 +- 快速迭代优先于测试覆盖率 -### 验收测试规范 - -- **来源于 Spec**：每个 Scenario 对应一个测试用例 -- **测试先于实现**：在功能实现前生成，预期全部 FAIL -- **必须有破坏点**：每个测试注释说明什么代码变更会导致失败 -- **使用 IntegrationTestEnv**：不要 mock 依赖 - -详见：[tests/acceptance/README.md](tests/acceptance/README.md) - -### 流程测试规范 - -- **来源于 Spec Business Flow**：每个 Flow 对应一个测试 -- **跨 API 验证**：多个 API 调用的组合行为 -- **状态共享**：流程中的数据在 steps 之间传递 -- **依赖声明**：每个 step 声明依赖哪些前置 step - -详见：[tests/flows/README.md](tests/flows/README.md) - -### 单元测试精简规则 - -**保留**： -- ✅ 纯函数（计费计算、分佣算法） -- ✅ 状态机（订单状态流转） -- ✅ 复杂业务规则（层级校验、权限计算） -- ✅ 边界条件（时间、金额、精度） - -**删除/不再写**： -- ❌ 简单 CRUD（已被验收测试覆盖） -- ❌ DTO 转换 -- ❌ 配置读取 -- ❌ 重复测试同一逻辑 - -### ⚠️ 测试真实性原则（严格遵守） - -**测试必须真正验证功能，禁止绕过核心逻辑：** - -| 规则 | 说明 | -|------|------| -| ❌ 禁止传递 nil 绕过依赖 | 如果功能依赖外部服务（如对象存储、第三方 API），测试必须验证该依赖的调用 | -| ❌ 禁止只测试部分流程 | 如果功能包含 A → B → C 三步，不能只测试 B 而跳过 A 和 C | -| ❌ 禁止声称"测试通过"但未验证核心逻辑 | 测试通过必须意味着功能真正可用 | -| ❌ 禁止擅自使用 Mock | 尽量使用真实服务进行集成测试，如需使用 Mock 必须先询问用户并获得同意 | -| ✅ 必须验证端到端流程 | 新增功能必须有完整的集成测试覆盖整个调用链 | -| ✅ 缺少配置时必须询问 | 如果测试需要的配置（如 API Key、环境变量）缺失，必须询问用户而非跳过测试 | - -**反面案例**： -```go -// ❌ 错误：传递 nil 绕过 storageService，只测试了 processImport -handler := NewIotCardImportHandler(db, redis, store1, store2, nil, logger) -result := handler.processImport(ctx, task) // 跳过了 downloadAndParseCSV - -// ✅ 正确：使用真实服务测试完整流程 -handler := NewIotCardImportHandler(db, redis, store1, store2, realStorageService, logger) -handler.HandleIotCardImport(ctx, asynqTask) // 测试完整流程，验证真实上传/下载 -``` - -**测试超时 = 生产超时**： -- 集成测试超时意味着生产环境也可能超时 -- 发现超时必须排查原因，不能简单跳过或增加超时时间 - -### 测试连接管理（必读） - -**详细规范**: [docs/testing/test-connection-guide.md](docs/testing/test-connection-guide.md) - -**⚠️ 运行测试必须先加载环境变量**: -```bash -# ✅ 正确 -source .env.local && go test -v ./internal/service/xxx/... - -# ❌ 错误（会因缺少配置而失败） -go test -v ./internal/service/xxx/... -``` - -**标准模板**: -```go -func TestXxx(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := postgres.NewXxxStore(tx, rdb) - // 测试代码... -} -``` - -**核心函数**: -- `NewTestTransaction(t)`: 创建测试事务，自动回滚 -- `GetTestRedis(t)`: 获取全局 Redis 连接 -- `CleanTestRedisKeys(t, rdb)`: 自动清理测试 Redis 键 - -**集成测试环境**（HTTP API 测试）: -```go -func TestAPI_Create(t *testing.T) { - env := testutils.NewIntegrationTestEnv(t) - - t.Run("成功创建", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/resources", jsonBody) - require.NoError(t, err) - assert.Equal(t, 200, resp.StatusCode) - }) -} -``` - -- `NewIntegrationTestEnv(t)`: 创建完整测试环境（事务、Redis、App、Token） -- `AsSuperAdmin()`: 以超级管理员身份请求 -- `AsUser(account)`: 以指定账号身份请求 - -**禁止使用（已移除）**: -- ❌ `SetupTestDB` / `TeardownTestDB` / `SetupTestDBWithStore` +**替代方案：** +- 使用 PostgreSQL MCP 工具手动验证数据 +- 使用 Postman/curl 手动测试 API +- 依赖生产环境日志和监控发现问题 ## 性能要求 @@ -311,10 +197,9 @@ func TestAPI_Create(t *testing.T) { 3. ✅ 使用统一错误处理 4. ✅ 常量定义在 pkg/constants/ 5. ✅ Go 惯用法（非 Java 风格） -6. ✅ 包含测试计划 -7. ✅ 性能考虑 -8. ✅ 文档更新计划 -9. ✅ 中文优先 +6. ✅ 性能考虑 +7. ✅ 文档更新计划 +8. ✅ 中文优先 ## Code Review 检查清单 @@ -330,11 +215,6 @@ func TestAPI_Create(t *testing.T) { - [ ] 常量定义在 `pkg/constants/` - [ ] 使用 Go 惯用法（非 Java 风格） -### 测试覆盖 -- [ ] 核心业务逻辑测试覆盖率 ≥ 90% -- [ ] 所有 API 端点有集成测试 -- [ ] 测试验证真实功能（不绕过核心逻辑） - ### 文档和注释 - [ ] 所有注释使用中文 - [ ] 导出函数/类型有文档注释 diff --git a/docs/admin-openapi.yaml b/docs/admin-openapi.yaml index 98e24a2..93cd689 100644 --- a/docs/admin-openapi.yaml +++ b/docs/admin-openapi.yaml @@ -1136,15 +1136,33 @@ components: type: object DtoCreatePackageRequest: properties: + calendar_type: + description: 套餐周期类型 (natural_month:自然月, by_day:按天) + nullable: true + type: string cost_price: description: 成本价(分) minimum: 0 type: integer + data_reset_cycle: + description: 流量重置周期 (daily:每日, monthly:每月, yearly:每年, none:不重置) + nullable: true + type: string + duration_days: + description: 套餐天数(calendar_type=by_day时必填) + maximum: 3650 + minimum: 1 + nullable: true + type: integer duration_months: description: 套餐时长(月数) maximum: 120 minimum: 1 type: integer + enable_realname_activation: + description: 是否启用实名激活 (true:需实名后激活, false:立即激活) + nullable: true + type: boolean enable_virtual_data: description: 是否启用虚流量 type: boolean @@ -3052,6 +3070,9 @@ components: type: object DtoPackageResponse: properties: + calendar_type: + description: 套餐周期类型 (natural_month:自然月, by_day:按天) + type: string cost_price: description: 成本价(分) type: integer @@ -3061,9 +3082,19 @@ components: current_commission_rate: description: 当前返佣比例（仅代理用户可见） type: string + data_reset_cycle: + description: 流量重置周期 (daily:每日, monthly:每月, yearly:每年, none:不重置) + type: string + duration_days: + description: 套餐天数(calendar_type=by_day时有值) + nullable: true + type: integer duration_months: description: 套餐时长(月数) type: integer + enable_realname_activation: + description: 是否启用实名激活 (true:需实名后激活, false:立即激活) + type: boolean enable_virtual_data: description: 是否启用虚流量 type: boolean @@ -3169,6 +3200,94 @@ components: description: 更新时间 type: string type: object + DtoPackageUsageCustomerViewResponse: + properties: + addon_packages: + description: 加油包列表（按priority排序） + items: + $ref: '#/components/schemas/DtoPackageUsageItemResponse' + nullable: true + type: array + main_package: + $ref: '#/components/schemas/DtoPackageUsageItemResponse' + total: + $ref: '#/components/schemas/DtoPackageUsageTotalInfo' + type: object + DtoPackageUsageDailyRecordResponse: + properties: + cumulative_usage_mb: + description: 截止当日的累计流量(MB) + type: integer + daily_usage_mb: + description: 当日流量使用量(MB) + type: integer + date: + description: 日期 + type: string + type: object + DtoPackageUsageDetailResponse: + properties: + package_name: + description: 套餐名称 + type: string + package_usage_id: + description: 套餐使用记录ID + minimum: 0 + type: integer + records: + description: 流量日记录列表 + items: + $ref: '#/components/schemas/DtoPackageUsageDailyRecordResponse' + nullable: true + type: array + total_usage_mb: + description: 总使用流量(MB) + type: integer + type: object + DtoPackageUsageItemResponse: + properties: + activated_at: + description: 激活时间 + type: string + expires_at: + description: 过期时间 + type: string + package_id: + description: 套餐ID + minimum: 0 + type: integer + package_name: + description: 套餐名称 + type: string + package_usage_id: + description: 套餐使用记录ID + minimum: 0 + type: integer + priority: + description: 优先级（数字越小优先级越高） + type: integer + status: + description: 状态 (0:待生效, 1:生效中, 2:已用完, 3:已过期, 4:已失效) + type: integer + status_text: + description: 状态文本 + type: string + total_mb: + description: 总流量(MB) + type: integer + used_mb: + description: 已使用流量(MB) + type: integer + type: object + DtoPackageUsageTotalInfo: + properties: + total_mb: + description: 总流量(MB) + type: integer + used_mb: + description: 总已使用流量(MB) + type: integer + type: object DtoPermissionPageResult: properties: items: @@ -4938,17 +5057,35 @@ components: type: object DtoUpdatePackageParams: properties: + calendar_type: + description: 套餐周期类型 (natural_month:自然月, by_day:按天) + nullable: true + type: string cost_price: description: 成本价(分) minimum: 0 nullable: true type: integer + data_reset_cycle: + description: 流量重置周期 (daily:每日, monthly:每月, yearly:每年, none:不重置) + nullable: true + type: string + duration_days: + description: 套餐天数(calendar_type=by_day时必填) + maximum: 3650 + minimum: 1 + nullable: true + type: integer duration_months: description: 套餐时长(月数) maximum: 120 minimum: 1 nullable: true type: integer + enable_realname_activation: + description: 是否启用实名激活 (true:需实名后激活, false:立即激活) + nullable: true + type: boolean enable_virtual_data: description: 是否启用虚流量 nullable: true @@ -12800,6 +12937,73 @@ paths: summary: 更新套餐系列状态 tags: - 套餐系列管理 + /api/admin/package-usage/{id}/daily-records: + get: + parameters: + - description: ID + in: path + name: id + required: true + schema: + description: ID + minimum: 0 + type: integer + responses: + "200": + content: + application/json: + schema: + properties: + code: + description: 响应码 + example: 0 + type: integer + data: + $ref: '#/components/schemas/DtoPackageUsageDetailResponse' + msg: + description: 响应消息 + example: success + type: string + timestamp: + description: 时间戳 + format: date-time + type: string + required: + - code + - msg + - data + - timestamp + type: object + description: 成功 + "400": + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorResponse' + description: 请求参数错误 + "401": + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorResponse' + description: 未认证或认证已过期 + "403": + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorResponse' + description: 无权访问 + "500": + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorResponse' + description: 服务器内部错误 + security: + - BearerAuth: [] + summary: 获取套餐流量详单 + tags: + - 套餐使用记录 /api/admin/packages: get: parameters: @@ -18863,6 +19067,64 @@ paths: summary: 微信 JSAPI 支付 tags: - H5 订单 + /api/h5/packages/my-usage: + get: + responses: + "200": + content: + application/json: + schema: + properties: + code: + description: 响应码 + example: 0 + type: integer + data: + $ref: '#/components/schemas/DtoPackageUsageCustomerViewResponse' + msg: + description: 响应消息 + example: success + type: string + timestamp: + description: 时间戳 + format: date-time + type: string + required: + - code + - msg + - data + - timestamp + type: object + description: 成功 + "400": + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorResponse' + description: 请求参数错误 + "401": + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorResponse' + description: 未认证或认证已过期 + "403": + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorResponse' + description: 无权访问 + "500": + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorResponse' + description: 服务器内部错误 + security: + - BearerAuth: [] + summary: 获取我的套餐使用情况 + tags: + - H5-套餐 /api/h5/wallets/recharge: post: requestBody: diff --git a/internal/bootstrap/handlers.go b/internal/bootstrap/handlers.go index 627101f..f8b61a6 100644 --- a/internal/bootstrap/handlers.go +++ b/internal/bootstrap/handlers.go @@ -40,6 +40,8 @@ func initHandlers(svc *services, deps *Dependencies) *Handlers { Carrier: admin.NewCarrierHandler(svc.Carrier), PackageSeries: admin.NewPackageSeriesHandler(svc.PackageSeries), Package: admin.NewPackageHandler(svc.Package), + PackageUsage: admin.NewPackageUsageHandler(svc.PackageDailyRecord), + H5PackageUsage: h5.NewPackageUsageHandler(deps.DB, svc.PackageCustomerView), ShopSeriesAllocation: admin.NewShopSeriesAllocationHandler(svc.ShopSeriesAllocation), ShopPackageAllocation: admin.NewShopPackageAllocationHandler(svc.ShopPackageAllocation), ShopPackageBatchAllocation: admin.NewShopPackageBatchAllocationHandler(svc.ShopPackageBatchAllocation), diff --git a/internal/bootstrap/services.go b/internal/bootstrap/services.go index f345d01..891b64d 100644 --- a/internal/bootstrap/services.go +++ b/internal/bootstrap/services.go @@ -63,6 +63,8 @@ type services struct { Carrier *carrierSvc.Service PackageSeries *packageSeriesSvc.Service Package *packageSvc.Service + PackageDailyRecord *packageSvc.DailyRecordService + PackageCustomerView *packageSvc.CustomerViewService ShopSeriesAllocation *shopSeriesAllocationSvc.Service ShopPackageAllocation *shopPackageAllocationSvc.Service ShopPackageBatchAllocation *shopPackageBatchAllocationSvc.Service @@ -130,13 +132,15 @@ func initServices(s *stores, deps *Dependencies) *services { Carrier: carrierSvc.New(s.Carrier), PackageSeries: packageSeriesSvc.New(s.PackageSeries), Package: packageSvc.New(s.Package, s.PackageSeries, s.ShopPackageAllocation, s.ShopSeriesAllocation), + PackageDailyRecord: packageSvc.NewDailyRecordService(deps.DB, deps.Redis, s.PackageUsageDailyRecord, deps.Logger), + PackageCustomerView: packageSvc.NewCustomerViewService(deps.DB, deps.Redis, s.PackageUsage, deps.Logger), ShopSeriesAllocation: shopSeriesAllocationSvc.New(s.ShopSeriesAllocation, s.ShopPackageAllocation, s.Shop, s.PackageSeries), ShopPackageAllocation: shopPackageAllocationSvc.New(s.ShopPackageAllocation, s.ShopSeriesAllocation, s.ShopPackageAllocationPriceHistory, s.Shop, s.Package, s.PackageSeries), ShopPackageBatchAllocation: shopPackageBatchAllocationSvc.New(deps.DB, s.Package, s.ShopPackageAllocation, s.ShopSeriesAllocation, s.Shop), ShopPackageBatchPricing: shopPackageBatchPricingSvc.New(deps.DB, s.ShopPackageAllocation, s.ShopPackageAllocationPriceHistory, s.Shop), CommissionStats: commissionStatsSvc.New(s.ShopSeriesCommissionStats), PurchaseValidation: purchaseValidation, - Order: orderSvc.New(deps.DB, s.Order, s.OrderItem, s.Wallet, purchaseValidation, s.ShopPackageAllocation, s.ShopSeriesAllocation, s.IotCard, s.Device, s.PackageSeries, deps.WechatPayment, deps.QueueClient, deps.Logger), + Order: orderSvc.New(deps.DB, s.Order, s.OrderItem, s.Wallet, purchaseValidation, s.ShopPackageAllocation, s.ShopSeriesAllocation, s.IotCard, s.Device, s.PackageSeries, s.PackageUsage, s.Package, deps.WechatPayment, deps.QueueClient, deps.Logger), Recharge: rechargeSvc.New(deps.DB, s.Recharge, s.Wallet, s.WalletTransaction, s.IotCard, s.Device, s.ShopSeriesAllocation, s.PackageSeries, s.CommissionRecord, deps.Logger), PollingConfig: pollingSvc.NewConfigService(s.PollingConfig), PollingConcurrency: pollingSvc.NewConcurrencyService(s.PollingConcurrencyConfig, deps.Redis), diff --git a/internal/bootstrap/stores.go b/internal/bootstrap/stores.go index d77fc3b..71378c3 100644 --- a/internal/bootstrap/stores.go +++ b/internal/bootstrap/stores.go @@ -32,6 +32,8 @@ type stores struct { Carrier *postgres.CarrierStore PackageSeries *postgres.PackageSeriesStore Package *postgres.PackageStore + PackageUsage *postgres.PackageUsageStore + PackageUsageDailyRecord *postgres.PackageUsageDailyRecordStore ShopSeriesAllocation *postgres.ShopSeriesAllocationStore ShopPackageAllocation *postgres.ShopPackageAllocationStore ShopPackageAllocationPriceHistory *postgres.ShopPackageAllocationPriceHistoryStore @@ -77,6 +79,8 @@ func initStores(deps *Dependencies) *stores { Carrier: postgres.NewCarrierStore(deps.DB), PackageSeries: postgres.NewPackageSeriesStore(deps.DB), Package: postgres.NewPackageStore(deps.DB), + PackageUsage: postgres.NewPackageUsageStore(deps.DB, deps.Redis), + PackageUsageDailyRecord: postgres.NewPackageUsageDailyRecordStore(deps.DB, deps.Redis), ShopSeriesAllocation: postgres.NewShopSeriesAllocationStore(deps.DB), ShopPackageAllocation: postgres.NewShopPackageAllocationStore(deps.DB), ShopPackageAllocationPriceHistory: postgres.NewShopPackageAllocationPriceHistoryStore(deps.DB), diff --git a/internal/bootstrap/types.go b/internal/bootstrap/types.go index 2357ae1..0ce7e1e 100644 --- a/internal/bootstrap/types.go +++ b/internal/bootstrap/types.go @@ -38,6 +38,8 @@ type Handlers struct { Carrier *admin.CarrierHandler PackageSeries *admin.PackageSeriesHandler Package *admin.PackageHandler + PackageUsage *admin.PackageUsageHandler + H5PackageUsage *h5.PackageUsageHandler ShopSeriesAllocation *admin.ShopSeriesAllocationHandler ShopPackageAllocation *admin.ShopPackageAllocationHandler ShopPackageBatchAllocation *admin.ShopPackageBatchAllocationHandler diff --git a/internal/gateway/client_test.go b/internal/gateway/client_test.go deleted file mode 100644 index 556d938..0000000 --- a/internal/gateway/client_test.go +++ /dev/null @@ -1,323 +0,0 @@ -package gateway - -import ( - "context" - "encoding/json" - "net/http" - "net/http/httptest" - "strings" - "testing" - "time" -) - -func TestNewClient(t *testing.T) { - client := NewClient("https://test.example.com", "testAppID", "testSecret") - - if client.baseURL != "https://test.example.com" { - t.Errorf("baseURL = %s, want https://test.example.com", client.baseURL) - } - if client.appID != "testAppID" { - t.Errorf("appID = %s, want testAppID", client.appID) - } - if client.appSecret != "testSecret" { - t.Errorf("appSecret = %s, want testSecret", client.appSecret) - } - if client.timeout != 30*time.Second { - t.Errorf("timeout = %v, want 30s", client.timeout) - } - if client.httpClient == nil { - t.Error("httpClient should not be nil") - } -} - -func TestWithTimeout(t *testing.T) { - client := NewClient("https://test.example.com", "testAppID", "testSecret"). - WithTimeout(60 * time.Second) - - if client.timeout != 60*time.Second { - t.Errorf("timeout = %v, want 60s", client.timeout) - } -} - -func TestWithTimeout_Chain(t *testing.T) { - // 验证链式调用返回同一个 Client 实例 - client := NewClient("https://test.example.com", "testAppID", "testSecret") - returned := client.WithTimeout(45 * time.Second) - - if returned != client { - t.Error("WithTimeout should return the same Client instance for chaining") - } -} - -func TestDoRequest_Success(t *testing.T) { - // 创建 mock HTTP 服务器 - server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - // 验证请求方法 - if r.Method != http.MethodPost { - t.Errorf("Method = %s, want POST", r.Method) - } - - // 验证 Content-Type - if r.Header.Get("Content-Type") != "application/json;charset=utf-8" { - t.Errorf("Content-Type = %s, want application/json;charset=utf-8", r.Header.Get("Content-Type")) - } - - // 验证请求体格式 - var reqBody map[string]interface{} - if err := json.NewDecoder(r.Body).Decode(&reqBody); err != nil { - t.Fatalf("解析请求体失败: %v", err) - } - - // 验证必需字段 - if _, ok := reqBody["appId"]; !ok { - t.Error("请求体缺少 appId 字段") - } - if _, ok := reqBody["data"]; !ok { - t.Error("请求体缺少 data 字段") - } - if _, ok := reqBody["sign"]; !ok { - t.Error("请求体缺少 sign 字段") - } - if _, ok := reqBody["timestamp"]; !ok { - t.Error("请求体缺少 timestamp 字段") - } - - // 返回 mock 响应 - resp := GatewayResponse{ - Code: 200, - Msg: "成功", - Data: json.RawMessage(`{"test":"data"}`), - TraceID: "test-trace-id", - } - w.Header().Set("Content-Type", "application/json") - json.NewEncoder(w).Encode(resp) - })) - defer server.Close() - - client := NewClient(server.URL, "testAppID", "testSecret") - - ctx := context.Background() - businessData := map[string]interface{}{ - "params": map[string]string{ - "cardNo": "898608070422D0010269", - }, - } - - data, err := client.doRequest(ctx, "/test", businessData) - if err != nil { - t.Fatalf("doRequest() error = %v", err) - } - - if string(data) != `{"test":"data"}` { - t.Errorf("data = %s, want {\"test\":\"data\"}", string(data)) - } -} - -func TestDoRequest_BusinessError(t *testing.T) { - // 创建返回业务错误的 mock 服务器 - server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - resp := GatewayResponse{ - Code: 500, - Msg: "业务处理失败", - Data: nil, - TraceID: "error-trace-id", - } - w.Header().Set("Content-Type", "application/json") - json.NewEncoder(w).Encode(resp) - })) - defer server.Close() - - client := NewClient(server.URL, "testAppID", "testSecret") - - ctx := context.Background() - _, err := client.doRequest(ctx, "/test", map[string]interface{}{}) - if err == nil { - t.Fatal("doRequest() expected business error") - } - - // 验证错误信息包含业务错误内容 - if !strings.Contains(err.Error(), "业务错误") { - t.Errorf("error should contain '业务错误', got: %v", err) - } -} - -func TestDoRequest_Timeout(t *testing.T) { - // 创建延迟响应的服务器 - server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - time.Sleep(500 * time.Millisecond) // 延迟 500ms - w.WriteHeader(http.StatusOK) - })) - defer server.Close() - - client := NewClient(server.URL, "testAppID", "testSecret"). - WithTimeout(100 * time.Millisecond) // 设置 100ms 超时 - - ctx := context.Background() - _, err := client.doRequest(ctx, "/test", map[string]interface{}{}) - if err == nil { - t.Fatal("doRequest() expected timeout error") - } - - // 验证是超时错误 - if !strings.Contains(err.Error(), "超时") { - t.Errorf("error should contain '超时', got: %v", err) - } -} - -func TestDoRequest_HTTPStatusError(t *testing.T) { - // 创建返回 500 状态码的服务器 - server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte("Internal Server Error")) - })) - defer server.Close() - - client := NewClient(server.URL, "testAppID", "testSecret") - - ctx := context.Background() - _, err := client.doRequest(ctx, "/test", map[string]interface{}{}) - if err == nil { - t.Fatal("doRequest() expected HTTP status error") - } - - // 验证错误信息包含 HTTP 状态码 - if !strings.Contains(err.Error(), "500") { - t.Errorf("error should contain '500', got: %v", err) - } -} - -func TestDoRequest_InvalidResponse(t *testing.T) { - // 创建返回无效 JSON 的服务器 - server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - w.Header().Set("Content-Type", "application/json") - w.Write([]byte("invalid json")) - })) - defer server.Close() - - client := NewClient(server.URL, "testAppID", "testSecret") - - ctx := context.Background() - _, err := client.doRequest(ctx, "/test", map[string]interface{}{}) - if err == nil { - t.Fatal("doRequest() expected JSON parse error") - } - - // 验证错误信息包含解析失败提示 - if !strings.Contains(err.Error(), "解析") { - t.Errorf("error should contain '解析', got: %v", err) - } -} - -func TestDoRequest_ContextCanceled(t *testing.T) { - // 创建正常响应的服务器（但会延迟） - server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - time.Sleep(500 * time.Millisecond) - resp := GatewayResponse{Code: 200, Msg: "成功"} - json.NewEncoder(w).Encode(resp) - })) - defer server.Close() - - client := NewClient(server.URL, "testAppID", "testSecret") - - // 创建已取消的 context - ctx, cancel := context.WithCancel(context.Background()) - cancel() // 立即取消 - - _, err := client.doRequest(ctx, "/test", map[string]interface{}{}) - if err == nil { - t.Fatal("doRequest() expected context canceled error") - } -} - -func TestDoRequest_NetworkError(t *testing.T) { - // 使用无效的服务器地址 - client := NewClient("http://127.0.0.1:1", "testAppID", "testSecret"). - WithTimeout(1 * time.Second) - - ctx := context.Background() - _, err := client.doRequest(ctx, "/test", map[string]interface{}{}) - if err == nil { - t.Fatal("doRequest() expected network error") - } -} - -func TestDoRequest_EmptyBusinessData(t *testing.T) { - server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - resp := GatewayResponse{ - Code: 200, - Msg: "成功", - Data: json.RawMessage(`{}`), - } - json.NewEncoder(w).Encode(resp) - })) - defer server.Close() - - client := NewClient(server.URL, "testAppID", "testSecret") - - ctx := context.Background() - data, err := client.doRequest(ctx, "/test", map[string]interface{}{}) - if err != nil { - t.Fatalf("doRequest() error = %v", err) - } - - if string(data) != `{}` { - t.Errorf("data = %s, want {}", string(data)) - } -} - -func TestIntegration_QueryCardStatus(t *testing.T) { - if testing.Short() { - t.Skip("跳过集成测试") - } - - baseURL := "https://lplan.whjhft.com/openapi" - appID := "60bgt1X8i7AvXqkd" - appSecret := "BZeQttaZQt0i73moF" - - client := NewClient(baseURL, appID, appSecret).WithTimeout(30 * time.Second) - ctx := context.Background() - - resp, err := client.QueryCardStatus(ctx, &CardStatusReq{ - CardNo: "898608070422D0010269", - }) - - if err != nil { - t.Fatalf("QueryCardStatus() error = %v", err) - } - - if resp.ICCID == "" { - t.Error("ICCID should not be empty") - } - if resp.CardStatus == "" { - t.Error("CardStatus should not be empty") - } - - t.Logf("Integration test passed: ICCID=%s, Status=%s", resp.ICCID, resp.CardStatus) -} - -func TestIntegration_QueryFlow(t *testing.T) { - if testing.Short() { - t.Skip("跳过集成测试") - } - - baseURL := "https://lplan.whjhft.com/openapi" - appID := "60bgt1X8i7AvXqkd" - appSecret := "BZeQttaZQt0i73moF" - - client := NewClient(baseURL, appID, appSecret).WithTimeout(30 * time.Second) - ctx := context.Background() - - resp, err := client.QueryFlow(ctx, &FlowQueryReq{ - CardNo: "898608070422D0010269", - }) - - if err != nil { - t.Fatalf("QueryFlow() error = %v", err) - } - - if resp.UsedFlow < 0 { - t.Error("UsedFlow should not be negative") - } - - t.Logf("Integration test passed: UsedFlow=%d %s", resp.UsedFlow, resp.Unit) -} diff --git a/internal/gateway/crypto_test.go b/internal/gateway/crypto_test.go deleted file mode 100644 index 2d01a03..0000000 --- a/internal/gateway/crypto_test.go +++ /dev/null @@ -1,103 +0,0 @@ -package gateway - -import ( - "crypto/aes" - "encoding/base64" - "strings" - "testing" -) - -func TestAESEncrypt(t *testing.T) { - tests := []struct { - name string - data []byte - appSecret string - wantErr bool - }{ - { - name: "正常加密", - data: []byte(`{"params":{"cardNo":"898608070422D0010269"}}`), - appSecret: "BZeQttaZQt0i73moF", - wantErr: false, - }, - { - name: "空数据加密", - data: []byte(""), - appSecret: "BZeQttaZQt0i73moF", - wantErr: false, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - encrypted, err := aesEncrypt(tt.data, tt.appSecret) - if (err != nil) != tt.wantErr { - t.Errorf("aesEncrypt() error = %v, wantErr %v", err, tt.wantErr) - return - } - if !tt.wantErr && encrypted == "" { - t.Error("aesEncrypt() 返回空字符串") - } - // 验证 Base64 格式 - if !tt.wantErr { - _, err := base64.StdEncoding.DecodeString(encrypted) - if err != nil { - t.Errorf("aesEncrypt() 返回的不是有效的 Base64: %v", err) - } - } - }) - } -} - -func TestGenerateSign(t *testing.T) { - appID := "60bgt1X8i7AvXqkd" - encryptedData := "test_encrypted_data" - timestamp := int64(1704067200) - appSecret := "BZeQttaZQt0i73moF" - - sign := generateSign(appID, encryptedData, timestamp, appSecret) - - // 验证签名格式（32 位大写十六进制） - if len(sign) != 32 { - t.Errorf("签名长度错误: got %d, want 32", len(sign)) - } - - if sign != strings.ToUpper(sign) { - t.Error("签名应为大写") - } - - // 验证签名可重现 - sign2 := generateSign(appID, encryptedData, timestamp, appSecret) - if sign != sign2 { - t.Error("相同参数应生成相同签名") - } -} - -func TestNewECBEncrypterPanic(t *testing.T) { - defer func() { - if recover() == nil { - t.Fatal("newECBEncrypter 期望触发 panic，但未触发") - } - }() - - newECBEncrypter(nil) -} - -func TestECBEncrypterCryptBlocksPanic(t *testing.T) { - block, err := aes.NewCipher(make([]byte, aesBlockSize)) - if err != nil { - t.Fatalf("创建 AES cipher 失败: %v", err) - } - - encrypter := newECBEncrypter(block) - defer func() { - if recover() == nil { - t.Fatal("CryptBlocks 期望触发 panic，但未触发") - } - }() - - // 传入非完整块长度，触发 panic - src := []byte("short") - dst := make([]byte, len(src)) - encrypter.CryptBlocks(dst, src) -} diff --git a/internal/gateway/device_test.go b/internal/gateway/device_test.go deleted file mode 100644 index b3261ca..0000000 --- a/internal/gateway/device_test.go +++ /dev/null @@ -1,404 +0,0 @@ -package gateway - -import ( - "context" - "encoding/json" - "net/http" - "net/http/httptest" - "strings" - "testing" -) - -func TestGetDeviceInfo_ByCardNo_Success(t *testing.T) { - server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - resp := GatewayResponse{ - Code: 200, - Msg: "成功", - Data: json.RawMessage(`{"imei":"123456789012345","onlineStatus":1,"signalLevel":25,"wifiSsid":"TestWiFi","wifiEnabled":1,"uploadSpeed":100,"downloadSpeed":500}`), - } - w.Header().Set("Content-Type", "application/json") - json.NewEncoder(w).Encode(resp) - })) - defer server.Close() - - client := NewClient(server.URL, "testAppID", "testSecret") - ctx := context.Background() - - result, err := client.GetDeviceInfo(ctx, &DeviceInfoReq{ - CardNo: "898608070422D0010269", - }) - - if err != nil { - t.Fatalf("GetDeviceInfo() error = %v", err) - } - - if result.IMEI != "123456789012345" { - t.Errorf("IMEI = %s, want 123456789012345", result.IMEI) - } - if result.OnlineStatus != 1 { - t.Errorf("OnlineStatus = %d, want 1", result.OnlineStatus) - } - if result.SignalLevel != 25 { - t.Errorf("SignalLevel = %d, want 25", result.SignalLevel) - } - if result.WiFiSSID != "TestWiFi" { - t.Errorf("WiFiSSID = %s, want TestWiFi", result.WiFiSSID) - } -} - -func TestGetDeviceInfo_ByDeviceID_Success(t *testing.T) { - server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - resp := GatewayResponse{ - Code: 200, - Msg: "成功", - Data: json.RawMessage(`{"imei":"123456789012345","onlineStatus":0,"signalLevel":0}`), - } - json.NewEncoder(w).Encode(resp) - })) - defer server.Close() - - client := NewClient(server.URL, "testAppID", "testSecret") - ctx := context.Background() - - result, err := client.GetDeviceInfo(ctx, &DeviceInfoReq{ - DeviceID: "123456789012345", - }) - - if err != nil { - t.Fatalf("GetDeviceInfo() error = %v", err) - } - - if result.IMEI != "123456789012345" { - t.Errorf("IMEI = %s, want 123456789012345", result.IMEI) - } - if result.OnlineStatus != 0 { - t.Errorf("OnlineStatus = %d, want 0", result.OnlineStatus) - } -} - -func TestGetDeviceInfo_MissingParams(t *testing.T) { - client := NewClient("https://test.example.com", "testAppID", "testSecret") - ctx := context.Background() - - _, err := client.GetDeviceInfo(ctx, &DeviceInfoReq{}) - - if err == nil { - t.Fatal("GetDeviceInfo() expected validation error") - } - - if !strings.Contains(err.Error(), "至少需要一个") { - t.Errorf("error should contain '至少需要一个', got: %v", err) - } -} - -func TestGetDeviceInfo_InvalidResponse(t *testing.T) { - server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - resp := GatewayResponse{ - Code: 200, - Msg: "成功", - Data: json.RawMessage(`invalid json`), - } - json.NewEncoder(w).Encode(resp) - })) - defer server.Close() - - client := NewClient(server.URL, "testAppID", "testSecret") - ctx := context.Background() - - _, err := client.GetDeviceInfo(ctx, &DeviceInfoReq{CardNo: "test"}) - if err == nil { - t.Fatal("GetDeviceInfo() expected JSON parse error") - } - - if !strings.Contains(err.Error(), "解析") { - t.Errorf("error should contain '解析', got: %v", err) - } -} - -func TestGetSlotInfo_Success(t *testing.T) { - server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - resp := GatewayResponse{ - Code: 200, - Msg: "成功", - Data: json.RawMessage(`{"imei":"123456789012345","slots":[{"slotNo":1,"iccid":"898608070422D0010269","cardStatus":"正常","isActive":1},{"slotNo":2,"iccid":"898608070422D0010270","cardStatus":"停机","isActive":0}]}`), - } - json.NewEncoder(w).Encode(resp) - })) - defer server.Close() - - client := NewClient(server.URL, "testAppID", "testSecret") - ctx := context.Background() - - result, err := client.GetSlotInfo(ctx, &DeviceInfoReq{ - DeviceID: "123456789012345", - }) - - if err != nil { - t.Fatalf("GetSlotInfo() error = %v", err) - } - - if result.IMEI != "123456789012345" { - t.Errorf("IMEI = %s, want 123456789012345", result.IMEI) - } - if len(result.Slots) != 2 { - t.Errorf("len(Slots) = %d, want 2", len(result.Slots)) - } - if result.Slots[0].SlotNo != 1 { - t.Errorf("Slots[0].SlotNo = %d, want 1", result.Slots[0].SlotNo) - } - if result.Slots[0].ICCID != "898608070422D0010269" { - t.Errorf("Slots[0].ICCID = %s, want 898608070422D0010269", result.Slots[0].ICCID) - } - if result.Slots[0].IsActive != 1 { - t.Errorf("Slots[0].IsActive = %d, want 1", result.Slots[0].IsActive) - } -} - -func TestGetSlotInfo_MissingParams(t *testing.T) { - client := NewClient("https://test.example.com", "testAppID", "testSecret") - ctx := context.Background() - - _, err := client.GetSlotInfo(ctx, &DeviceInfoReq{}) - - if err == nil { - t.Fatal("GetSlotInfo() expected validation error") - } - - if !strings.Contains(err.Error(), "至少需要一个") { - t.Errorf("error should contain '至少需要一个', got: %v", err) - } -} - -func TestSetSpeedLimit_Success(t *testing.T) { - server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - resp := GatewayResponse{Code: 200, Msg: "成功"} - json.NewEncoder(w).Encode(resp) - })) - defer server.Close() - - client := NewClient(server.URL, "testAppID", "testSecret") - ctx := context.Background() - - err := client.SetSpeedLimit(ctx, &SpeedLimitReq{ - DeviceID: "123456789012345", - UploadSpeed: 100, - DownloadSpeed: 500, - }) - - if err != nil { - t.Fatalf("SetSpeedLimit() error = %v", err) - } -} - -func TestSetSpeedLimit_WithExtend(t *testing.T) { - server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - resp := GatewayResponse{Code: 200, Msg: "成功"} - json.NewEncoder(w).Encode(resp) - })) - defer server.Close() - - client := NewClient(server.URL, "testAppID", "testSecret") - ctx := context.Background() - - err := client.SetSpeedLimit(ctx, &SpeedLimitReq{ - DeviceID: "123456789012345", - UploadSpeed: 100, - DownloadSpeed: 500, - Extend: "test-extend", - }) - - if err != nil { - t.Fatalf("SetSpeedLimit() error = %v", err) - } -} - -func TestSetSpeedLimit_BusinessError(t *testing.T) { - server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - resp := GatewayResponse{Code: 500, Msg: "设置失败"} - json.NewEncoder(w).Encode(resp) - })) - defer server.Close() - - client := NewClient(server.URL, "testAppID", "testSecret") - ctx := context.Background() - - err := client.SetSpeedLimit(ctx, &SpeedLimitReq{ - DeviceID: "123456789012345", - UploadSpeed: 100, - DownloadSpeed: 500, - }) - - if err == nil { - t.Fatal("SetSpeedLimit() expected business error") - } - - if !strings.Contains(err.Error(), "业务错误") { - t.Errorf("error should contain '业务错误', got: %v", err) - } -} - -func TestSetWiFi_Success(t *testing.T) { - server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - resp := GatewayResponse{Code: 200, Msg: "成功"} - json.NewEncoder(w).Encode(resp) - })) - defer server.Close() - - client := NewClient(server.URL, "testAppID", "testSecret") - ctx := context.Background() - - err := client.SetWiFi(ctx, &WiFiReq{ - DeviceID: "123456789012345", - SSID: "TestWiFi", - Password: "password123", - Enabled: 1, - }) - - if err != nil { - t.Fatalf("SetWiFi() error = %v", err) - } -} - -func TestSetWiFi_WithExtend(t *testing.T) { - server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - resp := GatewayResponse{Code: 200, Msg: "成功"} - json.NewEncoder(w).Encode(resp) - })) - defer server.Close() - - client := NewClient(server.URL, "testAppID", "testSecret") - ctx := context.Background() - - err := client.SetWiFi(ctx, &WiFiReq{ - DeviceID: "123456789012345", - SSID: "TestWiFi", - Password: "password123", - Enabled: 0, - Extend: "test-extend", - }) - - if err != nil { - t.Fatalf("SetWiFi() error = %v", err) - } -} - -func TestSwitchCard_Success(t *testing.T) { - server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - resp := GatewayResponse{Code: 200, Msg: "成功"} - json.NewEncoder(w).Encode(resp) - })) - defer server.Close() - - client := NewClient(server.URL, "testAppID", "testSecret") - ctx := context.Background() - - err := client.SwitchCard(ctx, &SwitchCardReq{ - DeviceID: "123456789012345", - TargetICCID: "898608070422D0010270", - }) - - if err != nil { - t.Fatalf("SwitchCard() error = %v", err) - } -} - -func TestSwitchCard_BusinessError(t *testing.T) { - server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - resp := GatewayResponse{Code: 404, Msg: "目标卡不存在"} - json.NewEncoder(w).Encode(resp) - })) - defer server.Close() - - client := NewClient(server.URL, "testAppID", "testSecret") - ctx := context.Background() - - err := client.SwitchCard(ctx, &SwitchCardReq{ - DeviceID: "123456789012345", - TargetICCID: "invalid", - }) - - if err == nil { - t.Fatal("SwitchCard() expected business error") - } -} - -func TestResetDevice_Success(t *testing.T) { - server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - resp := GatewayResponse{Code: 200, Msg: "成功"} - json.NewEncoder(w).Encode(resp) - })) - defer server.Close() - - client := NewClient(server.URL, "testAppID", "testSecret") - ctx := context.Background() - - err := client.ResetDevice(ctx, &DeviceOperationReq{ - DeviceID: "123456789012345", - }) - - if err != nil { - t.Fatalf("ResetDevice() error = %v", err) - } -} - -func TestResetDevice_WithExtend(t *testing.T) { - server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - resp := GatewayResponse{Code: 200, Msg: "成功"} - json.NewEncoder(w).Encode(resp) - })) - defer server.Close() - - client := NewClient(server.URL, "testAppID", "testSecret") - ctx := context.Background() - - err := client.ResetDevice(ctx, &DeviceOperationReq{ - DeviceID: "123456789012345", - Extend: "test-extend", - }) - - if err != nil { - t.Fatalf("ResetDevice() error = %v", err) - } -} - -func TestRebootDevice_Success(t *testing.T) { - server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - resp := GatewayResponse{Code: 200, Msg: "成功"} - json.NewEncoder(w).Encode(resp) - })) - defer server.Close() - - client := NewClient(server.URL, "testAppID", "testSecret") - ctx := context.Background() - - err := client.RebootDevice(ctx, &DeviceOperationReq{ - DeviceID: "123456789012345", - }) - - if err != nil { - t.Fatalf("RebootDevice() error = %v", err) - } -} - -func TestRebootDevice_BusinessError(t *testing.T) { - server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - resp := GatewayResponse{Code: 500, Msg: "设备离线"} - json.NewEncoder(w).Encode(resp) - })) - defer server.Close() - - client := NewClient(server.URL, "testAppID", "testSecret") - ctx := context.Background() - - err := client.RebootDevice(ctx, &DeviceOperationReq{ - DeviceID: "123456789012345", - }) - - if err == nil { - t.Fatal("RebootDevice() expected business error") - } - - if !strings.Contains(err.Error(), "业务错误") { - t.Errorf("error should contain '业务错误', got: %v", err) - } -} diff --git a/internal/gateway/flow_card_test.go b/internal/gateway/flow_card_test.go deleted file mode 100644 index 743868a..0000000 --- a/internal/gateway/flow_card_test.go +++ /dev/null @@ -1,292 +0,0 @@ -package gateway - -import ( - "context" - "encoding/json" - "net/http" - "net/http/httptest" - "strings" - "testing" -) - -func TestQueryCardStatus_Success(t *testing.T) { - server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - resp := GatewayResponse{ - Code: 200, - Msg: "成功", - Data: json.RawMessage(`{"iccid":"898608070422D0010269","cardStatus":"正常"}`), - } - w.Header().Set("Content-Type", "application/json") - json.NewEncoder(w).Encode(resp) - })) - defer server.Close() - - client := NewClient(server.URL, "testAppID", "testSecret") - ctx := context.Background() - - result, err := client.QueryCardStatus(ctx, &CardStatusReq{ - CardNo: "898608070422D0010269", - }) - - if err != nil { - t.Fatalf("QueryCardStatus() error = %v", err) - } - - if result.ICCID != "898608070422D0010269" { - t.Errorf("ICCID = %s, want 898608070422D0010269", result.ICCID) - } - if result.CardStatus != "正常" { - t.Errorf("CardStatus = %s, want 正常", result.CardStatus) - } -} - -func TestQueryCardStatus_InvalidResponse(t *testing.T) { - server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - resp := GatewayResponse{ - Code: 200, - Msg: "成功", - Data: json.RawMessage(`invalid json`), - } - json.NewEncoder(w).Encode(resp) - })) - defer server.Close() - - client := NewClient(server.URL, "testAppID", "testSecret") - ctx := context.Background() - - _, err := client.QueryCardStatus(ctx, &CardStatusReq{CardNo: "test"}) - if err == nil { - t.Fatal("QueryCardStatus() expected JSON parse error") - } - - if !strings.Contains(err.Error(), "解析") { - t.Errorf("error should contain '解析', got: %v", err) - } -} - -func TestQueryFlow_Success(t *testing.T) { - server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - resp := GatewayResponse{ - Code: 200, - Msg: "成功", - Data: json.RawMessage(`{"usedFlow":1024,"unit":"MB"}`), - } - w.Header().Set("Content-Type", "application/json") - json.NewEncoder(w).Encode(resp) - })) - defer server.Close() - - client := NewClient(server.URL, "testAppID", "testSecret") - ctx := context.Background() - - result, err := client.QueryFlow(ctx, &FlowQueryReq{ - CardNo: "898608070422D0010269", - }) - - if err != nil { - t.Fatalf("QueryFlow() error = %v", err) - } - - if result.UsedFlow != 1024 { - t.Errorf("UsedFlow = %d, want 1024", result.UsedFlow) - } - if result.Unit != "MB" { - t.Errorf("Unit = %s, want MB", result.Unit) - } -} - -func TestQueryFlow_BusinessError(t *testing.T) { - server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - resp := GatewayResponse{ - Code: 404, - Msg: "卡号不存在", - } - json.NewEncoder(w).Encode(resp) - })) - defer server.Close() - - client := NewClient(server.URL, "testAppID", "testSecret") - ctx := context.Background() - - _, err := client.QueryFlow(ctx, &FlowQueryReq{CardNo: "invalid"}) - if err == nil { - t.Fatal("QueryFlow() expected business error") - } - - if !strings.Contains(err.Error(), "业务错误") { - t.Errorf("error should contain '业务错误', got: %v", err) - } -} - -func TestQueryRealnameStatus_Success(t *testing.T) { - server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - resp := GatewayResponse{ - Code: 200, - Msg: "成功", - Data: json.RawMessage(`{"status":"已实名"}`), - } - w.Header().Set("Content-Type", "application/json") - json.NewEncoder(w).Encode(resp) - })) - defer server.Close() - - client := NewClient(server.URL, "testAppID", "testSecret") - ctx := context.Background() - - result, err := client.QueryRealnameStatus(ctx, &CardStatusReq{ - CardNo: "898608070422D0010269", - }) - - if err != nil { - t.Fatalf("QueryRealnameStatus() error = %v", err) - } - - if result.Status != "已实名" { - t.Errorf("Status = %s, want 已实名", result.Status) - } -} - -func TestStopCard_Success(t *testing.T) { - server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - resp := GatewayResponse{ - Code: 200, - Msg: "成功", - } - json.NewEncoder(w).Encode(resp) - })) - defer server.Close() - - client := NewClient(server.URL, "testAppID", "testSecret") - ctx := context.Background() - - err := client.StopCard(ctx, &CardOperationReq{ - CardNo: "898608070422D0010269", - }) - - if err != nil { - t.Fatalf("StopCard() error = %v", err) - } -} - -func TestStopCard_WithExtend(t *testing.T) { - server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - resp := GatewayResponse{Code: 200, Msg: "成功"} - json.NewEncoder(w).Encode(resp) - })) - defer server.Close() - - client := NewClient(server.URL, "testAppID", "testSecret") - ctx := context.Background() - - err := client.StopCard(ctx, &CardOperationReq{ - CardNo: "898608070422D0010269", - Extend: "test-extend", - }) - - if err != nil { - t.Fatalf("StopCard() error = %v", err) - } -} - -func TestStartCard_Success(t *testing.T) { - server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - resp := GatewayResponse{Code: 200, Msg: "成功"} - json.NewEncoder(w).Encode(resp) - })) - defer server.Close() - - client := NewClient(server.URL, "testAppID", "testSecret") - ctx := context.Background() - - err := client.StartCard(ctx, &CardOperationReq{ - CardNo: "898608070422D0010269", - }) - - if err != nil { - t.Fatalf("StartCard() error = %v", err) - } -} - -func TestStartCard_BusinessError(t *testing.T) { - server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - resp := GatewayResponse{Code: 500, Msg: "操作失败"} - json.NewEncoder(w).Encode(resp) - })) - defer server.Close() - - client := NewClient(server.URL, "testAppID", "testSecret") - ctx := context.Background() - - err := client.StartCard(ctx, &CardOperationReq{CardNo: "test"}) - if err == nil { - t.Fatal("StartCard() expected business error") - } -} - -func TestGetRealnameLink_Success(t *testing.T) { - server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - resp := GatewayResponse{ - Code: 200, - Msg: "成功", - Data: json.RawMessage(`{"link":"https://realname.example.com/verify?token=abc123"}`), - } - json.NewEncoder(w).Encode(resp) - })) - defer server.Close() - - client := NewClient(server.URL, "testAppID", "testSecret") - ctx := context.Background() - - result, err := client.GetRealnameLink(ctx, &CardStatusReq{ - CardNo: "898608070422D0010269", - }) - - if err != nil { - t.Fatalf("GetRealnameLink() error = %v", err) - } - - if result.Link != "https://realname.example.com/verify?token=abc123" { - t.Errorf("Link = %s, want https://realname.example.com/verify?token=abc123", result.Link) - } -} - -func TestGetRealnameLink_InvalidResponse(t *testing.T) { - server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - resp := GatewayResponse{ - Code: 200, - Msg: "成功", - Data: json.RawMessage(`{"invalid": "structure"}`), - } - json.NewEncoder(w).Encode(resp) - })) - defer server.Close() - - client := NewClient(server.URL, "testAppID", "testSecret") - ctx := context.Background() - - result, err := client.GetRealnameLink(ctx, &CardStatusReq{CardNo: "test"}) - - if err != nil { - t.Fatalf("GetRealnameLink() unexpected error = %v", err) - } - if result.Link != "" { - t.Errorf("Link = %s, want empty string", result.Link) - } -} - -func TestBatchQuery_NotImplemented(t *testing.T) { - client := NewClient("https://test.example.com", "testAppID", "testSecret") - ctx := context.Background() - - _, err := client.BatchQuery(ctx, &BatchQueryReq{ - CardNos: []string{"test1", "test2"}, - }) - - if err == nil { - t.Fatal("BatchQuery() expected not implemented error") - } - - if !strings.Contains(err.Error(), "暂未实现") { - t.Errorf("error should contain '暂未实现', got: %v", err) - } -} diff --git a/internal/handler/admin/package_usage.go b/internal/handler/admin/package_usage.go new file mode 100644 index 0000000..90743e9 --- /dev/null +++ b/internal/handler/admin/package_usage.go @@ -0,0 +1,47 @@ +package admin + +import ( + "strconv" + + "github.com/gofiber/fiber/v2" + + packageService "github.com/break/junhong_cmp_fiber/internal/service/package" + "github.com/break/junhong_cmp_fiber/pkg/errors" + "github.com/break/junhong_cmp_fiber/pkg/response" +) + +// PackageUsageHandler 套餐使用记录 Handler +type PackageUsageHandler struct { + dailyRecordService *packageService.DailyRecordService +} + +// NewPackageUsageHandler 创建套餐使用记录 Handler +func NewPackageUsageHandler(dailyRecordService *packageService.DailyRecordService) *PackageUsageHandler { + return &PackageUsageHandler{ + dailyRecordService: dailyRecordService, + } +} + +// GetDailyRecords 任务 16.2-16.5: 获取套餐流量详单 +// GET /api/admin/package-usage/:id/daily-records +// 查询参数：start_date（开始日期，格式 YYYY-MM-DD）, end_date（结束日期，格式 YYYY-MM-DD） +func (h *PackageUsageHandler) GetDailyRecords(c *fiber.Ctx) error { + // 解析套餐使用记录 ID + id, err := strconv.ParseUint(c.Params("id"), 10, 64) + if err != nil { + return errors.New(errors.CodeInvalidParam, "无效的套餐使用记录 ID") + } + + // 任务 16.3: 解析日期范围查询参数 + startDate := c.Query("start_date", "") + endDate := c.Query("end_date", "") + + // 任务 16.4: 调用 DailyRecordService.GetDailyRecords 获取日记录 + records, err := h.dailyRecordService.GetDailyRecords(c.UserContext(), uint(id), startDate, endDate) + if err != nil { + return err + } + + // 任务 16.5: 返回 PackageUsageDetailResponse 响应 + return response.Success(c, records) +} diff --git a/internal/handler/h5/package_usage.go b/internal/handler/h5/package_usage.go new file mode 100644 index 0000000..7f4585b --- /dev/null +++ b/internal/handler/h5/package_usage.go @@ -0,0 +1,93 @@ +package h5 + +import ( + "github.com/gofiber/fiber/v2" + + "github.com/break/junhong_cmp_fiber/internal/model" + packageService "github.com/break/junhong_cmp_fiber/internal/service/package" + "github.com/break/junhong_cmp_fiber/pkg/constants" + "github.com/break/junhong_cmp_fiber/pkg/errors" + "github.com/break/junhong_cmp_fiber/pkg/middleware" + "github.com/break/junhong_cmp_fiber/pkg/response" + "gorm.io/gorm" +) + +// PackageUsageHandler H5 端套餐使用情况 Handler +type PackageUsageHandler struct { + db *gorm.DB + customerViewService *packageService.CustomerViewService +} + +// NewPackageUsageHandler 创建 H5 端套餐使用情况 Handler +func NewPackageUsageHandler(db *gorm.DB, customerViewService *packageService.CustomerViewService) *PackageUsageHandler { + return &PackageUsageHandler{ + db: db, + customerViewService: customerViewService, + } +} + +// GetMyUsage 任务 15.2-15.5: 获取我的套餐使用情况 +// GET /api/h5/packages/my-usage +func (h *PackageUsageHandler) GetMyUsage(c *fiber.Ctx) error { + ctx := c.UserContext() + + // 任务 15.3: 从 JWT 上下文中提取用户信息 + userType := middleware.GetUserTypeFromContext(ctx) + + var carrierType string + var carrierID uint + + // 根据用户类型获取载体信息 + switch userType { + case constants.UserTypePersonalCustomer: + // 个人客户：查询其订单关联的 IoT 卡或设备 + customerID := middleware.GetCustomerIDFromContext(ctx) + if customerID == 0 { + return errors.New(errors.CodeInvalidParam, "未找到客户信息") + } + + // 查询该客户的套餐使用记录，获取载体信息 + var usage model.PackageUsage + err := h.db.WithContext(ctx). + Joins("JOIN tb_order ON tb_order.id = tb_package_usage.order_id"). + Where("tb_order.buyer_type = ? AND tb_order.buyer_id = ?", model.BuyerTypePersonal, customerID). + Where("tb_package_usage.status IN ?", []int{constants.PackageUsageStatusActive, constants.PackageUsageStatusDepleted}). + Order("tb_package_usage.activated_at DESC"). + First(&usage).Error + + if err != nil { + if err == gorm.ErrRecordNotFound { + return errors.New(errors.CodeNotFound, "未找到套餐使用记录") + } + return errors.Wrap(errors.CodeDatabaseError, err, "查询套餐使用记录失败") + } + + // 确定载体类型和 ID + if usage.IotCardID > 0 { + carrierType = "iot_card" + carrierID = usage.IotCardID + } else if usage.DeviceID > 0 { + carrierType = "device" + carrierID = usage.DeviceID + } else { + return errors.New(errors.CodeInvalidParam, "套餐使用记录未关联卡或设备") + } + + case constants.UserTypeAgent, constants.UserTypeEnterprise: + // 代理和企业用户暂不支持通过此接口查询 + // 他们应该使用后台管理接口查询指定卡/设备的套餐情况 + return errors.New(errors.CodeForbidden, "此接口仅供个人客户使用") + + default: + return errors.New(errors.CodeForbidden, "不支持的用户类型") + } + + // 任务 15.4: 调用 CustomerViewService.GetMyUsage 获取流量数据 + usageData, err := h.customerViewService.GetMyUsage(ctx, carrierType, carrierID) + if err != nil { + return err + } + + // 任务 15.5: 返回 PackageUsageCustomerViewResponse 响应 + return response.Success(c, usageData) +} diff --git a/internal/middleware/recover_test.go b/internal/middleware/recover_test.go deleted file mode 100644 index d8c7d2a..0000000 --- a/internal/middleware/recover_test.go +++ /dev/null @@ -1,131 +0,0 @@ -package middleware - -import ( - "io" - "net/http/httptest" - "testing" - - "github.com/gofiber/fiber/v2" - "github.com/gofiber/fiber/v2/middleware/requestid" - "github.com/google/uuid" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - - "github.com/break/junhong_cmp_fiber/pkg/errors" - "github.com/break/junhong_cmp_fiber/pkg/logger" -) - -// TestRecover_PanicCapture 测试 panic 捕获功能 -func TestRecover_PanicCapture(t *testing.T) { - // 初始化日志器 - _ = logger.InitLoggers( - "debug", - true, - logger.LogRotationConfig{ - Filename: "../../tests/integration/logs/recover_test.log", - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: false, - }, - logger.LogRotationConfig{ - Filename: "../../tests/integration/logs/access_test.log", - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: false, - }, - ) - - appLogger := logger.GetAppLogger() - - app := fiber.New(fiber.Config{ - ErrorHandler: errors.SafeErrorHandler(appLogger), - }) - - // 注册 recover 中间件 - app.Use(Recover(appLogger)) - app.Use(requestid.New(requestid.Config{ - Generator: func() string { - return uuid.NewString() - }, - })) - - // 创建会触发 panic 的路由 - app.Get("/panic", func(c *fiber.Ctx) error { - panic("测试 panic") - }) - - // 发起请求 - req := httptest.NewRequest("GET", "/panic", nil) - resp, err := app.Test(req, -1) - require.NoError(t, err) - defer func() { _ = resp.Body.Close() }() - - // 验证响应状态码为 500 (内部错误) - assert.Equal(t, 500, resp.StatusCode, "panic 应转换为 500 错误") - - // 验证响应体不为空 - body, err := io.ReadAll(resp.Body) - require.NoError(t, err) - assert.NotEmpty(t, body, "panic 响应体不应为空") - - t.Log("✓ Panic 捕获测试通过") -} - -// TestRecover_NilPointerPanic 测试空指针 panic -func TestRecover_NilPointerPanic(t *testing.T) { - appLogger := logger.GetAppLogger() - - app := fiber.New(fiber.Config{ - ErrorHandler: errors.SafeErrorHandler(appLogger), - }) - - app.Use(Recover(appLogger)) - app.Use(requestid.New(requestid.Config{ - Generator: func() string { - return uuid.NewString() - }, - })) - - // 创建会触发空指针 panic 的路由 - app.Get("/nil-panic", func(c *fiber.Ctx) error { - var ptr *string - _ = *ptr // 空指针引用会导致 panic - return nil - }) - - req := httptest.NewRequest("GET", "/nil-panic", nil) - resp, err := app.Test(req, -1) - require.NoError(t, err) - defer func() { _ = resp.Body.Close() }() - - assert.Equal(t, 500, resp.StatusCode, "空指针 panic 应转换为 500 错误") - - t.Log("✓ 空指针 Panic 捕获测试通过") -} - -// TestRecover_NormalRequest 测试正常请求不受影响 -func TestRecover_NormalRequest(t *testing.T) { - appLogger := logger.GetAppLogger() - - app := fiber.New(fiber.Config{ - ErrorHandler: errors.SafeErrorHandler(appLogger), - }) - - app.Use(Recover(appLogger)) - - // 创建正常的路由 - app.Get("/normal", func(c *fiber.Ctx) error { - return c.JSON(fiber.Map{"status": "ok"}) - }) - - req := httptest.NewRequest("GET", "/normal", nil) - resp, err := app.Test(req, -1) - require.NoError(t, err) - defer func() { _ = resp.Body.Close() }() - - assert.Equal(t, 200, resp.StatusCode, "正常请求应返回 200") - - t.Log("✓ 正常请求测试通过") -} diff --git a/internal/model/dto/package_dto.go b/internal/model/dto/package_dto.go index bef9981..306d8e5 100644 --- a/internal/model/dto/package_dto.go +++ b/internal/model/dto/package_dto.go @@ -2,29 +2,37 @@ package dto // CreatePackageRequest 创建套餐请求 type CreatePackageRequest struct { - PackageCode string `json:"package_code" validate:"required,min=1,max=100" required:"true" minLength:"1" maxLength:"100" description:"套餐编码"` - PackageName string `json:"package_name" validate:"required,min=1,max=255" required:"true" minLength:"1" maxLength:"255" description:"套餐名称"` - SeriesID *uint `json:"series_id" validate:"omitempty" description:"套餐系列ID"` - PackageType string `json:"package_type" validate:"required,oneof=formal addon" required:"true" description:"套餐类型 (formal:正式套餐, addon:附加套餐)"` - DurationMonths int `json:"duration_months" validate:"required,min=1,max=120" required:"true" minimum:"1" maximum:"120" description:"套餐时长(月数)"` - RealDataMB *int64 `json:"real_data_mb" validate:"omitempty,min=0" minimum:"0" description:"真流量额度(MB)"` - VirtualDataMB *int64 `json:"virtual_data_mb" validate:"omitempty,min=0" minimum:"0" description:"虚流量额度(MB)"` - EnableVirtualData bool `json:"enable_virtual_data" description:"是否启用虚流量"` - SuggestedRetailPrice *int64 `json:"suggested_retail_price" validate:"omitempty,min=0" minimum:"0" description:"建议售价(分)"` - CostPrice int64 `json:"cost_price" validate:"required,min=0" required:"true" minimum:"0" description:"成本价(分)"` + PackageCode string `json:"package_code" validate:"required,min=1,max=100" required:"true" minLength:"1" maxLength:"100" description:"套餐编码"` + PackageName string `json:"package_name" validate:"required,min=1,max=255" required:"true" minLength:"1" maxLength:"255" description:"套餐名称"` + SeriesID *uint `json:"series_id" validate:"omitempty" description:"套餐系列ID"` + PackageType string `json:"package_type" validate:"required,oneof=formal addon" required:"true" description:"套餐类型 (formal:正式套餐, addon:附加套餐)"` + DurationMonths int `json:"duration_months" validate:"required,min=1,max=120" required:"true" minimum:"1" maximum:"120" description:"套餐时长(月数)"` + RealDataMB *int64 `json:"real_data_mb" validate:"omitempty,min=0" minimum:"0" description:"真流量额度(MB)"` + VirtualDataMB *int64 `json:"virtual_data_mb" validate:"omitempty,min=0" minimum:"0" description:"虚流量额度(MB)"` + EnableVirtualData bool `json:"enable_virtual_data" description:"是否启用虚流量"` + SuggestedRetailPrice *int64 `json:"suggested_retail_price" validate:"omitempty,min=0" minimum:"0" description:"建议售价(分)"` + CostPrice int64 `json:"cost_price" validate:"required,min=0" required:"true" minimum:"0" description:"成本价(分)"` + CalendarType *string `json:"calendar_type" validate:"omitempty,oneof=natural_month by_day" description:"套餐周期类型 (natural_month:自然月, by_day:按天)"` + DurationDays *int `json:"duration_days" validate:"omitempty,min=1,max=3650" minimum:"1" maximum:"3650" description:"套餐天数(calendar_type=by_day时必填)"` + DataResetCycle *string `json:"data_reset_cycle" validate:"omitempty,oneof=daily monthly yearly none" description:"流量重置周期 (daily:每日, monthly:每月, yearly:每年, none:不重置)"` + EnableRealnameActivation *bool `json:"enable_realname_activation" description:"是否启用实名激活 (true:需实名后激活, false:立即激活)"` } // UpdatePackageRequest 更新套餐请求 type UpdatePackageRequest struct { - PackageName *string `json:"package_name" validate:"omitempty,min=1,max=255" minLength:"1" maxLength:"255" description:"套餐名称"` - SeriesID *uint `json:"series_id" validate:"omitempty" description:"套餐系列ID"` - PackageType *string `json:"package_type" validate:"omitempty,oneof=formal addon" description:"套餐类型 (formal:正式套餐, addon:附加套餐)"` - DurationMonths *int `json:"duration_months" validate:"omitempty,min=1,max=120" minimum:"1" maximum:"120" description:"套餐时长(月数)"` - RealDataMB *int64 `json:"real_data_mb" validate:"omitempty,min=0" minimum:"0" description:"真流量额度(MB)"` - VirtualDataMB *int64 `json:"virtual_data_mb" validate:"omitempty,min=0" minimum:"0" description:"虚流量额度(MB)"` - EnableVirtualData *bool `json:"enable_virtual_data" description:"是否启用虚流量"` - SuggestedRetailPrice *int64 `json:"suggested_retail_price" validate:"omitempty,min=0" minimum:"0" description:"建议售价(分)"` - CostPrice *int64 `json:"cost_price" validate:"omitempty,min=0" minimum:"0" description:"成本价(分)"` + PackageName *string `json:"package_name" validate:"omitempty,min=1,max=255" minLength:"1" maxLength:"255" description:"套餐名称"` + SeriesID *uint `json:"series_id" validate:"omitempty" description:"套餐系列ID"` + PackageType *string `json:"package_type" validate:"omitempty,oneof=formal addon" description:"套餐类型 (formal:正式套餐, addon:附加套餐)"` + DurationMonths *int `json:"duration_months" validate:"omitempty,min=1,max=120" minimum:"1" maximum:"120" description:"套餐时长(月数)"` + RealDataMB *int64 `json:"real_data_mb" validate:"omitempty,min=0" minimum:"0" description:"真流量额度(MB)"` + VirtualDataMB *int64 `json:"virtual_data_mb" validate:"omitempty,min=0" minimum:"0" description:"虚流量额度(MB)"` + EnableVirtualData *bool `json:"enable_virtual_data" description:"是否启用虚流量"` + SuggestedRetailPrice *int64 `json:"suggested_retail_price" validate:"omitempty,min=0" minimum:"0" description:"建议售价(分)"` + CostPrice *int64 `json:"cost_price" validate:"omitempty,min=0" minimum:"0" description:"成本价(分)"` + CalendarType *string `json:"calendar_type" validate:"omitempty,oneof=natural_month by_day" description:"套餐周期类型 (natural_month:自然月, by_day:按天)"` + DurationDays *int `json:"duration_days" validate:"omitempty,min=1,max=3650" minimum:"1" maximum:"3650" description:"套餐天数(calendar_type=by_day时必填)"` + DataResetCycle *string `json:"data_reset_cycle" validate:"omitempty,oneof=daily monthly yearly none" description:"流量重置周期 (daily:每日, monthly:每月, yearly:每年, none:不重置)"` + EnableRealnameActivation *bool `json:"enable_realname_activation" description:"是否启用实名激活 (true:需实名后激活, false:立即激活)"` } // PackageListRequest 套餐列表请求 @@ -57,26 +65,30 @@ type CommissionTierInfo struct { // PackageResponse 套餐响应 type PackageResponse struct { - ID uint `json:"id" description:"套餐ID"` - PackageCode string `json:"package_code" description:"套餐编码"` - PackageName string `json:"package_name" description:"套餐名称"` - SeriesID *uint `json:"series_id" description:"套餐系列ID"` - SeriesName *string `json:"series_name" description:"套餐系列名称"` - PackageType string `json:"package_type" description:"套餐类型 (formal:正式套餐, addon:附加套餐)"` - DurationMonths int `json:"duration_months" description:"套餐时长(月数)"` - RealDataMB int64 `json:"real_data_mb" description:"真流量额度(MB)"` - VirtualDataMB int64 `json:"virtual_data_mb" description:"虚流量额度(MB)"` - EnableVirtualData bool `json:"enable_virtual_data" description:"是否启用虚流量"` - SuggestedRetailPrice int64 `json:"suggested_retail_price" description:"建议售价(分)"` - CostPrice int64 `json:"cost_price" description:"成本价(分)"` - OneTimeCommissionAmount *int64 `json:"one_time_commission_amount,omitempty" description:"一次性佣金金额（分，代理视角）"` - Status int `json:"status" description:"状态 (1:启用, 2:禁用)"` - ShelfStatus int `json:"shelf_status" description:"上架状态 (1:上架, 2:下架)"` - CreatedAt string `json:"created_at" description:"创建时间"` - UpdatedAt string `json:"updated_at" description:"更新时间"` - ProfitMargin *int64 `json:"profit_margin,omitempty" description:"利润空间（分，仅代理用户可见）"` - CurrentCommissionRate string `json:"current_commission_rate,omitempty" description:"当前返佣比例（仅代理用户可见）"` - TierInfo *CommissionTierInfo `json:"tier_info,omitempty" description:"梯度返佣信息（仅代理用户可见）"` + ID uint `json:"id" description:"套餐ID"` + PackageCode string `json:"package_code" description:"套餐编码"` + PackageName string `json:"package_name" description:"套餐名称"` + SeriesID *uint `json:"series_id" description:"套餐系列ID"` + SeriesName *string `json:"series_name" description:"套餐系列名称"` + PackageType string `json:"package_type" description:"套餐类型 (formal:正式套餐, addon:附加套餐)"` + DurationMonths int `json:"duration_months" description:"套餐时长(月数)"` + RealDataMB int64 `json:"real_data_mb" description:"真流量额度(MB)"` + VirtualDataMB int64 `json:"virtual_data_mb" description:"虚流量额度(MB)"` + EnableVirtualData bool `json:"enable_virtual_data" description:"是否启用虚流量"` + SuggestedRetailPrice int64 `json:"suggested_retail_price" description:"建议售价(分)"` + CostPrice int64 `json:"cost_price" description:"成本价(分)"` + OneTimeCommissionAmount *int64 `json:"one_time_commission_amount,omitempty" description:"一次性佣金金额（分，代理视角）"` + Status int `json:"status" description:"状态 (1:启用, 2:禁用)"` + ShelfStatus int `json:"shelf_status" description:"上架状态 (1:上架, 2:下架)"` + CreatedAt string `json:"created_at" description:"创建时间"` + UpdatedAt string `json:"updated_at" description:"更新时间"` + ProfitMargin *int64 `json:"profit_margin,omitempty" description:"利润空间（分，仅代理用户可见）"` + CurrentCommissionRate string `json:"current_commission_rate,omitempty" description:"当前返佣比例（仅代理用户可见）"` + TierInfo *CommissionTierInfo `json:"tier_info,omitempty" description:"梯度返佣信息（仅代理用户可见）"` + CalendarType string `json:"calendar_type" description:"套餐周期类型 (natural_month:自然月, by_day:按天)"` + DurationDays *int `json:"duration_days,omitempty" description:"套餐天数(calendar_type=by_day时有值)"` + DataResetCycle string `json:"data_reset_cycle" description:"流量重置周期 (daily:每日, monthly:每月, yearly:每年, none:不重置)"` + EnableRealnameActivation bool `json:"enable_realname_activation" description:"是否启用实名激活 (true:需实名后激活, false:立即激活)"` } // UpdatePackageParams 更新套餐聚合参数 @@ -105,3 +117,45 @@ type PackagePageResult struct { PageSize int `json:"page_size" description:"每页数量"` TotalPages int `json:"total_pages" description:"总页数"` } + +// PackageUsageItemResponse 套餐使用项响应（客户视图） +type PackageUsageItemResponse struct { + PackageUsageID uint `json:"package_usage_id" description:"套餐使用记录ID"` + PackageID uint `json:"package_id" description:"套餐ID"` + PackageName string `json:"package_name" description:"套餐名称"` + UsedMB int64 `json:"used_mb" description:"已使用流量(MB)"` + TotalMB int64 `json:"total_mb" description:"总流量(MB)"` + Status int `json:"status" description:"状态 (0:待生效, 1:生效中, 2:已用完, 3:已过期, 4:已失效)"` + StatusText string `json:"status_text" description:"状态文本"` + ExpiresAt string `json:"expires_at" description:"过期时间"` + ActivatedAt string `json:"activated_at" description:"激活时间"` + Priority int `json:"priority" description:"优先级（数字越小优先级越高）"` +} + +// PackageUsageTotalInfo 套餐流量总计信息 +type PackageUsageTotalInfo struct { + UsedMB int64 `json:"used_mb" description:"总已使用流量(MB)"` + TotalMB int64 `json:"total_mb" description:"总流量(MB)"` +} + +// PackageUsageCustomerViewResponse 客户视图流量查询响应 +type PackageUsageCustomerViewResponse struct { + MainPackage *PackageUsageItemResponse `json:"main_package" description:"主套餐信息"` + AddonPackages []PackageUsageItemResponse `json:"addon_packages" description:"加油包列表（按priority排序）"` + Total PackageUsageTotalInfo `json:"total" description:"总计流量信息"` +} + +// PackageUsageDailyRecordResponse 套餐流量日记录响应 +type PackageUsageDailyRecordResponse struct { + Date string `json:"date" description:"日期"` + DailyUsageMB int `json:"daily_usage_mb" description:"当日流量使用量(MB)"` + CumulativeUsageMB int64 `json:"cumulative_usage_mb" description:"截止当日的累计流量(MB)"` +} + +// PackageUsageDetailResponse 套餐流量详单响应 +type PackageUsageDetailResponse struct { + PackageUsageID uint `json:"package_usage_id" description:"套餐使用记录ID"` + PackageName string `json:"package_name" description:"套餐名称"` + Records []PackageUsageDailyRecordResponse `json:"records" description:"流量日记录列表"` + TotalUsageMB int64 `json:"total_usage_mb" description:"总使用流量(MB)"` +} diff --git a/internal/model/iot_card.go b/internal/model/iot_card.go index 8984bc6..b773080 100644 --- a/internal/model/iot_card.go +++ b/internal/model/iot_card.go @@ -44,6 +44,12 @@ type IotCard struct { AccumulatedRecharge int64 `gorm:"column:accumulated_recharge;type:bigint;default:0;comment:累计充值金额(分,废弃,使用按系列追踪)" json:"accumulated_recharge"` AccumulatedRechargeBySeriesJSON string `gorm:"column:accumulated_recharge_by_series;type:jsonb;default:'{}';comment:按套餐系列追踪的累计充值金额" json:"-"` FirstRechargeTriggeredBySeriesJSON string `gorm:"column:first_recharge_triggered_by_series;type:jsonb;default:'{}';comment:按套餐系列追踪的首充触发状态" json:"-"` + + // 任务 24.1: 停复机相关字段 + FirstRealnameAt *time.Time `gorm:"column:first_realname_at;comment:首次实名时间(用于触发首次实名激活)" json:"first_realname_at,omitempty"` + StoppedAt *time.Time `gorm:"column:stopped_at;comment:停机时间" json:"stopped_at,omitempty"` + ResumedAt *time.Time `gorm:"column:resumed_at;comment:最近复机时间" json:"resumed_at,omitempty"` + StopReason string `gorm:"column:stop_reason;type:varchar(50);comment:停机原因(traffic_exhausted=流量耗尽,manual=手动停机,arrears=欠费)" json:"stop_reason,omitempty"` } // TableName 指定表名 diff --git a/internal/model/package.go b/internal/model/package.go index 1ed36e9..3160326 100644 --- a/internal/model/package.go +++ b/internal/model/package.go @@ -29,19 +29,23 @@ func (PackageSeries) TableName() string { // 只适用于 IoT 卡,支持真流量/虚流量共存机制 type Package struct { gorm.Model - BaseModel `gorm:"embedded"` - PackageCode string `gorm:"column:package_code;type:varchar(100);uniqueIndex:idx_package_code,where:deleted_at IS NULL;not null;comment:套餐编码" json:"package_code"` - PackageName string `gorm:"column:package_name;type:varchar(255);not null;comment:套餐名称" json:"package_name"` - SeriesID uint `gorm:"column:series_id;index;comment:套餐系列ID" json:"series_id"` - PackageType string `gorm:"column:package_type;type:varchar(50);not null;comment:套餐类型 formal-正式套餐 addon-附加套餐" json:"package_type"` - DurationMonths int `gorm:"column:duration_months;type:int;not null;comment:套餐时长(月数) 1-月套餐 12-年套餐" json:"duration_months"` - RealDataMB int64 `gorm:"column:real_data_mb;type:bigint;default:0;comment:真流量额度(MB)" json:"real_data_mb"` - VirtualDataMB int64 `gorm:"column:virtual_data_mb;type:bigint;default:0;comment:虚流量额度(MB,用于停机判断)" json:"virtual_data_mb"` - EnableVirtualData bool `gorm:"column:enable_virtual_data;type:boolean;default:false;not null;comment:是否启用虚流量" json:"enable_virtual_data"` - Status int `gorm:"column:status;type:int;default:1;not null;comment:状态 1-启用 2-禁用" json:"status"` - CostPrice int64 `gorm:"column:cost_price;type:bigint;default:0;comment:成本价(分为单位)" json:"cost_price"` - SuggestedRetailPrice int64 `gorm:"column:suggested_retail_price;type:bigint;default:0;comment:建议售价(分为单位)" json:"suggested_retail_price"` - ShelfStatus int `gorm:"column:shelf_status;type:int;default:2;not null;comment:上架状态 1-上架 2-下架" json:"shelf_status"` + BaseModel `gorm:"embedded"` + PackageCode string `gorm:"column:package_code;type:varchar(100);uniqueIndex:idx_package_code,where:deleted_at IS NULL;not null;comment:套餐编码" json:"package_code"` + PackageName string `gorm:"column:package_name;type:varchar(255);not null;comment:套餐名称" json:"package_name"` + SeriesID uint `gorm:"column:series_id;index;comment:套餐系列ID" json:"series_id"` + PackageType string `gorm:"column:package_type;type:varchar(50);not null;comment:套餐类型 formal-正式套餐 addon-附加套餐" json:"package_type"` + DurationMonths int `gorm:"column:duration_months;type:int;not null;comment:套餐时长(月数) 1-月套餐 12-年套餐" json:"duration_months"` + RealDataMB int64 `gorm:"column:real_data_mb;type:bigint;default:0;comment:真流量额度(MB)" json:"real_data_mb"` + VirtualDataMB int64 `gorm:"column:virtual_data_mb;type:bigint;default:0;comment:虚流量额度(MB,用于停机判断)" json:"virtual_data_mb"` + EnableVirtualData bool `gorm:"column:enable_virtual_data;type:boolean;default:false;not null;comment:是否启用虚流量" json:"enable_virtual_data"` + Status int `gorm:"column:status;type:int;default:1;not null;comment:状态 1-启用 2-禁用" json:"status"` + CostPrice int64 `gorm:"column:cost_price;type:bigint;default:0;comment:成本价(分为单位)" json:"cost_price"` + SuggestedRetailPrice int64 `gorm:"column:suggested_retail_price;type:bigint;default:0;comment:建议售价(分为单位)" json:"suggested_retail_price"` + ShelfStatus int `gorm:"column:shelf_status;type:int;default:2;not null;comment:上架状态 1-上架 2-下架" json:"shelf_status"` + CalendarType string `gorm:"column:calendar_type;type:varchar(20);default:'by_day';comment:套餐周期类型 natural_month-自然月 by_day-按天" json:"calendar_type"` + DurationDays int `gorm:"column:duration_days;type:int;comment:套餐天数(calendar_type=by_day时必填)" json:"duration_days"` + DataResetCycle string `gorm:"column:data_reset_cycle;type:varchar(20);default:'monthly';comment:流量重置周期 daily-每日 monthly-每月 yearly-每年 none-不重置" json:"data_reset_cycle"` + EnableRealnameActivation bool `gorm:"column:enable_realname_activation;type:boolean;default:true;comment:是否启用实名激活 true-需实名后激活 false-立即激活" json:"enable_realname_activation"` } // TableName 指定表名 @@ -53,20 +57,27 @@ func (Package) TableName() string { // 跟踪单卡套餐和设备级套餐的流量使用 type PackageUsage struct { gorm.Model - BaseModel `gorm:"embedded"` - OrderID uint `gorm:"column:order_id;index;not null;comment:订单ID" json:"order_id"` - PackageID uint `gorm:"column:package_id;index;not null;comment:套餐ID" json:"package_id"` - UsageType string `gorm:"column:usage_type;type:varchar(20);not null;comment:使用类型 single_card-单卡套餐 device-设备级套餐" json:"usage_type"` - IotCardID uint `gorm:"column:iot_card_id;index;comment:IoT卡ID(单卡套餐时有值)" json:"iot_card_id"` - DeviceID uint `gorm:"column:device_id;index;comment:设备ID(设备级套餐时有值)" json:"device_id"` - DataLimitMB int64 `gorm:"column:data_limit_mb;type:bigint;not null;comment:流量限额(MB)" json:"data_limit_mb"` - DataUsageMB int64 `gorm:"column:data_usage_mb;type:bigint;default:0;comment:已使用流量(MB)" json:"data_usage_mb"` - RealDataUsageMB int64 `gorm:"column:real_data_usage_mb;type:bigint;default:0;comment:真流量使用(MB)" json:"real_data_usage_mb"` - VirtualDataUsageMB int64 `gorm:"column:virtual_data_usage_mb;type:bigint;default:0;comment:虚流量使用(MB)" json:"virtual_data_usage_mb"` - ActivatedAt time.Time `gorm:"column:activated_at;not null;comment:套餐生效时间" json:"activated_at"` - ExpiresAt time.Time `gorm:"column:expires_at;not null;comment:套餐过期时间" json:"expires_at"` - Status int `gorm:"column:status;type:int;default:1;not null;comment:状态 1-生效中 2-已用完 3-已过期" json:"status"` - LastPackageCheckAt *time.Time `gorm:"column:last_package_check_at;comment:最后一次套餐流量检查时间" json:"last_package_check_at"` + BaseModel `gorm:"embedded"` + OrderID uint `gorm:"column:order_id;index;not null;comment:订单ID" json:"order_id"` + PackageID uint `gorm:"column:package_id;index;not null;comment:套餐ID" json:"package_id"` + UsageType string `gorm:"column:usage_type;type:varchar(20);not null;comment:使用类型 single_card-单卡套餐 device-设备级套餐" json:"usage_type"` + IotCardID uint `gorm:"column:iot_card_id;index;comment:IoT卡ID(单卡套餐时有值)" json:"iot_card_id"` + DeviceID uint `gorm:"column:device_id;index;comment:设备ID(设备级套餐时有值)" json:"device_id"` + DataLimitMB int64 `gorm:"column:data_limit_mb;type:bigint;not null;comment:流量限额(MB)" json:"data_limit_mb"` + DataUsageMB int64 `gorm:"column:data_usage_mb;type:bigint;default:0;comment:已使用流量(MB)" json:"data_usage_mb"` + RealDataUsageMB int64 `gorm:"column:real_data_usage_mb;type:bigint;default:0;comment:真流量使用(MB)" json:"real_data_usage_mb"` + VirtualDataUsageMB int64 `gorm:"column:virtual_data_usage_mb;type:bigint;default:0;comment:虚流量使用(MB)" json:"virtual_data_usage_mb"` + ActivatedAt time.Time `gorm:"column:activated_at;not null;comment:套餐生效时间" json:"activated_at"` + ExpiresAt time.Time `gorm:"column:expires_at;not null;comment:套餐过期时间" json:"expires_at"` + Status int `gorm:"column:status;type:int;default:1;not null;comment:状态 0-待生效 1-生效中 2-已用完 3-已过期 4-已失效" json:"status"` + LastPackageCheckAt *time.Time `gorm:"column:last_package_check_at;comment:最后一次套餐流量检查时间" json:"last_package_check_at"` + Priority int `gorm:"column:priority;type:int;default:1;index:idx_package_usage_priority;comment:优先级(主套餐和加油包按此字段排队,数字越小优先级越高)" json:"priority"` + MasterUsageID *uint `gorm:"column:master_usage_id;type:bigint;index:idx_package_usage_master_usage_id;comment:主套餐使用记录ID(加油包关联主套餐,主套餐此字段为NULL)" json:"master_usage_id"` + HasIndependentExpiry bool `gorm:"column:has_independent_expiry;type:boolean;default:false;comment:加油包是否有独立有效期(true-有独立到期时间 false-跟随主套餐)" json:"has_independent_expiry"` + PendingRealnameActivation bool `gorm:"column:pending_realname_activation;type:boolean;default:false;comment:是否等待实名激活(true-待实名后激活 false-已激活或不需实名)" json:"pending_realname_activation"` + DataResetCycle string `gorm:"column:data_reset_cycle;type:varchar(20);comment:流量重置周期(从Package复制,用于历史记录)" json:"data_reset_cycle"` + LastResetAt *time.Time `gorm:"column:last_reset_at;comment:最后一次流量重置时间" json:"last_reset_at"` + NextResetAt *time.Time `gorm:"column:next_reset_at;index:idx_package_usage_next_reset_at;comment:下次流量重置时间(用于定时任务查询)" json:"next_reset_at"` } // TableName 指定表名 @@ -74,6 +85,23 @@ func (PackageUsage) TableName() string { return "tb_package_usage" } +// PackageUsageDailyRecord 套餐流量日记录模型 +// 记录每个套餐每天的流量使用情况，用于流量详单查询 +type PackageUsageDailyRecord struct { + ID uint `gorm:"column:id;primaryKey;autoIncrement" json:"id"` + PackageUsageID uint `gorm:"column:package_usage_id;not null;uniqueIndex:idx_package_usage_daily_record_unique;index:idx_package_usage_daily_record_date;comment:套餐使用记录ID" json:"package_usage_id"` + Date time.Time `gorm:"column:date;type:date;not null;uniqueIndex:idx_package_usage_daily_record_unique;comment:日期" json:"date"` + DailyUsageMB int `gorm:"column:daily_usage_mb;type:int;default:0;comment:当日流量使用量(MB)" json:"daily_usage_mb"` + CumulativeUsageMB int64 `gorm:"column:cumulative_usage_mb;type:bigint;default:0;comment:截止当日的累计流量(MB)" json:"cumulative_usage_mb"` + CreatedAt time.Time `gorm:"column:created_at;default:CURRENT_TIMESTAMP" json:"created_at"` + UpdatedAt time.Time `gorm:"column:updated_at;default:CURRENT_TIMESTAMP" json:"updated_at"` +} + +// TableName 指定表名 +func (PackageUsageDailyRecord) TableName() string { + return "tb_package_usage_daily_record" +} + // OneTimeCommissionConfig 一次性佣金规则配置 type OneTimeCommissionConfig struct { Enable bool `json:"enable"` diff --git a/internal/polling/data_reset_handler.go b/internal/polling/data_reset_handler.go new file mode 100644 index 0000000..33e0400 --- /dev/null +++ b/internal/polling/data_reset_handler.go @@ -0,0 +1,116 @@ +package polling + +import ( + "context" + "time" + + "go.uber.org/zap" + + packagepkg "github.com/break/junhong_cmp_fiber/internal/service/package" +) + +// DataResetHandler 流量重置调度处理器 +// 任务 20: 定期检查需要重置的套餐并调用 ResetService 执行重置 +type DataResetHandler struct { + resetService *packagepkg.ResetService + logger *zap.Logger + + // 上次执行时间（用于限流，避免重复执行） + lastDailyReset time.Time + lastMonthlyReset time.Time + lastYearlyReset time.Time +} + +// NewDataResetHandler 创建流量重置调度处理器 +func NewDataResetHandler( + resetService *packagepkg.ResetService, + logger *zap.Logger, +) *DataResetHandler { + return &DataResetHandler{ + resetService: resetService, + logger: logger, + } +} + +// HandleDataReset 任务 20.2: 处理流量重置调度 +// 每 10 秒被 Scheduler 调用一次，检查是否需要执行日/月/年重置 +func (h *DataResetHandler) HandleDataReset(ctx context.Context) error { + now := time.Now() + + // 任务 20.3: 日重置调度（每分钟检查一次，避免频繁查询数据库） + if now.Sub(h.lastDailyReset) >= time.Minute { + if err := h.processDailyReset(ctx); err != nil { + h.logger.Warn("日重置调度失败", zap.Error(err)) + } + h.lastDailyReset = now + } + + // 任务 20.4: 月重置调度（每分钟检查一次） + if now.Sub(h.lastMonthlyReset) >= time.Minute { + if err := h.processMonthlyReset(ctx); err != nil { + h.logger.Warn("月重置调度失败", zap.Error(err)) + } + h.lastMonthlyReset = now + } + + // 任务 20.5: 年重置调度（每分钟检查一次） + if now.Sub(h.lastYearlyReset) >= time.Minute { + if err := h.processYearlyReset(ctx); err != nil { + h.logger.Warn("年重置调度失败", zap.Error(err)) + } + h.lastYearlyReset = now + } + + return nil +} + +// processDailyReset 任务 20.3: 日重置调度 +func (h *DataResetHandler) processDailyReset(ctx context.Context) error { + if h.resetService == nil { + return nil + } + + startTime := time.Now() + if err := h.resetService.ResetDailyUsage(ctx); err != nil { + return err + } + + h.logger.Info("日重置调度完成", + zap.Duration("duration", time.Since(startTime))) + + return nil +} + +// processMonthlyReset 任务 20.4: 月重置调度 +func (h *DataResetHandler) processMonthlyReset(ctx context.Context) error { + if h.resetService == nil { + return nil + } + + startTime := time.Now() + if err := h.resetService.ResetMonthlyUsage(ctx); err != nil { + return err + } + + h.logger.Info("月重置调度完成", + zap.Duration("duration", time.Since(startTime))) + + return nil +} + +// processYearlyReset 任务 20.5: 年重置调度 +func (h *DataResetHandler) processYearlyReset(ctx context.Context) error { + if h.resetService == nil { + return nil + } + + startTime := time.Now() + if err := h.resetService.ResetYearlyUsage(ctx); err != nil { + return err + } + + h.logger.Info("年重置调度完成", + zap.Duration("duration", time.Since(startTime))) + + return nil +} diff --git a/internal/polling/package_activation_handler.go b/internal/polling/package_activation_handler.go new file mode 100644 index 0000000..8e83a36 --- /dev/null +++ b/internal/polling/package_activation_handler.go @@ -0,0 +1,368 @@ +package polling + +import ( + "context" + "time" + + "github.com/bytedance/sonic" + "github.com/hibiken/asynq" + "github.com/redis/go-redis/v9" + "go.uber.org/zap" + "gorm.io/gorm" + + "github.com/break/junhong_cmp_fiber/internal/model" + packagepkg "github.com/break/junhong_cmp_fiber/internal/service/package" + "github.com/break/junhong_cmp_fiber/internal/store/postgres" + "github.com/break/junhong_cmp_fiber/pkg/constants" +) + +// PackageActivationHandler 套餐激活检查处理器 +// 任务 19: 处理主套餐过期、加油包级联失效、待生效主套餐激活 +type PackageActivationHandler struct { + db *gorm.DB + redis *redis.Client + queueClient *asynq.Client + packageUsageStore *postgres.PackageUsageStore + activationService *packagepkg.ActivationService + logger *zap.Logger +} + +// PackageActivationPayload 套餐激活任务载荷 +type PackageActivationPayload struct { + PackageUsageID uint `json:"package_usage_id"` + CarrierType string `json:"carrier_type"` // "iot_card" 或 "device" + CarrierID uint `json:"carrier_id"` + ActivationType string `json:"activation_type"` // "queue" 或 "realname" + Timestamp int64 `json:"timestamp"` +} + +// NewPackageActivationHandler 创建套餐激活检查处理器 +func NewPackageActivationHandler( + db *gorm.DB, + redis *redis.Client, + queueClient *asynq.Client, + activationService *packagepkg.ActivationService, + logger *zap.Logger, +) *PackageActivationHandler { + return &PackageActivationHandler{ + db: db, + redis: redis, + queueClient: queueClient, + packageUsageStore: postgres.NewPackageUsageStore(db, redis), + activationService: activationService, + logger: logger, + } +} + +// HandlePackageActivationCheck 任务 19.2-19.5: 处理套餐激活检查 +// 每 10 秒调度一次，检查过期主套餐并激活下一个待生效主套餐 +func (h *PackageActivationHandler) HandlePackageActivationCheck(ctx context.Context) error { + startTime := time.Now() + + // 任务 19.2: 查询已过期的主套餐（status=1 AND expires_at <= NOW） + expiredPackages, err := h.findExpiredMainPackages(ctx) + if err != nil { + h.logger.Error("查询过期主套餐失败", zap.Error(err)) + return err + } + + if len(expiredPackages) == 0 { + return nil + } + + h.logger.Info("发现过期主套餐", + zap.Int("count", len(expiredPackages)), + zap.Duration("check_duration", time.Since(startTime))) + + // 处理每个过期的主套餐 + for _, pkg := range expiredPackages { + if err := h.processExpiredPackage(ctx, pkg); err != nil { + h.logger.Error("处理过期套餐失败", + zap.Uint("package_usage_id", pkg.ID), + zap.Error(err)) + // 继续处理下一个，不中断 + continue + } + } + + h.logger.Info("套餐激活检查完成", + zap.Int("processed", len(expiredPackages)), + zap.Duration("total_duration", time.Since(startTime))) + + return nil +} + +// findExpiredMainPackages 任务 19.2: 查询已过期的主套餐 +func (h *PackageActivationHandler) findExpiredMainPackages(ctx context.Context) ([]*model.PackageUsage, error) { + var packages []*model.PackageUsage + now := time.Now() + + // 查询 status=1 (生效中) AND expires_at <= NOW AND master_usage_id IS NULL (主套餐) + err := h.db.WithContext(ctx). + Where("status = ?", constants.PackageUsageStatusActive). + Where("expires_at <= ?", now). + Where("master_usage_id IS NULL"). // 主套餐没有 master_usage_id + Limit(1000). // 每次最多处理 1000 个，避免长事务 + Find(&packages).Error + + return packages, err +} + +// processExpiredPackage 处理单个过期套餐 +func (h *PackageActivationHandler) processExpiredPackage(ctx context.Context, pkg *model.PackageUsage) error { + return h.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error { + // 任务 19.3: 更新过期主套餐状态为 Expired (status=3) + if err := tx.Model(pkg).Update("status", constants.PackageUsageStatusExpired).Error; err != nil { + return err + } + + h.logger.Info("主套餐已过期", + zap.Uint("package_usage_id", pkg.ID), + zap.Time("expires_at", pkg.ExpiresAt)) + + // 任务 19.4: 加油包级联失效 + if err := h.invalidateAddons(ctx, tx, pkg.ID); err != nil { + h.logger.Warn("加油包级联失效失败", + zap.Uint("master_usage_id", pkg.ID), + zap.Error(err)) + // 不返回错误，继续处理 + } + + // 任务 19.5: 查询并激活下一个待生效主套餐 + carrierType, carrierID := h.getCarrierInfo(pkg) + if carrierType != "" && carrierID > 0 { + if err := h.activateNextPackage(ctx, tx, carrierType, carrierID); err != nil { + h.logger.Warn("激活下一个待生效套餐失败", + zap.String("carrier_type", carrierType), + zap.Uint("carrier_id", carrierID), + zap.Error(err)) + // 不返回错误，继续处理 + } + } + + return nil + }) +} + +// invalidateAddons 任务 19.4: 加油包级联失效 +func (h *PackageActivationHandler) invalidateAddons(ctx context.Context, tx *gorm.DB, masterUsageID uint) error { + // 查询主套餐下的所有加油包（status IN (0,1,2) 的加油包） + result := tx.Model(&model.PackageUsage{}). + Where("master_usage_id = ?", masterUsageID). + Where("status IN ?", []int{ + constants.PackageUsageStatusPending, + constants.PackageUsageStatusActive, + constants.PackageUsageStatusDepleted, + }). + Update("status", constants.PackageUsageStatusInvalidated) + + if result.Error != nil { + return result.Error + } + + if result.RowsAffected > 0 { + h.logger.Info("加油包已级联失效", + zap.Uint("master_usage_id", masterUsageID), + zap.Int64("invalidated_count", result.RowsAffected)) + } + + return nil +} + +// getCarrierInfo 获取载体信息 +func (h *PackageActivationHandler) getCarrierInfo(pkg *model.PackageUsage) (string, uint) { + if pkg.IotCardID > 0 { + return "iot_card", pkg.IotCardID + } + if pkg.DeviceID > 0 { + return "device", pkg.DeviceID + } + return "", 0 +} + +// activateNextPackage 任务 19.5: 激活下一个待生效主套餐 +func (h *PackageActivationHandler) activateNextPackage(ctx context.Context, tx *gorm.DB, carrierType string, carrierID uint) error { + // 查询下一个待生效主套餐 + // WHERE status=0 AND master_usage_id IS NULL ORDER BY priority ASC LIMIT 1 + var nextPkg model.PackageUsage + query := tx.Where("status = ?", constants.PackageUsageStatusPending). + Where("master_usage_id IS NULL"). // 主套餐 + Order("priority ASC"). + Limit(1) + + if carrierType == "iot_card" { + query = query.Where("iot_card_id = ?", carrierID) + } else if carrierType == "device" { + query = query.Where("device_id = ?", carrierID) + } + + if err := query.First(&nextPkg).Error; err != nil { + if err == gorm.ErrRecordNotFound { + // 没有待生效套餐，正常情况 + return nil + } + return err + } + + // 提交 Asynq 任务进行激活（避免长事务） + return h.enqueueActivationTask(ctx, nextPkg.ID, carrierType, carrierID, "queue") +} + +// enqueueActivationTask 提交套餐激活任务到 Asynq +func (h *PackageActivationHandler) enqueueActivationTask(ctx context.Context, packageUsageID uint, carrierType string, carrierID uint, activationType string) error { + payload := PackageActivationPayload{ + PackageUsageID: packageUsageID, + CarrierType: carrierType, + CarrierID: carrierID, + ActivationType: activationType, + Timestamp: time.Now().Unix(), + } + + payloadBytes, err := sonic.Marshal(payload) + if err != nil { + return err + } + + task := asynq.NewTask(constants.TaskTypePackageQueueActivation, payloadBytes, + asynq.MaxRetry(3), + asynq.Timeout(30*time.Second), + asynq.Queue(constants.QueueDefault), + ) + + _, err = h.queueClient.Enqueue(task) + if err != nil { + h.logger.Error("提交套餐激活任务失败", + zap.Uint("package_usage_id", packageUsageID), + zap.Error(err)) + return err + } + + h.logger.Info("已提交套餐激活任务", + zap.Uint("package_usage_id", packageUsageID), + zap.String("activation_type", activationType)) + + return nil +} + +// HandlePackageQueueActivation 处理套餐排队激活任务（Asynq Handler） +// 任务 23: 由 Asynq 调用，执行实际的套餐激活逻辑 +func (h *PackageActivationHandler) HandlePackageQueueActivation(ctx context.Context, t *asynq.Task) error { + var payload PackageActivationPayload + if err := sonic.Unmarshal(t.Payload(), &payload); err != nil { + h.logger.Error("解析套餐激活任务载荷失败", zap.Error(err)) + return nil // 不重试 + } + + h.logger.Info("开始执行套餐激活", + zap.Uint("package_usage_id", payload.PackageUsageID), + zap.String("activation_type", payload.ActivationType)) + + // 查询套餐使用记录 + var pkg model.PackageUsage + if err := h.db.First(&pkg, payload.PackageUsageID).Error; err != nil { + if err == gorm.ErrRecordNotFound { + h.logger.Warn("套餐使用记录不存在", zap.Uint("package_usage_id", payload.PackageUsageID)) + return nil + } + return err + } + + // 幂等性检查：如果已经是生效状态，跳过 + if pkg.Status == constants.PackageUsageStatusActive { + h.logger.Info("套餐已激活，跳过", + zap.Uint("package_usage_id", payload.PackageUsageID)) + return nil + } + + // 调用 ActivationService 执行激活 + if h.activationService != nil { + if err := h.activationService.ActivateQueuedPackage(ctx, payload.CarrierType, payload.CarrierID); err != nil { + h.logger.Error("套餐激活失败", + zap.Uint("package_usage_id", payload.PackageUsageID), + zap.String("carrier_type", payload.CarrierType), + zap.Uint("carrier_id", payload.CarrierID), + zap.Error(err)) + return err + } + } else { + // ActivationService 未注入，直接更新状态 + now := time.Now() + if err := h.db.Model(&pkg).Updates(map[string]interface{}{ + "status": constants.PackageUsageStatusActive, + "activated_at": now, + }).Error; err != nil { + return err + } + } + + h.logger.Info("套餐激活成功", + zap.Uint("package_usage_id", payload.PackageUsageID)) + + return nil +} + +// HandlePackageFirstActivation 处理首次实名激活任务（Asynq Handler） +// 任务 22: 由 Asynq 调用，执行首次实名后的套餐激活 +func (h *PackageActivationHandler) HandlePackageFirstActivation(ctx context.Context, t *asynq.Task) error { + var payload PackageActivationPayload + if err := sonic.Unmarshal(t.Payload(), &payload); err != nil { + h.logger.Error("解析首次实名激活任务载荷失败", zap.Error(err)) + return nil // 不重试 + } + + h.logger.Info("开始执行首次实名激活", + zap.Uint("package_usage_id", payload.PackageUsageID), + zap.String("carrier_type", payload.CarrierType), + zap.Uint("carrier_id", payload.CarrierID)) + + // 任务 22.4: 幂等性检查 + var pkg model.PackageUsage + if err := h.db.First(&pkg, payload.PackageUsageID).Error; err != nil { + if err == gorm.ErrRecordNotFound { + h.logger.Warn("套餐使用记录不存在", zap.Uint("package_usage_id", payload.PackageUsageID)) + return nil + } + return err + } + + // 检查 pending_realname_activation 是否已为 false（已处理过） + if !pkg.PendingRealnameActivation { + h.logger.Info("套餐已处理过首次实名激活，跳过", + zap.Uint("package_usage_id", payload.PackageUsageID)) + return nil + } + + // 如果已经是生效状态，跳过 + if pkg.Status == constants.PackageUsageStatusActive { + h.logger.Info("套餐已激活，跳过", + zap.Uint("package_usage_id", payload.PackageUsageID)) + return nil + } + + // 任务 22.3: 调用 ActivationService.ActivateByRealname 激活套餐 + if h.activationService != nil { + if err := h.activationService.ActivateByRealname(ctx, payload.CarrierType, payload.CarrierID); err != nil { + h.logger.Error("首次实名激活失败", + zap.Uint("package_usage_id", payload.PackageUsageID), + zap.String("carrier_type", payload.CarrierType), + zap.Uint("carrier_id", payload.CarrierID), + zap.Error(err)) + return err + } + } else { + // ActivationService 未注入，直接更新状态（备用逻辑） + now := time.Now() + if err := h.db.Model(&pkg).Updates(map[string]any{ + "status": constants.PackageUsageStatusActive, + "activated_at": now, + "pending_realname_activation": false, + }).Error; err != nil { + return err + } + } + + h.logger.Info("首次实名激活成功", + zap.Uint("package_usage_id", payload.PackageUsageID)) + + return nil +} diff --git a/internal/polling/scheduler.go b/internal/polling/scheduler.go index dae43fb..14f2260 100644 --- a/internal/polling/scheduler.go +++ b/internal/polling/scheduler.go @@ -28,6 +28,11 @@ type Scheduler struct { iotCardStore *postgres.IotCardStore concurrencyStore *postgres.PollingConcurrencyConfigStore + // 任务 19: 套餐激活检查处理器 + packageActivationHandler *PackageActivationHandler + // 任务 20: 流量重置调度处理器 + dataResetHandler *DataResetHandler + // 配置缓存 configCache []*model.PollingConfig configCacheLock sync.RWMutex @@ -87,13 +92,15 @@ func NewScheduler( logger *zap.Logger, ) *Scheduler { return &Scheduler{ - db: db, - redis: redisClient, - queueClient: queueClient, - logger: logger, - configStore: postgres.NewPollingConfigStore(db), - iotCardStore: postgres.NewIotCardStore(db, redisClient), - concurrencyStore: postgres.NewPollingConcurrencyConfigStore(db), + db: db, + redis: redisClient, + queueClient: queueClient, + logger: logger, + configStore: postgres.NewPollingConfigStore(db), + iotCardStore: postgres.NewIotCardStore(db, redisClient), + concurrencyStore: postgres.NewPollingConcurrencyConfigStore(db), + packageActivationHandler: NewPackageActivationHandler(db, redisClient, queueClient, nil, logger), + dataResetHandler: NewDataResetHandler(nil, logger), // ResetService 需要通过 SetResetService 注入 initProgress: &InitProgress{ Status: "pending", }, @@ -241,6 +248,20 @@ func (s *Scheduler) processSchedule(ctx context.Context) { s.processTimedQueue(ctx, constants.RedisPollingQueueRealnameKey(), constants.TaskTypePollingRealname, now) s.processTimedQueue(ctx, constants.RedisPollingQueueCarddataKey(), constants.TaskTypePollingCarddata, now) s.processTimedQueue(ctx, constants.RedisPollingQueuePackageKey(), constants.TaskTypePollingPackage, now) + + // 任务 19.6: 套餐激活检查（每次调度都执行，内部会限流） + if s.packageActivationHandler != nil { + if err := s.packageActivationHandler.HandlePackageActivationCheck(ctx); err != nil { + s.logger.Warn("套餐激活检查失败", zap.Error(err)) + } + } + + // 任务 20.6: 流量重置调度（每次调度都执行，内部会限流） + if s.dataResetHandler != nil { + if err := s.dataResetHandler.HandleDataReset(ctx); err != nil { + s.logger.Warn("流量重置调度失败", zap.Error(err)) + } + } } // processManualQueue 处理手动触发队列 @@ -709,3 +730,15 @@ func (s *Scheduler) IsInitCompleted() bool { func (s *Scheduler) RefreshConfigs(ctx context.Context) error { return s.loadConfigs(ctx) } + +// SetResetService 设置流量重置服务（用于依赖注入） +func (s *Scheduler) SetResetService(resetService interface{}) { + if rs, ok := resetService.(*DataResetHandler); ok { + s.dataResetHandler = rs + } +} + +// SetActivationService 设置套餐激活服务（用于依赖注入） +func (s *Scheduler) SetActivationService(activationHandler *PackageActivationHandler) { + s.packageActivationHandler = activationHandler +} diff --git a/internal/routes/admin.go b/internal/routes/admin.go index 77a7fc7..c911220 100644 --- a/internal/routes/admin.go +++ b/internal/routes/admin.go @@ -74,6 +74,9 @@ func RegisterAdminRoutes(router fiber.Router, handlers *bootstrap.Handlers, midd if handlers.Package != nil { registerPackageRoutes(authGroup, handlers.Package, doc, basePath) } + if handlers.PackageUsage != nil { + registerPackageUsageRoutes(authGroup, handlers.PackageUsage, doc, basePath) + } if handlers.ShopSeriesAllocation != nil { registerShopSeriesAllocationRoutes(authGroup, handlers.ShopSeriesAllocation, doc, basePath) } diff --git a/internal/routes/h5.go b/internal/routes/h5.go index 62d26f8..1daa585 100644 --- a/internal/routes/h5.go +++ b/internal/routes/h5.go @@ -21,4 +21,7 @@ func RegisterH5Routes(router fiber.Router, handlers *bootstrap.Handlers, middlew if handlers.EnterpriseDeviceH5 != nil { registerH5EnterpriseDeviceRoutes(authGroup, handlers.EnterpriseDeviceH5, doc, basePath) } + if handlers.H5PackageUsage != nil { + registerH5PackageUsageRoutes(authGroup, handlers.H5PackageUsage, doc, basePath) + } } diff --git a/internal/routes/h5_package_usage.go b/internal/routes/h5_package_usage.go new file mode 100644 index 0000000..df9b600 --- /dev/null +++ b/internal/routes/h5_package_usage.go @@ -0,0 +1,23 @@ +package routes + +import ( + "github.com/gofiber/fiber/v2" + + "github.com/break/junhong_cmp_fiber/internal/handler/h5" + "github.com/break/junhong_cmp_fiber/internal/model/dto" + "github.com/break/junhong_cmp_fiber/pkg/openapi" +) + +// registerH5PackageUsageRoutes 注册 H5 端套餐使用情况路由 +func registerH5PackageUsageRoutes(router fiber.Router, handler *h5.PackageUsageHandler, doc *openapi.Generator, basePath string) { + packages := router.Group("/packages") + groupPath := basePath + "/packages" + + Register(packages, doc, groupPath, "GET", "/my-usage", handler.GetMyUsage, RouteSpec{ + Summary: "获取我的套餐使用情况", + Tags: []string{"H5-套餐"}, + Input: nil, + Output: new(dto.PackageUsageCustomerViewResponse), + Auth: true, + }) +} diff --git a/internal/routes/package_usage.go b/internal/routes/package_usage.go new file mode 100644 index 0000000..3a9e7b2 --- /dev/null +++ b/internal/routes/package_usage.go @@ -0,0 +1,23 @@ +package routes + +import ( + "github.com/gofiber/fiber/v2" + + "github.com/break/junhong_cmp_fiber/internal/handler/admin" + "github.com/break/junhong_cmp_fiber/internal/model/dto" + "github.com/break/junhong_cmp_fiber/pkg/openapi" +) + +// registerPackageUsageRoutes 注册套餐使用记录相关路由 +func registerPackageUsageRoutes(router fiber.Router, handler *admin.PackageUsageHandler, doc *openapi.Generator, basePath string) { + packageUsage := router.Group("/package-usage") + groupPath := basePath + "/package-usage" + + Register(packageUsage, doc, groupPath, "GET", "/:id/daily-records", handler.GetDailyRecords, RouteSpec{ + Summary: "获取套餐流量详单", + Tags: []string{"套餐使用记录"}, + Input: new(dto.IDReq), + Output: new(dto.PackageUsageDetailResponse), + Auth: true, + }) +} diff --git a/internal/service/account/role_resolver_test.go b/internal/service/account/role_resolver_test.go deleted file mode 100644 index c94f9e7..0000000 --- a/internal/service/account/role_resolver_test.go +++ /dev/null @@ -1,211 +0,0 @@ -package account - -import ( - "context" - "testing" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/internal/store/postgres" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/tests/testutils" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -func TestGetRoleIDsForAccount(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - shopRoleStore := postgres.NewShopRoleStore(tx, rdb) - - service := New( - accountStore, - roleStore, - accountRoleStore, - shopRoleStore, - nil, - nil, - nil, - ) - - ctx := context.Background() - - t.Run("超级管理员返回空数组", func(t *testing.T) { - account := &model.Account{ - Username: "admin_roletest", - Phone: "13800010001", - Password: "hashed", - UserType: constants.UserTypeSuperAdmin, - Status: constants.StatusEnabled, - } - require.NoError(t, accountStore.Create(ctx, account)) - - roleIDs, err := service.GetRoleIDsForAccount(ctx, account.ID) - require.NoError(t, err) - assert.Empty(t, roleIDs) - }) - - t.Run("平台用户返回账号级角色", func(t *testing.T) { - account := &model.Account{ - Username: "platform_roletest", - Phone: "13800010002", - Password: "hashed", - UserType: constants.UserTypePlatform, - Status: constants.StatusEnabled, - } - require.NoError(t, accountStore.Create(ctx, account)) - - role := &model.Role{ - RoleName: "平台管理员", - RoleType: constants.RoleTypePlatform, - Status: constants.StatusEnabled, - } - require.NoError(t, roleStore.Create(ctx, role)) - - accountRole := &model.AccountRole{ - AccountID: account.ID, - RoleID: role.ID, - Status: constants.StatusEnabled, - Creator: 1, - Updater: 1, - } - require.NoError(t, accountRoleStore.Create(ctx, accountRole)) - - roleIDs, err := service.GetRoleIDsForAccount(ctx, account.ID) - require.NoError(t, err) - assert.Equal(t, []uint{role.ID}, roleIDs) - }) - - t.Run("代理账号有账号级角色，不继承店铺角色", func(t *testing.T) { - shopID := uint(1) - account := &model.Account{ - Username: "agent_with_roletest", - Phone: "13800010003", - Password: "hashed", - UserType: constants.UserTypeAgent, - ShopID: &shopID, - Status: constants.StatusEnabled, - } - require.NoError(t, accountStore.Create(ctx, account)) - - accountRole := &model.Role{ - RoleName: "账号角色", - RoleType: constants.RoleTypeCustomer, - Status: constants.StatusEnabled, - } - require.NoError(t, roleStore.Create(ctx, accountRole)) - - shopRole := &model.Role{ - RoleName: "店铺角色", - RoleType: constants.RoleTypeCustomer, - Status: constants.StatusEnabled, - } - require.NoError(t, roleStore.Create(ctx, shopRole)) - - require.NoError(t, accountRoleStore.Create(ctx, &model.AccountRole{ - AccountID: account.ID, - RoleID: accountRole.ID, - Status: constants.StatusEnabled, - Creator: 1, - Updater: 1, - })) - - require.NoError(t, shopRoleStore.Create(ctx, &model.ShopRole{ - ShopID: shopID, - RoleID: shopRole.ID, - Status: constants.StatusEnabled, - Creator: 1, - Updater: 1, - })) - - roleIDs, err := service.GetRoleIDsForAccount(ctx, account.ID) - require.NoError(t, err) - assert.Equal(t, []uint{accountRole.ID}, roleIDs) - }) - - t.Run("代理账号无账号级角色，继承店铺角色", func(t *testing.T) { - shopID := uint(2) - account := &model.Account{ - Username: "agent_inheritest", - Phone: "13800010004", - Password: "hashed", - UserType: constants.UserTypeAgent, - ShopID: &shopID, - Status: constants.StatusEnabled, - } - require.NoError(t, accountStore.Create(ctx, account)) - - shopRole := &model.Role{ - RoleName: "店铺默认角色", - RoleType: constants.RoleTypeCustomer, - Status: constants.StatusEnabled, - } - require.NoError(t, roleStore.Create(ctx, shopRole)) - - require.NoError(t, shopRoleStore.Create(ctx, &model.ShopRole{ - ShopID: shopID, - RoleID: shopRole.ID, - Status: constants.StatusEnabled, - Creator: 1, - Updater: 1, - })) - - roleIDs, err := service.GetRoleIDsForAccount(ctx, account.ID) - require.NoError(t, err) - assert.Equal(t, []uint{shopRole.ID}, roleIDs) - }) - - t.Run("代理账号无角色且店铺无角色，返回空数组", func(t *testing.T) { - shopID := uint(3) - account := &model.Account{ - Username: "agent_notest", - Phone: "13800010005", - Password: "hashed", - UserType: constants.UserTypeAgent, - ShopID: &shopID, - Status: constants.StatusEnabled, - } - require.NoError(t, accountStore.Create(ctx, account)) - - roleIDs, err := service.GetRoleIDsForAccount(ctx, account.ID) - require.NoError(t, err) - assert.Empty(t, roleIDs) - }) - - t.Run("企业账号返回账号级角色", func(t *testing.T) { - enterpriseID := uint(1) - account := &model.Account{ - Username: "enterprise_roletest", - Phone: "13800010006", - Password: "hashed", - UserType: constants.UserTypeEnterprise, - EnterpriseID: &enterpriseID, - Status: constants.StatusEnabled, - } - require.NoError(t, accountStore.Create(ctx, account)) - - role := &model.Role{ - RoleName: "企业管理员", - RoleType: constants.RoleTypeCustomer, - Status: constants.StatusEnabled, - } - require.NoError(t, roleStore.Create(ctx, role)) - - accountRole := &model.AccountRole{ - AccountID: account.ID, - RoleID: role.ID, - Status: constants.StatusEnabled, - Creator: 1, - Updater: 1, - } - require.NoError(t, accountRoleStore.Create(ctx, accountRole)) - - roleIDs, err := service.GetRoleIDsForAccount(ctx, account.ID) - require.NoError(t, err) - assert.Equal(t, []uint{role.ID}, roleIDs) - }) -} diff --git a/internal/service/account/service_test.go b/internal/service/account/service_test.go deleted file mode 100644 index 63f6791..0000000 --- a/internal/service/account/service_test.go +++ /dev/null @@ -1,3656 +0,0 @@ -package account - -import ( - "context" - "testing" - "time" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/internal/model/dto" - "github.com/break/junhong_cmp_fiber/internal/store/postgres" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/pkg/errors" - "github.com/break/junhong_cmp_fiber/pkg/middleware" - "github.com/break/junhong_cmp_fiber/tests/testutils" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/mock" - "github.com/stretchr/testify/require" -) - -type MockAuditService struct { - mock.Mock -} - -func (m *MockAuditService) LogOperation(ctx context.Context, log *model.AccountOperationLog) { - m.Called(ctx, log) -} - -type MockShopStore struct { - mock.Mock -} - -func (m *MockShopStore) GetByID(ctx context.Context, id uint) (*model.Shop, error) { - args := m.Called(ctx, id) - if args.Get(0) == nil { - return nil, args.Error(1) - } - return args.Get(0).(*model.Shop), args.Error(1) -} - -func (m *MockShopStore) GetByIDs(ctx context.Context, ids []uint) ([]*model.Shop, error) { - args := m.Called(ctx, ids) - if args.Get(0) == nil { - return nil, args.Error(1) - } - return args.Get(0).([]*model.Shop), args.Error(1) -} - -func (m *MockShopStore) GetSubordinateShopIDs(ctx context.Context, shopID uint) ([]uint, error) { - args := m.Called(ctx, shopID) - if args.Get(0) == nil { - return nil, args.Error(1) - } - return args.Get(0).([]uint), args.Error(1) -} - -type MockEnterpriseStore struct { - mock.Mock -} - -func (m *MockEnterpriseStore) GetByID(ctx context.Context, id uint) (*model.Enterprise, error) { - args := m.Called(ctx, id) - if args.Get(0) == nil { - return nil, args.Error(1) - } - return args.Get(0).(*model.Enterprise), args.Error(1) -} - -func (m *MockEnterpriseStore) GetByIDs(ctx context.Context, ids []uint) ([]*model.Enterprise, error) { - args := m.Called(ctx, ids) - if args.Get(0) == nil { - return nil, args.Error(1) - } - return args.Get(0).([]*model.Enterprise), args.Error(1) -} - -func TestAccountService_Create_SuperAdminSuccess(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - username := "test_super_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - resp, err := svc.Create(ctx, req) - require.NoError(t, err) - assert.NotZero(t, resp.ID) - assert.Equal(t, username, resp.Username) - assert.Equal(t, phone, resp.Phone) - assert.Equal(t, constants.UserTypePlatform, resp.UserType) - assert.Equal(t, constants.StatusEnabled, resp.Status) - - mockAudit.AssertCalled(t, "LogOperation", mock.Anything, mock.Anything) -} - -func TestAccountService_Create_PlatformUserCreatePlatformAccount(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypePlatform, - }) - - username := "test_platform_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - resp, err := svc.Create(ctx, req) - require.NoError(t, err) - assert.NotZero(t, resp.ID) - assert.Equal(t, username, resp.Username) - - mockAudit.AssertCalled(t, "LogOperation", mock.Anything, mock.Anything) -} - -func TestAccountService_Create_PlatformUserCreateAgentAccount(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypePlatform, - }) - - shopID := uint(1) - username := "test_agent_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypeAgent, - ShopID: &shopID, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - resp, err := svc.Create(ctx, req) - require.NoError(t, err) - assert.NotZero(t, resp.ID) - assert.Equal(t, constants.UserTypeAgent, resp.UserType) - assert.Equal(t, &shopID, resp.ShopID) - - mockAudit.AssertCalled(t, "LogOperation", mock.Anything, mock.Anything) -} - -func TestAccountService_Create_AgentCreateSubordinateShopAccount(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - agentShopID := uint(10) - subordinateShopID := uint(11) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeAgent, - ShopID: agentShopID, - }) - - username := "test_sub_agent_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypeAgent, - ShopID: &subordinateShopID, - } - - mockShop.On("GetSubordinateShopIDs", mock.Anything, agentShopID).Return([]uint{agentShopID, subordinateShopID}, nil) - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - resp, err := svc.Create(ctx, req) - require.NoError(t, err) - assert.NotZero(t, resp.ID) - assert.Equal(t, &subordinateShopID, resp.ShopID) - - mockShop.AssertCalled(t, "GetSubordinateShopIDs", mock.Anything, agentShopID) - mockAudit.AssertCalled(t, "LogOperation", mock.Anything, mock.Anything) -} - -func TestAccountService_Create_AgentCreateOtherShopAccountForbidden(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - agentShopID := uint(10) - otherShopID := uint(99) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeAgent, - ShopID: agentShopID, - }) - - username := "test_forbidden_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypeAgent, - ShopID: &otherShopID, - } - - mockShop.On("GetSubordinateShopIDs", mock.Anything, agentShopID).Return([]uint{agentShopID}, nil) - - _, err := svc.Create(ctx, req) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeForbidden, appErr.Code) -} - -func TestAccountService_Create_AgentCreatePlatformAccountForbidden(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeAgent, - ShopID: 10, - }) - - username := "test_platform_forbidden_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - _, err := svc.Create(ctx, req) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeForbidden, appErr.Code) -} - -func TestAccountService_Create_EnterpriseUserForbidden(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeEnterprise, - EnterpriseID: 1, - }) - - username := "test_enterprise_forbidden_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - _, err := svc.Create(ctx, req) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeForbidden, appErr.Code) -} - -func TestAccountService_Create_UsernameDuplicate(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - username := "test_dup_" + time.Now().Format("20060102150405") - phone1 := "1" + time.Now().Format("0601021504") - phone2 := "1" + time.Now().Format("0601021505") - - req1 := &dto.CreateAccountRequest{ - Username: username, - Phone: phone1, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - _, err := svc.Create(ctx, req1) - require.NoError(t, err) - - req2 := &dto.CreateAccountRequest{ - Username: username, - Phone: phone2, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - _, err = svc.Create(ctx, req2) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeUsernameExists, appErr.Code) -} - -func TestAccountService_Create_PhoneDuplicate(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - phone := "1" + time.Now().Format("0601021504") - username1 := "test_phone_dup1_" + time.Now().Format("20060102150405") - username2 := "test_phone_dup2_" + time.Now().Format("20060102150405") - - req1 := &dto.CreateAccountRequest{ - Username: username1, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - _, err := svc.Create(ctx, req1) - require.NoError(t, err) - - req2 := &dto.CreateAccountRequest{ - Username: username2, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - _, err = svc.Create(ctx, req2) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodePhoneExists, appErr.Code) -} - -func TestAccountService_Create_Unauthorized(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := context.Background() - - username := "test_unauth_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - _, err := svc.Create(ctx, req) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeUnauthorized, appErr.Code) -} - -// ============ Update 方法测试 ============ - -func TestAccountService_Update_Success(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - username := "test_update_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - created, err := svc.Create(ctx, req) - require.NoError(t, err) - - newUsername := "updated_" + time.Now().Format("20060102150405") - updateReq := &dto.UpdateAccountRequest{ - Username: &newUsername, - } - - updated, err := svc.Update(ctx, created.ID, updateReq) - require.NoError(t, err) - assert.Equal(t, newUsername, updated.Username) - - mockAudit.AssertCalled(t, "LogOperation", mock.Anything, mock.Anything) -} - -func TestAccountService_Update_NotFound(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - newUsername := "test" - updateReq := &dto.UpdateAccountRequest{ - Username: &newUsername, - } - - _, err := svc.Update(ctx, 99999, updateReq) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeForbidden, appErr.Code) -} - -func TestAccountService_Update_AgentUnauthorized(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - superAdminCtx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - username := "test_agent_unauth_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - created, err := svc.Create(superAdminCtx, req) - require.NoError(t, err) - - agentCtx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 2, - UserType: constants.UserTypeAgent, - ShopID: 10, - }) - - newUsername := "updated" - updateReq := &dto.UpdateAccountRequest{ - Username: &newUsername, - } - - mockShop.On("GetSubordinateShopIDs", mock.Anything, uint(10)).Return([]uint{10}, nil) - - _, err = svc.Update(agentCtx, created.ID, updateReq) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeForbidden, appErr.Code) -} - -func TestAccountService_Update_UsernameDuplicate(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - username1 := "test_dup1_" + time.Now().Format("20060102150405") - username2 := "test_dup2_" + time.Now().Format("20060102150405") - phone1 := "1" + time.Now().Format("0601021504") - phone2 := "1" + time.Now().Format("0601021505") - - req1 := &dto.CreateAccountRequest{ - Username: username1, - Phone: phone1, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - req2 := &dto.CreateAccountRequest{ - Username: username2, - Phone: phone2, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - acc1, err := svc.Create(ctx, req1) - require.NoError(t, err) - - _, err = svc.Create(ctx, req2) - require.NoError(t, err) - - updateReq := &dto.UpdateAccountRequest{ - Username: &username2, - } - - _, err = svc.Update(ctx, acc1.ID, updateReq) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeUsernameExists, appErr.Code) -} - -func TestAccountService_Update_PhoneDuplicate(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - username1 := "test_phone_dup1_" + time.Now().Format("20060102150405") - username2 := "test_phone_dup2_" + time.Now().Format("20060102150405") - phone1 := "1" + time.Now().Format("0601021504") - phone2 := "1" + time.Now().Format("0601021505") - - req1 := &dto.CreateAccountRequest{ - Username: username1, - Phone: phone1, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - req2 := &dto.CreateAccountRequest{ - Username: username2, - Phone: phone2, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - acc1, err := svc.Create(ctx, req1) - require.NoError(t, err) - - _, err = svc.Create(ctx, req2) - require.NoError(t, err) - - updateReq := &dto.UpdateAccountRequest{ - Phone: &phone2, - } - - _, err = svc.Update(ctx, acc1.ID, updateReq) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodePhoneExists, appErr.Code) -} - -// ============ Delete 方法测试 ============ - -func TestAccountService_Delete_Success(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - username := "test_delete_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - created, err := svc.Create(ctx, req) - require.NoError(t, err) - - err = svc.Delete(ctx, created.ID) - require.NoError(t, err) - - _, err = svc.Get(ctx, created.ID) - require.Error(t, err) - - mockAudit.AssertCalled(t, "LogOperation", mock.Anything, mock.Anything) -} - -func TestAccountService_Delete_NotFound(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - err := svc.Delete(ctx, 99999) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeForbidden, appErr.Code) -} - -func TestAccountService_Delete_AgentUnauthorized(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - superAdminCtx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - username := "test_delete_unauth_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - created, err := svc.Create(superAdminCtx, req) - require.NoError(t, err) - - agentCtx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 2, - UserType: constants.UserTypeAgent, - ShopID: 10, - }) - - mockShop.On("GetSubordinateShopIDs", mock.Anything, uint(10)).Return([]uint{10}, nil) - - err = svc.Delete(agentCtx, created.ID) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeForbidden, appErr.Code) -} - -// ============ AssignRoles 方法测试 ============ - -func TestAccountService_AssignRoles_Success(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - username := "test_assign_roles_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - created, err := svc.Create(ctx, req) - require.NoError(t, err) - - role := &model.Role{ - RoleName: "test_role_" + time.Now().Format("20060102150405"), - RoleType: constants.RoleTypePlatform, - Status: constants.StatusEnabled, - } - errRole := roleStore.Create(ctx, role) - require.NoError(t, errRole) - - ars, err := svc.AssignRoles(ctx, created.ID, []uint{role.ID}) - require.NoError(t, err) - assert.Len(t, ars, 1) - assert.Equal(t, created.ID, ars[0].AccountID) - assert.Equal(t, role.ID, ars[0].RoleID) - - mockAudit.AssertCalled(t, "LogOperation", mock.Anything, mock.Anything) -} - -func TestAccountService_AssignRoles_SuperAdminForbidden(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - username := "test_super_admin_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypeSuperAdmin, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - created, err := svc.Create(ctx, req) - require.NoError(t, err) - - _, err = svc.AssignRoles(ctx, created.ID, []uint{1}) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeInvalidParam, appErr.Code) -} - -func TestAccountService_AssignRoles_RoleTypeMismatch(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - username := "test_role_mismatch_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypeAgent, - ShopID: ptrUint(1), - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - created, err := svc.Create(ctx, req) - require.NoError(t, err) - - role := &model.Role{ - RoleName: "test_platform_role_" + time.Now().Format("20060102150405"), - RoleType: constants.RoleTypePlatform, - Status: constants.StatusEnabled, - } - errRole := roleStore.Create(ctx, role) - require.NoError(t, errRole) - - _, err = svc.AssignRoles(ctx, created.ID, []uint{role.ID}) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeInvalidParam, appErr.Code) -} - -func TestAccountService_AssignRoles_EmptyArrayClearsRoles(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - username := "test_clear_roles_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - created, err := svc.Create(ctx, req) - require.NoError(t, err) - - role := &model.Role{ - RoleName: "test_role_clear_" + time.Now().Format("20060102150405"), - RoleType: constants.RoleTypePlatform, - Status: constants.StatusEnabled, - } - errRole := roleStore.Create(ctx, role) - require.NoError(t, errRole) - - _, err = svc.AssignRoles(ctx, created.ID, []uint{role.ID}) - require.NoError(t, err) - - ars, err := svc.AssignRoles(ctx, created.ID, []uint{}) - require.NoError(t, err) - assert.Len(t, ars, 0) -} - -// ============ RemoveRole 方法测试 ============ - -func TestAccountService_RemoveRole_Success(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - username := "test_remove_role_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - created, err := svc.Create(ctx, req) - require.NoError(t, err) - - role := &model.Role{ - RoleName: "test_role_remove_" + time.Now().Format("20060102150405"), - RoleType: constants.RoleTypePlatform, - Status: constants.StatusEnabled, - } - errRole := roleStore.Create(ctx, role) - require.NoError(t, errRole) - - _, err = svc.AssignRoles(ctx, created.ID, []uint{role.ID}) - require.NoError(t, err) - - err = svc.RemoveRole(ctx, created.ID, role.ID) - require.NoError(t, err) - - roles, err := svc.GetRoles(ctx, created.ID) - require.NoError(t, err) - assert.Len(t, roles, 0) - - mockAudit.AssertCalled(t, "LogOperation", mock.Anything, mock.Anything) -} - -func TestAccountService_RemoveRole_AccountNotFound(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - err := svc.RemoveRole(ctx, 99999, 1) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeForbidden, appErr.Code) -} - -// ============ GetRoles 方法测试 ============ - -func TestAccountService_GetRoles_Success(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - username := "test_get_roles_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - created, err := svc.Create(ctx, req) - require.NoError(t, err) - - role := &model.Role{ - RoleName: "test_role_get_" + time.Now().Format("20060102150405"), - RoleType: constants.RoleTypePlatform, - Status: constants.StatusEnabled, - } - errRole := roleStore.Create(ctx, role) - require.NoError(t, errRole) - - _, err = svc.AssignRoles(ctx, created.ID, []uint{role.ID}) - require.NoError(t, err) - - roles, err := svc.GetRoles(ctx, created.ID) - require.NoError(t, err) - assert.Len(t, roles, 1) - assert.Equal(t, role.ID, roles[0].ID) -} - -func TestAccountService_GetRoles_EmptyArray(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - username := "test_no_roles_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - created, err := svc.Create(ctx, req) - require.NoError(t, err) - - roles, err := svc.GetRoles(ctx, created.ID) - require.NoError(t, err) - assert.Len(t, roles, 0) -} - -// ============ List 方法测试 ============ - -func TestAccountService_List_Success(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - username := "test_list_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - _, err := svc.Create(ctx, req) - require.NoError(t, err) - - listReq := &dto.AccountListRequest{ - Page: 1, - PageSize: 20, - } - - accounts, total, err := svc.List(ctx, listReq) - require.NoError(t, err) - assert.Greater(t, total, int64(0)) - assert.Greater(t, len(accounts), 0) -} - -func TestAccountService_List_FilterByUsername(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - username := "test_filter_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - _, err := svc.Create(ctx, req) - require.NoError(t, err) - - listReq := &dto.AccountListRequest{ - Page: 1, - PageSize: 20, - Username: username, - } - - accounts, total, err := svc.List(ctx, listReq) - require.NoError(t, err) - assert.Greater(t, total, int64(0)) - assert.Greater(t, len(accounts), 0) - assert.Equal(t, username, accounts[0].Username) -} - -// ============ ValidatePassword 方法测试 ============ - -func TestAccountService_ValidatePassword_Correct(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - password := "TestPass123" - username := "test_validate_pwd_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: password, - UserType: constants.UserTypePlatform, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - created, err := svc.Create(ctx, req) - require.NoError(t, err) - - isValid := svc.ValidatePassword(password, created.Password) - assert.True(t, isValid) -} - -func TestAccountService_ValidatePassword_Incorrect(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - password := "TestPass123" - username := "test_validate_pwd_wrong_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: password, - UserType: constants.UserTypePlatform, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - created, err := svc.Create(ctx, req) - require.NoError(t, err) - - isValid := svc.ValidatePassword("WrongPassword", created.Password) - assert.False(t, isValid) -} - -// ============ UpdatePassword 方法测试 ============ - -func TestAccountService_UpdatePassword_Success(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - password := "TestPass123" - username := "test_update_pwd_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: password, - UserType: constants.UserTypePlatform, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - created, err := svc.Create(ctx, req) - require.NoError(t, err) - - newPassword := "NewPass456" - err = svc.UpdatePassword(ctx, created.ID, newPassword) - require.NoError(t, err) - - updated, err := svc.Get(ctx, created.ID) - require.NoError(t, err) - - isValid := svc.ValidatePassword(newPassword, updated.Password) - assert.True(t, isValid) - - isOldValid := svc.ValidatePassword(password, updated.Password) - assert.False(t, isOldValid) -} - -// ============ UpdateStatus 方法测试 ============ - -func TestAccountService_UpdateStatus_Success(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - username := "test_update_status_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - created, err := svc.Create(ctx, req) - require.NoError(t, err) - assert.Equal(t, constants.StatusEnabled, created.Status) - - err = svc.UpdateStatus(ctx, created.ID, constants.StatusDisabled) - require.NoError(t, err) - - updated, err := svc.Get(ctx, created.ID) - require.NoError(t, err) - assert.Equal(t, constants.StatusDisabled, updated.Status) -} - -// ============ 辅助函数 ============ - -func TestAccountService_Get_Success(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - username := "test_get_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - created, err := svc.Create(ctx, req) - require.NoError(t, err) - - retrieved, err := svc.Get(ctx, created.ID) - require.NoError(t, err) - assert.Equal(t, created.ID, retrieved.ID) - assert.Equal(t, username, retrieved.Username) -} - -func TestAccountService_Get_NotFound(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - _, err := svc.Get(ctx, 99999) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeAccountNotFound, appErr.Code) -} - -func TestAccountService_UpdatePassword_AccountNotFound(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - err := svc.UpdatePassword(ctx, 99999, "NewPass456") - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeAccountNotFound, appErr.Code) -} - -func TestAccountService_UpdateStatus_AccountNotFound(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - err := svc.UpdateStatus(ctx, 99999, constants.StatusDisabled) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeAccountNotFound, appErr.Code) -} - -func TestAccountService_UpdatePassword_Unauthorized(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := context.Background() - - err := svc.UpdatePassword(ctx, 1, "NewPass456") - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeUnauthorized, appErr.Code) -} - -func TestAccountService_UpdateStatus_Unauthorized(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := context.Background() - - err := svc.UpdateStatus(ctx, 1, constants.StatusDisabled) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeUnauthorized, appErr.Code) -} - -func TestAccountService_Delete_Unauthorized(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := context.Background() - - err := svc.Delete(ctx, 1) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeUnauthorized, appErr.Code) -} - -func TestAccountService_AssignRoles_Unauthorized(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := context.Background() - - _, err := svc.AssignRoles(ctx, 1, []uint{1}) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeUnauthorized, appErr.Code) -} - -func TestAccountService_RemoveRole_Unauthorized(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := context.Background() - - err := svc.RemoveRole(ctx, 1, 1) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeUnauthorized, appErr.Code) -} - -func TestAccountService_Update_Unauthorized(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := context.Background() - - newUsername := "test" - updateReq := &dto.UpdateAccountRequest{ - Username: &newUsername, - } - - _, err := svc.Update(ctx, 1, updateReq) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeUnauthorized, appErr.Code) -} - -func TestAccountService_AssignRoles_NotFound(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - _, err := svc.AssignRoles(ctx, 99999, []uint{1}) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeForbidden, appErr.Code) -} - -func TestAccountService_GetRoles_NotFound(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - _, err := svc.GetRoles(ctx, 99999) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeAccountNotFound, appErr.Code) -} - -func TestAccountService_List_FilterByUserType(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - username := "test_filter_type_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - _, err := svc.Create(ctx, req) - require.NoError(t, err) - - userType := constants.UserTypePlatform - listReq := &dto.AccountListRequest{ - Page: 1, - PageSize: 20, - UserType: &userType, - } - - accounts, total, err := svc.List(ctx, listReq) - require.NoError(t, err) - assert.Greater(t, total, int64(0)) - assert.Greater(t, len(accounts), 0) -} - -func TestAccountService_List_FilterByStatus(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - username := "test_filter_status_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - _, err := svc.Create(ctx, req) - require.NoError(t, err) - - status := constants.StatusEnabled - listReq := &dto.AccountListRequest{ - Page: 1, - PageSize: 20, - Status: &status, - } - - accounts, total, err := svc.List(ctx, listReq) - require.NoError(t, err) - assert.Greater(t, total, int64(0)) - assert.Greater(t, len(accounts), 0) -} - -func TestAccountService_List_FilterByPhone(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - username := "test_filter_phone_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - _, err := svc.Create(ctx, req) - require.NoError(t, err) - - listReq := &dto.AccountListRequest{ - Page: 1, - PageSize: 20, - Phone: phone, - } - - accounts, total, err := svc.List(ctx, listReq) - require.NoError(t, err) - assert.Greater(t, total, int64(0)) - assert.Greater(t, len(accounts), 0) -} - -func TestAccountService_Update_UpdatePassword(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - username := "test_update_pwd_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - created, err := svc.Create(ctx, req) - require.NoError(t, err) - - newPassword := "NewPass456" - updateReq := &dto.UpdateAccountRequest{ - Password: &newPassword, - } - - updated, err := svc.Update(ctx, created.ID, updateReq) - require.NoError(t, err) - - isValid := svc.ValidatePassword(newPassword, updated.Password) - assert.True(t, isValid) -} - -func TestAccountService_Update_UpdateStatus(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - username := "test_update_status_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - created, err := svc.Create(ctx, req) - require.NoError(t, err) - - status := constants.StatusDisabled - updateReq := &dto.UpdateAccountRequest{ - Status: &status, - } - - updated, err := svc.Update(ctx, created.ID, updateReq) - require.NoError(t, err) - assert.Equal(t, constants.StatusDisabled, updated.Status) -} - -func TestAccountService_Update_UpdatePhone(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - username := "test_update_phone_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - created, err := svc.Create(ctx, req) - require.NoError(t, err) - - newPhone := "1" + time.Now().Format("0601021505") - updateReq := &dto.UpdateAccountRequest{ - Phone: &newPhone, - } - - updated, err := svc.Update(ctx, created.ID, updateReq) - require.NoError(t, err) - assert.Equal(t, newPhone, updated.Phone) -} - -func TestAccountService_AssignRoles_AgentUnauthorized(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - superAdminCtx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - username := "test_agent_assign_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - created, err := svc.Create(superAdminCtx, req) - require.NoError(t, err) - - agentCtx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 2, - UserType: constants.UserTypeAgent, - ShopID: 10, - }) - - mockShop.On("GetSubordinateShopIDs", mock.Anything, uint(10)).Return([]uint{10}, nil) - - _, err = svc.AssignRoles(agentCtx, created.ID, []uint{1}) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeForbidden, appErr.Code) -} - -func TestAccountService_Create_EnterpriseAccountSuccess(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypePlatform, - }) - - enterpriseID := uint(1) - username := "test_enterprise_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypeEnterprise, - EnterpriseID: &enterpriseID, - } - - mockEnterprise.On("GetByID", mock.Anything, enterpriseID).Return(&model.Enterprise{}, nil) - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - resp, err := svc.Create(ctx, req) - require.NoError(t, err) - assert.NotZero(t, resp.ID) - assert.Equal(t, constants.UserTypeEnterprise, resp.UserType) - assert.Equal(t, &enterpriseID, resp.EnterpriseID) - - mockAudit.AssertCalled(t, "LogOperation", mock.Anything, mock.Anything) -} - -func TestAccountService_Create_AgentMissingShopID(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypePlatform, - }) - - username := "test_agent_no_shop_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypeAgent, - } - - _, err := svc.Create(ctx, req) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeInvalidParam, appErr.Code) -} - -func TestAccountService_Create_EnterpriseMissingEnterpriseID(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypePlatform, - }) - - username := "test_enterprise_no_id_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypeEnterprise, - } - - _, err := svc.Create(ctx, req) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeInvalidParam, appErr.Code) -} - -func TestAccountService_RemoveRole_AgentUnauthorized(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - superAdminCtx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - username := "test_remove_role_agent_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - created, err := svc.Create(superAdminCtx, req) - require.NoError(t, err) - - agentCtx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 2, - UserType: constants.UserTypeAgent, - ShopID: 10, - }) - - mockShop.On("GetSubordinateShopIDs", mock.Anything, uint(10)).Return([]uint{10}, nil) - - err = svc.RemoveRole(agentCtx, created.ID, 1) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeForbidden, appErr.Code) -} - -func TestAccountService_AssignRoles_MultipleRoles(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - username := "test_multi_roles_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - created, err := svc.Create(ctx, req) - require.NoError(t, err) - - role1 := &model.Role{ - RoleName: "test_role1_" + time.Now().Format("20060102150405"), - RoleType: constants.RoleTypePlatform, - Status: constants.StatusEnabled, - } - errRole := roleStore.Create(ctx, role1) - require.NoError(t, errRole) - - role2 := &model.Role{ - RoleName: "test_role2_" + time.Now().Format("20060102150405"), - RoleType: constants.RoleTypePlatform, - Status: constants.StatusEnabled, - } - errRole = roleStore.Create(ctx, role2) - require.NoError(t, errRole) - - ars, err := svc.AssignRoles(ctx, created.ID, []uint{role1.ID, role2.ID}) - require.NoError(t, err) - assert.Len(t, ars, 2) - - roles, err := svc.GetRoles(ctx, created.ID) - require.NoError(t, err) - assert.Len(t, roles, 2) -} - -func TestAccountService_Update_AllFields(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - username := "test_update_all_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - created, err := svc.Create(ctx, req) - require.NoError(t, err) - - newUsername := "updated_" + time.Now().Format("20060102150405") - newPhone := "1" + time.Now().Format("0601021505") - newPassword := "NewPass456" - newStatus := constants.StatusDisabled - - updateReq := &dto.UpdateAccountRequest{ - Username: &newUsername, - Phone: &newPhone, - Password: &newPassword, - Status: &newStatus, - } - - updated, err := svc.Update(ctx, created.ID, updateReq) - require.NoError(t, err) - assert.Equal(t, newUsername, updated.Username) - assert.Equal(t, newPhone, updated.Phone) - assert.Equal(t, newStatus, updated.Status) - - isValid := svc.ValidatePassword(newPassword, updated.Password) - assert.True(t, isValid) -} - -func TestAccountService_ListPlatformAccounts_Success(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - username := "test_platform_list_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - _, err := svc.Create(ctx, req) - require.NoError(t, err) - - listReq := &dto.PlatformAccountListRequest{ - Page: 1, - PageSize: 20, - } - - accounts, total, err := svc.ListPlatformAccounts(ctx, listReq) - require.NoError(t, err) - assert.Greater(t, total, int64(0)) - assert.Greater(t, len(accounts), 0) -} - -func TestAccountService_CreateSystemAccount_Success(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := context.Background() - - username := "test_system_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - account := &model.Account{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - Status: constants.StatusEnabled, - } - - err := svc.CreateSystemAccount(ctx, account) - require.NoError(t, err) - assert.NotZero(t, account.ID) -} - -func TestAccountService_CreateSystemAccount_MissingUsername(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := context.Background() - - account := &model.Account{ - Username: "", - Phone: "13800000000", - Password: "TestPass123", - UserType: constants.UserTypePlatform, - Status: constants.StatusEnabled, - } - - err := svc.CreateSystemAccount(ctx, account) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeInvalidParam, appErr.Code) -} - -func TestAccountService_CreateSystemAccount_MissingPhone(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := context.Background() - - account := &model.Account{ - Username: "test_system", - Phone: "", - Password: "TestPass123", - UserType: constants.UserTypePlatform, - Status: constants.StatusEnabled, - } - - err := svc.CreateSystemAccount(ctx, account) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeInvalidParam, appErr.Code) -} - -func TestAccountService_CreateSystemAccount_MissingPassword(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := context.Background() - - account := &model.Account{ - Username: "test_system", - Phone: "13800000000", - Password: "", - UserType: constants.UserTypePlatform, - Status: constants.StatusEnabled, - } - - err := svc.CreateSystemAccount(ctx, account) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeInvalidParam, appErr.Code) -} - -func TestAccountService_CreateSystemAccount_UsernameDuplicate(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := context.Background() - - username := "test_system_dup_" + time.Now().Format("20060102150405") - phone1 := "1" + time.Now().Format("0601021504") - phone2 := "1" + time.Now().Format("0601021505") - - account1 := &model.Account{ - Username: username, - Phone: phone1, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - Status: constants.StatusEnabled, - } - - err := svc.CreateSystemAccount(ctx, account1) - require.NoError(t, err) - - account2 := &model.Account{ - Username: username, - Phone: phone2, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - Status: constants.StatusEnabled, - } - - err = svc.CreateSystemAccount(ctx, account2) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeUsernameExists, appErr.Code) -} - -func TestAccountService_CreateSystemAccount_PhoneDuplicate(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := context.Background() - - username1 := "test_system_phone1_" + time.Now().Format("20060102150405") - username2 := "test_system_phone2_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - account1 := &model.Account{ - Username: username1, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - Status: constants.StatusEnabled, - } - - err := svc.CreateSystemAccount(ctx, account1) - require.NoError(t, err) - - account2 := &model.Account{ - Username: username2, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - Status: constants.StatusEnabled, - } - - err = svc.CreateSystemAccount(ctx, account2) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodePhoneExists, appErr.Code) -} - -func TestAccountService_ListPlatformAccounts_FilterByUsername(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - username := "test_platform_filter_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - _, err := svc.Create(ctx, req) - require.NoError(t, err) - - listReq := &dto.PlatformAccountListRequest{ - Page: 1, - PageSize: 20, - Username: username, - } - - accounts, total, err := svc.ListPlatformAccounts(ctx, listReq) - require.NoError(t, err) - assert.Greater(t, total, int64(0)) - assert.Greater(t, len(accounts), 0) -} - -func TestAccountService_ListPlatformAccounts_FilterByPhone(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - username := "test_platform_phone_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - _, err := svc.Create(ctx, req) - require.NoError(t, err) - - listReq := &dto.PlatformAccountListRequest{ - Page: 1, - PageSize: 20, - Phone: phone, - } - - accounts, total, err := svc.ListPlatformAccounts(ctx, listReq) - require.NoError(t, err) - assert.Greater(t, total, int64(0)) - assert.Greater(t, len(accounts), 0) -} - -func TestAccountService_ListPlatformAccounts_FilterByStatus(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - username := "test_platform_status_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - _, err := svc.Create(ctx, req) - require.NoError(t, err) - - status := constants.StatusEnabled - listReq := &dto.PlatformAccountListRequest{ - Page: 1, - PageSize: 20, - Status: &status, - } - - accounts, total, err := svc.ListPlatformAccounts(ctx, listReq) - require.NoError(t, err) - assert.Greater(t, total, int64(0)) - assert.Greater(t, len(accounts), 0) -} - -func TestAccountService_Create_PlatformUserCreateEnterpriseAccount(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypePlatform, - }) - - enterpriseID := uint(1) - username := "test_enterprise_create_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypeEnterprise, - EnterpriseID: &enterpriseID, - } - - mockEnterprise.On("GetByID", mock.Anything, enterpriseID).Return(&model.Enterprise{}, nil) - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - resp, err := svc.Create(ctx, req) - require.NoError(t, err) - assert.NotZero(t, resp.ID) - assert.Equal(t, constants.UserTypeEnterprise, resp.UserType) - - mockAudit.AssertCalled(t, "LogOperation", mock.Anything, mock.Anything) -} - -func TestAccountService_List_DefaultPagination(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - listReq := &dto.AccountListRequest{ - Page: 0, - PageSize: 0, - } - - accounts, total, err := svc.List(ctx, listReq) - require.NoError(t, err) - assert.Greater(t, total, int64(0)) - assert.Greater(t, len(accounts), 0) -} - -func TestAccountService_ListPlatformAccounts_DefaultPagination(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - listReq := &dto.PlatformAccountListRequest{ - Page: 0, - PageSize: 0, - } - - accounts, total, err := svc.ListPlatformAccounts(ctx, listReq) - require.NoError(t, err) - assert.Greater(t, total, int64(0)) - assert.Greater(t, len(accounts), 0) -} - -func TestAccountService_AssignRoles_RoleNotFound(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - username := "test_role_not_found_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - created, err := svc.Create(ctx, req) - require.NoError(t, err) - - _, err = svc.AssignRoles(ctx, created.ID, []uint{99999}) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeRoleNotFound, appErr.Code) -} - -func TestAccountService_Update_SameUsername(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - username := "test_same_username_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - created, err := svc.Create(ctx, req) - require.NoError(t, err) - - updateReq := &dto.UpdateAccountRequest{ - Username: &username, - } - - updated, err := svc.Update(ctx, created.ID, updateReq) - require.NoError(t, err) - assert.Equal(t, username, updated.Username) -} - -func TestAccountService_Update_SamePhone(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - username := "test_same_phone_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - created, err := svc.Create(ctx, req) - require.NoError(t, err) - - updateReq := &dto.UpdateAccountRequest{ - Phone: &phone, - } - - updated, err := svc.Update(ctx, created.ID, updateReq) - require.NoError(t, err) - assert.Equal(t, phone, updated.Phone) -} - -func TestAccountService_AssignRoles_DuplicateRoles(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - username := "test_dup_roles_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - created, err := svc.Create(ctx, req) - require.NoError(t, err) - - role := &model.Role{ - RoleName: "test_role_dup_" + time.Now().Format("20060102150405"), - RoleType: constants.RoleTypePlatform, - Status: constants.StatusEnabled, - } - errRole := roleStore.Create(ctx, role) - require.NoError(t, errRole) - - ars, err := svc.AssignRoles(ctx, created.ID, []uint{role.ID, role.ID}) - require.NoError(t, err) - assert.Len(t, ars, 1) -} - -func TestAccountService_Create_PlatformUserCreateAgentWithShop(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypePlatform, - }) - - shopID := uint(1) - username := "test_agent_shop_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypeAgent, - ShopID: &shopID, - } - - mockShop.On("GetSubordinateShopIDs", mock.Anything, uint(1)).Return([]uint{1}, nil) - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - resp, err := svc.Create(ctx, req) - require.NoError(t, err) - assert.NotZero(t, resp.ID) - assert.Equal(t, constants.UserTypeAgent, resp.UserType) - assert.Equal(t, &shopID, resp.ShopID) - - mockAudit.AssertCalled(t, "LogOperation", mock.Anything, mock.Anything) -} - -func TestAccountService_AssignRoles_CustomerAccountType(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - shopID := uint(1) - username := "test_agent_role_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypeAgent, - ShopID: &shopID, - } - - mockShop.On("GetSubordinateShopIDs", mock.Anything, uint(1)).Return([]uint{1}, nil) - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - created, err := svc.Create(ctx, req) - require.NoError(t, err) - - role := &model.Role{ - RoleName: "test_customer_role_" + time.Now().Format("20060102150405"), - RoleType: constants.RoleTypeCustomer, - Status: constants.StatusEnabled, - } - errRole := roleStore.Create(ctx, role) - require.NoError(t, errRole) - - ars, err := svc.AssignRoles(ctx, created.ID, []uint{role.ID}) - require.NoError(t, err) - assert.Len(t, ars, 1) -} - -func TestAccountService_Delete_AgentAccountWithShop(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - superAdminCtx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - shopID := uint(1) - username := "test_delete_agent_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypeAgent, - ShopID: &shopID, - } - - mockShop.On("GetSubordinateShopIDs", mock.Anything, uint(1)).Return([]uint{1}, nil) - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - created, err := svc.Create(superAdminCtx, req) - require.NoError(t, err) - - agentCtx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 2, - UserType: constants.UserTypeAgent, - ShopID: 1, - }) - - mockShop.On("GetSubordinateShopIDs", mock.Anything, uint(1)).Return([]uint{1}, nil) - - err = svc.Delete(agentCtx, created.ID) - require.NoError(t, err) - - _, err = svc.Get(superAdminCtx, created.ID) - require.Error(t, err) -} - -func TestAccountService_Update_AgentAccountWithShop(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - superAdminCtx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - shopID := uint(1) - username := "test_update_agent_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypeAgent, - ShopID: &shopID, - } - - mockShop.On("GetSubordinateShopIDs", mock.Anything, uint(1)).Return([]uint{1}, nil) - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - created, err := svc.Create(superAdminCtx, req) - require.NoError(t, err) - - agentCtx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 2, - UserType: constants.UserTypeAgent, - ShopID: 1, - }) - - mockShop.On("GetSubordinateShopIDs", mock.Anything, uint(1)).Return([]uint{1}, nil) - - newUsername := "updated_agent_" + time.Now().Format("20060102150405") - updateReq := &dto.UpdateAccountRequest{ - Username: &newUsername, - } - - updated, err := svc.Update(agentCtx, created.ID, updateReq) - require.NoError(t, err) - assert.Equal(t, newUsername, updated.Username) -} - -func TestAccountService_AssignRoles_AgentAccountWithShop(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - superAdminCtx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - shopID := uint(1) - username := "test_assign_agent_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypeAgent, - ShopID: &shopID, - } - - mockShop.On("GetSubordinateShopIDs", mock.Anything, uint(1)).Return([]uint{1}, nil) - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - created, err := svc.Create(superAdminCtx, req) - require.NoError(t, err) - - role := &model.Role{ - RoleName: "test_agent_role_" + time.Now().Format("20060102150405"), - RoleType: constants.RoleTypeCustomer, - Status: constants.StatusEnabled, - } - errRole := roleStore.Create(superAdminCtx, role) - require.NoError(t, errRole) - - agentCtx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 2, - UserType: constants.UserTypeAgent, - ShopID: 1, - }) - - mockShop.On("GetSubordinateShopIDs", mock.Anything, uint(1)).Return([]uint{1}, nil) - - ars, err := svc.AssignRoles(agentCtx, created.ID, []uint{role.ID}) - require.NoError(t, err) - assert.Len(t, ars, 1) -} - -func TestAccountService_RemoveRole_AgentAccountWithShop(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - superAdminCtx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - shopID := uint(1) - username := "test_remove_agent_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypeAgent, - ShopID: &shopID, - } - - mockShop.On("GetSubordinateShopIDs", mock.Anything, uint(1)).Return([]uint{1}, nil) - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - created, err := svc.Create(superAdminCtx, req) - require.NoError(t, err) - - role := &model.Role{ - RoleName: "test_remove_agent_role_" + time.Now().Format("20060102150405"), - RoleType: constants.RoleTypeCustomer, - Status: constants.StatusEnabled, - } - errRole := roleStore.Create(superAdminCtx, role) - require.NoError(t, errRole) - - _, err = svc.AssignRoles(superAdminCtx, created.ID, []uint{role.ID}) - require.NoError(t, err) - - agentCtx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 2, - UserType: constants.UserTypeAgent, - ShopID: 1, - }) - - mockShop.On("GetSubordinateShopIDs", mock.Anything, uint(1)).Return([]uint{1}, nil) - - err = svc.RemoveRole(agentCtx, created.ID, role.ID) - require.NoError(t, err) - - roles, err := svc.GetRoles(superAdminCtx, created.ID) - require.NoError(t, err) - assert.Len(t, roles, 0) -} - -func TestAccountService_Create_EnterpriseAccountWithShop(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypePlatform, - }) - - shopID := uint(1) - enterpriseID := uint(1) - username := "test_enterprise_shop_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypeEnterprise, - ShopID: &shopID, - EnterpriseID: &enterpriseID, - } - - mockShop.On("GetSubordinateShopIDs", mock.Anything, uint(1)).Return([]uint{1}, nil) - mockEnterprise.On("GetByID", mock.Anything, enterpriseID).Return(&model.Enterprise{}, nil) - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - resp, err := svc.Create(ctx, req) - require.NoError(t, err) - assert.NotZero(t, resp.ID) - assert.Equal(t, constants.UserTypeEnterprise, resp.UserType) - assert.Equal(t, &enterpriseID, resp.EnterpriseID) - - mockAudit.AssertCalled(t, "LogOperation", mock.Anything, mock.Anything) -} - -func TestAccountService_Delete_PlatformAccountByAgent(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - superAdminCtx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - username := "test_delete_platform_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - created, err := svc.Create(superAdminCtx, req) - require.NoError(t, err) - - agentCtx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 2, - UserType: constants.UserTypeAgent, - ShopID: 10, - }) - - err = svc.Delete(agentCtx, created.ID) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeForbidden, appErr.Code) -} - -func TestAccountService_Update_PlatformAccountByAgent(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - superAdminCtx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - username := "test_update_platform_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - created, err := svc.Create(superAdminCtx, req) - require.NoError(t, err) - - agentCtx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 2, - UserType: constants.UserTypeAgent, - ShopID: 10, - }) - - newUsername := "updated" - updateReq := &dto.UpdateAccountRequest{ - Username: &newUsername, - } - - _, err = svc.Update(agentCtx, created.ID, updateReq) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeForbidden, appErr.Code) -} - -func TestAccountService_AssignRoles_PlatformAccountByAgent(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - superAdminCtx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - username := "test_assign_platform_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - created, err := svc.Create(superAdminCtx, req) - require.NoError(t, err) - - agentCtx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 2, - UserType: constants.UserTypeAgent, - ShopID: 10, - }) - - _, err = svc.AssignRoles(agentCtx, created.ID, []uint{1}) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeForbidden, appErr.Code) -} - -func TestAccountService_RemoveRole_PlatformAccountByAgent(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - mockAudit := new(MockAuditService) - mockShop := new(MockShopStore) - mockEnterprise := new(MockEnterpriseStore) - - svc := New(accountStore, roleStore, accountRoleStore, nil, mockShop, mockEnterprise, mockAudit) - - superAdminCtx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - username := "test_remove_platform_" + time.Now().Format("20060102150405") - phone := "1" + time.Now().Format("0601021504") - - req := &dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "TestPass123", - UserType: constants.UserTypePlatform, - } - - mockAudit.On("LogOperation", mock.Anything, mock.Anything).Return() - - created, err := svc.Create(superAdminCtx, req) - require.NoError(t, err) - - agentCtx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 2, - UserType: constants.UserTypeAgent, - ShopID: 10, - }) - - err = svc.RemoveRole(agentCtx, created.ID, 1) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeForbidden, appErr.Code) -} - -func ptrUint(v uint) *uint { - return &v -} diff --git a/internal/service/account_audit/service_test.go b/internal/service/account_audit/service_test.go deleted file mode 100644 index 8fc2d2b..0000000 --- a/internal/service/account_audit/service_test.go +++ /dev/null @@ -1,145 +0,0 @@ -package account_audit - -import ( - "context" - "errors" - "testing" - "time" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/mock" -) - -type MockAccountOperationLogStore struct { - mock.Mock -} - -func (m *MockAccountOperationLogStore) Create(ctx context.Context, log *model.AccountOperationLog) error { - args := m.Called(ctx, log) - return args.Error(0) -} - -func TestLogOperation_Success(t *testing.T) { - mockStore := new(MockAccountOperationLogStore) - service := NewService(mockStore) - - log := &model.AccountOperationLog{ - OperatorID: 1, - OperatorType: 2, - OperatorName: "admin", - OperationType: "create", - OperationDesc: "创建账号: testuser", - } - - mockStore.On("Create", mock.Anything, log).Return(nil) - - ctx := context.Background() - service.LogOperation(ctx, log) - - time.Sleep(50 * time.Millisecond) - - mockStore.AssertCalled(t, "Create", mock.Anything, log) -} - -func TestLogOperation_Failure(t *testing.T) { - mockStore := new(MockAccountOperationLogStore) - service := NewService(mockStore) - - log := &model.AccountOperationLog{ - OperatorID: 1, - OperatorType: 2, - OperatorName: "admin", - OperationType: "create", - OperationDesc: "创建账号: testuser", - } - - mockStore.On("Create", mock.Anything, log).Return(errors.New("database error")) - - ctx := context.Background() - - assert.NotPanics(t, func() { - service.LogOperation(ctx, log) - }) - - time.Sleep(50 * time.Millisecond) - - mockStore.AssertCalled(t, "Create", mock.Anything, log) -} - -func TestLogOperation_NonBlocking(t *testing.T) { - mockStore := new(MockAccountOperationLogStore) - service := NewService(mockStore) - - log := &model.AccountOperationLog{ - OperatorID: 1, - OperatorType: 2, - OperatorName: "admin", - OperationType: "create", - OperationDesc: "创建账号: testuser", - } - - mockStore.On("Create", mock.Anything, log).Run(func(args mock.Arguments) { - time.Sleep(100 * time.Millisecond) - }).Return(nil) - - ctx := context.Background() - - start := time.Now() - service.LogOperation(ctx, log) - elapsed := time.Since(start) - - assert.Less(t, elapsed, 50*time.Millisecond, "LogOperation should return immediately") - - time.Sleep(150 * time.Millisecond) - mockStore.AssertCalled(t, "Create", mock.Anything, log) -} - -func TestNewService(t *testing.T) { - mockStore := new(MockAccountOperationLogStore) - service := NewService(mockStore) - - assert.NotNil(t, service) - assert.Equal(t, mockStore, service.store) -} - -func TestLogOperation_WithAllFields(t *testing.T) { - mockStore := new(MockAccountOperationLogStore) - service := NewService(mockStore) - - targetAccountID := uint(10) - targetUsername := "targetuser" - targetUserType := 3 - requestID := "req-12345" - ipAddress := "127.0.0.1" - userAgent := "Mozilla/5.0" - - log := &model.AccountOperationLog{ - OperatorID: 1, - OperatorType: 2, - OperatorName: "admin", - TargetAccountID: &targetAccountID, - TargetUsername: &targetUsername, - TargetUserType: &targetUserType, - OperationType: "update", - OperationDesc: "更新账号: targetuser", - BeforeData: model.JSONB{ - "username": "oldname", - }, - AfterData: model.JSONB{ - "username": "newname", - }, - RequestID: &requestID, - IPAddress: &ipAddress, - UserAgent: &userAgent, - } - - mockStore.On("Create", mock.Anything, log).Return(nil) - - ctx := context.Background() - service.LogOperation(ctx, log) - - time.Sleep(50 * time.Millisecond) - - mockStore.AssertCalled(t, "Create", mock.Anything, log) -} diff --git a/internal/service/auth/classify_test.go b/internal/service/auth/classify_test.go deleted file mode 100644 index 7516b5e..0000000 --- a/internal/service/auth/classify_test.go +++ /dev/null @@ -1,186 +0,0 @@ -package auth - -import ( - "testing" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/stretchr/testify/assert" - "go.uber.org/zap" - "gorm.io/gorm" -) - -func TestClassifyPermissions_PlatformFilter(t *testing.T) { - logger, _ := zap.NewDevelopment() - service := &Service{logger: logger} - - permissions := []*model.Permission{ - { - Model: gorm.Model{ID: 1}, - PermCode: "dashboard:menu", - PermName: "仪表盘", - PermType: constants.PermissionTypeMenu, - Platform: constants.PlatformAll, - Status: constants.StatusEnabled, - }, - { - Model: gorm.Model{ID: 2}, - PermCode: "user:menu", - PermName: "用户管理", - PermType: constants.PermissionTypeMenu, - Platform: constants.PlatformWeb, - Status: constants.StatusEnabled, - }, - { - Model: gorm.Model{ID: 3}, - PermCode: "mobile:menu", - PermName: "移动端菜单", - PermType: constants.PermissionTypeMenu, - Platform: constants.PlatformH5, - Status: constants.StatusEnabled, - }, - } - - allCodes, menus, buttons, err := service.classifyPermissions(permissions, constants.PlatformWeb) - - assert.NoError(t, err) - assert.Len(t, allCodes, 2) - assert.Contains(t, allCodes, "dashboard:menu") - assert.Contains(t, allCodes, "user:menu") - assert.NotContains(t, allCodes, "mobile:menu") - assert.Len(t, menus, 2) - assert.Empty(t, buttons) -} - -func TestClassifyPermissions_MenuAndButton(t *testing.T) { - logger, _ := zap.NewDevelopment() - service := &Service{logger: logger} - - permissions := []*model.Permission{ - { - Model: gorm.Model{ID: 1}, - PermCode: "user:menu", - PermName: "用户管理", - PermType: constants.PermissionTypeMenu, - Platform: constants.PlatformAll, - Status: constants.StatusEnabled, - }, - { - Model: gorm.Model{ID: 2}, - PermCode: "user:create", - PermName: "创建用户", - PermType: constants.PermissionTypeButton, - Platform: constants.PlatformAll, - Status: constants.StatusEnabled, - }, - { - Model: gorm.Model{ID: 3}, - PermCode: "user:delete", - PermName: "删除用户", - PermType: constants.PermissionTypeButton, - Platform: constants.PlatformAll, - Status: constants.StatusEnabled, - }, - } - - allCodes, menus, buttons, err := service.classifyPermissions(permissions, constants.PlatformWeb) - - assert.NoError(t, err) - assert.Len(t, allCodes, 3) - assert.Len(t, menus, 1) - assert.Equal(t, "user:menu", menus[0].PermCode) - assert.Len(t, buttons, 2) - assert.Contains(t, buttons, "user:create") - assert.Contains(t, buttons, "user:delete") -} - -func TestClassifyPermissions_AllPermissions(t *testing.T) { - logger, _ := zap.NewDevelopment() - service := &Service{logger: logger} - - permissions := []*model.Permission{ - { - Model: gorm.Model{ID: 1}, - PermCode: "menu1", - PermName: "菜单1", - PermType: constants.PermissionTypeMenu, - Platform: constants.PlatformAll, - Status: constants.StatusEnabled, - }, - { - Model: gorm.Model{ID: 2}, - PermCode: "button1", - PermName: "按钮1", - PermType: constants.PermissionTypeButton, - Platform: constants.PlatformAll, - Status: constants.StatusEnabled, - }, - } - - allCodes, _, _, err := service.classifyPermissions(permissions, constants.PlatformWeb) - - assert.NoError(t, err) - assert.Len(t, allCodes, 2) - assert.Contains(t, allCodes, "menu1") - assert.Contains(t, allCodes, "button1") -} - -func TestClassifyPermissions_PlatformAll(t *testing.T) { - logger, _ := zap.NewDevelopment() - service := &Service{logger: logger} - - permissions := []*model.Permission{ - { - Model: gorm.Model{ID: 1}, - PermCode: "common:menu", - PermName: "通用菜单", - PermType: constants.PermissionTypeMenu, - Platform: constants.PlatformAll, - Status: constants.StatusEnabled, - }, - } - - allCodesWeb, menusWeb, _, errWeb := service.classifyPermissions(permissions, constants.PlatformWeb) - allCodesH5, menusH5, _, errH5 := service.classifyPermissions(permissions, constants.PlatformH5) - - assert.NoError(t, errWeb) - assert.NoError(t, errH5) - assert.Len(t, allCodesWeb, 1) - assert.Len(t, allCodesH5, 1) - assert.Len(t, menusWeb, 1) - assert.Len(t, menusH5, 1) - assert.Equal(t, "common:menu", menusWeb[0].PermCode) - assert.Equal(t, "common:menu", menusH5[0].PermCode) -} - -func TestClassifyPermissions_DisabledPermissions(t *testing.T) { - logger, _ := zap.NewDevelopment() - service := &Service{logger: logger} - - permissions := []*model.Permission{ - { - Model: gorm.Model{ID: 1}, - PermCode: "enabled:menu", - PermName: "启用菜单", - PermType: constants.PermissionTypeMenu, - Platform: constants.PlatformAll, - Status: constants.StatusEnabled, - }, - { - Model: gorm.Model{ID: 2}, - PermCode: "disabled:menu", - PermName: "禁用菜单", - PermType: constants.PermissionTypeMenu, - Platform: constants.PlatformAll, - Status: constants.StatusDisabled, - }, - } - - allCodes, menus, _, err := service.classifyPermissions(permissions, constants.PlatformWeb) - - assert.NoError(t, err) - assert.Len(t, allCodes, 1) - assert.Contains(t, allCodes, "enabled:menu") - assert.NotContains(t, allCodes, "disabled:menu") - assert.Len(t, menus, 1) -} diff --git a/internal/service/auth/menu_tree_test.go b/internal/service/auth/menu_tree_test.go deleted file mode 100644 index 679f4d8..0000000 --- a/internal/service/auth/menu_tree_test.go +++ /dev/null @@ -1,126 +0,0 @@ -package auth - -import ( - "testing" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/internal/model/dto" - "github.com/stretchr/testify/assert" - "go.uber.org/zap" - "gorm.io/gorm" -) - -func TestBuildMenuTree_RootNodes(t *testing.T) { - logger, _ := zap.NewDevelopment() - service := &Service{logger: logger} - - permissions := []*model.Permission{ - {Model: gorm.Model{ID: 1}, PermCode: "user:menu", PermName: "用户管理", URL: "/users", Sort: 1, ParentID: nil}, - {Model: gorm.Model{ID: 2}, PermCode: "order:menu", PermName: "订单管理", URL: "/orders", Sort: 2, ParentID: nil}, - {Model: gorm.Model{ID: 3}, PermCode: "dashboard:menu", PermName: "仪表盘", URL: "/dashboard", Sort: 0, ParentID: nil}, - } - - result := service.buildMenuTree(permissions) - - assert.Len(t, result, 3) - assert.Equal(t, "dashboard:menu", result[0].PermCode) - assert.Equal(t, "user:menu", result[1].PermCode) - assert.Equal(t, "order:menu", result[2].PermCode) - assert.Empty(t, result[0].Children) -} - -func TestBuildMenuTree_MultiLevel(t *testing.T) { - logger, _ := zap.NewDevelopment() - service := &Service{logger: logger} - - parentID1 := uint(1) - parentID2 := uint(3) - - permissions := []*model.Permission{ - {Model: gorm.Model{ID: 1}, PermCode: "user:menu", PermName: "用户管理", URL: "/users", Sort: 1, ParentID: nil}, - {Model: gorm.Model{ID: 2}, PermCode: "user:list:menu", PermName: "用户列表", URL: "/users/list", Sort: 10, ParentID: &parentID1}, - {Model: gorm.Model{ID: 3}, PermCode: "user:role:menu", PermName: "角色管理", URL: "/users/roles", Sort: 5, ParentID: &parentID1}, - {Model: gorm.Model{ID: 4}, PermCode: "user:role:detail:menu", PermName: "角色详情", URL: "/users/roles/detail", Sort: 1, ParentID: &parentID2}, - } - - result := service.buildMenuTree(permissions) - - assert.Len(t, result, 1) - assert.Equal(t, "user:menu", result[0].PermCode) - assert.Len(t, result[0].Children, 2) - assert.Equal(t, "user:role:menu", result[0].Children[0].PermCode) - assert.Equal(t, "user:list:menu", result[0].Children[1].PermCode) - assert.Len(t, result[0].Children[0].Children, 1) - assert.Equal(t, "user:role:detail:menu", result[0].Children[0].Children[0].PermCode) -} - -func TestBuildMenuTree_OrphanNodes(t *testing.T) { - logger, _ := zap.NewDevelopment() - service := &Service{logger: logger} - - nonExistentParentID := uint(999) - - permissions := []*model.Permission{ - {Model: gorm.Model{ID: 1}, PermCode: "user:menu", PermName: "用户管理", URL: "/users", Sort: 1, ParentID: nil}, - {Model: gorm.Model{ID: 2}, PermCode: "orphan:menu", PermName: "孤儿菜单", URL: "/orphan", Sort: 0, ParentID: &nonExistentParentID}, - } - - result := service.buildMenuTree(permissions) - - assert.Len(t, result, 2) - assert.Equal(t, "orphan:menu", result[0].PermCode) - assert.Equal(t, "user:menu", result[1].PermCode) - assert.Empty(t, result[0].Children) -} - -func TestBuildMenuTree_Sorting(t *testing.T) { - logger, _ := zap.NewDevelopment() - service := &Service{logger: logger} - - parentID := uint(1) - - permissions := []*model.Permission{ - {Model: gorm.Model{ID: 1}, PermCode: "user:menu", PermName: "用户管理", URL: "/users", Sort: 1, ParentID: nil}, - {Model: gorm.Model{ID: 2}, PermCode: "user:list:menu", PermName: "用户列表", URL: "/users/list", Sort: 10, ParentID: &parentID}, - {Model: gorm.Model{ID: 3}, PermCode: "user:role:menu", PermName: "角色管理", URL: "/users/roles", Sort: 5, ParentID: &parentID}, - {Model: gorm.Model{ID: 4}, PermCode: "user:dept:menu", PermName: "部门管理", URL: "/users/depts", Sort: 8, ParentID: &parentID}, - } - - result := service.buildMenuTree(permissions) - - assert.Len(t, result, 1) - assert.Len(t, result[0].Children, 3) - assert.Equal(t, "user:role:menu", result[0].Children[0].PermCode) - assert.Equal(t, 5, result[0].Children[0].Sort) - assert.Equal(t, "user:dept:menu", result[0].Children[1].PermCode) - assert.Equal(t, 8, result[0].Children[1].Sort) - assert.Equal(t, "user:list:menu", result[0].Children[2].PermCode) - assert.Equal(t, 10, result[0].Children[2].Sort) -} - -func TestBuildMenuTree_EmptyInput(t *testing.T) { - logger, _ := zap.NewDevelopment() - service := &Service{logger: logger} - - result := service.buildMenuTree([]*model.Permission{}) - - assert.NotNil(t, result) - assert.Empty(t, result) -} - -func TestSortMenuNodes(t *testing.T) { - logger, _ := zap.NewDevelopment() - service := &Service{logger: logger} - - nodes := []dto.MenuNode{ - {ID: 3, PermCode: "c", Sort: 30, Children: []dto.MenuNode{}}, - {ID: 1, PermCode: "a", Sort: 10, Children: []dto.MenuNode{}}, - {ID: 2, PermCode: "b", Sort: 20, Children: []dto.MenuNode{}}, - } - - service.sortMenuNodes(nodes) - - assert.Equal(t, "a", nodes[0].PermCode) - assert.Equal(t, "b", nodes[1].PermCode) - assert.Equal(t, "c", nodes[2].PermCode) -} diff --git a/internal/service/carrier/service_test.go b/internal/service/carrier/service_test.go deleted file mode 100644 index d4169b3..0000000 --- a/internal/service/carrier/service_test.go +++ /dev/null @@ -1,268 +0,0 @@ -package carrier - -import ( - "context" - "testing" - - "github.com/break/junhong_cmp_fiber/internal/model/dto" - "github.com/break/junhong_cmp_fiber/internal/store/postgres" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/pkg/errors" - "github.com/break/junhong_cmp_fiber/pkg/middleware" - "github.com/break/junhong_cmp_fiber/tests/testutils" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -func TestCarrierService_Create(t *testing.T) { - tx := testutils.NewTestTransaction(t) - store := postgres.NewCarrierStore(tx) - svc := New(store) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypePlatform, - }) - - t.Run("创建成功", func(t *testing.T) { - req := &dto.CreateCarrierRequest{ - CarrierCode: "SVC_CMCC_001", - CarrierName: "中国移动-服务测试", - CarrierType: constants.CarrierTypeCMCC, - Description: "服务层测试", - } - - resp, err := svc.Create(ctx, req) - require.NoError(t, err) - assert.NotZero(t, resp.ID) - assert.Equal(t, req.CarrierCode, resp.CarrierCode) - assert.Equal(t, req.CarrierName, resp.CarrierName) - assert.Equal(t, constants.StatusEnabled, resp.Status) - }) - - t.Run("编码重复失败", func(t *testing.T) { - req := &dto.CreateCarrierRequest{ - CarrierCode: "SVC_CMCC_001", - CarrierName: "中国移动-重复", - CarrierType: constants.CarrierTypeCMCC, - } - - _, err := svc.Create(ctx, req) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeCarrierCodeExists, appErr.Code) - }) - - t.Run("未授权失败", func(t *testing.T) { - req := &dto.CreateCarrierRequest{ - CarrierCode: "SVC_CMCC_002", - CarrierName: "未授权测试", - CarrierType: constants.CarrierTypeCMCC, - } - - _, err := svc.Create(context.Background(), req) - require.Error(t, err) - }) -} - -func TestCarrierService_Get(t *testing.T) { - tx := testutils.NewTestTransaction(t) - store := postgres.NewCarrierStore(tx) - svc := New(store) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypePlatform, - }) - - req := &dto.CreateCarrierRequest{ - CarrierCode: "SVC_GET_001", - CarrierName: "查询测试", - CarrierType: constants.CarrierTypeCUCC, - } - created, err := svc.Create(ctx, req) - require.NoError(t, err) - - t.Run("查询存在的运营商", func(t *testing.T) { - resp, err := svc.Get(ctx, created.ID) - require.NoError(t, err) - assert.Equal(t, created.CarrierCode, resp.CarrierCode) - }) - - t.Run("查询不存在的运营商", func(t *testing.T) { - _, err := svc.Get(ctx, 99999) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeCarrierNotFound, appErr.Code) - }) -} - -func TestCarrierService_Update(t *testing.T) { - tx := testutils.NewTestTransaction(t) - store := postgres.NewCarrierStore(tx) - svc := New(store) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypePlatform, - }) - - req := &dto.CreateCarrierRequest{ - CarrierCode: "SVC_UPD_001", - CarrierName: "更新测试", - CarrierType: constants.CarrierTypeCTCC, - } - created, err := svc.Create(ctx, req) - require.NoError(t, err) - - t.Run("更新成功", func(t *testing.T) { - newName := "更新后的名称" - newDesc := "更新后的描述" - updateReq := &dto.UpdateCarrierRequest{ - CarrierName: &newName, - Description: &newDesc, - } - - resp, err := svc.Update(ctx, created.ID, updateReq) - require.NoError(t, err) - assert.Equal(t, newName, resp.CarrierName) - assert.Equal(t, newDesc, resp.Description) - }) - - t.Run("更新不存在的运营商", func(t *testing.T) { - newName := "test" - updateReq := &dto.UpdateCarrierRequest{ - CarrierName: &newName, - } - - _, err := svc.Update(ctx, 99999, updateReq) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeCarrierNotFound, appErr.Code) - }) -} - -func TestCarrierService_Delete(t *testing.T) { - tx := testutils.NewTestTransaction(t) - store := postgres.NewCarrierStore(tx) - svc := New(store) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypePlatform, - }) - - req := &dto.CreateCarrierRequest{ - CarrierCode: "SVC_DEL_001", - CarrierName: "删除测试", - CarrierType: constants.CarrierTypeCBN, - } - created, err := svc.Create(ctx, req) - require.NoError(t, err) - - t.Run("删除成功", func(t *testing.T) { - err := svc.Delete(ctx, created.ID) - require.NoError(t, err) - - _, err = svc.Get(ctx, created.ID) - require.Error(t, err) - }) - - t.Run("删除不存在的运营商", func(t *testing.T) { - err := svc.Delete(ctx, 99999) - require.Error(t, err) - }) -} - -func TestCarrierService_List(t *testing.T) { - tx := testutils.NewTestTransaction(t) - store := postgres.NewCarrierStore(tx) - svc := New(store) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypePlatform, - }) - - carriers := []dto.CreateCarrierRequest{ - {CarrierCode: "SVC_LIST_001", CarrierName: "移动列表", CarrierType: constants.CarrierTypeCMCC}, - {CarrierCode: "SVC_LIST_002", CarrierName: "联通列表", CarrierType: constants.CarrierTypeCUCC}, - {CarrierCode: "SVC_LIST_003", CarrierName: "电信列表", CarrierType: constants.CarrierTypeCTCC}, - } - for _, c := range carriers { - _, err := svc.Create(ctx, &c) - require.NoError(t, err) - } - - t.Run("查询列表", func(t *testing.T) { - req := &dto.CarrierListRequest{ - Page: 1, - PageSize: 20, - } - result, total, err := svc.List(ctx, req) - require.NoError(t, err) - assert.GreaterOrEqual(t, total, int64(3)) - assert.GreaterOrEqual(t, len(result), 3) - }) - - t.Run("按类型过滤", func(t *testing.T) { - carrierType := constants.CarrierTypeCMCC - req := &dto.CarrierListRequest{ - Page: 1, - PageSize: 20, - CarrierType: &carrierType, - } - result, total, err := svc.List(ctx, req) - require.NoError(t, err) - assert.GreaterOrEqual(t, total, int64(1)) - for _, c := range result { - assert.Equal(t, constants.CarrierTypeCMCC, c.CarrierType) - } - }) -} - -func TestCarrierService_UpdateStatus(t *testing.T) { - tx := testutils.NewTestTransaction(t) - store := postgres.NewCarrierStore(tx) - svc := New(store) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypePlatform, - }) - - req := &dto.CreateCarrierRequest{ - CarrierCode: "SVC_STATUS_001", - CarrierName: "状态测试", - CarrierType: constants.CarrierTypeCMCC, - } - created, err := svc.Create(ctx, req) - require.NoError(t, err) - assert.Equal(t, constants.StatusEnabled, created.Status) - - t.Run("禁用运营商", func(t *testing.T) { - err := svc.UpdateStatus(ctx, created.ID, constants.StatusDisabled) - require.NoError(t, err) - - updated, err := svc.Get(ctx, created.ID) - require.NoError(t, err) - assert.Equal(t, constants.StatusDisabled, updated.Status) - }) - - t.Run("启用运营商", func(t *testing.T) { - err := svc.UpdateStatus(ctx, created.ID, constants.StatusEnabled) - require.NoError(t, err) - - updated, err := svc.Get(ctx, created.ID) - require.NoError(t, err) - assert.Equal(t, constants.StatusEnabled, updated.Status) - }) - - t.Run("更新不存在的运营商状态", func(t *testing.T) { - err := svc.UpdateStatus(ctx, 99999, 1) - require.Error(t, err) - }) -} diff --git a/internal/service/enterprise_card/authorization_service_test.go b/internal/service/enterprise_card/authorization_service_test.go deleted file mode 100644 index 136d73b..0000000 --- a/internal/service/enterprise_card/authorization_service_test.go +++ /dev/null @@ -1,158 +0,0 @@ -package enterprise_card - -import ( - "context" - "testing" - "time" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/internal/store/postgres" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/pkg/errors" - "github.com/break/junhong_cmp_fiber/pkg/middleware" - "github.com/break/junhong_cmp_fiber/tests/testutils" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - "go.uber.org/zap" -) - -func TestAuthorizationService_BatchAuthorize_BoundCardRejected(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - logger, _ := zap.NewDevelopment() - - enterpriseStore := postgres.NewEnterpriseStore(tx, rdb) - iotCardStore := postgres.NewIotCardStore(tx, rdb) - authStore := postgres.NewEnterpriseCardAuthorizationStore(tx, rdb) - - service := NewAuthorizationService(enterpriseStore, iotCardStore, authStore, logger) - - shop := &model.Shop{ - BaseModel: model.BaseModel{Creator: 1, Updater: 1}, - ShopName: "测试店铺", - ShopCode: "TEST_SHOP_001", - Level: 1, - Status: 1, - } - require.NoError(t, tx.Create(shop).Error) - - enterprise := &model.Enterprise{ - BaseModel: model.BaseModel{Creator: 1, Updater: 1}, - EnterpriseName: "测试企业", - EnterpriseCode: "TEST_ENT_001", - OwnerShopID: &shop.ID, - Status: 1, - } - require.NoError(t, tx.Create(enterprise).Error) - - carrier := &model.Carrier{CarrierName: "测试运营商", CarrierType: "CMCC", Status: 1} - require.NoError(t, tx.Create(carrier).Error) - - unboundCard := &model.IotCard{ - ICCID: "UNBOUND_CARD_001", - CarrierID: carrier.ID, - Status: 2, - ShopID: &shop.ID, - } - require.NoError(t, tx.Create(unboundCard).Error) - - boundCard := &model.IotCard{ - ICCID: "BOUND_CARD_001", - CarrierID: carrier.ID, - Status: 2, - ShopID: &shop.ID, - } - require.NoError(t, tx.Create(boundCard).Error) - - device := &model.Device{ - DeviceNo: "TEST_DEVICE_001", - DeviceName: "测试设备", - Status: 2, - ShopID: &shop.ID, - } - require.NoError(t, tx.Create(device).Error) - - now := time.Now() - binding := &model.DeviceSimBinding{ - DeviceID: device.ID, - IotCardID: boundCard.ID, - SlotPosition: 1, - BindStatus: 1, - BindTime: &now, - } - require.NoError(t, tx.Create(binding).Error) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypePlatform, - ShopID: shop.ID, - }) - - t.Run("绑定设备的卡被拒绝授权", func(t *testing.T) { - req := BatchAuthorizeRequest{ - EnterpriseID: enterprise.ID, - CardIDs: []uint{boundCard.ID}, - AuthorizerID: 1, - AuthorizerType: constants.UserTypePlatform, - Remark: "测试授权", - } - - err := service.BatchAuthorize(ctx, req) - - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok, "应返回 AppError 类型") - assert.Equal(t, errors.CodeCannotAuthorizeBoundCard, appErr.Code) - assert.Contains(t, appErr.Message, "已绑定设备") - }) - - t.Run("未绑定设备的卡可以授权", func(t *testing.T) { - req := BatchAuthorizeRequest{ - EnterpriseID: enterprise.ID, - CardIDs: []uint{unboundCard.ID}, - AuthorizerID: 1, - AuthorizerType: constants.UserTypePlatform, - Remark: "测试授权", - } - - err := service.BatchAuthorize(ctx, req) - - require.NoError(t, err) - - auths, err := authStore.ListByCards(ctx, []uint{unboundCard.ID}, false) - require.NoError(t, err) - assert.Len(t, auths, 1) - assert.Equal(t, enterprise.ID, auths[0].EnterpriseID) - }) - - t.Run("混合卡列表中有绑定卡时整体拒绝", func(t *testing.T) { - unboundCard2 := &model.IotCard{ - ICCID: "UNBOUND_CARD_002", - CarrierID: carrier.ID, - Status: 2, - ShopID: &shop.ID, - } - require.NoError(t, tx.Create(unboundCard2).Error) - - req := BatchAuthorizeRequest{ - EnterpriseID: enterprise.ID, - CardIDs: []uint{unboundCard2.ID, boundCard.ID}, - AuthorizerID: 1, - AuthorizerType: constants.UserTypePlatform, - Remark: "测试授权", - } - - err := service.BatchAuthorize(ctx, req) - - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok, "应返回 AppError 类型") - assert.Equal(t, errors.CodeCannotAuthorizeBoundCard, appErr.Code) - - auths, err := authStore.ListByCards(ctx, []uint{unboundCard2.ID}, false) - require.NoError(t, err) - assert.Len(t, auths, 0, "混合列表中的未绑定卡也不应被授权") - }) -} diff --git a/internal/service/enterprise_device/service_test.go b/internal/service/enterprise_device/service_test.go deleted file mode 100644 index e2e0aaf..0000000 --- a/internal/service/enterprise_device/service_test.go +++ /dev/null @@ -1,913 +0,0 @@ -package enterprise_device - -import ( - "context" - "fmt" - "testing" - "time" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/internal/model/dto" - "github.com/break/junhong_cmp_fiber/internal/store/postgres" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/pkg/middleware" - "github.com/break/junhong_cmp_fiber/tests/testutils" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - "go.uber.org/zap" -) - -func uniqueServiceTestPrefix() string { - return fmt.Sprintf("SVC%d", time.Now().UnixNano()%1000000000) -} - -func createTestContext(userID uint, userType int, shopID uint, enterpriseID uint) context.Context { - ctx := context.Background() - return middleware.SetUserContext(ctx, &middleware.UserContextInfo{ - UserID: userID, - UserType: userType, - ShopID: shopID, - EnterpriseID: enterpriseID, - }) -} - -type testEnv struct { - service *Service - enterprise *model.Enterprise - shop *model.Shop - devices []*model.Device - cards []*model.IotCard - bindings []*model.DeviceSimBinding - carrier *model.Carrier -} - -func setupTestEnv(t *testing.T, prefix string) *testEnv { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - enterpriseStore := postgres.NewEnterpriseStore(tx, rdb) - deviceStore := postgres.NewDeviceStore(tx, rdb) - deviceSimBindingStore := postgres.NewDeviceSimBindingStore(tx, rdb) - enterpriseDeviceAuthStore := postgres.NewEnterpriseDeviceAuthorizationStore(tx, rdb) - enterpriseCardAuthStore := postgres.NewEnterpriseCardAuthorizationStore(tx, rdb) - logger := zap.NewNop() - - svc := New(tx, enterpriseStore, deviceStore, deviceSimBindingStore, enterpriseDeviceAuthStore, enterpriseCardAuthStore, logger) - - shop := &model.Shop{ - ShopName: prefix + "_测试店铺", - ShopCode: prefix, - Level: 1, - Status: 1, - } - require.NoError(t, tx.Create(shop).Error) - - enterprise := &model.Enterprise{ - EnterpriseName: prefix + "_测试企业", - EnterpriseCode: prefix, - OwnerShopID: &shop.ID, - Status: 1, - } - require.NoError(t, tx.Create(enterprise).Error) - - carrier := &model.Carrier{ - CarrierName: "测试运营商", - CarrierType: "CMCC", - Status: 1, - } - require.NoError(t, tx.Create(carrier).Error) - - devices := make([]*model.Device, 3) - for i := 0; i < 3; i++ { - devices[i] = &model.Device{ - DeviceNo: fmt.Sprintf("%s_D%03d", prefix, i+1), - DeviceName: fmt.Sprintf("测试设备%d", i+1), - Status: 2, - ShopID: &shop.ID, - } - require.NoError(t, tx.Create(devices[i]).Error) - } - - cards := make([]*model.IotCard, 4) - for i := 0; i < 4; i++ { - cards[i] = &model.IotCard{ - ICCID: fmt.Sprintf("%s%04d", prefix, i+1), - CarrierID: carrier.ID, - Status: 2, - ShopID: &shop.ID, - } - require.NoError(t, tx.Create(cards[i]).Error) - } - - now := time.Now() - bindings := []*model.DeviceSimBinding{ - {DeviceID: devices[0].ID, IotCardID: cards[0].ID, SlotPosition: 1, BindStatus: 1, BindTime: &now}, - {DeviceID: devices[0].ID, IotCardID: cards[1].ID, SlotPosition: 2, BindStatus: 1, BindTime: &now}, - {DeviceID: devices[1].ID, IotCardID: cards[2].ID, SlotPosition: 1, BindStatus: 1, BindTime: &now}, - } - for _, b := range bindings { - require.NoError(t, tx.Create(b).Error) - } - - return &testEnv{ - service: svc, - enterprise: enterprise, - shop: shop, - devices: devices, - cards: cards, - bindings: bindings, - carrier: carrier, - } -} - -func TestService_AllocateDevices(t *testing.T) { - prefix := uniqueServiceTestPrefix() - env := setupTestEnv(t, prefix) - - tests := []struct { - name string - ctx context.Context - req *dto.AllocateDevicesReq - wantSuccess int - wantFail int - wantErr bool - }{ - { - name: "平台用户成功授权设备", - ctx: createTestContext(1, constants.UserTypePlatform, 0, 0), - req: &dto.AllocateDevicesReq{ - DeviceNos: []string{env.devices[0].DeviceNo}, - Remark: "测试授权", - }, - wantSuccess: 1, - wantFail: 0, - wantErr: false, - }, - { - name: "代理用户成功授权自己店铺的设备", - ctx: createTestContext(2, constants.UserTypeAgent, env.shop.ID, 0), - req: &dto.AllocateDevicesReq{ - DeviceNos: []string{env.devices[1].DeviceNo}, - }, - wantSuccess: 1, - wantFail: 0, - wantErr: false, - }, - { - name: "设备不存在时记录失败", - ctx: createTestContext(1, constants.UserTypePlatform, 0, 0), - req: &dto.AllocateDevicesReq{ - DeviceNos: []string{"NOT_EXIST_DEVICE"}, - }, - wantSuccess: 0, - wantFail: 1, - wantErr: false, - }, - { - name: "未授权用户返回错误", - ctx: context.Background(), - req: &dto.AllocateDevicesReq{ - DeviceNos: []string{env.devices[2].DeviceNo}, - }, - wantSuccess: 0, - wantFail: 0, - wantErr: true, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - resp, err := env.service.AllocateDevices(tt.ctx, env.enterprise.ID, tt.req) - if tt.wantErr { - require.Error(t, err) - return - } - require.NoError(t, err) - assert.Equal(t, tt.wantSuccess, resp.SuccessCount) - assert.Equal(t, tt.wantFail, resp.FailCount) - }) - } -} - -func TestService_AllocateDevices_DeviceStatusValidation(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - prefix := uniqueServiceTestPrefix() - - enterpriseStore := postgres.NewEnterpriseStore(tx, rdb) - deviceStore := postgres.NewDeviceStore(tx, rdb) - deviceSimBindingStore := postgres.NewDeviceSimBindingStore(tx, rdb) - enterpriseDeviceAuthStore := postgres.NewEnterpriseDeviceAuthorizationStore(tx, rdb) - enterpriseCardAuthStore := postgres.NewEnterpriseCardAuthorizationStore(tx, rdb) - logger := zap.NewNop() - - svc := New(tx, enterpriseStore, deviceStore, deviceSimBindingStore, enterpriseDeviceAuthStore, enterpriseCardAuthStore, logger) - - enterprise := &model.Enterprise{ - EnterpriseName: prefix + "_测试企业", - EnterpriseCode: prefix, - Status: 1, - } - require.NoError(t, tx.Create(enterprise).Error) - - inStockDevice := &model.Device{ - DeviceNo: prefix + "_INSTOCK", - DeviceName: "在库设备", - Status: 1, - } - require.NoError(t, tx.Create(inStockDevice).Error) - - ctx := createTestContext(1, constants.UserTypePlatform, 0, 0) - - t.Run("设备状态不是已分销时失败", func(t *testing.T) { - req := &dto.AllocateDevicesReq{ - DeviceNos: []string{inStockDevice.DeviceNo}, - } - - resp, err := svc.AllocateDevices(ctx, enterprise.ID, req) - require.NoError(t, err) - assert.Equal(t, 0, resp.SuccessCount) - assert.Equal(t, 1, resp.FailCount) - assert.Contains(t, resp.FailedItems[0].Reason, "状态不正确") - }) -} - -func TestService_AllocateDevices_AgentPermission(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - prefix := uniqueServiceTestPrefix() - - enterpriseStore := postgres.NewEnterpriseStore(tx, rdb) - deviceStore := postgres.NewDeviceStore(tx, rdb) - deviceSimBindingStore := postgres.NewDeviceSimBindingStore(tx, rdb) - enterpriseDeviceAuthStore := postgres.NewEnterpriseDeviceAuthorizationStore(tx, rdb) - enterpriseCardAuthStore := postgres.NewEnterpriseCardAuthorizationStore(tx, rdb) - logger := zap.NewNop() - - svc := New(tx, enterpriseStore, deviceStore, deviceSimBindingStore, enterpriseDeviceAuthStore, enterpriseCardAuthStore, logger) - - shop1 := &model.Shop{ShopName: prefix + "_店铺1", ShopCode: prefix + "1", Level: 1, Status: 1} - require.NoError(t, tx.Create(shop1).Error) - - shop2 := &model.Shop{ShopName: prefix + "_店铺2", ShopCode: prefix + "2", Level: 1, Status: 1} - require.NoError(t, tx.Create(shop2).Error) - - enterprise := &model.Enterprise{ - EnterpriseName: prefix + "_测试企业", - EnterpriseCode: prefix, - Status: 1, - } - require.NoError(t, tx.Create(enterprise).Error) - - device := &model.Device{ - DeviceNo: prefix + "_D001", - DeviceName: "测试设备", - Status: 2, - ShopID: &shop1.ID, - } - require.NoError(t, tx.Create(device).Error) - - t.Run("代理用户无法授权其他店铺的设备", func(t *testing.T) { - ctx := createTestContext(1, constants.UserTypeAgent, shop2.ID, 0) - req := &dto.AllocateDevicesReq{ - DeviceNos: []string{device.DeviceNo}, - } - - resp, err := svc.AllocateDevices(ctx, enterprise.ID, req) - require.NoError(t, err) - assert.Equal(t, 0, resp.SuccessCount) - assert.Equal(t, 1, resp.FailCount) - assert.Contains(t, resp.FailedItems[0].Reason, "无权操作") - }) -} - -func TestService_AllocateDevices_DuplicateAuthorization(t *testing.T) { - prefix := uniqueServiceTestPrefix() - env := setupTestEnv(t, prefix) - - ctx := createTestContext(1, constants.UserTypePlatform, 0, 0) - - req := &dto.AllocateDevicesReq{ - DeviceNos: []string{env.devices[0].DeviceNo}, - } - resp, err := env.service.AllocateDevices(ctx, env.enterprise.ID, req) - require.NoError(t, err) - assert.Equal(t, 1, resp.SuccessCount) - - t.Run("重复授权同一设备时失败", func(t *testing.T) { - resp2, err := env.service.AllocateDevices(ctx, env.enterprise.ID, req) - require.NoError(t, err) - assert.Equal(t, 0, resp2.SuccessCount) - assert.Equal(t, 1, resp2.FailCount) - assert.Contains(t, resp2.FailedItems[0].Reason, "已授权") - }) -} - -func TestService_AllocateDevices_CascadeCardAuthorization(t *testing.T) { - prefix := uniqueServiceTestPrefix() - env := setupTestEnv(t, prefix) - - ctx := createTestContext(1, constants.UserTypePlatform, 0, 0) - - t.Run("授权设备时级联授权绑定的卡", func(t *testing.T) { - req := &dto.AllocateDevicesReq{ - DeviceNos: []string{env.devices[0].DeviceNo}, - } - - resp, err := env.service.AllocateDevices(ctx, env.enterprise.ID, req) - require.NoError(t, err) - assert.Equal(t, 1, resp.SuccessCount) - assert.Len(t, resp.AuthorizedDevices, 1) - assert.Equal(t, 2, resp.AuthorizedDevices[0].CardCount) - }) -} - -func TestService_RecallDevices(t *testing.T) { - prefix := uniqueServiceTestPrefix() - env := setupTestEnv(t, prefix) - - ctx := createTestContext(1, constants.UserTypePlatform, 0, 0) - - allocateReq := &dto.AllocateDevicesReq{ - DeviceNos: []string{env.devices[0].DeviceNo, env.devices[1].DeviceNo}, - } - _, err := env.service.AllocateDevices(ctx, env.enterprise.ID, allocateReq) - require.NoError(t, err) - - tests := []struct { - name string - req *dto.RecallDevicesReq - wantSuccess int - wantFail int - wantErr bool - }{ - { - name: "成功撤销授权", - req: &dto.RecallDevicesReq{ - DeviceNos: []string{env.devices[0].DeviceNo}, - }, - wantSuccess: 1, - wantFail: 0, - wantErr: false, - }, - { - name: "设备不存在时失败", - req: &dto.RecallDevicesReq{ - DeviceNos: []string{"NOT_EXIST"}, - }, - wantSuccess: 0, - wantFail: 1, - wantErr: false, - }, - { - name: "设备未授权时失败", - req: &dto.RecallDevicesReq{ - DeviceNos: []string{env.devices[2].DeviceNo}, - }, - wantSuccess: 0, - wantFail: 1, - wantErr: false, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - resp, err := env.service.RecallDevices(ctx, env.enterprise.ID, tt.req) - if tt.wantErr { - require.Error(t, err) - return - } - require.NoError(t, err) - assert.Equal(t, tt.wantSuccess, resp.SuccessCount) - assert.Equal(t, tt.wantFail, resp.FailCount) - }) - } -} - -func TestService_RecallDevices_Unauthorized(t *testing.T) { - prefix := uniqueServiceTestPrefix() - env := setupTestEnv(t, prefix) - - t.Run("未授权用户返回错误", func(t *testing.T) { - req := &dto.RecallDevicesReq{ - DeviceNos: []string{env.devices[0].DeviceNo}, - } - - _, err := env.service.RecallDevices(context.Background(), env.enterprise.ID, req) - require.Error(t, err) - }) -} - -func TestService_ListDevices(t *testing.T) { - prefix := uniqueServiceTestPrefix() - env := setupTestEnv(t, prefix) - - ctx := createTestContext(1, constants.UserTypePlatform, 0, 0) - - allocateReq := &dto.AllocateDevicesReq{ - DeviceNos: []string{env.devices[0].DeviceNo, env.devices[1].DeviceNo}, - } - _, err := env.service.AllocateDevices(ctx, env.enterprise.ID, allocateReq) - require.NoError(t, err) - - tests := []struct { - name string - req *dto.EnterpriseDeviceListReq - wantTotal int64 - wantLen int - }{ - { - name: "获取所有授权设备", - req: &dto.EnterpriseDeviceListReq{Page: 1, PageSize: 10}, - wantTotal: 2, - wantLen: 2, - }, - { - name: "分页查询", - req: &dto.EnterpriseDeviceListReq{Page: 1, PageSize: 1}, - wantTotal: 2, - wantLen: 1, - }, - { - name: "按设备号搜索", - req: &dto.EnterpriseDeviceListReq{Page: 1, PageSize: 10, DeviceNo: env.devices[0].DeviceNo}, - wantTotal: 2, - wantLen: 1, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - resp, err := env.service.ListDevices(ctx, env.enterprise.ID, tt.req) - require.NoError(t, err) - assert.Equal(t, tt.wantTotal, resp.Total) - assert.Len(t, resp.List, tt.wantLen) - }) - } -} - -func TestService_ListDevices_EnterpriseNotFound(t *testing.T) { - prefix := uniqueServiceTestPrefix() - env := setupTestEnv(t, prefix) - - ctx := createTestContext(1, constants.UserTypePlatform, 0, 0) - - t.Run("企业不存在返回错误", func(t *testing.T) { - req := &dto.EnterpriseDeviceListReq{Page: 1, PageSize: 10} - _, err := env.service.ListDevices(ctx, 99999, req) - require.Error(t, err) - }) -} - -func TestService_ListDevicesForEnterprise(t *testing.T) { - prefix := uniqueServiceTestPrefix() - env := setupTestEnv(t, prefix) - - ctx := createTestContext(1, constants.UserTypePlatform, 0, 0) - allocateReq := &dto.AllocateDevicesReq{ - DeviceNos: []string{env.devices[0].DeviceNo}, - } - _, err := env.service.AllocateDevices(ctx, env.enterprise.ID, allocateReq) - require.NoError(t, err) - - t.Run("企业用户获取自己的授权设备", func(t *testing.T) { - enterpriseCtx := createTestContext(1, constants.UserTypeEnterprise, 0, env.enterprise.ID) - req := &dto.EnterpriseDeviceListReq{Page: 1, PageSize: 10} - - resp, err := env.service.ListDevicesForEnterprise(enterpriseCtx, req) - require.NoError(t, err) - assert.Equal(t, int64(1), resp.Total) - }) - - t.Run("未设置企业ID返回错误", func(t *testing.T) { - req := &dto.EnterpriseDeviceListReq{Page: 1, PageSize: 10} - _, err := env.service.ListDevicesForEnterprise(context.Background(), req) - require.Error(t, err) - }) -} - -func TestService_GetDeviceDetail(t *testing.T) { - prefix := uniqueServiceTestPrefix() - env := setupTestEnv(t, prefix) - - ctx := createTestContext(1, constants.UserTypePlatform, 0, 0) - allocateReq := &dto.AllocateDevicesReq{ - DeviceNos: []string{env.devices[0].DeviceNo}, - } - _, err := env.service.AllocateDevices(ctx, env.enterprise.ID, allocateReq) - require.NoError(t, err) - - enterpriseCtx := createTestContext(1, constants.UserTypeEnterprise, 0, env.enterprise.ID) - - t.Run("成功获取设备详情", func(t *testing.T) { - resp, err := env.service.GetDeviceDetail(enterpriseCtx, env.devices[0].ID) - require.NoError(t, err) - assert.Equal(t, env.devices[0].ID, resp.Device.DeviceID) - assert.Equal(t, env.devices[0].DeviceNo, resp.Device.DeviceNo) - assert.Len(t, resp.Cards, 2) - }) - - t.Run("设备未授权时返回错误", func(t *testing.T) { - _, err := env.service.GetDeviceDetail(enterpriseCtx, env.devices[1].ID) - require.Error(t, err) - }) - - t.Run("未设置企业ID返回错误", func(t *testing.T) { - _, err := env.service.GetDeviceDetail(context.Background(), env.devices[0].ID) - require.Error(t, err) - }) -} - -func TestService_SuspendCard(t *testing.T) { - prefix := uniqueServiceTestPrefix() - env := setupTestEnv(t, prefix) - - ctx := createTestContext(1, constants.UserTypePlatform, 0, 0) - allocateReq := &dto.AllocateDevicesReq{ - DeviceNos: []string{env.devices[0].DeviceNo}, - } - _, err := env.service.AllocateDevices(ctx, env.enterprise.ID, allocateReq) - require.NoError(t, err) - - enterpriseCtx := createTestContext(1, constants.UserTypeEnterprise, 0, env.enterprise.ID) - - t.Run("成功停机", func(t *testing.T) { - req := &dto.DeviceCardOperationReq{Reason: "测试停机"} - resp, err := env.service.SuspendCard(enterpriseCtx, env.devices[0].ID, env.cards[0].ID, req) - require.NoError(t, err) - assert.True(t, resp.Success) - }) - - t.Run("卡不属于设备时返回错误", func(t *testing.T) { - req := &dto.DeviceCardOperationReq{Reason: "测试停机"} - _, err := env.service.SuspendCard(enterpriseCtx, env.devices[0].ID, env.cards[3].ID, req) - require.Error(t, err) - }) - - t.Run("设备未授权时返回错误", func(t *testing.T) { - req := &dto.DeviceCardOperationReq{Reason: "测试停机"} - _, err := env.service.SuspendCard(enterpriseCtx, env.devices[1].ID, env.cards[2].ID, req) - require.Error(t, err) - }) - - t.Run("未设置企业ID返回错误", func(t *testing.T) { - req := &dto.DeviceCardOperationReq{Reason: "测试停机"} - _, err := env.service.SuspendCard(context.Background(), env.devices[0].ID, env.cards[0].ID, req) - require.Error(t, err) - }) -} - -func TestService_ResumeCard(t *testing.T) { - prefix := uniqueServiceTestPrefix() - env := setupTestEnv(t, prefix) - - ctx := createTestContext(1, constants.UserTypePlatform, 0, 0) - allocateReq := &dto.AllocateDevicesReq{ - DeviceNos: []string{env.devices[0].DeviceNo}, - } - _, err := env.service.AllocateDevices(ctx, env.enterprise.ID, allocateReq) - require.NoError(t, err) - - enterpriseCtx := createTestContext(1, constants.UserTypeEnterprise, 0, env.enterprise.ID) - - t.Run("成功复机", func(t *testing.T) { - req := &dto.DeviceCardOperationReq{Reason: "测试复机"} - resp, err := env.service.ResumeCard(enterpriseCtx, env.devices[0].ID, env.cards[0].ID, req) - require.NoError(t, err) - assert.True(t, resp.Success) - }) - - t.Run("卡不属于设备时返回错误", func(t *testing.T) { - req := &dto.DeviceCardOperationReq{Reason: "测试复机"} - _, err := env.service.ResumeCard(enterpriseCtx, env.devices[0].ID, env.cards[3].ID, req) - require.Error(t, err) - }) - - t.Run("设备未授权时返回错误", func(t *testing.T) { - req := &dto.DeviceCardOperationReq{Reason: "测试复机"} - _, err := env.service.ResumeCard(enterpriseCtx, env.devices[1].ID, env.cards[2].ID, req) - require.Error(t, err) - }) - - t.Run("未设置企业ID返回错误", func(t *testing.T) { - req := &dto.DeviceCardOperationReq{Reason: "测试复机"} - _, err := env.service.ResumeCard(context.Background(), env.devices[0].ID, env.cards[0].ID, req) - require.Error(t, err) - }) -} - -func TestService_ListDevices_EmptyResult(t *testing.T) { - prefix := uniqueServiceTestPrefix() - env := setupTestEnv(t, prefix) - - ctx := createTestContext(1, constants.UserTypePlatform, 0, 0) - - t.Run("企业无授权设备时返回空列表", func(t *testing.T) { - req := &dto.EnterpriseDeviceListReq{Page: 1, PageSize: 10} - resp, err := env.service.ListDevices(ctx, env.enterprise.ID, req) - require.NoError(t, err) - assert.Equal(t, int64(0), resp.Total) - assert.Empty(t, resp.List) - }) -} - -func TestService_GetDeviceDetail_WithCarrierInfo(t *testing.T) { - prefix := uniqueServiceTestPrefix() - env := setupTestEnv(t, prefix) - - ctx := createTestContext(1, constants.UserTypePlatform, 0, 0) - allocateReq := &dto.AllocateDevicesReq{ - DeviceNos: []string{env.devices[0].DeviceNo}, - } - _, err := env.service.AllocateDevices(ctx, env.enterprise.ID, allocateReq) - require.NoError(t, err) - - enterpriseCtx := createTestContext(1, constants.UserTypeEnterprise, 0, env.enterprise.ID) - - t.Run("获取设备详情包含运营商信息", func(t *testing.T) { - resp, err := env.service.GetDeviceDetail(enterpriseCtx, env.devices[0].ID) - require.NoError(t, err) - assert.Len(t, resp.Cards, 2) - for _, card := range resp.Cards { - assert.NotEmpty(t, card.CarrierName) - } - }) -} - -func TestService_GetDeviceDetail_NetworkStatus(t *testing.T) { - prefix := uniqueServiceTestPrefix() - env := setupTestEnv(t, prefix) - - ctx := createTestContext(1, constants.UserTypePlatform, 0, 0) - allocateReq := &dto.AllocateDevicesReq{ - DeviceNos: []string{env.devices[0].DeviceNo}, - } - _, err := env.service.AllocateDevices(ctx, env.enterprise.ID, allocateReq) - require.NoError(t, err) - - enterpriseCtx := createTestContext(1, constants.UserTypeEnterprise, 0, env.enterprise.ID) - - t.Run("网络状态名称正确", func(t *testing.T) { - resp, err := env.service.GetDeviceDetail(enterpriseCtx, env.devices[0].ID) - require.NoError(t, err) - for _, card := range resp.Cards { - if card.NetworkStatus == 1 { - assert.Equal(t, "开机", card.NetworkStatusName) - } else { - assert.Equal(t, "停机", card.NetworkStatusName) - } - } - }) -} - -func TestService_GetDeviceDetail_DeviceWithoutCards(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - prefix := uniqueServiceTestPrefix() - - enterpriseStore := postgres.NewEnterpriseStore(tx, rdb) - deviceStore := postgres.NewDeviceStore(tx, rdb) - deviceSimBindingStore := postgres.NewDeviceSimBindingStore(tx, rdb) - enterpriseDeviceAuthStore := postgres.NewEnterpriseDeviceAuthorizationStore(tx, rdb) - enterpriseCardAuthStore := postgres.NewEnterpriseCardAuthorizationStore(tx, rdb) - logger := zap.NewNop() - - svc := New(tx, enterpriseStore, deviceStore, deviceSimBindingStore, enterpriseDeviceAuthStore, enterpriseCardAuthStore, logger) - - enterprise := &model.Enterprise{ - EnterpriseName: prefix + "_测试企业", - EnterpriseCode: prefix, - Status: 1, - } - require.NoError(t, tx.Create(enterprise).Error) - - device := &model.Device{ - DeviceNo: prefix + "_D001", - DeviceName: "无卡设备", - Status: 2, - } - require.NoError(t, tx.Create(device).Error) - - ctx := createTestContext(1, constants.UserTypePlatform, 0, 0) - allocateReq := &dto.AllocateDevicesReq{ - DeviceNos: []string{device.DeviceNo}, - } - _, err := svc.AllocateDevices(ctx, enterprise.ID, allocateReq) - require.NoError(t, err) - - t.Run("设备无绑定卡时返回空卡列表", func(t *testing.T) { - enterpriseCtx := createTestContext(1, constants.UserTypeEnterprise, 0, enterprise.ID) - resp, err := svc.GetDeviceDetail(enterpriseCtx, device.ID) - require.NoError(t, err) - assert.Equal(t, device.ID, resp.Device.DeviceID) - assert.Empty(t, resp.Cards) - }) -} - -func TestService_RecallDevices_CascadeRevoke(t *testing.T) { - prefix := uniqueServiceTestPrefix() - env := setupTestEnv(t, prefix) - - ctx := createTestContext(1, constants.UserTypePlatform, 0, 0) - - allocateReq := &dto.AllocateDevicesReq{ - DeviceNos: []string{env.devices[0].DeviceNo}, - } - resp, err := env.service.AllocateDevices(ctx, env.enterprise.ID, allocateReq) - require.NoError(t, err) - assert.Equal(t, 2, resp.AuthorizedDevices[0].CardCount) - - t.Run("撤销设备授权时级联撤销卡授权", func(t *testing.T) { - recallReq := &dto.RecallDevicesReq{ - DeviceNos: []string{env.devices[0].DeviceNo}, - } - - recallResp, err := env.service.RecallDevices(ctx, env.enterprise.ID, recallReq) - require.NoError(t, err) - assert.Equal(t, 1, recallResp.SuccessCount) - }) -} - -func TestService_GetDeviceDetail_WithNetworkStatusOn(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - prefix := uniqueServiceTestPrefix() - - enterpriseStore := postgres.NewEnterpriseStore(tx, rdb) - deviceStore := postgres.NewDeviceStore(tx, rdb) - deviceSimBindingStore := postgres.NewDeviceSimBindingStore(tx, rdb) - enterpriseDeviceAuthStore := postgres.NewEnterpriseDeviceAuthorizationStore(tx, rdb) - enterpriseCardAuthStore := postgres.NewEnterpriseCardAuthorizationStore(tx, rdb) - logger := zap.NewNop() - - svc := New(tx, enterpriseStore, deviceStore, deviceSimBindingStore, enterpriseDeviceAuthStore, enterpriseCardAuthStore, logger) - - enterprise := &model.Enterprise{ - EnterpriseName: prefix + "_测试企业", - EnterpriseCode: prefix, - Status: 1, - } - require.NoError(t, tx.Create(enterprise).Error) - - carrier := &model.Carrier{ - CarrierName: "测试运营商", - CarrierType: "CMCC", - Status: 1, - } - require.NoError(t, tx.Create(carrier).Error) - - device := &model.Device{ - DeviceNo: prefix + "_D001", - DeviceName: "测试设备", - Status: 2, - } - require.NoError(t, tx.Create(device).Error) - - card := &model.IotCard{ - ICCID: prefix + "0001", - CarrierID: carrier.ID, - Status: 2, - NetworkStatus: 1, - } - require.NoError(t, tx.Create(card).Error) - - now := time.Now() - binding := &model.DeviceSimBinding{ - DeviceID: device.ID, - IotCardID: card.ID, - SlotPosition: 1, - BindStatus: 1, - BindTime: &now, - } - require.NoError(t, tx.Create(binding).Error) - - ctx := createTestContext(1, constants.UserTypePlatform, 0, 0) - allocateReq := &dto.AllocateDevicesReq{ - DeviceNos: []string{device.DeviceNo}, - } - _, err := svc.AllocateDevices(ctx, enterprise.ID, allocateReq) - require.NoError(t, err) - - t.Run("开机状态卡显示正确", func(t *testing.T) { - enterpriseCtx := createTestContext(1, constants.UserTypeEnterprise, 0, enterprise.ID) - resp, err := svc.GetDeviceDetail(enterpriseCtx, device.ID) - require.NoError(t, err) - assert.Len(t, resp.Cards, 1) - assert.Equal(t, 1, resp.Cards[0].NetworkStatus) - assert.Equal(t, "开机", resp.Cards[0].NetworkStatusName) - }) -} - -func TestService_EnterpriseNotFound(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - enterpriseStore := postgres.NewEnterpriseStore(tx, rdb) - deviceStore := postgres.NewDeviceStore(tx, rdb) - deviceSimBindingStore := postgres.NewDeviceSimBindingStore(tx, rdb) - enterpriseDeviceAuthStore := postgres.NewEnterpriseDeviceAuthorizationStore(tx, rdb) - enterpriseCardAuthStore := postgres.NewEnterpriseCardAuthorizationStore(tx, rdb) - logger := zap.NewNop() - - svc := New(tx, enterpriseStore, deviceStore, deviceSimBindingStore, enterpriseDeviceAuthStore, enterpriseCardAuthStore, logger) - ctx := createTestContext(1, constants.UserTypePlatform, 0, 0) - - t.Run("AllocateDevices企业不存在", func(t *testing.T) { - req := &dto.AllocateDevicesReq{DeviceNos: []string{"D001"}} - _, err := svc.AllocateDevices(ctx, 99999, req) - require.Error(t, err) - }) - - t.Run("RecallDevices企业不存在", func(t *testing.T) { - req := &dto.RecallDevicesReq{DeviceNos: []string{"D001"}} - _, err := svc.RecallDevices(ctx, 99999, req) - require.Error(t, err) - }) -} - -func TestService_ValidateCardOperation_RevokedDeviceAuth(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - prefix := uniqueServiceTestPrefix() - - enterpriseStore := postgres.NewEnterpriseStore(tx, rdb) - deviceStore := postgres.NewDeviceStore(tx, rdb) - deviceSimBindingStore := postgres.NewDeviceSimBindingStore(tx, rdb) - enterpriseDeviceAuthStore := postgres.NewEnterpriseDeviceAuthorizationStore(tx, rdb) - enterpriseCardAuthStore := postgres.NewEnterpriseCardAuthorizationStore(tx, rdb) - logger := zap.NewNop() - - svc := New(tx, enterpriseStore, deviceStore, deviceSimBindingStore, enterpriseDeviceAuthStore, enterpriseCardAuthStore, logger) - - enterprise := &model.Enterprise{ - EnterpriseName: prefix + "_测试企业", - EnterpriseCode: prefix, - Status: 1, - } - require.NoError(t, tx.Create(enterprise).Error) - - carrier := &model.Carrier{ - CarrierName: "测试运营商", - CarrierType: "CMCC", - Status: 1, - } - require.NoError(t, tx.Create(carrier).Error) - - device := &model.Device{ - DeviceNo: prefix + "_D001", - DeviceName: "测试设备", - Status: 2, - } - require.NoError(t, tx.Create(device).Error) - - card := &model.IotCard{ - ICCID: prefix + "0001", - CarrierID: carrier.ID, - Status: 2, - } - require.NoError(t, tx.Create(card).Error) - - now := time.Now() - binding := &model.DeviceSimBinding{ - DeviceID: device.ID, - IotCardID: card.ID, - SlotPosition: 1, - BindStatus: 1, - BindTime: &now, - } - require.NoError(t, tx.Create(binding).Error) - - deviceAuth := &model.EnterpriseDeviceAuthorization{ - EnterpriseID: enterprise.ID, - DeviceID: device.ID, - AuthorizedBy: 1, - AuthorizedAt: now, - AuthorizerType: 2, - RevokedBy: ptrUintED(1), - RevokedAt: &now, - } - require.NoError(t, tx.Create(deviceAuth).Error) - - t.Run("已撤销的设备授权无法操作卡", func(t *testing.T) { - enterpriseCtx := createTestContext(1, constants.UserTypeEnterprise, 0, enterprise.ID) - req := &dto.DeviceCardOperationReq{Reason: "测试"} - _, err := svc.SuspendCard(enterpriseCtx, device.ID, card.ID, req) - require.Error(t, err) - }) -} - -func ptrUintED(v uint) *uint { - return &v -} diff --git a/internal/service/iot_card/stop_resume_service.go b/internal/service/iot_card/stop_resume_service.go new file mode 100644 index 0000000..c2ab460 --- /dev/null +++ b/internal/service/iot_card/stop_resume_service.go @@ -0,0 +1,235 @@ +package iot_card + +import ( + "context" + "time" + + "github.com/redis/go-redis/v9" + "go.uber.org/zap" + "gorm.io/gorm" + + "github.com/break/junhong_cmp_fiber/internal/gateway" + "github.com/break/junhong_cmp_fiber/internal/model" + "github.com/break/junhong_cmp_fiber/internal/store/postgres" + "github.com/break/junhong_cmp_fiber/pkg/constants" +) + +// StopResumeService 停复机服务 +// 任务 24.2: 处理 IoT 卡的自动停机和复机逻辑 +type StopResumeService struct { + db *gorm.DB + redis *redis.Client + iotCardStore *postgres.IotCardStore + gatewayClient *gateway.Client + logger *zap.Logger + + // 重试配置 + maxRetries int + retryInterval time.Duration +} + +// NewStopResumeService 创建停复机服务 +func NewStopResumeService( + db *gorm.DB, + redis *redis.Client, + iotCardStore *postgres.IotCardStore, + gatewayClient *gateway.Client, + logger *zap.Logger, +) *StopResumeService { + return &StopResumeService{ + db: db, + redis: redis, + iotCardStore: iotCardStore, + gatewayClient: gatewayClient, + logger: logger, + maxRetries: 3, // 默认最多重试 3 次 + retryInterval: 2 * time.Second, // 默认重试间隔 2 秒 + } +} + +// CheckAndStopCard 任务 24.3: 检查流量耗尽并停机 +// 当所有套餐流量用完时，调用运营商接口停机 +func (s *StopResumeService) CheckAndStopCard(ctx context.Context, cardID uint) error { + // 查询卡信息 + card, err := s.iotCardStore.GetByID(ctx, cardID) + if err != nil { + return err + } + + // 如果已经是停机状态，跳过 + if card.NetworkStatus == constants.NetworkStatusOffline { + s.logger.Debug("卡已处于停机状态，跳过", + zap.Uint("card_id", cardID)) + return nil + } + + // 检查是否有可用套餐（status=1 生效中 或 status=0 待生效） + hasAvailablePackage, err := s.hasAvailablePackage(ctx, cardID) + if err != nil { + return err + } + + // 如果还有可用套餐，不停机 + if hasAvailablePackage { + return nil + } + + // 任务 24.5: 调用运营商停机接口（带重试机制） + if err := s.stopCardWithRetry(ctx, card); err != nil { + s.logger.Error("调用运营商停机接口失败", + zap.Uint("card_id", cardID), + zap.String("iccid", card.ICCID), + zap.Error(err)) + return err + } + + // 更新卡状态 + now := time.Now() + if err := s.db.WithContext(ctx).Model(card).Updates(map[string]any{ + "network_status": constants.NetworkStatusOffline, + "stopped_at": now, + "stop_reason": constants.StopReasonTrafficExhausted, + }).Error; err != nil { + return err + } + + s.logger.Info("卡因流量耗尽已停机", + zap.Uint("card_id", cardID), + zap.String("iccid", card.ICCID)) + + return nil +} + +// ResumeCardIfStopped 任务 24.4: 购买套餐后自动复机 +// 当购买新套餐且卡之前因流量耗尽停机时，自动复机 +func (s *StopResumeService) ResumeCardIfStopped(ctx context.Context, cardID uint) error { + // 查询卡信息 + card, err := s.iotCardStore.GetByID(ctx, cardID) + if err != nil { + return err + } + + // 幂等性检查：如果已经是开机状态，跳过 + if card.NetworkStatus == constants.NetworkStatusOnline { + s.logger.Debug("卡已处于开机状态，跳过", + zap.Uint("card_id", cardID)) + return nil + } + + // 只有因流量耗尽停机的卡才自动复机 + if card.StopReason != constants.StopReasonTrafficExhausted { + s.logger.Debug("卡非流量耗尽停机，不自动复机", + zap.Uint("card_id", cardID), + zap.String("stop_reason", card.StopReason)) + return nil + } + + // 任务 24.5: 调用运营商复机接口（带重试机制） + if err := s.resumeCardWithRetry(ctx, card); err != nil { + s.logger.Error("调用运营商复机接口失败", + zap.Uint("card_id", cardID), + zap.String("iccid", card.ICCID), + zap.Error(err)) + return err + } + + // 更新卡状态 + now := time.Now() + if err := s.db.WithContext(ctx).Model(card).Updates(map[string]any{ + "network_status": constants.NetworkStatusOnline, + "resumed_at": now, + "stop_reason": "", // 清空停机原因 + }).Error; err != nil { + return err + } + + s.logger.Info("卡购买套餐后已自动复机", + zap.Uint("card_id", cardID), + zap.String("iccid", card.ICCID)) + + return nil +} + +// hasAvailablePackage 检查是否有可用套餐 +func (s *StopResumeService) hasAvailablePackage(ctx context.Context, cardID uint) (bool, error) { + var count int64 + err := s.db.WithContext(ctx).Model(&model.PackageUsage{}). + Where("iot_card_id = ?", cardID). + Where("status IN ?", []int{ + constants.PackageUsageStatusPending, // 待生效 + constants.PackageUsageStatusActive, // 生效中 + }). + Count(&count).Error + + if err != nil { + return false, err + } + + return count > 0, nil +} + +// stopCardWithRetry 任务 24.5: 调用运营商停机接口（带重试机制） +func (s *StopResumeService) stopCardWithRetry(ctx context.Context, card *model.IotCard) error { + if s.gatewayClient == nil { + s.logger.Warn("Gateway 客户端未配置，跳过调用运营商接口", + zap.Uint("card_id", card.ID)) + return nil + } + + var lastErr error + for i := 0; i < s.maxRetries; i++ { + if i > 0 { + s.logger.Debug("重试调用停机接口", + zap.Int("attempt", i+1), + zap.String("iccid", card.ICCID)) + time.Sleep(s.retryInterval) + } + + err := s.gatewayClient.StopCard(ctx, &gateway.CardOperationReq{ + CardNo: card.ICCID, + }) + if err == nil { + return nil + } + + lastErr = err + s.logger.Warn("调用停机接口失败，准备重试", + zap.Int("attempt", i+1), + zap.Error(err)) + } + + return lastErr +} + +// resumeCardWithRetry 任务 24.5: 调用运营商复机接口（带重试机制） +func (s *StopResumeService) resumeCardWithRetry(ctx context.Context, card *model.IotCard) error { + if s.gatewayClient == nil { + s.logger.Warn("Gateway 客户端未配置，跳过调用运营商接口", + zap.Uint("card_id", card.ID)) + return nil + } + + var lastErr error + for i := 0; i < s.maxRetries; i++ { + if i > 0 { + s.logger.Debug("重试调用复机接口", + zap.Int("attempt", i+1), + zap.String("iccid", card.ICCID)) + time.Sleep(s.retryInterval) + } + + err := s.gatewayClient.StartCard(ctx, &gateway.CardOperationReq{ + CardNo: card.ICCID, + }) + if err == nil { + return nil + } + + lastErr = err + s.logger.Warn("调用复机接口失败，准备重试", + zap.Int("attempt", i+1), + zap.Error(err)) + } + + return lastErr +} diff --git a/internal/service/order/service.go b/internal/service/order/service.go index 4cb2d1a..09c4a0a 100644 --- a/internal/service/order/service.go +++ b/internal/service/order/service.go @@ -6,6 +6,7 @@ import ( "github.com/break/junhong_cmp_fiber/internal/model" "github.com/break/junhong_cmp_fiber/internal/model/dto" + packagepkg "github.com/break/junhong_cmp_fiber/internal/service/package" "github.com/break/junhong_cmp_fiber/internal/service/purchase_validation" "github.com/break/junhong_cmp_fiber/internal/store" "github.com/break/junhong_cmp_fiber/internal/store/postgres" @@ -30,6 +31,8 @@ type Service struct { iotCardStore *postgres.IotCardStore deviceStore *postgres.DeviceStore packageSeriesStore *postgres.PackageSeriesStore + packageUsageStore *postgres.PackageUsageStore + packageStore *postgres.PackageStore wechatPayment wechat.PaymentServiceInterface queueClient *queue.Client logger *zap.Logger @@ -46,6 +49,8 @@ func New( iotCardStore *postgres.IotCardStore, deviceStore *postgres.DeviceStore, packageSeriesStore *postgres.PackageSeriesStore, + packageUsageStore *postgres.PackageUsageStore, + packageStore *postgres.PackageStore, wechatPayment wechat.PaymentServiceInterface, queueClient *queue.Client, logger *zap.Logger, @@ -61,6 +66,8 @@ func New( iotCardStore: iotCardStore, deviceStore: deviceStore, packageSeriesStore: packageSeriesStore, + packageUsageStore: packageUsageStore, + packageStore: packageStore, wechatPayment: wechatPayment, queueClient: queueClient, logger: logger, @@ -517,8 +524,26 @@ func (s *Service) activatePackage(ctx context.Context, tx *gorm.DB, order *model return errors.Wrap(errors.CodeDatabaseError, err, "查询订单明细失败") } + // 任务 8.1: 检查混买限制 - 禁止同订单混买正式套餐和加油包 + if err := s.validatePackageTypeMix(tx, items); err != nil { + return err + } + + // 确定载体类型和ID + carrierType := "iot_card" + var carrierID uint + if order.OrderType == model.OrderTypeSingleCard && order.IotCardID != nil { + carrierID = *order.IotCardID + } else if order.OrderType == model.OrderTypeDevice && order.DeviceID != nil { + carrierType = "device" + carrierID = *order.DeviceID + } else { + return errors.New(errors.CodeInvalidParam, "无效的订单类型或缺少载体ID") + } + now := time.Now() for _, item := range items { + // 检查是否已存在使用记录 var existingUsage model.PackageUsage err := tx.Where("order_id = ? AND package_id = ?", order.ID, item.PackageID). First(&existingUsage).Error @@ -532,39 +557,226 @@ func (s *Service) activatePackage(ctx context.Context, tx *gorm.DB, order *model return errors.Wrap(errors.CodeDatabaseError, err, "检查套餐使用记录失败") } + // 查询套餐信息 var pkg model.Package if err := tx.First(&pkg, item.PackageID).Error; err != nil { return errors.Wrap(errors.CodeDatabaseError, err, "查询套餐信息失败") } - usage := &model.PackageUsage{ - BaseModel: model.BaseModel{ - Creator: order.Creator, - Updater: order.Creator, - }, - OrderID: order.ID, - PackageID: item.PackageID, - UsageType: order.OrderType, - DataLimitMB: pkg.RealDataMB, - ActivatedAt: now, - ExpiresAt: now.AddDate(0, pkg.DurationMonths, 0), - Status: 1, + // 根据套餐类型分别处理 + if pkg.PackageType == "formal" { + // 主套餐处理逻辑（任务 8.2-8.4） + if err := s.activateMainPackage(ctx, tx, order, &pkg, carrierType, carrierID, now); err != nil { + return err + } + } else if pkg.PackageType == "addon" { + // 加油包处理逻辑（任务 8.5-8.7） + if err := s.activateAddonPackage(ctx, tx, order, &pkg, carrierType, carrierID, now); err != nil { + return err + } + } + } + + return nil +} + +// validatePackageTypeMix 任务 8.1: 检查混买限制 +func (s *Service) validatePackageTypeMix(tx *gorm.DB, items []*model.OrderItem) error { + hasFormal := false + hasAddon := false + + for _, item := range items { + var pkg model.Package + if err := tx.First(&pkg, item.PackageID).Error; err != nil { + return errors.Wrap(errors.CodeDatabaseError, err, "查询套餐信息失败") } - if order.OrderType == model.OrderTypeSingleCard && order.IotCardID != nil { - usage.IotCardID = *order.IotCardID - } else if order.OrderType == model.OrderTypeDevice && order.DeviceID != nil { - usage.DeviceID = *order.DeviceID + if pkg.PackageType == "formal" { + hasFormal = true + } else if pkg.PackageType == "addon" { + hasAddon = true } - if err := tx.Create(usage).Error; err != nil { - return errors.Wrap(errors.CodeDatabaseError, err, "创建套餐使用记录失败") + if hasFormal && hasAddon { + return errors.New(errors.CodeInvalidParam, "不允许在同一订单中同时购买正式套餐和加油包") } } return nil } +// activateMainPackage 任务 8.2-8.4: 主套餐激活逻辑 +func (s *Service) activateMainPackage(ctx context.Context, tx *gorm.DB, order *model.Order, pkg *model.Package, carrierType string, carrierID uint, now time.Time) error { + // 检查是否有生效中主套餐 + var activeMainPackage model.PackageUsage + err := tx.Where("status = ?", constants.PackageUsageStatusActive). + Where("master_usage_id IS NULL"). + Where(carrierType+"_id = ?", carrierID). + Order("priority ASC"). + First(&activeMainPackage).Error + + hasActiveMain := err == nil + + var status int + var priority int + var activatedAt time.Time + var expiresAt time.Time + var nextResetAt *time.Time + var pendingRealnameActivation bool + + if hasActiveMain { + // 任务 8.3: 有生效中主套餐，新套餐排队 + status = constants.PackageUsageStatusPending + // 查询当前最大优先级 + var maxPriority int + tx.Model(&model.PackageUsage{}). + Where(carrierType+"_id = ?", carrierID). + Select("COALESCE(MAX(priority), 0)"). + Scan(&maxPriority) + priority = maxPriority + 1 + // 排队套餐暂不设置激活时间和过期时间（由激活任务处理） + } else { + // 任务 8.4: 无生效中主套餐，立即激活 + status = constants.PackageUsageStatusActive + priority = 1 + activatedAt = now + // 使用工具函数计算过期时间 + expiresAt = packagepkg.CalculateExpiryTime(pkg.CalendarType, activatedAt, pkg.DurationMonths, pkg.DurationDays) + // 计算下次重置时间 + // TODO: 从运营商表读取 billing_day（任务 1.5 待实现） + // 暂时使用默认值：联通=27，其他=1 + billingDay := 1 // 默认1号计费 + if carrierType == "iot_card" { + var card model.IotCard + if err := tx.First(&card, carrierID).Error; err == nil { + var carrier model.Carrier + if err := tx.First(&carrier, card.CarrierID).Error; err == nil { + if carrier.CarrierType == "CUCC" { + billingDay = 27 // 联通27号计费 + } + } + } + } + nextResetAt = packagepkg.CalculateNextResetTime(pkg.DataResetCycle, now, billingDay) + } + + // 任务 8.9: 后台囤货场景 + if pkg.EnableRealnameActivation { + // 需要实名后才能激活 + status = constants.PackageUsageStatusPending + pendingRealnameActivation = true + } + + // 创建套餐使用记录 + usage := &model.PackageUsage{ + BaseModel: model.BaseModel{ + Creator: order.Creator, + Updater: order.Creator, + }, + OrderID: order.ID, + PackageID: pkg.ID, + UsageType: order.OrderType, + DataLimitMB: pkg.RealDataMB, + Status: status, + Priority: priority, + DataResetCycle: pkg.DataResetCycle, + PendingRealnameActivation: pendingRealnameActivation, + } + + if carrierType == "iot_card" { + usage.IotCardID = carrierID + } else { + usage.DeviceID = carrierID + } + + if status == constants.PackageUsageStatusActive { + usage.ActivatedAt = activatedAt + usage.ExpiresAt = expiresAt + usage.NextResetAt = nextResetAt + } + + // 创建套餐使用记录（两步处理零值问题） + if err := tx.Omit("status", "pending_realname_activation").Create(usage).Error; err != nil { + return errors.Wrap(errors.CodeDatabaseError, err, "创建主套餐使用记录失败") + } + // 明确更新零值字段 + if err := tx.Model(usage).Updates(map[string]interface{}{ + "status": usage.Status, + "pending_realname_activation": usage.PendingRealnameActivation, + }).Error; err != nil { + return errors.Wrap(errors.CodeDatabaseError, err, "更新主套餐状态失败") + } + + return nil +} + +// activateAddonPackage 任务 8.5-8.7: 加油包激活逻辑 +func (s *Service) activateAddonPackage(ctx context.Context, tx *gorm.DB, order *model.Order, pkg *model.Package, carrierType string, carrierID uint, now time.Time) error { + // 任务 8.5-8.6: 检查是否有主套餐（status IN (0,1)） + var mainPackage model.PackageUsage + err := tx.Where("status IN ?", []int{constants.PackageUsageStatusPending, constants.PackageUsageStatusActive}). + Where("master_usage_id IS NULL"). + Where(carrierType+"_id = ?", carrierID). + Order("priority ASC"). + First(&mainPackage).Error + + if err == gorm.ErrRecordNotFound { + return errors.New(errors.CodeInvalidParam, "必须有主套餐才能购买加油包") + } + if err != nil { + return errors.Wrap(errors.CodeDatabaseError, err, "查询主套餐失败") + } + + // 任务 8.7: 创建加油包，绑定到主套餐 + // 查询当前最大优先级（加油包优先级低于主套餐） + var maxPriority int + tx.Model(&model.PackageUsage{}). + Where(carrierType+"_id = ?", carrierID). + Select("COALESCE(MAX(priority), 0)"). + Scan(&maxPriority) + priority := maxPriority + 1 + + // 加油包立即生效 + status := constants.PackageUsageStatusActive + activatedAt := now + + // 计算过期时间（根据 has_independent_expiry） + var expiresAt time.Time + // 注意：has_independent_expiry 字段在 Package 模型中，暂时使用默认行为 + // 默认加油包跟随主套餐过期 + expiresAt = mainPackage.ExpiresAt + + usage := &model.PackageUsage{ + BaseModel: model.BaseModel{ + Creator: order.Creator, + Updater: order.Creator, + }, + OrderID: order.ID, + PackageID: pkg.ID, + UsageType: order.OrderType, + DataLimitMB: pkg.RealDataMB, + Status: status, + Priority: priority, + MasterUsageID: &mainPackage.ID, + ActivatedAt: activatedAt, + ExpiresAt: expiresAt, + DataResetCycle: pkg.DataResetCycle, + } + + if carrierType == "iot_card" { + usage.IotCardID = carrierID + } else { + usage.DeviceID = carrierID + } + + // 创建加油包使用记录（加油包 status=1，不需要处理零值） + if err := tx.Create(usage).Error; err != nil { + return errors.Wrap(errors.CodeDatabaseError, err, "创建加油包使用记录失败") + } + + return nil +} + func (s *Service) enqueueCommissionCalculation(ctx context.Context, orderID uint) { if s.queueClient == nil { s.logger.Warn("队列客户端未初始化，跳过佣金计算任务入队", zap.Uint("order_id", orderID)) diff --git a/internal/service/package/activation_service.go b/internal/service/package/activation_service.go new file mode 100644 index 0000000..35c33be --- /dev/null +++ b/internal/service/package/activation_service.go @@ -0,0 +1,340 @@ +package packagepkg + +import ( + "context" + "time" + + "github.com/break/junhong_cmp_fiber/internal/model" + "github.com/break/junhong_cmp_fiber/internal/store/postgres" + "github.com/break/junhong_cmp_fiber/pkg/constants" + "github.com/break/junhong_cmp_fiber/pkg/errors" + "github.com/redis/go-redis/v9" + "go.uber.org/zap" + "gorm.io/gorm" +) + +// ResumeCallback 任务 24.7: 复机回调接口 +// 用于在套餐激活后触发自动复机 +type ResumeCallback interface { + // ResumeCardIfStopped 购买套餐后自动复机 + ResumeCardIfStopped(ctx context.Context, cardID uint) error +} + +type ActivationService struct { + db *gorm.DB + redis *redis.Client + packageUsageStore *postgres.PackageUsageStore + packageStore *postgres.PackageStore + packageUsageDailyRecord *postgres.PackageUsageDailyRecordStore + logger *zap.Logger + resumeCallback ResumeCallback // 复机回调，可选 +} + +func NewActivationService( + db *gorm.DB, + redis *redis.Client, + packageUsageStore *postgres.PackageUsageStore, + packageStore *postgres.PackageStore, + packageUsageDailyRecord *postgres.PackageUsageDailyRecordStore, + logger *zap.Logger, +) *ActivationService { + return &ActivationService{ + db: db, + redis: redis, + packageUsageStore: packageUsageStore, + packageStore: packageStore, + packageUsageDailyRecord: packageUsageDailyRecord, + logger: logger, + } +} + +// SetResumeCallback 任务 24.7: 设置复机回调 +// 在应用启动时由 bootstrap 调用，注入停复机服务 +func (s *ActivationService) SetResumeCallback(callback ResumeCallback) { + s.resumeCallback = callback +} + +// ActivateByRealname 任务 9.2-9.3: 首次实名激活 +// 当用户完成实名后，激活所有待实名激活的套餐 +func (s *ActivationService) ActivateByRealname(ctx context.Context, carrierType string, carrierID uint) error { + // 查询待实名激活的套餐 + var pendingUsages []*model.PackageUsage + query := s.db.WithContext(ctx). + Where("pending_realname_activation = ?", true). + Where("status = ?", constants.PackageUsageStatusPending) + + if carrierType == "iot_card" { + query = query.Where("iot_card_id = ?", carrierID) + } else if carrierType == "device" { + query = query.Where("device_id = ?", carrierID) + } else { + return errors.New(errors.CodeInvalidParam, "无效的载体类型") + } + + if err := query.Order("priority ASC").Find(&pendingUsages).Error; err != nil { + return errors.Wrap(errors.CodeDatabaseError, err, "查询待实名激活套餐失败") + } + + if len(pendingUsages) == 0 { + s.logger.Info("没有待实名激活的套餐", zap.String("carrier_type", carrierType), zap.Uint("carrier_id", carrierID)) + return nil + } + + now := time.Now() + + // 在事务中激活套餐 + return s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error { + for _, usage := range pendingUsages { + // 查询套餐信息 + var pkg model.Package + if err := tx.First(&pkg, usage.PackageID).Error; err != nil { + return errors.Wrap(errors.CodeDatabaseError, err, "查询套餐信息失败") + } + + // 检查是否是主套餐 + if usage.MasterUsageID == nil { + // 主套餐：需要检查是否有已激活的主套餐 + var activeMain model.PackageUsage + err := tx.Where("status = ?", constants.PackageUsageStatusActive). + Where("master_usage_id IS NULL"). + Where(carrierType+"_id = ?", carrierID). + Order("priority ASC"). + First(&activeMain).Error + + if err == nil { + // 已有激活的主套餐，保持排队状态 + s.logger.Warn("已有激活主套餐，跳过激活", + zap.Uint("usage_id", usage.ID), + zap.Uint("active_main_id", activeMain.ID)) + continue + } + if err != gorm.ErrRecordNotFound { + return errors.Wrap(errors.CodeDatabaseError, err, "检查生效中主套餐失败") + } + } + + // 激活套餐 + activatedAt := now + expiresAt := CalculateExpiryTime(pkg.CalendarType, activatedAt, pkg.DurationMonths, pkg.DurationDays) + + // 计算下次重置时间 + billingDay := 1 // 默认1号计费 + if carrierType == "iot_card" { + var card model.IotCard + if err := tx.First(&card, carrierID).Error; err == nil { + var carrier model.Carrier + if err := tx.First(&carrier, card.CarrierID).Error; err == nil { + if carrier.CarrierType == "CUCC" { + billingDay = 27 // 联通27号计费 + } + } + } + } + nextResetAt := CalculateNextResetTime(pkg.DataResetCycle, now, billingDay) + + // 更新套餐使用记录 + updates := map[string]interface{}{ + "status": constants.PackageUsageStatusActive, + "pending_realname_activation": false, + "activated_at": activatedAt, + "expires_at": expiresAt, + } + if nextResetAt != nil { + updates["next_reset_at"] = *nextResetAt + } + + if err := tx.Model(usage).Updates(updates).Error; err != nil { + return errors.Wrap(errors.CodeDatabaseError, err, "激活套餐失败") + } + + s.logger.Info("套餐已激活", + zap.Uint("usage_id", usage.ID), + zap.Uint("package_id", usage.PackageID), + zap.Time("activated_at", activatedAt), + zap.Time("expires_at", expiresAt)) + + // 任务 24.7: 在套餐激活后触发自动复机 + if s.resumeCallback != nil && carrierType == "iot_card" { + go func(cardID uint) { + resumeCtx := context.Background() + if err := s.resumeCallback.ResumeCardIfStopped(resumeCtx, cardID); err != nil { + s.logger.Error("自动复机失败", + zap.Uint("card_id", cardID), + zap.Error(err)) + } + }(carrierID) + } + } + + return nil + }) +} + +// ActivateQueuedPackage 任务 9.4-9.7: 排队主套餐激活 +// 当主套餐过期后，激活下一个待生效的主套餐 +func (s *ActivationService) ActivateQueuedPackage(ctx context.Context, carrierType string, carrierID uint) error { + // 使用 Redis 分布式锁避免并发 + lockKey := constants.RedisPackageActivationLockKey(carrierType, carrierID) + lockValue := time.Now().String() + locked, err := s.redis.SetNX(ctx, lockKey, lockValue, 30*time.Second).Result() + if err != nil { + return errors.Wrap(errors.CodeRedisError, err, "获取分布式锁失败") + } + if !locked { + s.logger.Warn("套餐激活正在进行中，跳过", + zap.String("carrier_type", carrierType), + zap.Uint("carrier_id", carrierID)) + return nil + } + defer s.redis.Del(ctx, lockKey) + + return s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error { + // 任务 9.5: 检测并标记过期的主套餐 + now := time.Now() + var expiredMainUsages []*model.PackageUsage + err := tx.Where("status = ?", constants.PackageUsageStatusActive). + Where("master_usage_id IS NULL"). + Where("expires_at <= ?", now). + Where(carrierType+"_id = ?", carrierID). + Find(&expiredMainUsages).Error + + if err != nil { + return errors.Wrap(errors.CodeDatabaseError, err, "查询过期主套餐失败") + } + + for _, expiredMain := range expiredMainUsages { + // 更新主套餐状态为已过期 + if err := tx.Model(expiredMain).Update("status", constants.PackageUsageStatusExpired).Error; err != nil { + return errors.Wrap(errors.CodeDatabaseError, err, "更新过期主套餐状态失败") + } + + s.logger.Info("主套餐已过期", + zap.Uint("usage_id", expiredMain.ID), + zap.Time("expires_at", expiredMain.ExpiresAt)) + + // 任务 9.7: 加油包级联失效 + if err := s.invalidateAddons(ctx, tx, expiredMain.ID); err != nil { + return err + } + + // 任务 9.6: 激活下一个待生效主套餐 + if err := s.activateNextMainPackage(ctx, tx, carrierType, carrierID, now); err != nil { + return err + } + } + + return nil + }) +} + +// invalidateAddons 任务 9.7: 加油包级联失效 +func (s *ActivationService) invalidateAddons(ctx context.Context, tx *gorm.DB, masterUsageID uint) error { + var addons []*model.PackageUsage + if err := tx.Where("master_usage_id = ?", masterUsageID). + Where("status IN ?", []int{constants.PackageUsageStatusActive, constants.PackageUsageStatusPending}). + Find(&addons).Error; err != nil { + return errors.Wrap(errors.CodeDatabaseError, err, "查询加油包失败") + } + + if len(addons) == 0 { + return nil + } + + addonIDs := make([]uint, len(addons)) + for i, addon := range addons { + addonIDs[i] = addon.ID + } + + // 批量更新加油包状态为已失效 + if err := tx.Model(&model.PackageUsage{}). + Where("id IN ?", addonIDs). + Update("status", constants.PackageUsageStatusInvalidated).Error; err != nil { + return errors.Wrap(errors.CodeDatabaseError, err, "批量失效加油包失败") + } + + s.logger.Info("加油包已级联失效", + zap.Uint("master_usage_id", masterUsageID), + zap.Int("addon_count", len(addons))) + + return nil +} + +// activateNextMainPackage 任务 9.6: 激活下一个待生效主套餐 +func (s *ActivationService) activateNextMainPackage(ctx context.Context, tx *gorm.DB, carrierType string, carrierID uint, now time.Time) error { + // 查询下一个待生效主套餐 + var nextMain model.PackageUsage + err := tx.Where("status = ?", constants.PackageUsageStatusPending). + Where("master_usage_id IS NULL"). + Where(carrierType+"_id = ?", carrierID). + Order("priority ASC"). + First(&nextMain).Error + + if err == gorm.ErrRecordNotFound { + s.logger.Info("没有待生效的主套餐", + zap.String("carrier_type", carrierType), + zap.Uint("carrier_id", carrierID)) + return nil + } + if err != nil { + return errors.Wrap(errors.CodeDatabaseError, err, "查询下一个待生效主套餐失败") + } + + // 查询套餐信息 + var pkg model.Package + if err := tx.First(&pkg, nextMain.PackageID).Error; err != nil { + return errors.Wrap(errors.CodeDatabaseError, err, "查询套餐信息失败") + } + + // 激活套餐 + activatedAt := now + expiresAt := CalculateExpiryTime(pkg.CalendarType, activatedAt, pkg.DurationMonths, pkg.DurationDays) + + // 计算下次重置时间 + billingDay := 1 + if carrierType == "iot_card" { + var card model.IotCard + if err := tx.First(&card, carrierID).Error; err == nil { + var carrier model.Carrier + if err := tx.First(&carrier, card.CarrierID).Error; err == nil { + if carrier.CarrierType == "CUCC" { + billingDay = 27 + } + } + } + } + nextResetAt := CalculateNextResetTime(pkg.DataResetCycle, now, billingDay) + + // 更新套餐使用记录 + updates := map[string]interface{}{ + "status": constants.PackageUsageStatusActive, + "activated_at": activatedAt, + "expires_at": expiresAt, + } + if nextResetAt != nil { + updates["next_reset_at"] = *nextResetAt + } + + if err := tx.Model(&nextMain).Updates(updates).Error; err != nil { + return errors.Wrap(errors.CodeDatabaseError, err, "激活排队主套餐失败") + } + + s.logger.Info("排队主套餐已激活", + zap.Uint("usage_id", nextMain.ID), + zap.Uint("package_id", nextMain.PackageID), + zap.Time("activated_at", activatedAt), + zap.Time("expires_at", expiresAt)) + + // 任务 24.7: 在套餐激活后触发自动复机 + if s.resumeCallback != nil && carrierType == "iot_card" { + go func(cardID uint) { + resumeCtx := context.Background() + if err := s.resumeCallback.ResumeCardIfStopped(resumeCtx, cardID); err != nil { + s.logger.Error("排队激活后自动复机失败", + zap.Uint("card_id", cardID), + zap.Error(err)) + } + }(carrierID) + } + + return nil +} diff --git a/internal/service/package/customer_view_service.go b/internal/service/package/customer_view_service.go new file mode 100644 index 0000000..09db83e --- /dev/null +++ b/internal/service/package/customer_view_service.go @@ -0,0 +1,147 @@ +package packagepkg + +import ( + "context" + + "github.com/break/junhong_cmp_fiber/internal/model" + "github.com/break/junhong_cmp_fiber/internal/model/dto" + "github.com/break/junhong_cmp_fiber/internal/store/postgres" + "github.com/break/junhong_cmp_fiber/pkg/constants" + "github.com/break/junhong_cmp_fiber/pkg/errors" + "github.com/redis/go-redis/v9" + "go.uber.org/zap" + "gorm.io/gorm" +) + +type CustomerViewService struct { + db *gorm.DB + redis *redis.Client + packageUsageStore *postgres.PackageUsageStore + logger *zap.Logger +} + +func NewCustomerViewService( + db *gorm.DB, + redis *redis.Client, + packageUsageStore *postgres.PackageUsageStore, + logger *zap.Logger, +) *CustomerViewService { + return &CustomerViewService{ + db: db, + redis: redis, + packageUsageStore: packageUsageStore, + logger: logger, + } +} + +// GetMyUsage 任务 12.2-12.5: 获取客户套餐使用情况 +// 根据载体ID和类型查询生效中的套餐，计算总流量使用情况 +func (s *CustomerViewService) GetMyUsage(ctx context.Context, carrierType string, carrierID uint) (*dto.PackageUsageCustomerViewResponse, error) { + // 任务 12.3: 查询生效套餐（status IN (1,2)） + var packages []*model.PackageUsage + query := s.db.WithContext(ctx). + Where("status IN ?", []int{constants.PackageUsageStatusActive, constants.PackageUsageStatusDepleted}) + + if carrierType == "iot_card" { + query = query.Where("iot_card_id = ?", carrierID) + } else if carrierType == "device" { + query = query.Where("device_id = ?", carrierID) + } else { + return nil, errors.New(errors.CodeInvalidParam, "无效的载体类型") + } + + // 按优先级排序：主套餐在前，加油包在后 + if err := query.Order("CASE WHEN master_usage_id IS NULL THEN 0 ELSE 1 END, priority ASC"). + Find(&packages).Error; err != nil { + return nil, errors.Wrap(errors.CodeDatabaseError, err, "查询套餐使用记录失败") + } + + if len(packages) == 0 { + return nil, errors.New(errors.CodeNotFound, "未找到套餐使用记录") + } + + // 任务 12.4: 区分主套餐和加油包，计算总流量 + var mainPackage *dto.PackageUsageItemResponse + var addonPackages []dto.PackageUsageItemResponse + var totalUsedMB int64 + var totalLimitMB int64 + + for _, pkg := range packages { + // 查询套餐信息 + var packageInfo model.Package + if err := s.db.First(&packageInfo, pkg.PackageID).Error; err != nil { + s.logger.Warn("查询套餐信息失败", + zap.Uint("package_id", pkg.PackageID), + zap.Error(err)) + continue + } + + // 格式化状态文本 + statusText := getStatusText(pkg.Status) + + // 格式化时间 + activatedAtStr := "" + if pkg.ActivatedAt.Year() > 1 { + activatedAtStr = pkg.ActivatedAt.Format("2006-01-02 15:04:05") + } + + expiresAtStr := "" + if pkg.ExpiresAt.Year() > 1 { + expiresAtStr = pkg.ExpiresAt.Format("2006-01-02 15:04:05") + } + + item := dto.PackageUsageItemResponse{ + PackageUsageID: pkg.ID, + PackageID: pkg.PackageID, + PackageName: packageInfo.PackageName, + UsedMB: pkg.DataUsageMB, + TotalMB: pkg.DataLimitMB, + Status: pkg.Status, + StatusText: statusText, + ActivatedAt: activatedAtStr, + ExpiresAt: expiresAtStr, + Priority: pkg.Priority, + } + + // 累计总流量 + totalUsedMB += pkg.DataUsageMB + totalLimitMB += pkg.DataLimitMB + + // 区分主套餐和加油包 + if pkg.MasterUsageID == nil { + mainPackage = &item + } else { + addonPackages = append(addonPackages, item) + } + } + + // 任务 12.5: 组装响应 DTO + response := &dto.PackageUsageCustomerViewResponse{ + MainPackage: mainPackage, + AddonPackages: addonPackages, + Total: dto.PackageUsageTotalInfo{ + UsedMB: totalUsedMB, + TotalMB: totalLimitMB, + }, + } + + return response, nil +} + +// getStatusText 获取状态文本 +func getStatusText(status int) string { + switch status { + case constants.PackageUsageStatusPending: + return "待生效" + case constants.PackageUsageStatusActive: + return "生效中" + case constants.PackageUsageStatusDepleted: + return "已用完" + case constants.PackageUsageStatusExpired: + return "已过期" + case constants.PackageUsageStatusInvalidated: + return "已失效" + default: + return "未知" + } +} diff --git a/internal/service/package/daily_record_service.go b/internal/service/package/daily_record_service.go new file mode 100644 index 0000000..f755713 --- /dev/null +++ b/internal/service/package/daily_record_service.go @@ -0,0 +1,101 @@ +package packagepkg + +import ( + "context" + "time" + + "github.com/break/junhong_cmp_fiber/internal/model" + "github.com/break/junhong_cmp_fiber/internal/model/dto" + "github.com/break/junhong_cmp_fiber/internal/store/postgres" + "github.com/break/junhong_cmp_fiber/pkg/errors" + "github.com/redis/go-redis/v9" + "go.uber.org/zap" + "gorm.io/gorm" +) + +type DailyRecordService struct { + db *gorm.DB + redis *redis.Client + packageUsageDailyRecord *postgres.PackageUsageDailyRecordStore + logger *zap.Logger +} + +func NewDailyRecordService( + db *gorm.DB, + redis *redis.Client, + packageUsageDailyRecord *postgres.PackageUsageDailyRecordStore, + logger *zap.Logger, +) *DailyRecordService { + return &DailyRecordService{ + db: db, + redis: redis, + packageUsageDailyRecord: packageUsageDailyRecord, + logger: logger, + } +} + +// GetDailyRecords 任务 13.2-13.5: 查询套餐流量详单 +// 查询指定套餐使用记录的日流量明细 +func (s *DailyRecordService) GetDailyRecords(ctx context.Context, packageUsageID uint, startDate, endDate string) (*dto.PackageUsageDetailResponse, error) { + // 查询套餐使用记录 + var usage model.PackageUsage + if err := s.db.WithContext(ctx).First(&usage, packageUsageID).Error; err != nil { + if err == gorm.ErrRecordNotFound { + return nil, errors.New(errors.CodeNotFound, "套餐使用记录不存在") + } + return nil, errors.Wrap(errors.CodeDatabaseError, err, "查询套餐使用记录失败") + } + + // 查询套餐信息 + var pkg model.Package + if err := s.db.WithContext(ctx).First(&pkg, usage.PackageID).Error; err != nil { + return nil, errors.Wrap(errors.CodeDatabaseError, err, "查询套餐信息失败") + } + + // 任务 13.4: 查询日记录 + var records []*model.PackageUsageDailyRecord + query := s.db.WithContext(ctx).Where("package_usage_id = ?", packageUsageID) + + // 如果提供了日期范围，添加过滤条件 + if startDate != "" { + start, err := time.Parse("2006-01-02", startDate) + if err != nil { + return nil, errors.New(errors.CodeInvalidParam, "开始日期格式错误") + } + query = query.Where("date >= ?", start) + } + + if endDate != "" { + end, err := time.Parse("2006-01-02", endDate) + if err != nil { + return nil, errors.New(errors.CodeInvalidParam, "结束日期格式错误") + } + query = query.Where("date <= ?", end) + } + + if err := query.Order("date ASC").Find(&records).Error; err != nil { + return nil, errors.Wrap(errors.CodeDatabaseError, err, "查询日流量记录失败") + } + + // 任务 13.5: 组装响应 DTO + recordResponses := make([]dto.PackageUsageDailyRecordResponse, len(records)) + var totalUsageMB int64 + + for i, record := range records { + recordResponses[i] = dto.PackageUsageDailyRecordResponse{ + Date: record.Date.Format("2006-01-02"), + DailyUsageMB: record.DailyUsageMB, + CumulativeUsageMB: record.CumulativeUsageMB, + } + totalUsageMB += int64(record.DailyUsageMB) + } + + response := &dto.PackageUsageDetailResponse{ + PackageUsageID: packageUsageID, + PackageName: pkg.PackageName, + Records: recordResponses, + TotalUsageMB: totalUsageMB, + } + + return response, nil +} diff --git a/internal/service/package/reset_service.go b/internal/service/package/reset_service.go new file mode 100644 index 0000000..6377e91 --- /dev/null +++ b/internal/service/package/reset_service.go @@ -0,0 +1,242 @@ +package packagepkg + +import ( + "context" + "time" + + "github.com/break/junhong_cmp_fiber/internal/model" + "github.com/break/junhong_cmp_fiber/internal/store/postgres" + "github.com/break/junhong_cmp_fiber/pkg/constants" + "github.com/break/junhong_cmp_fiber/pkg/errors" + "github.com/redis/go-redis/v9" + "go.uber.org/zap" + "gorm.io/gorm" +) + +type ResetService struct { + db *gorm.DB + redis *redis.Client + packageUsageStore *postgres.PackageUsageStore + logger *zap.Logger +} + +func NewResetService( + db *gorm.DB, + redis *redis.Client, + packageUsageStore *postgres.PackageUsageStore, + logger *zap.Logger, +) *ResetService { + return &ResetService{ + db: db, + redis: redis, + packageUsageStore: packageUsageStore, + logger: logger, + } +} + +// ResetDailyUsage 任务 11.2-11.3: 重置日流量 +func (s *ResetService) ResetDailyUsage(ctx context.Context) error { + return s.resetDailyUsageWithDB(ctx, s.db) +} + +// resetDailyUsageWithDB 内部方法，支持传入 DB/TX +func (s *ResetService) resetDailyUsageWithDB(ctx context.Context, db *gorm.DB) error { + now := time.Now() + + return db.WithContext(ctx).Transaction(func(tx *gorm.DB) error { + // 查询需要重置的套餐 + var packages []*model.PackageUsage + err := tx.Where("data_reset_cycle = ?", constants.PackageDataResetDaily). + Where("next_reset_at <= ?", now). + Where("status IN ?", []int{constants.PackageUsageStatusActive, constants.PackageUsageStatusDepleted}). + Find(&packages).Error + + if err != nil { + return errors.Wrap(errors.CodeDatabaseError, err, "查询待重置套餐失败") + } + + if len(packages) == 0 { + s.logger.Info("没有需要重置的日流量套餐") + return nil + } + + // 批量重置 + packageIDs := make([]uint, len(packages)) + for i, pkg := range packages { + packageIDs[i] = pkg.ID + } + + // 计算下次重置时间（明天 00:00:00） + nextReset := time.Date(now.Year(), now.Month(), now.Day()+1, 0, 0, 0, 0, now.Location()) + + // 批量更新 + updates := map[string]interface{}{ + "data_usage_mb": 0, + "last_reset_at": now, + "next_reset_at": nextReset, + "status": constants.PackageUsageStatusActive, // 重置后恢复为生效中 + } + + if err := tx.Model(&model.PackageUsage{}). + Where("id IN ?", packageIDs). + Updates(updates).Error; err != nil { + return errors.Wrap(errors.CodeDatabaseError, err, "批量重置日流量失败") + } + + s.logger.Info("日流量重置完成", + zap.Int("count", len(packages)), + zap.Time("next_reset_at", nextReset)) + + return nil + }) +} + +// ResetMonthlyUsage 任务 11.4-11.5: 重置月流量 +func (s *ResetService) ResetMonthlyUsage(ctx context.Context) error { + return s.resetMonthlyUsageWithDB(ctx, s.db) +} + +// resetMonthlyUsageWithDB 内部方法，支持传入 DB/TX +func (s *ResetService) resetMonthlyUsageWithDB(ctx context.Context, db *gorm.DB) error { + now := time.Now() + + return db.WithContext(ctx).Transaction(func(tx *gorm.DB) error { + // 查询需要重置的套餐 + var packages []*model.PackageUsage + err := tx.Where("data_reset_cycle = ?", constants.PackageDataResetMonthly). + Where("next_reset_at <= ?", now). + Where("status IN ?", []int{constants.PackageUsageStatusActive, constants.PackageUsageStatusDepleted}). + Find(&packages).Error + + if err != nil { + return errors.Wrap(errors.CodeDatabaseError, err, "查询待重置套餐失败") + } + + if len(packages) == 0 { + s.logger.Info("没有需要重置的月流量套餐") + return nil + } + + // 按套餐分组处理（因为需要区分联通27号 vs 其他1号） + for _, pkg := range packages { + // 查询运营商信息以确定计费日 + // 只有单卡套餐才根据运营商判断，设备级套餐统一使用1号计费 + billingDay := 1 + if pkg.IotCardID != 0 { + var card model.IotCard + if err := tx.First(&card, pkg.IotCardID).Error; err == nil { + var carrier model.Carrier + if err := tx.First(&carrier, card.CarrierID).Error; err == nil { + if carrier.CarrierType == "CUCC" { + billingDay = 27 + } + } + } + } + // 设备级套餐默认使用1号计费（已在 billingDay := 1 初始化） + + // 计算下次重置时间 + nextReset := calculateNextMonthlyResetTime(now, billingDay) + + // 更新套餐 + updates := map[string]interface{}{ + "data_usage_mb": 0, + "last_reset_at": now, + "next_reset_at": nextReset, + "status": constants.PackageUsageStatusActive, // 重置后恢复为生效中 + } + + if err := tx.Model(pkg).Updates(updates).Error; err != nil { + return errors.Wrap(errors.CodeDatabaseError, err, "重置月流量失败") + } + + s.logger.Info("月流量已重置", + zap.Uint("usage_id", pkg.ID), + zap.Int("billing_day", billingDay), + zap.Time("next_reset_at", nextReset)) + } + + return nil + }) +} + +// ResetYearlyUsage 任务 11.6-11.7: 重置年流量 +func (s *ResetService) ResetYearlyUsage(ctx context.Context) error { + return s.resetYearlyUsageWithDB(ctx, s.db) +} + +// resetYearlyUsageWithDB 内部方法，支持传入 DB/TX +func (s *ResetService) resetYearlyUsageWithDB(ctx context.Context, db *gorm.DB) error { + now := time.Now() + + return db.WithContext(ctx).Transaction(func(tx *gorm.DB) error { + // 查询需要重置的套餐 + var packages []*model.PackageUsage + err := tx.Where("data_reset_cycle = ?", constants.PackageDataResetYearly). + Where("next_reset_at <= ?", now). + Where("status IN ?", []int{constants.PackageUsageStatusActive, constants.PackageUsageStatusDepleted}). + Find(&packages).Error + + if err != nil { + return errors.Wrap(errors.CodeDatabaseError, err, "查询待重置套餐失败") + } + + if len(packages) == 0 { + s.logger.Info("没有需要重置的年流量套餐") + return nil + } + + // 批量重置 + packageIDs := make([]uint, len(packages)) + for i, pkg := range packages { + packageIDs[i] = pkg.ID + } + + // 计算下次重置时间（明年 1月1日 00:00:00） + nextReset := time.Date(now.Year()+1, 1, 1, 0, 0, 0, 0, now.Location()) + + // 批量更新 + updates := map[string]interface{}{ + "data_usage_mb": 0, + "last_reset_at": now, + "next_reset_at": nextReset, + "status": constants.PackageUsageStatusActive, // 重置后恢复为生效中 + } + + if err := tx.Model(&model.PackageUsage{}). + Where("id IN ?", packageIDs). + Updates(updates).Error; err != nil { + return errors.Wrap(errors.CodeDatabaseError, err, "批量重置年流量失败") + } + + s.logger.Info("年流量重置完成", + zap.Int("count", len(packages)), + zap.Time("next_reset_at", nextReset)) + + return nil + }) +} + +// calculateNextMonthlyResetTime 计算下次月重置时间 +func calculateNextMonthlyResetTime(now time.Time, billingDay int) time.Time { + currentDay := now.Day() + targetMonth := now.Month() + targetYear := now.Year() + + // 如果当前日期 >= 计费日，下次重置是下月计费日 + if currentDay >= billingDay { + targetMonth++ + if targetMonth > 12 { + targetMonth = 1 + targetYear++ + } + } + + // 处理月末天数不足的情况（例如2月没有27日） + maxDay := time.Date(targetYear, targetMonth+1, 0, 0, 0, 0, 0, now.Location()).Day() + if billingDay > maxDay { + billingDay = maxDay + } + + return time.Date(targetYear, targetMonth, billingDay, 0, 0, 0, 0, now.Location()) +} diff --git a/internal/service/package/service.go b/internal/service/package/service.go index 652fc98..646be95 100644 --- a/internal/service/package/service.go +++ b/internal/service/package/service.go @@ -62,6 +62,23 @@ func (s *Service) Create(ctx context.Context, req *dto.CreatePackageRequest) (*d } } + // 校验套餐周期类型和时长配置 + calendarType := constants.PackageCalendarTypeByDay // 默认按天 + if req.CalendarType != nil { + calendarType = *req.CalendarType + } + if calendarType == constants.PackageCalendarTypeNaturalMonth { + // 自然月套餐：必须提供 duration_months + if req.DurationMonths <= 0 { + return nil, errors.New(errors.CodeInvalidParam, "自然月套餐必须提供有效的duration_months") + } + } else if calendarType == constants.PackageCalendarTypeByDay { + // 按天套餐：必须提供 duration_days + if req.DurationDays == nil || *req.DurationDays <= 0 { + return nil, errors.New(errors.CodeInvalidParam, "按天套餐必须提供有效的duration_days") + } + } + var seriesName *string if req.SeriesID != nil && *req.SeriesID > 0 { series, err := s.packageSeriesStore.GetByID(ctx, *req.SeriesID) @@ -81,6 +98,7 @@ func (s *Service) Create(ctx context.Context, req *dto.CreatePackageRequest) (*d DurationMonths: req.DurationMonths, CostPrice: req.CostPrice, EnableVirtualData: req.EnableVirtualData, + CalendarType: calendarType, Status: constants.StatusEnabled, ShelfStatus: 2, } @@ -96,6 +114,21 @@ func (s *Service) Create(ctx context.Context, req *dto.CreatePackageRequest) (*d if req.SuggestedRetailPrice != nil { pkg.SuggestedRetailPrice = *req.SuggestedRetailPrice } + if req.DurationDays != nil { + pkg.DurationDays = *req.DurationDays + } + if req.DataResetCycle != nil { + pkg.DataResetCycle = *req.DataResetCycle + } else { + // 默认月重置 + pkg.DataResetCycle = constants.PackageDataResetMonthly + } + if req.EnableRealnameActivation != nil { + pkg.EnableRealnameActivation = *req.EnableRealnameActivation + } else { + // 默认启用实名激活 + pkg.EnableRealnameActivation = true + } pkg.Creator = currentUserID if err := s.packageStore.Create(ctx, pkg); err != nil { @@ -183,6 +216,29 @@ func (s *Service) Update(ctx context.Context, id uint, req *dto.UpdatePackageReq if req.SuggestedRetailPrice != nil { pkg.SuggestedRetailPrice = *req.SuggestedRetailPrice } + if req.CalendarType != nil { + pkg.CalendarType = *req.CalendarType + } + if req.DurationDays != nil { + pkg.DurationDays = *req.DurationDays + } + if req.DataResetCycle != nil { + pkg.DataResetCycle = *req.DataResetCycle + } + if req.EnableRealnameActivation != nil { + pkg.EnableRealnameActivation = *req.EnableRealnameActivation + } + + // 校验套餐周期类型和时长配置 + if pkg.CalendarType == constants.PackageCalendarTypeNaturalMonth { + if pkg.DurationMonths <= 0 { + return nil, errors.New(errors.CodeInvalidParam, "自然月套餐必须提供有效的duration_months") + } + } else if pkg.CalendarType == constants.PackageCalendarTypeByDay { + if pkg.DurationDays <= 0 { + return nil, errors.New(errors.CodeInvalidParam, "按天套餐必须提供有效的duration_days") + } + } // 校验虚流量配置 if pkg.EnableVirtualData { @@ -397,22 +453,31 @@ func (s *Service) toResponse(ctx context.Context, pkg *model.Package) *dto.Packa seriesID = &pkg.SeriesID } + var durationDays *int + if pkg.CalendarType == constants.PackageCalendarTypeByDay && pkg.DurationDays > 0 { + durationDays = &pkg.DurationDays + } + resp := &dto.PackageResponse{ - ID: pkg.ID, - PackageCode: pkg.PackageCode, - PackageName: pkg.PackageName, - SeriesID: seriesID, - PackageType: pkg.PackageType, - DurationMonths: pkg.DurationMonths, - RealDataMB: pkg.RealDataMB, - VirtualDataMB: pkg.VirtualDataMB, - EnableVirtualData: pkg.EnableVirtualData, - CostPrice: pkg.CostPrice, - SuggestedRetailPrice: pkg.SuggestedRetailPrice, - Status: pkg.Status, - ShelfStatus: pkg.ShelfStatus, - CreatedAt: pkg.CreatedAt.Format(time.RFC3339), - UpdatedAt: pkg.UpdatedAt.Format(time.RFC3339), + ID: pkg.ID, + PackageCode: pkg.PackageCode, + PackageName: pkg.PackageName, + SeriesID: seriesID, + PackageType: pkg.PackageType, + DurationMonths: pkg.DurationMonths, + RealDataMB: pkg.RealDataMB, + VirtualDataMB: pkg.VirtualDataMB, + EnableVirtualData: pkg.EnableVirtualData, + CostPrice: pkg.CostPrice, + SuggestedRetailPrice: pkg.SuggestedRetailPrice, + CalendarType: pkg.CalendarType, + DurationDays: durationDays, + DataResetCycle: pkg.DataResetCycle, + EnableRealnameActivation: pkg.EnableRealnameActivation, + Status: pkg.Status, + ShelfStatus: pkg.ShelfStatus, + CreatedAt: pkg.CreatedAt.Format(time.RFC3339), + UpdatedAt: pkg.UpdatedAt.Format(time.RFC3339), } userType := middleware.GetUserTypeFromContext(ctx) @@ -450,22 +515,31 @@ func (s *Service) toResponseWithAllocation(_ context.Context, pkg *model.Package seriesID = &pkg.SeriesID } + var durationDays *int + if pkg.CalendarType == constants.PackageCalendarTypeByDay && pkg.DurationDays > 0 { + durationDays = &pkg.DurationDays + } + resp := &dto.PackageResponse{ - ID: pkg.ID, - PackageCode: pkg.PackageCode, - PackageName: pkg.PackageName, - SeriesID: seriesID, - PackageType: pkg.PackageType, - DurationMonths: pkg.DurationMonths, - RealDataMB: pkg.RealDataMB, - VirtualDataMB: pkg.VirtualDataMB, - EnableVirtualData: pkg.EnableVirtualData, - CostPrice: pkg.CostPrice, - SuggestedRetailPrice: pkg.SuggestedRetailPrice, - Status: pkg.Status, - ShelfStatus: pkg.ShelfStatus, - CreatedAt: pkg.CreatedAt.Format(time.RFC3339), - UpdatedAt: pkg.UpdatedAt.Format(time.RFC3339), + ID: pkg.ID, + PackageCode: pkg.PackageCode, + PackageName: pkg.PackageName, + SeriesID: seriesID, + PackageType: pkg.PackageType, + DurationMonths: pkg.DurationMonths, + RealDataMB: pkg.RealDataMB, + VirtualDataMB: pkg.VirtualDataMB, + EnableVirtualData: pkg.EnableVirtualData, + CostPrice: pkg.CostPrice, + SuggestedRetailPrice: pkg.SuggestedRetailPrice, + CalendarType: pkg.CalendarType, + DurationDays: durationDays, + DataResetCycle: pkg.DataResetCycle, + EnableRealnameActivation: pkg.EnableRealnameActivation, + Status: pkg.Status, + ShelfStatus: pkg.ShelfStatus, + CreatedAt: pkg.CreatedAt.Format(time.RFC3339), + UpdatedAt: pkg.UpdatedAt.Format(time.RFC3339), } if allocationMap != nil { diff --git a/internal/service/package/service_test.go b/internal/service/package/service_test.go deleted file mode 100644 index f1dc2dd..0000000 --- a/internal/service/package/service_test.go +++ /dev/null @@ -1,673 +0,0 @@ -package packagepkg - -import ( - "context" - "fmt" - "testing" - "time" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/internal/model/dto" - "github.com/break/junhong_cmp_fiber/internal/store/postgres" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/pkg/errors" - "github.com/break/junhong_cmp_fiber/pkg/middleware" - "github.com/break/junhong_cmp_fiber/tests/testutils" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -func generateUniquePackageCode(prefix string) string { - return fmt.Sprintf("%s_%d", prefix, time.Now().UnixNano()) -} - -func TestPackageService_Create(t *testing.T) { - tx := testutils.NewTestTransaction(t) - packageStore := postgres.NewPackageStore(tx) - packageSeriesStore := postgres.NewPackageSeriesStore(tx) - svc := New(packageStore, packageSeriesStore, nil, nil) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypePlatform, - }) - - t.Run("创建成功", func(t *testing.T) { - req := &dto.CreatePackageRequest{ - PackageCode: generateUniquePackageCode("PKG_CREATE"), - PackageName: "创建测试套餐", - PackageType: "formal", - DurationMonths: 1, - } - - resp, err := svc.Create(ctx, req) - require.NoError(t, err) - assert.NotZero(t, resp.ID) - assert.Equal(t, req.PackageCode, resp.PackageCode) - assert.Equal(t, req.PackageName, resp.PackageName) - assert.Equal(t, constants.StatusEnabled, resp.Status) - assert.Equal(t, 2, resp.ShelfStatus) - }) - - t.Run("编码重复失败", func(t *testing.T) { - code := generateUniquePackageCode("PKG_DUP") - req1 := &dto.CreatePackageRequest{ - PackageCode: code, - PackageName: "第一个套餐", - PackageType: "formal", - DurationMonths: 1, - } - _, err := svc.Create(ctx, req1) - require.NoError(t, err) - - req2 := &dto.CreatePackageRequest{ - PackageCode: code, - PackageName: "第二个套餐", - PackageType: "formal", - DurationMonths: 1, - } - _, err = svc.Create(ctx, req2) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeConflict, appErr.Code) - }) - - t.Run("系列不存在失败", func(t *testing.T) { - req := &dto.CreatePackageRequest{ - PackageCode: generateUniquePackageCode("PKG_SERIES"), - PackageName: "系列测试套餐", - PackageType: "formal", - DurationMonths: 1, - SeriesID: func() *uint { id := uint(99999); return &id }(), - } - - _, err := svc.Create(ctx, req) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeNotFound, appErr.Code) - }) -} - -func TestPackageService_UpdateStatus(t *testing.T) { - tx := testutils.NewTestTransaction(t) - packageStore := postgres.NewPackageStore(tx) - packageSeriesStore := postgres.NewPackageSeriesStore(tx) - svc := New(packageStore, packageSeriesStore, nil, nil) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypePlatform, - }) - - req := &dto.CreatePackageRequest{ - PackageCode: generateUniquePackageCode("PKG_STATUS"), - PackageName: "状态测试套餐", - PackageType: "formal", - DurationMonths: 1, - } - created, err := svc.Create(ctx, req) - require.NoError(t, err) - - t.Run("禁用套餐时自动强制下架", func(t *testing.T) { - err := svc.UpdateShelfStatus(ctx, created.ID, 1) - require.NoError(t, err) - - pkg, err := svc.Get(ctx, created.ID) - require.NoError(t, err) - assert.Equal(t, 1, pkg.ShelfStatus) - - err = svc.UpdateStatus(ctx, created.ID, constants.StatusDisabled) - require.NoError(t, err) - - pkg, err = svc.Get(ctx, created.ID) - require.NoError(t, err) - assert.Equal(t, constants.StatusDisabled, pkg.Status) - assert.Equal(t, 2, pkg.ShelfStatus) - }) - - t.Run("启用套餐时保持原上架状态", func(t *testing.T) { - req2 := &dto.CreatePackageRequest{ - PackageCode: generateUniquePackageCode("PKG_ENABLE"), - PackageName: "启用测试套餐", - PackageType: "formal", - DurationMonths: 1, - } - created2, err := svc.Create(ctx, req2) - require.NoError(t, err) - - err = svc.UpdateShelfStatus(ctx, created2.ID, 1) - require.NoError(t, err) - - err = svc.UpdateStatus(ctx, created2.ID, constants.StatusDisabled) - require.NoError(t, err) - - pkg, err := svc.Get(ctx, created2.ID) - require.NoError(t, err) - assert.Equal(t, constants.StatusDisabled, pkg.Status) - assert.Equal(t, 2, pkg.ShelfStatus) - - err = svc.UpdateStatus(ctx, created2.ID, constants.StatusEnabled) - require.NoError(t, err) - - pkg, err = svc.Get(ctx, created2.ID) - require.NoError(t, err) - assert.Equal(t, constants.StatusEnabled, pkg.Status) - assert.Equal(t, 2, pkg.ShelfStatus) - }) -} - -func TestPackageService_UpdateShelfStatus(t *testing.T) { - tx := testutils.NewTestTransaction(t) - packageStore := postgres.NewPackageStore(tx) - packageSeriesStore := postgres.NewPackageSeriesStore(tx) - svc := New(packageStore, packageSeriesStore, nil, nil) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypePlatform, - }) - - t.Run("启用状态的套餐可以上架", func(t *testing.T) { - req := &dto.CreatePackageRequest{ - PackageCode: generateUniquePackageCode("PKG_SHELF_ENABLE"), - PackageName: "上架测试-启用", - PackageType: "formal", - DurationMonths: 1, - } - created, err := svc.Create(ctx, req) - require.NoError(t, err) - - pkg, err := svc.Get(ctx, created.ID) - require.NoError(t, err) - assert.Equal(t, 1, pkg.Status) - assert.Equal(t, 2, pkg.ShelfStatus) - - err = svc.UpdateShelfStatus(ctx, created.ID, 1) - require.NoError(t, err) - - pkg, err = svc.Get(ctx, created.ID) - require.NoError(t, err) - assert.Equal(t, 1, pkg.ShelfStatus) - }) - - t.Run("禁用状态的套餐不能上架", func(t *testing.T) { - req := &dto.CreatePackageRequest{ - PackageCode: generateUniquePackageCode("PKG_SHELF_DISABLE"), - PackageName: "上架测试-禁用", - PackageType: "formal", - DurationMonths: 1, - } - created, err := svc.Create(ctx, req) - require.NoError(t, err) - - err = svc.UpdateStatus(ctx, created.ID, constants.StatusDisabled) - require.NoError(t, err) - - err = svc.UpdateShelfStatus(ctx, created.ID, 1) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeInvalidStatus, appErr.Code) - - pkg, err := svc.Get(ctx, created.ID) - require.NoError(t, err) - assert.Equal(t, 2, pkg.ShelfStatus) - }) - - t.Run("下架成功", func(t *testing.T) { - req := &dto.CreatePackageRequest{ - PackageCode: generateUniquePackageCode("PKG_SHELF_OFF"), - PackageName: "下架测试", - PackageType: "formal", - DurationMonths: 1, - } - created, err := svc.Create(ctx, req) - require.NoError(t, err) - - err = svc.UpdateShelfStatus(ctx, created.ID, 1) - require.NoError(t, err) - - pkg, err := svc.Get(ctx, created.ID) - require.NoError(t, err) - assert.Equal(t, 1, pkg.ShelfStatus) - - err = svc.UpdateShelfStatus(ctx, created.ID, 2) - require.NoError(t, err) - - pkg, err = svc.Get(ctx, created.ID) - require.NoError(t, err) - assert.Equal(t, 2, pkg.ShelfStatus) - }) -} - -func TestPackageService_Get(t *testing.T) { - tx := testutils.NewTestTransaction(t) - packageStore := postgres.NewPackageStore(tx) - packageSeriesStore := postgres.NewPackageSeriesStore(tx) - svc := New(packageStore, packageSeriesStore, nil, nil) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypePlatform, - }) - - req := &dto.CreatePackageRequest{ - PackageCode: generateUniquePackageCode("PKG_GET"), - PackageName: "查询测试套餐", - PackageType: "formal", - DurationMonths: 1, - } - created, err := svc.Create(ctx, req) - require.NoError(t, err) - - t.Run("获取成功", func(t *testing.T) { - resp, err := svc.Get(ctx, created.ID) - require.NoError(t, err) - assert.Equal(t, created.PackageCode, resp.PackageCode) - assert.Equal(t, created.PackageName, resp.PackageName) - assert.Equal(t, created.ID, resp.ID) - }) - - t.Run("不存在返回错误", func(t *testing.T) { - _, err := svc.Get(ctx, 99999) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeNotFound, appErr.Code) - }) -} - -func TestPackageService_Update(t *testing.T) { - tx := testutils.NewTestTransaction(t) - packageStore := postgres.NewPackageStore(tx) - packageSeriesStore := postgres.NewPackageSeriesStore(tx) - svc := New(packageStore, packageSeriesStore, nil, nil) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypePlatform, - }) - - req := &dto.CreatePackageRequest{ - PackageCode: generateUniquePackageCode("PKG_UPDATE"), - PackageName: "更新测试套餐", - PackageType: "formal", - DurationMonths: 1, - } - created, err := svc.Create(ctx, req) - require.NoError(t, err) - - t.Run("更新成功", func(t *testing.T) { - newName := "更新后的套餐名称" - updateReq := &dto.UpdatePackageRequest{ - PackageName: &newName, - } - - resp, err := svc.Update(ctx, created.ID, updateReq) - require.NoError(t, err) - assert.Equal(t, newName, resp.PackageName) - }) - - t.Run("更新不存在的套餐", func(t *testing.T) { - newName := "test" - updateReq := &dto.UpdatePackageRequest{ - PackageName: &newName, - } - - _, err := svc.Update(ctx, 99999, updateReq) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeNotFound, appErr.Code) - }) -} - -func TestPackageService_Delete(t *testing.T) { - tx := testutils.NewTestTransaction(t) - packageStore := postgres.NewPackageStore(tx) - packageSeriesStore := postgres.NewPackageSeriesStore(tx) - svc := New(packageStore, packageSeriesStore, nil, nil) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypePlatform, - }) - - req := &dto.CreatePackageRequest{ - PackageCode: generateUniquePackageCode("PKG_DELETE"), - PackageName: "删除测试套餐", - PackageType: "formal", - DurationMonths: 1, - } - created, err := svc.Create(ctx, req) - require.NoError(t, err) - - t.Run("删除成功", func(t *testing.T) { - err := svc.Delete(ctx, created.ID) - require.NoError(t, err) - - _, err = svc.Get(ctx, created.ID) - require.Error(t, err) - }) - - t.Run("删除不存在的套餐", func(t *testing.T) { - err := svc.Delete(ctx, 99999) - require.Error(t, err) - }) -} - -func TestPackageService_List(t *testing.T) { - tx := testutils.NewTestTransaction(t) - packageStore := postgres.NewPackageStore(tx) - packageSeriesStore := postgres.NewPackageSeriesStore(tx) - svc := New(packageStore, packageSeriesStore, nil, nil) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypePlatform, - }) - - packages := []dto.CreatePackageRequest{ - { - PackageCode: generateUniquePackageCode("PKG_LIST_001"), - PackageName: "列表测试套餐1", - PackageType: "formal", - DurationMonths: 1, - }, - { - PackageCode: generateUniquePackageCode("PKG_LIST_002"), - PackageName: "列表测试套餐2", - PackageType: "addon", - DurationMonths: 1, - }, - { - PackageCode: generateUniquePackageCode("PKG_LIST_003"), - PackageName: "列表测试套餐3", - PackageType: "formal", - DurationMonths: 12, - }, - } - - for _, p := range packages { - _, err := svc.Create(ctx, &p) - require.NoError(t, err) - } - - t.Run("列表查询", func(t *testing.T) { - req := &dto.PackageListRequest{ - Page: 1, - PageSize: 10, - } - - resp, total, err := svc.List(ctx, req) - require.NoError(t, err) - assert.Greater(t, total, int64(0)) - assert.Greater(t, len(resp), 0) - }) - - t.Run("按套餐类型过滤", func(t *testing.T) { - packageType := "formal" - req := &dto.PackageListRequest{ - Page: 1, - PageSize: 10, - PackageType: &packageType, - } - - resp, _, err := svc.List(ctx, req) - require.NoError(t, err) - for _, p := range resp { - assert.Equal(t, packageType, p.PackageType) - } - }) - - t.Run("按状态过滤", func(t *testing.T) { - status := constants.StatusEnabled - req := &dto.PackageListRequest{ - Page: 1, - PageSize: 10, - Status: &status, - } - - resp, _, err := svc.List(ctx, req) - require.NoError(t, err) - for _, p := range resp { - assert.Equal(t, status, p.Status) - } - }) -} - -func TestPackageService_VirtualDataValidation(t *testing.T) { - tx := testutils.NewTestTransaction(t) - packageStore := postgres.NewPackageStore(tx) - packageSeriesStore := postgres.NewPackageSeriesStore(tx) - svc := New(packageStore, packageSeriesStore, nil, nil) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypePlatform, - }) - - t.Run("启用虚流量时虚流量必须大于0", func(t *testing.T) { - req := &dto.CreatePackageRequest{ - PackageCode: generateUniquePackageCode("PKG_VDATA_1"), - PackageName: "虚流量测试-零值", - PackageType: "formal", - DurationMonths: 1, - EnableVirtualData: true, - RealDataMB: func() *int64 { v := int64(1000); return &v }(), - VirtualDataMB: func() *int64 { v := int64(0); return &v }(), - } - - _, err := svc.Create(ctx, req) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeInvalidParam, appErr.Code) - assert.Contains(t, appErr.Message, "虚流量额度必须大于0") - }) - - t.Run("启用虚流量时虚流量不能超过真流量", func(t *testing.T) { - req := &dto.CreatePackageRequest{ - PackageCode: generateUniquePackageCode("PKG_VDATA_2"), - PackageName: "虚流量测试-超过", - PackageType: "formal", - DurationMonths: 1, - EnableVirtualData: true, - RealDataMB: func() *int64 { v := int64(1000); return &v }(), - VirtualDataMB: func() *int64 { v := int64(2000); return &v }(), - } - - _, err := svc.Create(ctx, req) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeInvalidParam, appErr.Code) - assert.Contains(t, appErr.Message, "虚流量额度不能大于真流量额度") - }) - - t.Run("启用虚流量时配置正确则创建成功", func(t *testing.T) { - req := &dto.CreatePackageRequest{ - PackageCode: generateUniquePackageCode("PKG_VDATA_3"), - PackageName: "虚流量测试-正确", - PackageType: "formal", - DurationMonths: 1, - EnableVirtualData: true, - RealDataMB: func() *int64 { v := int64(1000); return &v }(), - VirtualDataMB: func() *int64 { v := int64(500); return &v }(), - } - - resp, err := svc.Create(ctx, req) - require.NoError(t, err) - assert.True(t, resp.EnableVirtualData) - assert.Equal(t, int64(500), resp.VirtualDataMB) - }) - - t.Run("不启用虚流量时可以不填虚流量值", func(t *testing.T) { - req := &dto.CreatePackageRequest{ - PackageCode: generateUniquePackageCode("PKG_VDATA_4"), - PackageName: "虚流量测试-不启用", - PackageType: "formal", - DurationMonths: 1, - EnableVirtualData: false, - RealDataMB: func() *int64 { v := int64(1000); return &v }(), - } - - resp, err := svc.Create(ctx, req) - require.NoError(t, err) - assert.False(t, resp.EnableVirtualData) - }) - - t.Run("更新时校验虚流量配置", func(t *testing.T) { - req := &dto.CreatePackageRequest{ - PackageCode: generateUniquePackageCode("PKG_VDATA_5"), - PackageName: "虚流量测试-更新", - PackageType: "formal", - DurationMonths: 1, - EnableVirtualData: false, - RealDataMB: func() *int64 { v := int64(1000); return &v }(), - } - created, err := svc.Create(ctx, req) - require.NoError(t, err) - - enableVD := true - virtualDataMB := int64(2000) - updateReq := &dto.UpdatePackageRequest{ - EnableVirtualData: &enableVD, - VirtualDataMB: &virtualDataMB, - } - _, err = svc.Update(ctx, created.ID, updateReq) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeInvalidParam, appErr.Code) - }) -} - -func TestPackageService_SeriesNameInResponse(t *testing.T) { - tx := testutils.NewTestTransaction(t) - packageStore := postgres.NewPackageStore(tx) - packageSeriesStore := postgres.NewPackageSeriesStore(tx) - svc := New(packageStore, packageSeriesStore, nil, nil) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypePlatform, - }) - - // 创建套餐系列 - series := &model.PackageSeries{ - SeriesCode: fmt.Sprintf("SERIES_%d", time.Now().UnixNano()), - SeriesName: "测试套餐系列", - Description: "用于测试系列名称字段", - Status: constants.StatusEnabled, - } - series.Creator = 1 - err := packageSeriesStore.Create(ctx, series) - require.NoError(t, err) - - t.Run("创建套餐时返回系列名称", func(t *testing.T) { - req := &dto.CreatePackageRequest{ - PackageCode: generateUniquePackageCode("PKG_SERIES"), - PackageName: "带系列的套餐", - SeriesID: &series.ID, - PackageType: "formal", - DurationMonths: 1, - } - - resp, err := svc.Create(ctx, req) - require.NoError(t, err) - assert.NotNil(t, resp.SeriesName) - assert.Equal(t, series.SeriesName, *resp.SeriesName) - }) - - t.Run("获取套餐时返回系列名称", func(t *testing.T) { - // 先创建一个套餐 - req := &dto.CreatePackageRequest{ - PackageCode: generateUniquePackageCode("PKG_GET_SERIES"), - PackageName: "获取测试套餐", - SeriesID: &series.ID, - PackageType: "formal", - DurationMonths: 1, - } - created, err := svc.Create(ctx, req) - require.NoError(t, err) - - // 获取套餐 - resp, err := svc.Get(ctx, created.ID) - require.NoError(t, err) - assert.NotNil(t, resp.SeriesName) - assert.Equal(t, series.SeriesName, *resp.SeriesName) - }) - - t.Run("更新套餐时返回系列名称", func(t *testing.T) { - // 先创建一个套餐 - req := &dto.CreatePackageRequest{ - PackageCode: generateUniquePackageCode("PKG_UPDATE_SERIES"), - PackageName: "更新测试套餐", - SeriesID: &series.ID, - PackageType: "formal", - DurationMonths: 1, - } - created, err := svc.Create(ctx, req) - require.NoError(t, err) - - // 更新套餐 - newName := "更新后的套餐" - updateReq := &dto.UpdatePackageRequest{ - PackageName: &newName, - } - resp, err := svc.Update(ctx, created.ID, updateReq) - require.NoError(t, err) - assert.NotNil(t, resp.SeriesName) - assert.Equal(t, series.SeriesName, *resp.SeriesName) - }) - - t.Run("列表查询时返回系列名称", func(t *testing.T) { - // 创建多个带系列的套餐 - for i := 0; i < 3; i++ { - req := &dto.CreatePackageRequest{ - PackageCode: generateUniquePackageCode(fmt.Sprintf("PKG_LIST_SERIES_%d", i)), - PackageName: fmt.Sprintf("列表测试套餐%d", i), - SeriesID: &series.ID, - PackageType: "formal", - DurationMonths: 1, - } - _, err := svc.Create(ctx, req) - require.NoError(t, err) - } - - // 查询列表 - listReq := &dto.PackageListRequest{ - Page: 1, - PageSize: 10, - SeriesID: &series.ID, - } - resp, _, err := svc.List(ctx, listReq) - require.NoError(t, err) - assert.Greater(t, len(resp), 0) - - // 验证所有套餐都有系列名称 - for _, pkg := range resp { - if pkg.SeriesID != nil && *pkg.SeriesID == series.ID { - assert.NotNil(t, pkg.SeriesName) - assert.Equal(t, series.SeriesName, *pkg.SeriesName) - } - } - }) - - t.Run("没有系列的套餐SeriesName为空", func(t *testing.T) { - req := &dto.CreatePackageRequest{ - PackageCode: generateUniquePackageCode("PKG_NO_SERIES"), - PackageName: "无系列套餐", - PackageType: "formal", - DurationMonths: 1, - } - - resp, err := svc.Create(ctx, req) - require.NoError(t, err) - assert.Nil(t, resp.SeriesID) - assert.Nil(t, resp.SeriesName) - }) -} diff --git a/internal/service/package/usage_service.go b/internal/service/package/usage_service.go new file mode 100644 index 0000000..025ab5e --- /dev/null +++ b/internal/service/package/usage_service.go @@ -0,0 +1,238 @@ +package packagepkg + +import ( + "context" + "time" + + "github.com/break/junhong_cmp_fiber/internal/model" + "github.com/break/junhong_cmp_fiber/internal/store/postgres" + "github.com/break/junhong_cmp_fiber/pkg/constants" + "github.com/break/junhong_cmp_fiber/pkg/errors" + "github.com/redis/go-redis/v9" + "go.uber.org/zap" + "gorm.io/gorm" +) + +// StopResumeCallback 任务 24.6: 停复机回调接口 +// 用于在流量用完时触发停机操作 +type StopResumeCallback interface { + // CheckAndStopCard 检查流量耗尽并停机 + CheckAndStopCard(ctx context.Context, cardID uint) error +} + +type UsageService struct { + db *gorm.DB + redis *redis.Client + packageUsageStore *postgres.PackageUsageStore + packageUsageDailyRecord *postgres.PackageUsageDailyRecordStore + logger *zap.Logger + stopResumeCallback StopResumeCallback // 停复机回调，可选 +} + +func NewUsageService( + db *gorm.DB, + redis *redis.Client, + packageUsageStore *postgres.PackageUsageStore, + packageUsageDailyRecord *postgres.PackageUsageDailyRecordStore, + logger *zap.Logger, +) *UsageService { + return &UsageService{ + db: db, + redis: redis, + packageUsageStore: packageUsageStore, + packageUsageDailyRecord: packageUsageDailyRecord, + logger: logger, + } +} + +// SetStopResumeCallback 任务 24.6: 设置停复机回调 +// 在应用启动时由 bootstrap 调用，注入停复机服务 +func (s *UsageService) SetStopResumeCallback(callback StopResumeCallback) { + s.stopResumeCallback = callback +} + +// DeductDataUsage 任务 10.2-10.6: 按优先级扣减流量 +// 扣减顺序：加油包（按 priority ASC） → 主套餐 +// 流量用完时自动标记 status=2，所有套餐用完时触发停机 +func (s *UsageService) DeductDataUsage(ctx context.Context, carrierType string, carrierID uint, usageMB int64) error { + if usageMB <= 0 { + return errors.New(errors.CodeInvalidParam, "扣减流量必须大于0") + } + + return s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error { + // 查询所有生效中的套餐（按优先级排序） + var packages []*model.PackageUsage + query := tx.Where("status = ?", constants.PackageUsageStatusActive) + + if carrierType == "iot_card" { + query = query.Where("iot_card_id = ?", carrierID) + } else if carrierType == "device" { + query = query.Where("device_id = ?", carrierID) + } else { + return errors.New(errors.CodeInvalidParam, "无效的载体类型") + } + + // 加油包按 priority ASC 排序，主套餐在后 + if err := query.Order("CASE WHEN master_usage_id IS NOT NULL THEN 0 ELSE 1 END, priority ASC"). + Find(&packages).Error; err != nil { + return errors.Wrap(errors.CodeDatabaseError, err, "查询生效套餐失败") + } + + if len(packages) == 0 { + return errors.New(errors.CodeNoAvailablePackage, "没有可用套餐") + } + + // 按优先级扣减流量 + remainingUsage := usageMB + today := time.Now().Format("2006-01-02") + + for _, pkg := range packages { + if remainingUsage <= 0 { + break + } + + // 计算当前套餐剩余额度 + remainingQuota := pkg.DataLimitMB - pkg.DataUsageMB + if remainingQuota <= 0 { + // 套餐已用完，标记为已用完 + if err := tx.Model(pkg).Update("status", constants.PackageUsageStatusDepleted).Error; err != nil { + return errors.Wrap(errors.CodeDatabaseError, err, "更新套餐状态失败") + } + continue + } + + // 本次从该套餐扣减的流量 + var deductFromPkg int64 + if remainingUsage <= remainingQuota { + deductFromPkg = remainingUsage + } else { + deductFromPkg = remainingQuota + } + + // 更新套餐使用量 + newUsage := pkg.DataUsageMB + deductFromPkg + updates := map[string]interface{}{ + "data_usage_mb": newUsage, + } + + // 检查是否用完 + if newUsage >= pkg.DataLimitMB { + updates["status"] = constants.PackageUsageStatusDepleted + } + + if err := tx.Model(pkg).Updates(updates).Error; err != nil { + return errors.Wrap(errors.CodeDatabaseError, err, "更新套餐使用量失败") + } + + // 任务 10.6: 写入日记录 + if err := s.updateDailyRecord(ctx, tx, pkg.ID, today, deductFromPkg, newUsage); err != nil { + return err + } + + remainingUsage -= deductFromPkg + + s.logger.Info("扣减套餐流量", + zap.Uint("usage_id", pkg.ID), + zap.Int64("deduct_mb", deductFromPkg), + zap.Int64("new_usage_mb", newUsage), + zap.Int64("data_limit_mb", pkg.DataLimitMB)) + } + + // 如果流量扣减未完成，说明所有套餐都不够 + if remainingUsage > 0 { + s.logger.Warn("流量不足", + zap.String("carrier_type", carrierType), + zap.Uint("carrier_id", carrierID), + zap.Int64("requested_mb", usageMB), + zap.Int64("remaining_mb", remainingUsage)) + return errors.New(errors.CodeInsufficientQuota, "流量不足") + } + + // 任务 10.5: 检查是否所有套餐都用完（触发停机） + if err := s.checkAndTriggerSuspension(ctx, tx, carrierType, carrierID); err != nil { + return err + } + + return nil + }) +} + +// updateDailyRecord 任务 10.6: 更新日流量记录 +func (s *UsageService) updateDailyRecord(ctx context.Context, tx *gorm.DB, packageUsageID uint, dateStr string, dailyUsageMB, cumulativeUsageMB int64) error { + // 解析日期字符串 + date, err := time.Parse("2006-01-02", dateStr) + if err != nil { + return errors.Wrap(errors.CodeInvalidParam, err, "日期格式错误") + } + + // 查询是否已有今日记录 + var record model.PackageUsageDailyRecord + err = tx.Where("package_usage_id = ? AND date = ?", packageUsageID, date). + First(&record).Error + + if err == gorm.ErrRecordNotFound { + // 创建新记录 + record = model.PackageUsageDailyRecord{ + PackageUsageID: packageUsageID, + Date: date, + DailyUsageMB: int(dailyUsageMB), + CumulativeUsageMB: cumulativeUsageMB, + } + if err := tx.Create(&record).Error; err != nil { + return errors.Wrap(errors.CodeDatabaseError, err, "创建日流量记录失败") + } + } else if err != nil { + return errors.Wrap(errors.CodeDatabaseError, err, "查询日流量记录失败") + } else { + // 更新现有记录 + updates := map[string]interface{}{ + "daily_usage_mb": record.DailyUsageMB + int(dailyUsageMB), + "cumulative_usage_mb": cumulativeUsageMB, + } + if err := tx.Model(&record).Updates(updates).Error; err != nil { + return errors.Wrap(errors.CodeDatabaseError, err, "更新日流量记录失败") + } + } + + return nil +} + +// checkAndTriggerSuspension 任务 10.5: 检查停机条件 +func (s *UsageService) checkAndTriggerSuspension(ctx context.Context, tx *gorm.DB, carrierType string, carrierID uint) error { + // 查询是否还有生效中的套餐 + var activeCount int64 + query := tx.Model(&model.PackageUsage{}). + Where("status = ?", constants.PackageUsageStatusActive) + + if carrierType == "iot_card" { + query = query.Where("iot_card_id = ?", carrierID) + } else if carrierType == "device" { + query = query.Where("device_id = ?", carrierID) + } + + if err := query.Count(&activeCount).Error; err != nil { + return errors.Wrap(errors.CodeDatabaseError, err, "查询生效套餐数量失败") + } + + // 如果没有生效中的套餐，触发停机操作 + if activeCount == 0 { + s.logger.Warn("所有套餐已用完，触发停机", + zap.String("carrier_type", carrierType), + zap.Uint("carrier_id", carrierID)) + + // 任务 24.6: 调用停复机服务执行停机 + if s.stopResumeCallback != nil && carrierType == "iot_card" { + // 在事务外异步执行停机，避免长事务 + go func() { + stopCtx := context.Background() + if err := s.stopResumeCallback.CheckAndStopCard(stopCtx, carrierID); err != nil { + s.logger.Error("调用停机服务失败", + zap.Uint("card_id", carrierID), + zap.Error(err)) + } + }() + } + } + + return nil +} diff --git a/internal/service/package/utils.go b/internal/service/package/utils.go new file mode 100644 index 0000000..5d963fb --- /dev/null +++ b/internal/service/package/utils.go @@ -0,0 +1,112 @@ +package packagepkg + +import ( + "time" + + "github.com/break/junhong_cmp_fiber/pkg/constants" +) + +// CalculateExpiryTime 计算套餐过期时间 +// calendarType: 套餐周期类型（natural_month=自然月，by_day=按天） +// activatedAt: 激活时间 +// durationMonths: 套餐时长（月数，calendar_type=natural_month 时使用） +// durationDays: 套餐天数（calendar_type=by_day 时使用） +// 返回：过期时间（当天 23:59:59） +func CalculateExpiryTime(calendarType string, activatedAt time.Time, durationMonths, durationDays int) time.Time { + var expiryDate time.Time + + if calendarType == constants.PackageCalendarTypeNaturalMonth { + // 自然月套餐：activated_at 月份 + N 个月，月末 23:59:59 + // 计算目标年月 + targetYear := activatedAt.Year() + targetMonth := activatedAt.Month() + time.Month(durationMonths) + + // 处理月份溢出 + for targetMonth > 12 { + targetMonth -= 12 + targetYear++ + } + + // 获取目标月份的最后一天（下个月的第0天就是本月最后一天） + expiryDate = time.Date(targetYear, targetMonth+1, 0, 23, 59, 59, 0, activatedAt.Location()) + } else { + // 按天套餐：activated_at + N 天，23:59:59 + expiryDate = activatedAt.AddDate(0, 0, durationDays) + expiryDate = time.Date(expiryDate.Year(), expiryDate.Month(), expiryDate.Day(), 23, 59, 59, 0, expiryDate.Location()) + } + + return expiryDate +} + +// CalculateNextResetTime 计算下次流量重置时间 +// dataResetCycle: 流量重置周期（daily/monthly/yearly/none） +// currentTime: 当前时间 +// billingDay: 计费日（月重置时使用，联通=27，其他=1） +// 返回：下次重置时间（00:00:00） +func CalculateNextResetTime(dataResetCycle string, currentTime time.Time, billingDay int) *time.Time { + if dataResetCycle == constants.PackageDataResetNone { + // 不重置 + return nil + } + + var nextResetTime time.Time + + switch dataResetCycle { + case constants.PackageDataResetDaily: + // 日重置：明天 00:00:00 + nextResetTime = time.Date( + currentTime.Year(), + currentTime.Month(), + currentTime.Day()+1, + 0, 0, 0, 0, + currentTime.Location(), + ) + + case constants.PackageDataResetMonthly: + // 月重置：下月 billingDay 号 00:00:00 + year := currentTime.Year() + month := currentTime.Month() + + // 检查 billingDay 是否为当前月的最后一天（月末计费的特殊情况） + currentMonthLastDay := time.Date(year, month+1, 0, 0, 0, 0, 0, currentTime.Location()).Day() + isBillingDayMonthEnd := billingDay >= currentMonthLastDay + + // 如果当前日期 >= billingDay，则重置时间为下个月的 billingDay + // 否则，重置时间为本月的 billingDay + // 特殊情况：如果 billingDay 是月末，并且当前日期已接近月末，则跳到下个月 + shouldUseNextMonth := currentTime.Day() >= billingDay || (isBillingDayMonthEnd && currentTime.Day() >= currentMonthLastDay-1) + + if shouldUseNextMonth { + // 下个月 + month++ + if month > 12 { + month = 1 + year++ + } + } + + // 计算目标月份的最后一天（处理月末情况） + lastDayOfMonth := time.Date(year, month+1, 0, 0, 0, 0, 0, currentTime.Location()).Day() + resetDay := billingDay + if billingDay > lastDayOfMonth { + // 如果 billingDay 超过该月天数，使用月末 + resetDay = lastDayOfMonth + } + + nextResetTime = time.Date(year, month, resetDay, 0, 0, 0, 0, currentTime.Location()) + + case constants.PackageDataResetYearly: + // 年重置：明年 1 月 1 日 00:00:00 + nextResetTime = time.Date( + currentTime.Year()+1, + 1, 1, + 0, 0, 0, 0, + currentTime.Location(), + ) + + default: + return nil + } + + return &nextResetTime +} diff --git a/internal/service/package_series/service_test.go b/internal/service/package_series/service_test.go deleted file mode 100644 index 7c1f063..0000000 --- a/internal/service/package_series/service_test.go +++ /dev/null @@ -1,313 +0,0 @@ -package package_series - -import ( - "context" - "fmt" - "testing" - "time" - - "github.com/break/junhong_cmp_fiber/internal/model/dto" - "github.com/break/junhong_cmp_fiber/internal/store/postgres" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/pkg/errors" - "github.com/break/junhong_cmp_fiber/pkg/middleware" - "github.com/break/junhong_cmp_fiber/tests/testutils" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -func TestPackageSeriesService_Create(t *testing.T) { - tx := testutils.NewTestTransaction(t) - store := postgres.NewPackageSeriesStore(tx) - svc := New(store) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypePlatform, - }) - - t.Run("创建成功", func(t *testing.T) { - seriesCode := fmt.Sprintf("SVC_CREATE_%d", time.Now().UnixNano()) - req := &dto.CreatePackageSeriesRequest{ - SeriesCode: seriesCode, - SeriesName: "测试套餐系列", - Description: "服务层测试", - } - - resp, err := svc.Create(ctx, req) - require.NoError(t, err) - assert.NotZero(t, resp.ID) - assert.Equal(t, req.SeriesCode, resp.SeriesCode) - assert.Equal(t, req.SeriesName, resp.SeriesName) - assert.Equal(t, constants.StatusEnabled, resp.Status) - }) - - t.Run("编码重复失败", func(t *testing.T) { - seriesCode := fmt.Sprintf("SVC_DUP_%d", time.Now().UnixNano()) - req1 := &dto.CreatePackageSeriesRequest{ - SeriesCode: seriesCode, - SeriesName: "第一个系列", - Description: "测试重复", - } - - _, err := svc.Create(ctx, req1) - require.NoError(t, err) - - req2 := &dto.CreatePackageSeriesRequest{ - SeriesCode: seriesCode, - SeriesName: "第二个系列", - Description: "重复编码", - } - - _, err = svc.Create(ctx, req2) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeConflict, appErr.Code) - }) - - t.Run("未授权失败", func(t *testing.T) { - req := &dto.CreatePackageSeriesRequest{ - SeriesCode: fmt.Sprintf("SVC_UNAUTH_%d", time.Now().UnixNano()), - SeriesName: "未授权测试", - Description: "无用户上下文", - } - - _, err := svc.Create(context.Background(), req) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeUnauthorized, appErr.Code) - }) -} - -func TestPackageSeriesService_Get(t *testing.T) { - tx := testutils.NewTestTransaction(t) - store := postgres.NewPackageSeriesStore(tx) - svc := New(store) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypePlatform, - }) - - seriesCode := fmt.Sprintf("SVC_GET_%d", time.Now().UnixNano()) - req := &dto.CreatePackageSeriesRequest{ - SeriesCode: seriesCode, - SeriesName: "查询测试", - Description: "用于查询测试", - } - created, err := svc.Create(ctx, req) - require.NoError(t, err) - - t.Run("获取存在的系列", func(t *testing.T) { - resp, err := svc.Get(ctx, created.ID) - require.NoError(t, err) - assert.Equal(t, created.SeriesCode, resp.SeriesCode) - assert.Equal(t, created.SeriesName, resp.SeriesName) - }) - - t.Run("获取不存在的系列", func(t *testing.T) { - _, err := svc.Get(ctx, 99999) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeNotFound, appErr.Code) - }) -} - -func TestPackageSeriesService_Update(t *testing.T) { - tx := testutils.NewTestTransaction(t) - store := postgres.NewPackageSeriesStore(tx) - svc := New(store) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypePlatform, - }) - - seriesCode := fmt.Sprintf("SVC_UPD_%d", time.Now().UnixNano()) - req := &dto.CreatePackageSeriesRequest{ - SeriesCode: seriesCode, - SeriesName: "更新测试", - Description: "原始描述", - } - created, err := svc.Create(ctx, req) - require.NoError(t, err) - - t.Run("更新成功", func(t *testing.T) { - newName := "更新后的名称" - newDesc := "更新后的描述" - updateReq := &dto.UpdatePackageSeriesRequest{ - SeriesName: &newName, - Description: &newDesc, - } - - resp, err := svc.Update(ctx, created.ID, updateReq) - require.NoError(t, err) - assert.Equal(t, newName, resp.SeriesName) - assert.Equal(t, newDesc, resp.Description) - }) - - t.Run("更新不存在的系列", func(t *testing.T) { - newName := "test" - updateReq := &dto.UpdatePackageSeriesRequest{ - SeriesName: &newName, - } - - _, err := svc.Update(ctx, 99999, updateReq) - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeNotFound, appErr.Code) - }) -} - -func TestPackageSeriesService_Delete(t *testing.T) { - tx := testutils.NewTestTransaction(t) - store := postgres.NewPackageSeriesStore(tx) - svc := New(store) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypePlatform, - }) - - seriesCode := fmt.Sprintf("SVC_DEL_%d", time.Now().UnixNano()) - req := &dto.CreatePackageSeriesRequest{ - SeriesCode: seriesCode, - SeriesName: "删除测试", - Description: "用于删除测试", - } - created, err := svc.Create(ctx, req) - require.NoError(t, err) - - t.Run("删除成功", func(t *testing.T) { - err := svc.Delete(ctx, created.ID) - require.NoError(t, err) - - _, err = svc.Get(ctx, created.ID) - require.Error(t, err) - }) - - t.Run("删除不存在的系列", func(t *testing.T) { - err := svc.Delete(ctx, 99999) - require.Error(t, err) - }) -} - -func TestPackageSeriesService_List(t *testing.T) { - tx := testutils.NewTestTransaction(t) - store := postgres.NewPackageSeriesStore(tx) - svc := New(store) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypePlatform, - }) - - seriesList := []dto.CreatePackageSeriesRequest{ - { - SeriesCode: fmt.Sprintf("SVC_LIST_001_%d", time.Now().UnixNano()), - SeriesName: "基础套餐", - Description: "列表测试1", - }, - { - SeriesCode: fmt.Sprintf("SVC_LIST_002_%d", time.Now().UnixNano()), - SeriesName: "高级套餐", - Description: "列表测试2", - }, - { - SeriesCode: fmt.Sprintf("SVC_LIST_003_%d", time.Now().UnixNano()), - SeriesName: "企业套餐", - Description: "列表测试3", - }, - } - for _, s := range seriesList { - _, err := svc.Create(ctx, &s) - require.NoError(t, err) - } - - t.Run("查询列表", func(t *testing.T) { - req := &dto.PackageSeriesListRequest{ - Page: 1, - PageSize: 20, - } - result, total, err := svc.List(ctx, req) - require.NoError(t, err) - assert.GreaterOrEqual(t, total, int64(3)) - assert.GreaterOrEqual(t, len(result), 3) - }) - - t.Run("按状态过滤", func(t *testing.T) { - status := constants.StatusEnabled - req := &dto.PackageSeriesListRequest{ - Page: 1, - PageSize: 20, - Status: &status, - } - result, total, err := svc.List(ctx, req) - require.NoError(t, err) - assert.GreaterOrEqual(t, total, int64(3)) - for _, s := range result { - assert.Equal(t, constants.StatusEnabled, s.Status) - } - }) - - t.Run("按名称模糊搜索", func(t *testing.T) { - seriesName := "高级" - req := &dto.PackageSeriesListRequest{ - Page: 1, - PageSize: 20, - SeriesName: &seriesName, - } - result, total, err := svc.List(ctx, req) - require.NoError(t, err) - assert.GreaterOrEqual(t, total, int64(1)) - assert.GreaterOrEqual(t, len(result), 1) - }) -} - -func TestPackageSeriesService_UpdateStatus(t *testing.T) { - tx := testutils.NewTestTransaction(t) - store := postgres.NewPackageSeriesStore(tx) - svc := New(store) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypePlatform, - }) - - seriesCode := fmt.Sprintf("SVC_STATUS_%d", time.Now().UnixNano()) - req := &dto.CreatePackageSeriesRequest{ - SeriesCode: seriesCode, - SeriesName: "状态测试", - Description: "用于状态更新测试", - } - created, err := svc.Create(ctx, req) - require.NoError(t, err) - assert.Equal(t, constants.StatusEnabled, created.Status) - - t.Run("禁用系列", func(t *testing.T) { - err := svc.UpdateStatus(ctx, created.ID, constants.StatusDisabled) - require.NoError(t, err) - - updated, err := svc.Get(ctx, created.ID) - require.NoError(t, err) - assert.Equal(t, constants.StatusDisabled, updated.Status) - }) - - t.Run("启用系列", func(t *testing.T) { - err := svc.UpdateStatus(ctx, created.ID, constants.StatusEnabled) - require.NoError(t, err) - - updated, err := svc.Get(ctx, created.ID) - require.NoError(t, err) - assert.Equal(t, constants.StatusEnabled, updated.Status) - }) - - t.Run("更新不存在的系列状态", func(t *testing.T) { - err := svc.UpdateStatus(ctx, 99999, constants.StatusDisabled) - require.Error(t, err) - }) -} diff --git a/internal/service/shop/shop_role_test.go b/internal/service/shop/shop_role_test.go deleted file mode 100644 index b8ce2be..0000000 --- a/internal/service/shop/shop_role_test.go +++ /dev/null @@ -1,243 +0,0 @@ -package shop - -import ( - "context" - "testing" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/internal/store/postgres" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/pkg/middleware" - "github.com/break/junhong_cmp_fiber/tests/testutils" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -func TestAssignRolesToShop(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - shopStore := postgres.NewShopStore(tx, rdb) - accountStore := postgres.NewAccountStore(tx, rdb) - shopRoleStore := postgres.NewShopRoleStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - - service := New(shopStore, accountStore, shopRoleStore, roleStore) - - shop := &model.Shop{ - ShopName: "测试店铺", - ShopCode: "TEST_SHOP_001", - Level: 1, - Status: constants.StatusEnabled, - } - require.NoError(t, tx.Create(shop).Error) - - role := &model.Role{ - RoleName: "代理店长", - RoleType: constants.RoleTypeCustomer, - Status: constants.StatusEnabled, - } - require.NoError(t, roleStore.Create(context.Background(), role)) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - t.Run("成功分配单个角色", func(t *testing.T) { - result, err := service.AssignRolesToShop(ctx, shop.ID, []uint{role.ID}) - require.NoError(t, err) - assert.Len(t, result, 1) - assert.Equal(t, shop.ID, result[0].ShopID) - assert.Equal(t, role.ID, result[0].RoleID) - }) - - t.Run("清空所有角色", func(t *testing.T) { - result, err := service.AssignRolesToShop(ctx, shop.ID, []uint{}) - require.NoError(t, err) - assert.Empty(t, result) - - roles, err := service.GetShopRoles(ctx, shop.ID) - require.NoError(t, err) - assert.Empty(t, roles.Roles) - }) - - t.Run("替换现有角色", func(t *testing.T) { - require.NoError(t, shopRoleStore.Create(ctx, &model.ShopRole{ - ShopID: shop.ID, - RoleID: role.ID, - Status: constants.StatusEnabled, - Creator: 1, - Updater: 1, - })) - - newRole := &model.Role{ - RoleName: "代理经理", - RoleType: constants.RoleTypeCustomer, - Status: constants.StatusEnabled, - } - require.NoError(t, roleStore.Create(ctx, newRole)) - - result, err := service.AssignRolesToShop(ctx, shop.ID, []uint{newRole.ID}) - require.NoError(t, err) - assert.Len(t, result, 1) - assert.Equal(t, newRole.ID, result[0].RoleID) - }) - - t.Run("角色类型校验失败", func(t *testing.T) { - platformRole := &model.Role{ - RoleName: "平台角色", - RoleType: constants.RoleTypePlatform, - Status: constants.StatusEnabled, - } - require.NoError(t, roleStore.Create(ctx, platformRole)) - - _, err := service.AssignRolesToShop(ctx, shop.ID, []uint{platformRole.ID}) - require.Error(t, err) - assert.Contains(t, err.Error(), "店铺只能分配客户角色") - }) - - t.Run("角色不存在", func(t *testing.T) { - _, err := service.AssignRolesToShop(ctx, shop.ID, []uint{99999}) - require.Error(t, err) - assert.Contains(t, err.Error(), "部分角色不存在") - }) - - t.Run("店铺不存在", func(t *testing.T) { - _, err := service.AssignRolesToShop(ctx, 99999, []uint{role.ID}) - require.Error(t, err) - assert.Contains(t, err.Error(), "店铺不存在") - }) -} - -func TestGetShopRoles(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - shopStore := postgres.NewShopStore(tx, rdb) - accountStore := postgres.NewAccountStore(tx, rdb) - shopRoleStore := postgres.NewShopRoleStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - - service := New(shopStore, accountStore, shopRoleStore, roleStore) - - shop := &model.Shop{ - ShopName: "测试店铺2", - ShopCode: "TEST_SHOP_002", - Level: 1, - Status: constants.StatusEnabled, - } - require.NoError(t, tx.Create(shop).Error) - - role := &model.Role{ - RoleName: "代理店长", - RoleType: constants.RoleTypeCustomer, - Status: constants.StatusEnabled, - } - require.NoError(t, roleStore.Create(context.Background(), role)) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - t.Run("查询已分配角色", func(t *testing.T) { - require.NoError(t, shopRoleStore.Create(ctx, &model.ShopRole{ - ShopID: shop.ID, - RoleID: role.ID, - Status: constants.StatusEnabled, - Creator: 1, - Updater: 1, - })) - - result, err := service.GetShopRoles(ctx, shop.ID) - require.NoError(t, err) - assert.Len(t, result.Roles, 1) - assert.Equal(t, shop.ID, result.ShopID) - assert.Equal(t, role.ID, result.Roles[0].RoleID) - assert.Equal(t, "代理店长", result.Roles[0].RoleName) - }) - - t.Run("查询未分配角色的店铺", func(t *testing.T) { - emptyShop := &model.Shop{ - ShopName: "空店铺", - ShopCode: "EMPTY_SHOP", - Level: 1, - Status: constants.StatusEnabled, - } - require.NoError(t, tx.Create(emptyShop).Error) - - result, err := service.GetShopRoles(ctx, emptyShop.ID) - require.NoError(t, err) - assert.Empty(t, result.Roles) - }) - - t.Run("店铺不存在", func(t *testing.T) { - _, err := service.GetShopRoles(ctx, 99999) - require.Error(t, err) - assert.Contains(t, err.Error(), "店铺不存在") - }) -} - -func TestDeleteShopRole(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - shopStore := postgres.NewShopStore(tx, rdb) - accountStore := postgres.NewAccountStore(tx, rdb) - shopRoleStore := postgres.NewShopRoleStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - - service := New(shopStore, accountStore, shopRoleStore, roleStore) - - shop := &model.Shop{ - ShopName: "测试店铺3", - ShopCode: "TEST_SHOP_003", - Level: 1, - Status: constants.StatusEnabled, - } - require.NoError(t, tx.Create(shop).Error) - - role := &model.Role{ - RoleName: "代理店长", - RoleType: constants.RoleTypeCustomer, - Status: constants.StatusEnabled, - } - require.NoError(t, roleStore.Create(context.Background(), role)) - - ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - }) - - t.Run("成功删除角色", func(t *testing.T) { - require.NoError(t, shopRoleStore.Create(ctx, &model.ShopRole{ - ShopID: shop.ID, - RoleID: role.ID, - Status: constants.StatusEnabled, - Creator: 1, - Updater: 1, - })) - - err := service.DeleteShopRole(ctx, shop.ID, role.ID) - require.NoError(t, err) - - result, err := service.GetShopRoles(ctx, shop.ID) - require.NoError(t, err) - assert.Empty(t, result.Roles) - }) - - t.Run("删除不存在的角色关联（幂等）", func(t *testing.T) { - err := service.DeleteShopRole(ctx, shop.ID, role.ID) - require.NoError(t, err) - }) - - t.Run("店铺不存在", func(t *testing.T) { - err := service.DeleteShopRole(ctx, 99999, role.ID) - require.Error(t, err) - assert.Contains(t, err.Error(), "店铺不存在") - }) -} diff --git a/internal/store/postgres/asset_allocation_record_store_test.go b/internal/store/postgres/asset_allocation_record_store_test.go deleted file mode 100644 index b5b4f04..0000000 --- a/internal/store/postgres/asset_allocation_record_store_test.go +++ /dev/null @@ -1,232 +0,0 @@ -package postgres - -import ( - "context" - "testing" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/internal/store" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/tests/testutils" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -func TestAssetAllocationRecordStore_Create(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - s := NewAssetAllocationRecordStore(tx, rdb) - ctx := context.Background() - - record := &model.AssetAllocationRecord{ - AllocationNo: "AL20260124100001", - AllocationType: constants.AssetAllocationTypeAllocate, - AssetType: constants.AssetTypeIotCard, - AssetID: 1, - AssetIdentifier: "89860012345678901234", - FromOwnerType: constants.OwnerTypePlatform, - ToOwnerType: constants.OwnerTypeShop, - ToOwnerID: 10, - OperatorID: 1, - } - - err := s.Create(ctx, record) - require.NoError(t, err) - assert.NotZero(t, record.ID) -} - -func TestAssetAllocationRecordStore_BatchCreate(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - s := NewAssetAllocationRecordStore(tx, rdb) - ctx := context.Background() - - records := []*model.AssetAllocationRecord{ - { - AllocationNo: "AL20260124100010", - AllocationType: constants.AssetAllocationTypeAllocate, - AssetType: constants.AssetTypeIotCard, - AssetID: 1, - AssetIdentifier: "89860012345678901001", - FromOwnerType: constants.OwnerTypePlatform, - ToOwnerType: constants.OwnerTypeShop, - ToOwnerID: 10, - OperatorID: 1, - }, - { - AllocationNo: "AL20260124100011", - AllocationType: constants.AssetAllocationTypeAllocate, - AssetType: constants.AssetTypeIotCard, - AssetID: 2, - AssetIdentifier: "89860012345678901002", - FromOwnerType: constants.OwnerTypePlatform, - ToOwnerType: constants.OwnerTypeShop, - ToOwnerID: 10, - OperatorID: 1, - }, - } - - err := s.BatchCreate(ctx, records) - require.NoError(t, err) - - for _, record := range records { - assert.NotZero(t, record.ID) - } - - t.Run("空列表不报错", func(t *testing.T) { - err := s.BatchCreate(ctx, []*model.AssetAllocationRecord{}) - require.NoError(t, err) - }) -} - -func TestAssetAllocationRecordStore_GetByID(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - s := NewAssetAllocationRecordStore(tx, rdb) - ctx := context.Background() - - record := &model.AssetAllocationRecord{ - AllocationNo: "AL20260124100003", - AllocationType: constants.AssetAllocationTypeAllocate, - AssetType: constants.AssetTypeIotCard, - AssetID: 1, - AssetIdentifier: "89860012345678903001", - FromOwnerType: constants.OwnerTypePlatform, - ToOwnerType: constants.OwnerTypeShop, - ToOwnerID: 10, - OperatorID: 1, - Remark: "测试备注", - } - require.NoError(t, s.Create(ctx, record)) - - result, err := s.GetByID(ctx, record.ID) - require.NoError(t, err) - assert.Equal(t, record.AllocationNo, result.AllocationNo) - assert.Equal(t, record.AssetIdentifier, result.AssetIdentifier) - assert.Equal(t, "测试备注", result.Remark) -} - -func TestAssetAllocationRecordStore_List(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - s := NewAssetAllocationRecordStore(tx, rdb) - ctx := context.Background() - - shopID := uint(100) - records := []*model.AssetAllocationRecord{ - { - AllocationNo: "AL20260124100004", - AllocationType: constants.AssetAllocationTypeAllocate, - AssetType: constants.AssetTypeIotCard, - AssetID: 1, - AssetIdentifier: "89860012345678904001", - FromOwnerType: constants.OwnerTypePlatform, - ToOwnerType: constants.OwnerTypeShop, - ToOwnerID: shopID, - OperatorID: 1, - }, - { - AllocationNo: "AL20260124100005", - AllocationType: constants.AssetAllocationTypeAllocate, - AssetType: constants.AssetTypeIotCard, - AssetID: 2, - AssetIdentifier: "89860012345678904002", - FromOwnerType: constants.OwnerTypeShop, - FromOwnerID: &shopID, - ToOwnerType: constants.OwnerTypeShop, - ToOwnerID: 200, - OperatorID: 2, - }, - { - AllocationNo: "RC20260124100001", - AllocationType: constants.AssetAllocationTypeRecall, - AssetType: constants.AssetTypeIotCard, - AssetID: 3, - AssetIdentifier: "89860012345678904003", - FromOwnerType: constants.OwnerTypeShop, - FromOwnerID: &shopID, - ToOwnerType: constants.OwnerTypePlatform, - ToOwnerID: 0, - OperatorID: 1, - }, - } - require.NoError(t, s.BatchCreate(ctx, records)) - - t.Run("查询所有记录", func(t *testing.T) { - result, total, err := s.List(ctx, &store.QueryOptions{Page: 1, PageSize: 20}, nil) - require.NoError(t, err) - assert.Equal(t, int64(3), total) - assert.Len(t, result, 3) - }) - - t.Run("按分配类型过滤", func(t *testing.T) { - filters := map[string]any{"allocation_type": constants.AssetAllocationTypeAllocate} - result, total, err := s.List(ctx, nil, filters) - require.NoError(t, err) - assert.Equal(t, int64(2), total) - for _, r := range result { - assert.Equal(t, constants.AssetAllocationTypeAllocate, r.AllocationType) - } - }) - - t.Run("按分配单号过滤", func(t *testing.T) { - filters := map[string]any{"allocation_no": "AL20260124100004"} - result, total, err := s.List(ctx, nil, filters) - require.NoError(t, err) - assert.Equal(t, int64(1), total) - assert.Equal(t, "AL20260124100004", result[0].AllocationNo) - }) - - t.Run("按资产标识模糊查询", func(t *testing.T) { - filters := map[string]any{"asset_identifier": "904002"} - result, total, err := s.List(ctx, nil, filters) - require.NoError(t, err) - assert.Equal(t, int64(1), total) - assert.Contains(t, result[0].AssetIdentifier, "904002") - }) - - t.Run("按目标店铺过滤", func(t *testing.T) { - filters := map[string]any{"to_shop_id": shopID} - result, total, err := s.List(ctx, nil, filters) - require.NoError(t, err) - assert.Equal(t, int64(1), total) - assert.Equal(t, shopID, result[0].ToOwnerID) - }) - - t.Run("按操作人过滤", func(t *testing.T) { - filters := map[string]any{"operator_id": uint(2)} - result, total, err := s.List(ctx, nil, filters) - require.NoError(t, err) - assert.Equal(t, int64(1), total) - assert.Equal(t, uint(2), result[0].OperatorID) - }) -} - -func TestAssetAllocationRecordStore_GenerateAllocationNo(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - s := NewAssetAllocationRecordStore(tx, rdb) - ctx := context.Background() - - t.Run("分配单号前缀为AL", func(t *testing.T) { - no := s.GenerateAllocationNo(ctx, constants.AssetAllocationTypeAllocate) - assert.True(t, len(no) > 0) - assert.Equal(t, "AL", no[:2]) - }) - - t.Run("回收单号前缀为RC", func(t *testing.T) { - no := s.GenerateAllocationNo(ctx, constants.AssetAllocationTypeRecall) - assert.True(t, len(no) > 0) - assert.Equal(t, "RC", no[:2]) - }) -} diff --git a/internal/store/postgres/carrier_store_test.go b/internal/store/postgres/carrier_store_test.go deleted file mode 100644 index 1cd9331..0000000 --- a/internal/store/postgres/carrier_store_test.go +++ /dev/null @@ -1,204 +0,0 @@ -package postgres - -import ( - "context" - "testing" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/internal/store" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/tests/testutils" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -func TestCarrierStore_Create(t *testing.T) { - tx := testutils.NewTestTransaction(t) - s := NewCarrierStore(tx) - ctx := context.Background() - - carrier := &model.Carrier{ - CarrierCode: "CMCC_TEST_001", - CarrierName: "中国移动测试", - CarrierType: constants.CarrierTypeCMCC, - Description: "测试运营商", - Status: constants.StatusEnabled, - } - - err := s.Create(ctx, carrier) - require.NoError(t, err) - assert.NotZero(t, carrier.ID) -} - -func TestCarrierStore_GetByID(t *testing.T) { - tx := testutils.NewTestTransaction(t) - s := NewCarrierStore(tx) - ctx := context.Background() - - carrier := &model.Carrier{ - CarrierCode: "CUCC_TEST_001", - CarrierName: "中国联通测试", - CarrierType: constants.CarrierTypeCUCC, - Status: constants.StatusEnabled, - } - require.NoError(t, s.Create(ctx, carrier)) - - t.Run("查询存在的运营商", func(t *testing.T) { - result, err := s.GetByID(ctx, carrier.ID) - require.NoError(t, err) - assert.Equal(t, carrier.CarrierCode, result.CarrierCode) - assert.Equal(t, carrier.CarrierName, result.CarrierName) - }) - - t.Run("查询不存在的运营商", func(t *testing.T) { - _, err := s.GetByID(ctx, 99999) - require.Error(t, err) - }) -} - -func TestCarrierStore_GetByCode(t *testing.T) { - tx := testutils.NewTestTransaction(t) - s := NewCarrierStore(tx) - ctx := context.Background() - - carrier := &model.Carrier{ - CarrierCode: "CTCC_TEST_001", - CarrierName: "中国电信测试", - CarrierType: constants.CarrierTypeCTCC, - Status: constants.StatusEnabled, - } - require.NoError(t, s.Create(ctx, carrier)) - - t.Run("查询存在的编码", func(t *testing.T) { - result, err := s.GetByCode(ctx, "CTCC_TEST_001") - require.NoError(t, err) - assert.Equal(t, carrier.ID, result.ID) - }) - - t.Run("查询不存在的编码", func(t *testing.T) { - _, err := s.GetByCode(ctx, "NOT_EXISTS") - require.Error(t, err) - }) -} - -func TestCarrierStore_Update(t *testing.T) { - tx := testutils.NewTestTransaction(t) - s := NewCarrierStore(tx) - ctx := context.Background() - - carrier := &model.Carrier{ - CarrierCode: "CBN_TEST_001", - CarrierName: "中国广电测试", - CarrierType: constants.CarrierTypeCBN, - Status: constants.StatusEnabled, - } - require.NoError(t, s.Create(ctx, carrier)) - - carrier.CarrierName = "中国广电测试-更新" - carrier.Description = "更新后的描述" - err := s.Update(ctx, carrier) - require.NoError(t, err) - - updated, err := s.GetByID(ctx, carrier.ID) - require.NoError(t, err) - assert.Equal(t, "中国广电测试-更新", updated.CarrierName) - assert.Equal(t, "更新后的描述", updated.Description) -} - -func TestCarrierStore_Delete(t *testing.T) { - tx := testutils.NewTestTransaction(t) - s := NewCarrierStore(tx) - ctx := context.Background() - - carrier := &model.Carrier{ - CarrierCode: "DEL_TEST_001", - CarrierName: "待删除运营商", - CarrierType: constants.CarrierTypeCMCC, - Status: constants.StatusEnabled, - } - require.NoError(t, s.Create(ctx, carrier)) - - err := s.Delete(ctx, carrier.ID) - require.NoError(t, err) - - _, err = s.GetByID(ctx, carrier.ID) - require.Error(t, err) -} - -func TestCarrierStore_List(t *testing.T) { - tx := testutils.NewTestTransaction(t) - s := NewCarrierStore(tx) - ctx := context.Background() - - carriers := []*model.Carrier{ - {CarrierCode: "LIST_001", CarrierName: "移动1", CarrierType: constants.CarrierTypeCMCC, Status: constants.StatusEnabled}, - {CarrierCode: "LIST_002", CarrierName: "联通1", CarrierType: constants.CarrierTypeCUCC, Status: constants.StatusEnabled}, - {CarrierCode: "LIST_003", CarrierName: "电信1", CarrierType: constants.CarrierTypeCTCC, Status: constants.StatusEnabled}, - } - for _, c := range carriers { - require.NoError(t, s.Create(ctx, c)) - } - // 显式更新第三个 carrier 为禁用状态（GORM 不会写入零值） - carriers[2].Status = constants.StatusDisabled - require.NoError(t, s.Update(ctx, carriers[2])) - - t.Run("查询所有运营商", func(t *testing.T) { - result, total, err := s.List(ctx, &store.QueryOptions{Page: 1, PageSize: 20}, nil) - require.NoError(t, err) - assert.GreaterOrEqual(t, total, int64(3)) - assert.GreaterOrEqual(t, len(result), 3) - }) - - t.Run("按类型过滤", func(t *testing.T) { - filters := map[string]interface{}{"carrier_type": constants.CarrierTypeCMCC} - result, total, err := s.List(ctx, &store.QueryOptions{Page: 1, PageSize: 20}, filters) - require.NoError(t, err) - assert.GreaterOrEqual(t, total, int64(1)) - for _, c := range result { - assert.Equal(t, constants.CarrierTypeCMCC, c.CarrierType) - } - }) - - t.Run("按名称模糊搜索", func(t *testing.T) { - filters := map[string]interface{}{"carrier_name": "联通"} - result, total, err := s.List(ctx, &store.QueryOptions{Page: 1, PageSize: 20}, filters) - require.NoError(t, err) - assert.GreaterOrEqual(t, total, int64(1)) - for _, c := range result { - assert.Contains(t, c.CarrierName, "联通") - } - }) - - t.Run("按状态过滤-禁用", func(t *testing.T) { - filters := map[string]interface{}{"status": constants.StatusDisabled} - result, total, err := s.List(ctx, &store.QueryOptions{Page: 1, PageSize: 20}, filters) - require.NoError(t, err) - assert.GreaterOrEqual(t, total, int64(1)) - for _, c := range result { - assert.Equal(t, constants.StatusDisabled, c.Status) - } - }) - - t.Run("按状态过滤-启用", func(t *testing.T) { - filters := map[string]interface{}{"status": constants.StatusEnabled} - result, total, err := s.List(ctx, &store.QueryOptions{Page: 1, PageSize: 20}, filters) - require.NoError(t, err) - assert.GreaterOrEqual(t, total, int64(2)) - for _, c := range result { - assert.Equal(t, constants.StatusEnabled, c.Status) - } - }) - - t.Run("分页查询", func(t *testing.T) { - result, total, err := s.List(ctx, &store.QueryOptions{Page: 1, PageSize: 2}, nil) - require.NoError(t, err) - assert.GreaterOrEqual(t, total, int64(3)) - assert.LessOrEqual(t, len(result), 2) - }) - - t.Run("默认分页选项", func(t *testing.T) { - result, _, err := s.List(ctx, nil, nil) - require.NoError(t, err) - assert.NotNil(t, result) - }) -} diff --git a/internal/store/postgres/device_sim_binding_store_test.go b/internal/store/postgres/device_sim_binding_store_test.go deleted file mode 100644 index 2e2d6fe..0000000 --- a/internal/store/postgres/device_sim_binding_store_test.go +++ /dev/null @@ -1,209 +0,0 @@ -package postgres - -import ( - "context" - "sync" - "testing" - "time" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/pkg/errors" - "github.com/break/junhong_cmp_fiber/tests/testutils" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -func TestDeviceSimBindingStore_Create_DuplicateCard(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - bindingStore := NewDeviceSimBindingStore(tx, rdb) - deviceStore := NewDeviceStore(tx, rdb) - cardStore := NewIotCardStore(tx, rdb) - ctx := context.Background() - - device1 := &model.Device{DeviceNo: "TEST-DEV-UC-001", Status: 1, MaxSimSlots: 4} - device2 := &model.Device{DeviceNo: "TEST-DEV-UC-002", Status: 1, MaxSimSlots: 4} - require.NoError(t, deviceStore.Create(ctx, device1)) - require.NoError(t, deviceStore.Create(ctx, device2)) - - card := &model.IotCard{ICCID: "89860012345678910001", CarrierID: 1, Status: 1} - require.NoError(t, cardStore.Create(ctx, card)) - - now := time.Now() - binding1 := &model.DeviceSimBinding{ - DeviceID: device1.ID, - IotCardID: card.ID, - SlotPosition: 1, - BindStatus: 1, - BindTime: &now, - } - require.NoError(t, bindingStore.Create(ctx, binding1)) - - binding2 := &model.DeviceSimBinding{ - DeviceID: device2.ID, - IotCardID: card.ID, - SlotPosition: 1, - BindStatus: 1, - BindTime: &now, - } - err := bindingStore.Create(ctx, binding2) - require.Error(t, err) - - appErr, ok := err.(*errors.AppError) - require.True(t, ok, "错误应该是 AppError 类型") - assert.Equal(t, errors.CodeIotCardBoundToDevice, appErr.Code) - assert.Contains(t, appErr.Message, "该卡已绑定到其他设备") -} - -func TestDeviceSimBindingStore_Create_DuplicateSlot(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - bindingStore := NewDeviceSimBindingStore(tx, rdb) - deviceStore := NewDeviceStore(tx, rdb) - cardStore := NewIotCardStore(tx, rdb) - ctx := context.Background() - - device := &model.Device{DeviceNo: "TEST-DEV-UC-003", Status: 1, MaxSimSlots: 4} - require.NoError(t, deviceStore.Create(ctx, device)) - - card1 := &model.IotCard{ICCID: "89860012345678910011", CarrierID: 1, Status: 1} - card2 := &model.IotCard{ICCID: "89860012345678910012", CarrierID: 1, Status: 1} - require.NoError(t, cardStore.Create(ctx, card1)) - require.NoError(t, cardStore.Create(ctx, card2)) - - now := time.Now() - binding1 := &model.DeviceSimBinding{ - DeviceID: device.ID, - IotCardID: card1.ID, - SlotPosition: 1, - BindStatus: 1, - BindTime: &now, - } - require.NoError(t, bindingStore.Create(ctx, binding1)) - - binding2 := &model.DeviceSimBinding{ - DeviceID: device.ID, - IotCardID: card2.ID, - SlotPosition: 1, - BindStatus: 1, - BindTime: &now, - } - err := bindingStore.Create(ctx, binding2) - require.Error(t, err) - - appErr, ok := err.(*errors.AppError) - require.True(t, ok, "错误应该是 AppError 类型") - assert.Equal(t, errors.CodeConflict, appErr.Code) - assert.Contains(t, appErr.Message, "该插槽已有绑定的卡") -} - -func TestDeviceSimBindingStore_Create_DifferentSlots(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - bindingStore := NewDeviceSimBindingStore(tx, rdb) - deviceStore := NewDeviceStore(tx, rdb) - cardStore := NewIotCardStore(tx, rdb) - ctx := context.Background() - - device := &model.Device{DeviceNo: "TEST-DEV-UC-004", Status: 1, MaxSimSlots: 4} - require.NoError(t, deviceStore.Create(ctx, device)) - - card1 := &model.IotCard{ICCID: "89860012345678910021", CarrierID: 1, Status: 1} - card2 := &model.IotCard{ICCID: "89860012345678910022", CarrierID: 1, Status: 1} - require.NoError(t, cardStore.Create(ctx, card1)) - require.NoError(t, cardStore.Create(ctx, card2)) - - now := time.Now() - binding1 := &model.DeviceSimBinding{ - DeviceID: device.ID, - IotCardID: card1.ID, - SlotPosition: 1, - BindStatus: 1, - BindTime: &now, - } - require.NoError(t, bindingStore.Create(ctx, binding1)) - assert.NotZero(t, binding1.ID) - - binding2 := &model.DeviceSimBinding{ - DeviceID: device.ID, - IotCardID: card2.ID, - SlotPosition: 2, - BindStatus: 1, - BindTime: &now, - } - err := bindingStore.Create(ctx, binding2) - require.NoError(t, err) - assert.NotZero(t, binding2.ID) -} - -func TestDeviceSimBindingStore_ConcurrentBinding(t *testing.T) { - db := testutils.GetTestDB(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - deviceStore := NewDeviceStore(db, rdb) - cardStore := NewIotCardStore(db, rdb) - ctx := context.Background() - - device1 := &model.Device{DeviceNo: "TEST-CONCURRENT-001", Status: 1, MaxSimSlots: 4} - device2 := &model.Device{DeviceNo: "TEST-CONCURRENT-002", Status: 1, MaxSimSlots: 4} - require.NoError(t, deviceStore.Create(ctx, device1)) - require.NoError(t, deviceStore.Create(ctx, device2)) - - card := &model.IotCard{ICCID: "89860012345678920001", CarrierID: 1, Status: 1} - require.NoError(t, cardStore.Create(ctx, card)) - - t.Cleanup(func() { - db.Where("device_id IN ?", []uint{device1.ID, device2.ID}).Delete(&model.DeviceSimBinding{}) - db.Delete(device1) - db.Delete(device2) - db.Delete(card) - }) - - t.Run("并发绑定同一张卡到不同设备", func(t *testing.T) { - bindingStore := NewDeviceSimBindingStore(db, rdb) - var wg sync.WaitGroup - results := make(chan error, 2) - - for i, deviceID := range []uint{device1.ID, device2.ID} { - wg.Add(1) - go func(devID uint, slot int) { - defer wg.Done() - now := time.Now() - binding := &model.DeviceSimBinding{ - DeviceID: devID, - IotCardID: card.ID, - SlotPosition: slot, - BindStatus: 1, - BindTime: &now, - } - results <- bindingStore.Create(ctx, binding) - }(deviceID, i+1) - } - - wg.Wait() - close(results) - - var successCount, errorCount int - for err := range results { - if err == nil { - successCount++ - } else { - errorCount++ - appErr, ok := err.(*errors.AppError) - if ok { - assert.Equal(t, errors.CodeIotCardBoundToDevice, appErr.Code) - } - } - } - - assert.Equal(t, 1, successCount, "应该只有一个请求成功") - assert.Equal(t, 1, errorCount, "应该有一个请求失败") - }) -} diff --git a/internal/store/postgres/device_store_test.go b/internal/store/postgres/device_store_test.go deleted file mode 100644 index 9bce017..0000000 --- a/internal/store/postgres/device_store_test.go +++ /dev/null @@ -1,119 +0,0 @@ -package postgres - -import ( - "context" - "fmt" - "testing" - "time" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/tests/testutils" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -func uniqueDeviceNoPrefix() string { - return fmt.Sprintf("D%d", time.Now().UnixNano()%1000000000) -} - -func TestDeviceStore_BatchUpdateSeriesID(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - s := NewDeviceStore(tx, rdb) - ctx := context.Background() - - prefix := uniqueDeviceNoPrefix() - devices := []*model.Device{ - {DeviceNo: prefix + "001", DeviceName: "测试设备1", Status: 1}, - {DeviceNo: prefix + "002", DeviceName: "测试设备2", Status: 1}, - } - require.NoError(t, s.CreateBatch(ctx, devices)) - - t.Run("设置系列ID", func(t *testing.T) { - seriesID := uint(100) - deviceIDs := []uint{devices[0].ID, devices[1].ID} - - err := s.BatchUpdateSeriesID(ctx, deviceIDs, &seriesID) - require.NoError(t, err) - - var updatedDevices []*model.Device - require.NoError(t, tx.Where("id IN ?", deviceIDs).Find(&updatedDevices).Error) - for _, device := range updatedDevices { - require.NotNil(t, device.SeriesID) - assert.Equal(t, seriesID, *device.SeriesID) - } - }) - - t.Run("清除系列ID", func(t *testing.T) { - deviceIDs := []uint{devices[0].ID} - - err := s.BatchUpdateSeriesID(ctx, deviceIDs, nil) - require.NoError(t, err) - - var updatedDevice model.Device - require.NoError(t, tx.First(&updatedDevice, devices[0].ID).Error) - assert.Nil(t, updatedDevice.SeriesID) - }) - - t.Run("空列表不报错", func(t *testing.T) { - err := s.BatchUpdateSeriesID(ctx, []uint{}, nil) - require.NoError(t, err) - }) -} - -func TestDeviceStore_ListBySeriesID(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - s := NewDeviceStore(tx, rdb) - ctx := context.Background() - - prefix := uniqueDeviceNoPrefix() - seriesID := uint(200) - devices := []*model.Device{ - {DeviceNo: prefix + "001", DeviceName: "测试设备1", Status: 1, SeriesID: &seriesID}, - {DeviceNo: prefix + "002", DeviceName: "测试设备2", Status: 1, SeriesID: &seriesID}, - {DeviceNo: prefix + "003", DeviceName: "测试设备3", Status: 1, SeriesID: nil}, - } - require.NoError(t, s.CreateBatch(ctx, devices)) - - result, err := s.ListBySeriesID(ctx, seriesID) - require.NoError(t, err) - assert.Len(t, result, 2) - for _, device := range result { - assert.Equal(t, seriesID, *device.SeriesID) - } -} - -func TestDeviceStore_List_SeriesIDFilter(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - s := NewDeviceStore(tx, rdb) - ctx := context.Background() - - prefix := uniqueDeviceNoPrefix() - seriesID := uint(300) - devices := []*model.Device{ - {DeviceNo: prefix + "001", DeviceName: "测试设备1", Status: 1, SeriesID: &seriesID}, - {DeviceNo: prefix + "002", DeviceName: "测试设备2", Status: 1, SeriesID: &seriesID}, - {DeviceNo: prefix + "003", DeviceName: "测试设备3", Status: 1, SeriesID: nil}, - } - require.NoError(t, s.CreateBatch(ctx, devices)) - - filters := map[string]interface{}{ - "series_id": seriesID, - "device_no": prefix, - } - result, total, err := s.List(ctx, nil, filters) - require.NoError(t, err) - assert.Equal(t, int64(2), total) - assert.Len(t, result, 2) - for _, device := range result { - assert.Equal(t, seriesID, *device.SeriesID) - } -} diff --git a/internal/store/postgres/enterprise_card_authorization_store_test.go b/internal/store/postgres/enterprise_card_authorization_store_test.go deleted file mode 100644 index 12d90ac..0000000 --- a/internal/store/postgres/enterprise_card_authorization_store_test.go +++ /dev/null @@ -1,308 +0,0 @@ -package postgres - -import ( - "context" - "fmt" - "testing" - "time" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/tests/testutils" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -func uniqueCardAuthTestPrefix() string { - return fmt.Sprintf("ECA%d", time.Now().UnixNano()%1000000000) -} - -func TestEnterpriseCardAuthorizationStore_RevokeByDeviceAuthID(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := NewEnterpriseCardAuthorizationStore(tx, rdb) - ctx := context.Background() - - prefix := uniqueCardAuthTestPrefix() - - enterprise := &model.Enterprise{ - EnterpriseName: prefix + "_测试企业", - EnterpriseCode: prefix, - Status: 1, - } - require.NoError(t, tx.Create(enterprise).Error) - - carrier := &model.Carrier{ - CarrierName: "测试运营商", - CarrierType: "CMCC", - Status: 1, - } - require.NoError(t, tx.Create(carrier).Error) - - cards := []*model.IotCard{ - {ICCID: prefix + "0001", CarrierID: carrier.ID, Status: 2}, - {ICCID: prefix + "0002", CarrierID: carrier.ID, Status: 2}, - {ICCID: prefix + "0003", CarrierID: carrier.ID, Status: 2}, - } - for _, c := range cards { - require.NoError(t, tx.Create(c).Error) - } - - deviceAuthID := uint(12345) - now := time.Now() - auths := []*model.EnterpriseCardAuthorization{ - {EnterpriseID: enterprise.ID, CardID: cards[0].ID, AuthorizedBy: 1, AuthorizedAt: now, AuthorizerType: 2, DeviceAuthID: &deviceAuthID}, - {EnterpriseID: enterprise.ID, CardID: cards[1].ID, AuthorizedBy: 1, AuthorizedAt: now, AuthorizerType: 2, DeviceAuthID: &deviceAuthID}, - {EnterpriseID: enterprise.ID, CardID: cards[2].ID, AuthorizedBy: 1, AuthorizedAt: now, AuthorizerType: 2, DeviceAuthID: nil}, - } - for _, auth := range auths { - require.NoError(t, store.Create(ctx, auth)) - } - - t.Run("成功撤销指定设备授权ID关联的卡授权", func(t *testing.T) { - revokerID := uint(2) - err := store.RevokeByDeviceAuthID(ctx, deviceAuthID, revokerID) - require.NoError(t, err) - - result, err := store.ListByEnterprise(ctx, enterprise.ID, false) - require.NoError(t, err) - assert.Len(t, result, 1) - assert.Equal(t, cards[2].ID, result[0].CardID) - - revokedResult, err := store.ListByEnterprise(ctx, enterprise.ID, true) - require.NoError(t, err) - assert.Len(t, revokedResult, 3) - - for _, auth := range revokedResult { - if auth.DeviceAuthID != nil && *auth.DeviceAuthID == deviceAuthID { - assert.NotNil(t, auth.RevokedAt) - assert.NotNil(t, auth.RevokedBy) - assert.Equal(t, revokerID, *auth.RevokedBy) - } - } - }) - - t.Run("设备授权ID不存在时不报错", func(t *testing.T) { - err := store.RevokeByDeviceAuthID(ctx, 99999, uint(1)) - require.NoError(t, err) - }) -} - -func TestEnterpriseCardAuthorizationStore_Create(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := NewEnterpriseCardAuthorizationStore(tx, rdb) - ctx := context.Background() - - prefix := uniqueCardAuthTestPrefix() - - enterprise := &model.Enterprise{ - EnterpriseName: prefix + "_测试企业", - EnterpriseCode: prefix, - Status: 1, - } - require.NoError(t, tx.Create(enterprise).Error) - - carrier := &model.Carrier{ - CarrierName: "测试运营商", - CarrierType: "CMCC", - Status: 1, - } - require.NoError(t, tx.Create(carrier).Error) - - card := &model.IotCard{ - ICCID: prefix + "0001", - CarrierID: carrier.ID, - Status: 2, - } - require.NoError(t, tx.Create(card).Error) - - t.Run("成功创建卡授权记录", func(t *testing.T) { - auth := &model.EnterpriseCardAuthorization{ - EnterpriseID: enterprise.ID, - CardID: card.ID, - AuthorizedBy: 1, - AuthorizedAt: time.Now(), - AuthorizerType: 2, - Remark: "测试授权", - } - - err := store.Create(ctx, auth) - require.NoError(t, err) - assert.NotZero(t, auth.ID) - }) -} - -func TestEnterpriseCardAuthorizationStore_BatchCreate(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := NewEnterpriseCardAuthorizationStore(tx, rdb) - ctx := context.Background() - - prefix := uniqueCardAuthTestPrefix() - - enterprise := &model.Enterprise{ - EnterpriseName: prefix + "_测试企业", - EnterpriseCode: prefix, - Status: 1, - } - require.NoError(t, tx.Create(enterprise).Error) - - carrier := &model.Carrier{ - CarrierName: "测试运营商", - CarrierType: "CMCC", - Status: 1, - } - require.NoError(t, tx.Create(carrier).Error) - - cards := []*model.IotCard{ - {ICCID: prefix + "0001", CarrierID: carrier.ID, Status: 2}, - {ICCID: prefix + "0002", CarrierID: carrier.ID, Status: 2}, - } - for _, c := range cards { - require.NoError(t, tx.Create(c).Error) - } - - t.Run("成功批量创建卡授权记录", func(t *testing.T) { - now := time.Now() - auths := []*model.EnterpriseCardAuthorization{ - {EnterpriseID: enterprise.ID, CardID: cards[0].ID, AuthorizedBy: 1, AuthorizedAt: now, AuthorizerType: 2}, - {EnterpriseID: enterprise.ID, CardID: cards[1].ID, AuthorizedBy: 1, AuthorizedAt: now, AuthorizerType: 2}, - } - - err := store.BatchCreate(ctx, auths) - require.NoError(t, err) - - for _, auth := range auths { - assert.NotZero(t, auth.ID) - } - }) - - t.Run("空列表不报错", func(t *testing.T) { - err := store.BatchCreate(ctx, []*model.EnterpriseCardAuthorization{}) - require.NoError(t, err) - }) -} - -func TestEnterpriseCardAuthorizationStore_ListByEnterprise(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := NewEnterpriseCardAuthorizationStore(tx, rdb) - ctx := context.Background() - - prefix := uniqueCardAuthTestPrefix() - - enterprise := &model.Enterprise{ - EnterpriseName: prefix + "_测试企业", - EnterpriseCode: prefix, - Status: 1, - } - require.NoError(t, tx.Create(enterprise).Error) - - carrier := &model.Carrier{ - CarrierName: "测试运营商", - CarrierType: "CMCC", - Status: 1, - } - require.NoError(t, tx.Create(carrier).Error) - - cards := []*model.IotCard{ - {ICCID: prefix + "0001", CarrierID: carrier.ID, Status: 2}, - {ICCID: prefix + "0002", CarrierID: carrier.ID, Status: 2}, - } - for _, c := range cards { - require.NoError(t, tx.Create(c).Error) - } - - now := time.Now() - auths := []*model.EnterpriseCardAuthorization{ - {EnterpriseID: enterprise.ID, CardID: cards[0].ID, AuthorizedBy: 1, AuthorizedAt: now, AuthorizerType: 2}, - {EnterpriseID: enterprise.ID, CardID: cards[1].ID, AuthorizedBy: 1, AuthorizedAt: now, AuthorizerType: 2, RevokedBy: ptrUintCA(1), RevokedAt: &now}, - } - for _, auth := range auths { - require.NoError(t, store.Create(ctx, auth)) - } - - t.Run("获取未撤销的授权记录", func(t *testing.T) { - result, err := store.ListByEnterprise(ctx, enterprise.ID, false) - require.NoError(t, err) - assert.Len(t, result, 1) - assert.Equal(t, cards[0].ID, result[0].CardID) - }) - - t.Run("获取所有授权记录包括已撤销", func(t *testing.T) { - result, err := store.ListByEnterprise(ctx, enterprise.ID, true) - require.NoError(t, err) - assert.Len(t, result, 2) - }) -} - -func ptrUintCA(v uint) *uint { - return &v -} - -func TestEnterpriseCardAuthorizationStore_GetActiveAuthsByCardIDs(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := NewEnterpriseCardAuthorizationStore(tx, rdb) - ctx := context.Background() - - prefix := uniqueCardAuthTestPrefix() - - enterprise := &model.Enterprise{ - EnterpriseName: prefix + "_测试企业", - EnterpriseCode: prefix, - Status: 1, - } - require.NoError(t, tx.Create(enterprise).Error) - - carrier := &model.Carrier{ - CarrierName: "测试运营商", - CarrierType: "CMCC", - Status: 1, - } - require.NoError(t, tx.Create(carrier).Error) - - cards := []*model.IotCard{ - {ICCID: prefix + "0001", CarrierID: carrier.ID, Status: 2}, - {ICCID: prefix + "0002", CarrierID: carrier.ID, Status: 2}, - {ICCID: prefix + "0003", CarrierID: carrier.ID, Status: 2}, - } - for _, c := range cards { - require.NoError(t, tx.Create(c).Error) - } - - now := time.Now() - auths := []*model.EnterpriseCardAuthorization{ - {EnterpriseID: enterprise.ID, CardID: cards[0].ID, AuthorizedBy: 1, AuthorizedAt: now, AuthorizerType: 2}, - {EnterpriseID: enterprise.ID, CardID: cards[1].ID, AuthorizedBy: 1, AuthorizedAt: now, AuthorizerType: 2, RevokedBy: ptrUintCA(1), RevokedAt: &now}, - } - for _, auth := range auths { - require.NoError(t, store.Create(ctx, auth)) - } - - t.Run("获取有效授权的卡ID映射", func(t *testing.T) { - cardIDs := []uint{cards[0].ID, cards[1].ID, cards[2].ID} - result, err := store.GetActiveAuthsByCardIDs(ctx, enterprise.ID, cardIDs) - require.NoError(t, err) - - assert.True(t, result[cards[0].ID]) - assert.False(t, result[cards[1].ID]) - assert.False(t, result[cards[2].ID]) - }) - - t.Run("空卡ID列表返回空映射", func(t *testing.T) { - result, err := store.GetActiveAuthsByCardIDs(ctx, enterprise.ID, []uint{}) - require.NoError(t, err) - assert.Empty(t, result) - }) -} diff --git a/internal/store/postgres/enterprise_device_authorization_store_test.go b/internal/store/postgres/enterprise_device_authorization_store_test.go deleted file mode 100644 index 83def3e..0000000 --- a/internal/store/postgres/enterprise_device_authorization_store_test.go +++ /dev/null @@ -1,517 +0,0 @@ -package postgres - -import ( - "context" - "fmt" - "testing" - "time" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/tests/testutils" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -func uniqueDeviceAuthTestPrefix() string { - return fmt.Sprintf("EDA%d", time.Now().UnixNano()%1000000000) -} - -func TestEnterpriseDeviceAuthorizationStore_Create(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := NewEnterpriseDeviceAuthorizationStore(tx, rdb) - ctx := context.Background() - - prefix := uniqueDeviceAuthTestPrefix() - - enterprise := &model.Enterprise{ - EnterpriseName: prefix + "_测试企业", - EnterpriseCode: prefix, - Status: 1, - } - require.NoError(t, tx.Create(enterprise).Error) - - device := &model.Device{ - DeviceNo: prefix + "_001", - DeviceName: "测试设备1", - Status: 2, - } - require.NoError(t, tx.Create(device).Error) - - t.Run("成功创建授权记录", func(t *testing.T) { - auth := &model.EnterpriseDeviceAuthorization{ - EnterpriseID: enterprise.ID, - DeviceID: device.ID, - AuthorizedBy: 1, - AuthorizedAt: time.Now(), - AuthorizerType: 2, - Remark: "测试授权", - } - - err := store.Create(ctx, auth) - require.NoError(t, err) - assert.NotZero(t, auth.ID) - assert.Equal(t, enterprise.ID, auth.EnterpriseID) - assert.Equal(t, device.ID, auth.DeviceID) - }) -} - -func TestEnterpriseDeviceAuthorizationStore_BatchCreate(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := NewEnterpriseDeviceAuthorizationStore(tx, rdb) - ctx := context.Background() - - prefix := uniqueDeviceAuthTestPrefix() - - enterprise := &model.Enterprise{ - EnterpriseName: prefix + "_测试企业", - EnterpriseCode: prefix, - Status: 1, - } - require.NoError(t, tx.Create(enterprise).Error) - - devices := []*model.Device{ - {DeviceNo: prefix + "_001", DeviceName: "测试设备1", Status: 2}, - {DeviceNo: prefix + "_002", DeviceName: "测试设备2", Status: 2}, - {DeviceNo: prefix + "_003", DeviceName: "测试设备3", Status: 2}, - } - for _, d := range devices { - require.NoError(t, tx.Create(d).Error) - } - - t.Run("成功批量创建授权记录", func(t *testing.T) { - now := time.Now() - auths := []*model.EnterpriseDeviceAuthorization{ - {EnterpriseID: enterprise.ID, DeviceID: devices[0].ID, AuthorizedBy: 1, AuthorizedAt: now, AuthorizerType: 2}, - {EnterpriseID: enterprise.ID, DeviceID: devices[1].ID, AuthorizedBy: 1, AuthorizedAt: now, AuthorizerType: 2}, - {EnterpriseID: enterprise.ID, DeviceID: devices[2].ID, AuthorizedBy: 1, AuthorizedAt: now, AuthorizerType: 2}, - } - - err := store.BatchCreate(ctx, auths) - require.NoError(t, err) - - for _, auth := range auths { - assert.NotZero(t, auth.ID) - } - }) - - t.Run("空列表不报错", func(t *testing.T) { - err := store.BatchCreate(ctx, []*model.EnterpriseDeviceAuthorization{}) - require.NoError(t, err) - }) -} - -func TestEnterpriseDeviceAuthorizationStore_GetByID(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := NewEnterpriseDeviceAuthorizationStore(tx, rdb) - ctx := context.Background() - - prefix := uniqueDeviceAuthTestPrefix() - - enterprise := &model.Enterprise{ - EnterpriseName: prefix + "_测试企业", - EnterpriseCode: prefix, - Status: 1, - } - require.NoError(t, tx.Create(enterprise).Error) - - device := &model.Device{ - DeviceNo: prefix + "_001", - DeviceName: "测试设备1", - Status: 2, - } - require.NoError(t, tx.Create(device).Error) - - auth := &model.EnterpriseDeviceAuthorization{ - EnterpriseID: enterprise.ID, - DeviceID: device.ID, - AuthorizedBy: 1, - AuthorizedAt: time.Now(), - AuthorizerType: 2, - Remark: "测试备注", - } - require.NoError(t, store.Create(ctx, auth)) - - t.Run("成功获取授权记录", func(t *testing.T) { - result, err := store.GetByID(ctx, auth.ID) - require.NoError(t, err) - assert.Equal(t, auth.ID, result.ID) - assert.Equal(t, enterprise.ID, result.EnterpriseID) - assert.Equal(t, device.ID, result.DeviceID) - assert.Equal(t, "测试备注", result.Remark) - }) - - t.Run("记录不存在返回错误", func(t *testing.T) { - _, err := store.GetByID(ctx, 99999) - require.Error(t, err) - }) -} - -func TestEnterpriseDeviceAuthorizationStore_GetByDeviceID(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := NewEnterpriseDeviceAuthorizationStore(tx, rdb) - ctx := context.Background() - - prefix := uniqueDeviceAuthTestPrefix() - - enterprise := &model.Enterprise{ - EnterpriseName: prefix + "_测试企业", - EnterpriseCode: prefix, - Status: 1, - } - require.NoError(t, tx.Create(enterprise).Error) - - device := &model.Device{ - DeviceNo: prefix + "_001", - DeviceName: "测试设备1", - Status: 2, - } - require.NoError(t, tx.Create(device).Error) - - auth := &model.EnterpriseDeviceAuthorization{ - EnterpriseID: enterprise.ID, - DeviceID: device.ID, - AuthorizedBy: 1, - AuthorizedAt: time.Now(), - AuthorizerType: 2, - } - require.NoError(t, store.Create(ctx, auth)) - - t.Run("成功通过设备ID获取授权记录", func(t *testing.T) { - result, err := store.GetByDeviceID(ctx, device.ID) - require.NoError(t, err) - assert.Equal(t, auth.ID, result.ID) - assert.Equal(t, enterprise.ID, result.EnterpriseID) - }) - - t.Run("设备未授权返回错误", func(t *testing.T) { - _, err := store.GetByDeviceID(ctx, 99999) - require.Error(t, err) - }) - - t.Run("已撤销的授权不返回", func(t *testing.T) { - device2 := &model.Device{ - DeviceNo: prefix + "_002", - DeviceName: "测试设备2", - Status: 2, - } - require.NoError(t, tx.Create(device2).Error) - - now := time.Now() - revokedAuth := &model.EnterpriseDeviceAuthorization{ - EnterpriseID: enterprise.ID, - DeviceID: device2.ID, - AuthorizedBy: 1, - AuthorizedAt: now, - AuthorizerType: 2, - RevokedBy: ptrUint(1), - RevokedAt: &now, - } - require.NoError(t, store.Create(ctx, revokedAuth)) - - _, err := store.GetByDeviceID(ctx, device2.ID) - require.Error(t, err) - }) -} - -func TestEnterpriseDeviceAuthorizationStore_GetByEnterpriseID(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := NewEnterpriseDeviceAuthorizationStore(tx, rdb) - ctx := context.Background() - - prefix := uniqueDeviceAuthTestPrefix() - - enterprise := &model.Enterprise{ - EnterpriseName: prefix + "_测试企业", - EnterpriseCode: prefix, - Status: 1, - } - require.NoError(t, tx.Create(enterprise).Error) - - devices := []*model.Device{ - {DeviceNo: prefix + "_001", DeviceName: "测试设备1", Status: 2}, - {DeviceNo: prefix + "_002", DeviceName: "测试设备2", Status: 2}, - } - for _, d := range devices { - require.NoError(t, tx.Create(d).Error) - } - - now := time.Now() - auths := []*model.EnterpriseDeviceAuthorization{ - {EnterpriseID: enterprise.ID, DeviceID: devices[0].ID, AuthorizedBy: 1, AuthorizedAt: now, AuthorizerType: 2}, - {EnterpriseID: enterprise.ID, DeviceID: devices[1].ID, AuthorizedBy: 1, AuthorizedAt: now, AuthorizerType: 2, RevokedBy: ptrUint(1), RevokedAt: &now}, - } - for _, auth := range auths { - require.NoError(t, store.Create(ctx, auth)) - } - - t.Run("获取未撤销的授权记录", func(t *testing.T) { - result, err := store.GetByEnterpriseID(ctx, enterprise.ID, false) - require.NoError(t, err) - assert.Len(t, result, 1) - assert.Equal(t, devices[0].ID, result[0].DeviceID) - }) - - t.Run("获取所有授权记录包括已撤销", func(t *testing.T) { - result, err := store.GetByEnterpriseID(ctx, enterprise.ID, true) - require.NoError(t, err) - assert.Len(t, result, 2) - }) -} - -func TestEnterpriseDeviceAuthorizationStore_ListByEnterprise(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := NewEnterpriseDeviceAuthorizationStore(tx, rdb) - ctx := context.Background() - - prefix := uniqueDeviceAuthTestPrefix() - - enterprise := &model.Enterprise{ - EnterpriseName: prefix + "_测试企业", - EnterpriseCode: prefix, - Status: 1, - } - require.NoError(t, tx.Create(enterprise).Error) - - devices := make([]*model.Device, 5) - for i := 0; i < 5; i++ { - devices[i] = &model.Device{ - DeviceNo: fmt.Sprintf("%s_%03d", prefix, i+1), - DeviceName: fmt.Sprintf("测试设备%d", i+1), - Status: 2, - } - require.NoError(t, tx.Create(devices[i]).Error) - } - - now := time.Now() - for i, d := range devices { - auth := &model.EnterpriseDeviceAuthorization{ - EnterpriseID: enterprise.ID, - DeviceID: d.ID, - AuthorizedBy: uint(i + 1), - AuthorizedAt: now.Add(time.Duration(i) * time.Minute), - AuthorizerType: 2, - } - require.NoError(t, store.Create(ctx, auth)) - } - - t.Run("分页查询", func(t *testing.T) { - opts := DeviceAuthListOptions{ - EnterpriseID: &enterprise.ID, - Page: 1, - PageSize: 2, - } - - result, total, err := store.ListByEnterprise(ctx, opts) - require.NoError(t, err) - assert.Equal(t, int64(5), total) - assert.Len(t, result, 2) - }) - - t.Run("按授权人过滤", func(t *testing.T) { - authorizerID := uint(1) - opts := DeviceAuthListOptions{ - EnterpriseID: &enterprise.ID, - AuthorizerID: &authorizerID, - Page: 1, - PageSize: 10, - } - - result, total, err := store.ListByEnterprise(ctx, opts) - require.NoError(t, err) - assert.Equal(t, int64(1), total) - assert.Len(t, result, 1) - }) - - t.Run("按设备ID过滤", func(t *testing.T) { - opts := DeviceAuthListOptions{ - EnterpriseID: &enterprise.ID, - DeviceIDs: []uint{devices[0].ID, devices[1].ID}, - Page: 1, - PageSize: 10, - } - - result, total, err := store.ListByEnterprise(ctx, opts) - require.NoError(t, err) - assert.Equal(t, int64(2), total) - assert.Len(t, result, 2) - }) -} - -func TestEnterpriseDeviceAuthorizationStore_RevokeByIDs(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := NewEnterpriseDeviceAuthorizationStore(tx, rdb) - ctx := context.Background() - - prefix := uniqueDeviceAuthTestPrefix() - - enterprise := &model.Enterprise{ - EnterpriseName: prefix + "_测试企业", - EnterpriseCode: prefix, - Status: 1, - } - require.NoError(t, tx.Create(enterprise).Error) - - devices := []*model.Device{ - {DeviceNo: prefix + "_001", DeviceName: "测试设备1", Status: 2}, - {DeviceNo: prefix + "_002", DeviceName: "测试设备2", Status: 2}, - } - for _, d := range devices { - require.NoError(t, tx.Create(d).Error) - } - - now := time.Now() - auths := []*model.EnterpriseDeviceAuthorization{ - {EnterpriseID: enterprise.ID, DeviceID: devices[0].ID, AuthorizedBy: 1, AuthorizedAt: now, AuthorizerType: 2}, - {EnterpriseID: enterprise.ID, DeviceID: devices[1].ID, AuthorizedBy: 1, AuthorizedAt: now, AuthorizerType: 2}, - } - for _, auth := range auths { - require.NoError(t, store.Create(ctx, auth)) - } - - t.Run("成功撤销授权", func(t *testing.T) { - revokerID := uint(2) - err := store.RevokeByIDs(ctx, []uint{auths[0].ID}, revokerID) - require.NoError(t, err) - - result, err := store.GetByID(ctx, auths[0].ID) - require.NoError(t, err) - assert.NotNil(t, result.RevokedAt) - assert.NotNil(t, result.RevokedBy) - assert.Equal(t, revokerID, *result.RevokedBy) - }) - - t.Run("已撤销的记录不再被重复撤销", func(t *testing.T) { - err := store.RevokeByIDs(ctx, []uint{auths[0].ID}, uint(3)) - require.NoError(t, err) - - result, err := store.GetByID(ctx, auths[0].ID) - require.NoError(t, err) - assert.Equal(t, uint(2), *result.RevokedBy) - }) -} - -func TestEnterpriseDeviceAuthorizationStore_GetActiveAuthsByDeviceIDs(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := NewEnterpriseDeviceAuthorizationStore(tx, rdb) - ctx := context.Background() - - prefix := uniqueDeviceAuthTestPrefix() - - enterprise := &model.Enterprise{ - EnterpriseName: prefix + "_测试企业", - EnterpriseCode: prefix, - Status: 1, - } - require.NoError(t, tx.Create(enterprise).Error) - - devices := []*model.Device{ - {DeviceNo: prefix + "_001", DeviceName: "测试设备1", Status: 2}, - {DeviceNo: prefix + "_002", DeviceName: "测试设备2", Status: 2}, - {DeviceNo: prefix + "_003", DeviceName: "测试设备3", Status: 2}, - } - for _, d := range devices { - require.NoError(t, tx.Create(d).Error) - } - - now := time.Now() - auths := []*model.EnterpriseDeviceAuthorization{ - {EnterpriseID: enterprise.ID, DeviceID: devices[0].ID, AuthorizedBy: 1, AuthorizedAt: now, AuthorizerType: 2}, - {EnterpriseID: enterprise.ID, DeviceID: devices[1].ID, AuthorizedBy: 1, AuthorizedAt: now, AuthorizerType: 2, RevokedBy: ptrUint(1), RevokedAt: &now}, - } - for _, auth := range auths { - require.NoError(t, store.Create(ctx, auth)) - } - - t.Run("获取有效授权的设备ID映射", func(t *testing.T) { - deviceIDs := []uint{devices[0].ID, devices[1].ID, devices[2].ID} - result, err := store.GetActiveAuthsByDeviceIDs(ctx, enterprise.ID, deviceIDs) - require.NoError(t, err) - - assert.True(t, result[devices[0].ID]) - assert.False(t, result[devices[1].ID]) - assert.False(t, result[devices[2].ID]) - }) - - t.Run("空设备ID列表返回空映射", func(t *testing.T) { - result, err := store.GetActiveAuthsByDeviceIDs(ctx, enterprise.ID, []uint{}) - require.NoError(t, err) - assert.Empty(t, result) - }) -} - -func TestEnterpriseDeviceAuthorizationStore_ListDeviceIDsByEnterprise(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := NewEnterpriseDeviceAuthorizationStore(tx, rdb) - ctx := context.Background() - - prefix := uniqueDeviceAuthTestPrefix() - - enterprise := &model.Enterprise{ - EnterpriseName: prefix + "_测试企业", - EnterpriseCode: prefix, - Status: 1, - } - require.NoError(t, tx.Create(enterprise).Error) - - devices := []*model.Device{ - {DeviceNo: prefix + "_001", DeviceName: "测试设备1", Status: 2}, - {DeviceNo: prefix + "_002", DeviceName: "测试设备2", Status: 2}, - } - for _, d := range devices { - require.NoError(t, tx.Create(d).Error) - } - - now := time.Now() - auths := []*model.EnterpriseDeviceAuthorization{ - {EnterpriseID: enterprise.ID, DeviceID: devices[0].ID, AuthorizedBy: 1, AuthorizedAt: now, AuthorizerType: 2}, - {EnterpriseID: enterprise.ID, DeviceID: devices[1].ID, AuthorizedBy: 1, AuthorizedAt: now, AuthorizerType: 2}, - } - for _, auth := range auths { - require.NoError(t, store.Create(ctx, auth)) - } - - t.Run("获取企业授权设备ID列表", func(t *testing.T) { - result, err := store.ListDeviceIDsByEnterprise(ctx, enterprise.ID) - require.NoError(t, err) - assert.Len(t, result, 2) - assert.Contains(t, result, devices[0].ID) - assert.Contains(t, result, devices[1].ID) - }) - - t.Run("无授权记录返回空列表", func(t *testing.T) { - result, err := store.ListDeviceIDsByEnterprise(ctx, 99999) - require.NoError(t, err) - assert.Empty(t, result) - }) -} - -func ptrUint(v uint) *uint { - return &v -} diff --git a/internal/store/postgres/iot_card_store_test.go b/internal/store/postgres/iot_card_store_test.go deleted file mode 100644 index 2e895fc..0000000 --- a/internal/store/postgres/iot_card_store_test.go +++ /dev/null @@ -1,524 +0,0 @@ -package postgres - -import ( - "context" - "fmt" - "testing" - "time" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/internal/store" - "github.com/break/junhong_cmp_fiber/tests/testutils" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -func uniqueICCIDPrefix() string { - return fmt.Sprintf("T%d", time.Now().UnixNano()%1000000000) -} - -func TestIotCardStore_Create(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - s := NewIotCardStore(tx, rdb) - ctx := context.Background() - - card := &model.IotCard{ - ICCID: "89860012345678901234", - CarrierID: 1, - Status: 1, - } - - err := s.Create(ctx, card) - require.NoError(t, err) - assert.NotZero(t, card.ID) -} - -func TestIotCardStore_ExistsByICCID(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - s := NewIotCardStore(tx, rdb) - ctx := context.Background() - - card := &model.IotCard{ - ICCID: "89860012345678901111", - CarrierID: 1, - Status: 1, - } - require.NoError(t, s.Create(ctx, card)) - - exists, err := s.ExistsByICCID(ctx, "89860012345678901111") - require.NoError(t, err) - assert.True(t, exists) - - exists, err = s.ExistsByICCID(ctx, "89860012345678909999") - require.NoError(t, err) - assert.False(t, exists) -} - -func TestIotCardStore_ExistsByICCIDBatch(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - s := NewIotCardStore(tx, rdb) - ctx := context.Background() - - cards := []*model.IotCard{ - {ICCID: "89860012345678902001", CarrierID: 1, Status: 1}, - {ICCID: "89860012345678902002", CarrierID: 1, Status: 1}, - {ICCID: "89860012345678902003", CarrierID: 1, Status: 1}, - } - require.NoError(t, s.CreateBatch(ctx, cards)) - - result, err := s.ExistsByICCIDBatch(ctx, []string{ - "89860012345678902001", - "89860012345678902002", - "89860012345678909999", - }) - require.NoError(t, err) - assert.True(t, result["89860012345678902001"]) - assert.True(t, result["89860012345678902002"]) - assert.False(t, result["89860012345678909999"]) - - emptyResult, err := s.ExistsByICCIDBatch(ctx, []string{}) - require.NoError(t, err) - assert.Empty(t, emptyResult) -} - -func TestIotCardStore_ListStandalone(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - s := NewIotCardStore(tx, rdb) - ctx := context.Background() - - prefix := uniqueICCIDPrefix() - standaloneCards := []*model.IotCard{ - {ICCID: prefix + "0001", CarrierID: 1, Status: 1}, - {ICCID: prefix + "0002", CarrierID: 1, Status: 1}, - {ICCID: prefix + "0003", CarrierID: 2, Status: 2}, - } - require.NoError(t, s.CreateBatch(ctx, standaloneCards)) - - boundCard := &model.IotCard{ - ICCID: prefix + "0004", - CarrierID: 1, - Status: 1, - } - require.NoError(t, s.Create(ctx, boundCard)) - - binding := &model.DeviceSimBinding{ - DeviceID: 1, - IotCardID: boundCard.ID, - BindStatus: 1, - } - require.NoError(t, tx.Create(binding).Error) - - t.Run("查询所有单卡", func(t *testing.T) { - filters := map[string]interface{}{"iccid": prefix} - cards, total, err := s.ListStandalone(ctx, &store.QueryOptions{Page: 1, PageSize: 20}, filters) - require.NoError(t, err) - assert.Equal(t, int64(3), total) - assert.Len(t, cards, 3) - - for _, card := range cards { - assert.NotEqual(t, boundCard.ID, card.ID, "已绑定的卡不应出现在单卡列表中") - } - }) - - t.Run("按运营商ID过滤", func(t *testing.T) { - filters := map[string]interface{}{"carrier_id": uint(1), "iccid": prefix} - cards, total, err := s.ListStandalone(ctx, &store.QueryOptions{Page: 1, PageSize: 20}, filters) - require.NoError(t, err) - assert.Equal(t, int64(2), total) - for _, card := range cards { - assert.Equal(t, uint(1), card.CarrierID) - } - }) - - t.Run("按状态过滤", func(t *testing.T) { - filters := map[string]interface{}{"status": 2, "iccid": prefix} - cards, total, err := s.ListStandalone(ctx, &store.QueryOptions{Page: 1, PageSize: 20}, filters) - require.NoError(t, err) - assert.Equal(t, int64(1), total) - assert.Len(t, cards, 1) - assert.Equal(t, 2, cards[0].Status) - }) - - t.Run("按ICCID模糊查询", func(t *testing.T) { - filters := map[string]interface{}{"iccid": prefix + "0001"} - cards, total, err := s.ListStandalone(ctx, &store.QueryOptions{Page: 1, PageSize: 20}, filters) - require.NoError(t, err) - assert.Equal(t, int64(1), total) - assert.Contains(t, cards[0].ICCID, prefix+"0001") - }) - - t.Run("分页查询", func(t *testing.T) { - filters := map[string]interface{}{"iccid": prefix} - cards, total, err := s.ListStandalone(ctx, &store.QueryOptions{Page: 1, PageSize: 2}, filters) - require.NoError(t, err) - assert.Equal(t, int64(3), total) - assert.Len(t, cards, 2) - - cards2, _, err := s.ListStandalone(ctx, &store.QueryOptions{Page: 2, PageSize: 2}, filters) - require.NoError(t, err) - assert.Len(t, cards2, 1) - }) - - t.Run("默认分页选项", func(t *testing.T) { - filters := map[string]interface{}{"iccid": prefix} - cards, total, err := s.ListStandalone(ctx, nil, filters) - require.NoError(t, err) - assert.Equal(t, int64(3), total) - assert.Len(t, cards, 3) - }) -} - -func TestIotCardStore_ListStandalone_Filters(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - s := NewIotCardStore(tx, rdb) - ctx := context.Background() - - prefix := uniqueICCIDPrefix() - batchPrefix := "B" + prefix - msisdnPrefix := "199" + prefix[1:8] - shopID := uint(time.Now().UnixNano() % 1000000) - - cards := []*model.IotCard{ - {ICCID: prefix + "A001", CarrierID: 1, Status: 1, ShopID: &shopID, BatchNo: batchPrefix + "01", MSISDN: msisdnPrefix + "01"}, - {ICCID: prefix + "A002", CarrierID: 1, Status: 1, ShopID: nil, BatchNo: batchPrefix + "01", MSISDN: msisdnPrefix + "02"}, - {ICCID: prefix + "A003", CarrierID: 1, Status: 1, ShopID: nil, BatchNo: batchPrefix + "02", MSISDN: msisdnPrefix + "03"}, - } - require.NoError(t, s.CreateBatch(ctx, cards)) - - t.Run("按店铺ID过滤", func(t *testing.T) { - filters := map[string]interface{}{"shop_id": shopID, "iccid": prefix} - result, total, err := s.ListStandalone(ctx, nil, filters) - require.NoError(t, err) - assert.Equal(t, int64(1), total) - assert.Equal(t, shopID, *result[0].ShopID) - }) - - t.Run("按批次号过滤", func(t *testing.T) { - filters := map[string]interface{}{"batch_no": batchPrefix + "01", "iccid": prefix} - _, total, err := s.ListStandalone(ctx, nil, filters) - require.NoError(t, err) - assert.Equal(t, int64(2), total) - }) - - t.Run("按MSISDN模糊查询", func(t *testing.T) { - filters := map[string]interface{}{"msisdn": msisdnPrefix + "01"} - result, total, err := s.ListStandalone(ctx, nil, filters) - require.NoError(t, err) - assert.Equal(t, int64(1), total) - assert.Contains(t, result[0].MSISDN, msisdnPrefix+"01") - }) - - t.Run("已分销过滤-true", func(t *testing.T) { - filters := map[string]interface{}{"is_distributed": true, "iccid": prefix} - result, total, err := s.ListStandalone(ctx, nil, filters) - require.NoError(t, err) - assert.Equal(t, int64(1), total) - assert.NotNil(t, result[0].ShopID) - }) - - t.Run("已分销过滤-false", func(t *testing.T) { - filters := map[string]interface{}{"is_distributed": false, "iccid": prefix} - result, total, err := s.ListStandalone(ctx, nil, filters) - require.NoError(t, err) - assert.Equal(t, int64(2), total) - for _, card := range result { - assert.Nil(t, card.ShopID) - } - }) - - t.Run("ICCID范围查询", func(t *testing.T) { - filters := map[string]interface{}{ - "iccid_start": prefix + "A001", - "iccid_end": prefix + "A002", - } - _, total, err := s.ListStandalone(ctx, nil, filters) - require.NoError(t, err) - assert.Equal(t, int64(2), total) - }) -} - -func TestIotCardStore_GetByICCIDs(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - s := NewIotCardStore(tx, rdb) - ctx := context.Background() - - cards := []*model.IotCard{ - {ICCID: "89860012345678905001", CarrierID: 1, Status: 1}, - {ICCID: "89860012345678905002", CarrierID: 1, Status: 1}, - {ICCID: "89860012345678905003", CarrierID: 1, Status: 1}, - } - require.NoError(t, s.CreateBatch(ctx, cards)) - - t.Run("查询存在的ICCID", func(t *testing.T) { - result, err := s.GetByICCIDs(ctx, []string{"89860012345678905001", "89860012345678905002"}) - require.NoError(t, err) - assert.Len(t, result, 2) - }) - - t.Run("查询不存在的ICCID", func(t *testing.T) { - result, err := s.GetByICCIDs(ctx, []string{"89860012345678909999"}) - require.NoError(t, err) - assert.Len(t, result, 0) - }) - - t.Run("空列表返回nil", func(t *testing.T) { - result, err := s.GetByICCIDs(ctx, []string{}) - require.NoError(t, err) - assert.Nil(t, result) - }) -} - -func TestIotCardStore_GetStandaloneByICCIDRange(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - s := NewIotCardStore(tx, rdb) - ctx := context.Background() - - shopID := uint(100) - cards := []*model.IotCard{ - {ICCID: "89860012345678906001", CarrierID: 1, Status: 1, ShopID: nil}, - {ICCID: "89860012345678906002", CarrierID: 1, Status: 1, ShopID: nil}, - {ICCID: "89860012345678906003", CarrierID: 1, Status: 1, ShopID: &shopID}, - {ICCID: "89860012345678906004", CarrierID: 1, Status: 1, ShopID: &shopID}, - } - require.NoError(t, s.CreateBatch(ctx, cards)) - - t.Run("平台查询未分配的卡", func(t *testing.T) { - result, err := s.GetStandaloneByICCIDRange(ctx, "89860012345678906001", "89860012345678906004", nil) - require.NoError(t, err) - assert.Len(t, result, 2) - for _, card := range result { - assert.Nil(t, card.ShopID) - } - }) - - t.Run("店铺查询自己的卡", func(t *testing.T) { - result, err := s.GetStandaloneByICCIDRange(ctx, "89860012345678906001", "89860012345678906004", &shopID) - require.NoError(t, err) - assert.Len(t, result, 2) - for _, card := range result { - assert.Equal(t, shopID, *card.ShopID) - } - }) -} - -func TestIotCardStore_GetStandaloneByFilters(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - s := NewIotCardStore(tx, rdb) - ctx := context.Background() - - shopID := uint(100) - cards := []*model.IotCard{ - {ICCID: "89860012345678907001", CarrierID: 1, Status: 1, ShopID: nil, BatchNo: "BATCH001"}, - {ICCID: "89860012345678907002", CarrierID: 2, Status: 1, ShopID: nil, BatchNo: "BATCH002"}, - {ICCID: "89860012345678907003", CarrierID: 1, Status: 2, ShopID: &shopID, BatchNo: "BATCH001"}, - } - require.NoError(t, s.CreateBatch(ctx, cards)) - - t.Run("按运营商过滤", func(t *testing.T) { - filters := map[string]any{"carrier_id": uint(1)} - result, err := s.GetStandaloneByFilters(ctx, filters, nil) - require.NoError(t, err) - assert.Len(t, result, 1) - assert.Equal(t, uint(1), result[0].CarrierID) - }) - - t.Run("按批次号过滤", func(t *testing.T) { - filters := map[string]any{"batch_no": "BATCH001"} - result, err := s.GetStandaloneByFilters(ctx, filters, &shopID) - require.NoError(t, err) - assert.Len(t, result, 1) - assert.Equal(t, "BATCH001", result[0].BatchNo) - }) -} - -func TestIotCardStore_BatchUpdateShopIDAndStatus(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - s := NewIotCardStore(tx, rdb) - ctx := context.Background() - - cards := []*model.IotCard{ - {ICCID: "89860012345678908001", CarrierID: 1, Status: 1}, - {ICCID: "89860012345678908002", CarrierID: 1, Status: 1}, - } - require.NoError(t, s.CreateBatch(ctx, cards)) - - newShopID := uint(200) - cardIDs := []uint{cards[0].ID, cards[1].ID} - - err := s.BatchUpdateShopIDAndStatus(ctx, cardIDs, &newShopID, 2) - require.NoError(t, err) - - var updatedCards []*model.IotCard - require.NoError(t, tx.Where("id IN ?", cardIDs).Find(&updatedCards).Error) - for _, card := range updatedCards { - assert.Equal(t, newShopID, *card.ShopID) - assert.Equal(t, 2, card.Status) - } - - t.Run("空列表不报错", func(t *testing.T) { - err := s.BatchUpdateShopIDAndStatus(ctx, []uint{}, nil, 1) - require.NoError(t, err) - }) -} - -func TestIotCardStore_GetBoundCardIDs(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - s := NewIotCardStore(tx, rdb) - ctx := context.Background() - - cards := []*model.IotCard{ - {ICCID: "89860012345678909001", CarrierID: 1, Status: 1}, - {ICCID: "89860012345678909002", CarrierID: 1, Status: 1}, - {ICCID: "89860012345678909003", CarrierID: 1, Status: 1}, - } - require.NoError(t, s.CreateBatch(ctx, cards)) - - binding := &model.DeviceSimBinding{ - DeviceID: 1, - IotCardID: cards[0].ID, - BindStatus: 1, - } - require.NoError(t, tx.Create(binding).Error) - - cardIDs := []uint{cards[0].ID, cards[1].ID, cards[2].ID} - boundIDs, err := s.GetBoundCardIDs(ctx, cardIDs) - require.NoError(t, err) - assert.Len(t, boundIDs, 1) - assert.Contains(t, boundIDs, cards[0].ID) - - t.Run("空列表返回nil", func(t *testing.T) { - result, err := s.GetBoundCardIDs(ctx, []uint{}) - require.NoError(t, err) - assert.Nil(t, result) - }) -} - -func TestIotCardStore_BatchUpdateSeriesID(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - s := NewIotCardStore(tx, rdb) - ctx := context.Background() - - cards := []*model.IotCard{ - {ICCID: "89860012345678910001", CarrierID: 1, Status: 1}, - {ICCID: "89860012345678910002", CarrierID: 1, Status: 1}, - } - require.NoError(t, s.CreateBatch(ctx, cards)) - - t.Run("设置系列ID", func(t *testing.T) { - seriesID := uint(100) - cardIDs := []uint{cards[0].ID, cards[1].ID} - - err := s.BatchUpdateSeriesID(ctx, cardIDs, &seriesID) - require.NoError(t, err) - - var updatedCards []*model.IotCard - require.NoError(t, tx.Where("id IN ?", cardIDs).Find(&updatedCards).Error) - for _, card := range updatedCards { - require.NotNil(t, card.SeriesID) - assert.Equal(t, seriesID, *card.SeriesID) - } - }) - - t.Run("清除系列ID", func(t *testing.T) { - cardIDs := []uint{cards[0].ID} - - err := s.BatchUpdateSeriesID(ctx, cardIDs, nil) - require.NoError(t, err) - - var updatedCard model.IotCard - require.NoError(t, tx.First(&updatedCard, cards[0].ID).Error) - assert.Nil(t, updatedCard.SeriesID) - }) - - t.Run("空列表不报错", func(t *testing.T) { - err := s.BatchUpdateSeriesID(ctx, []uint{}, nil) - require.NoError(t, err) - }) -} - -func TestIotCardStore_ListBySeriesID(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - s := NewIotCardStore(tx, rdb) - ctx := context.Background() - - seriesID := uint(200) - cards := []*model.IotCard{ - {ICCID: "89860012345678911001", CarrierID: 1, Status: 1, SeriesID: &seriesID}, - {ICCID: "89860012345678911002", CarrierID: 1, Status: 1, SeriesID: &seriesID}, - {ICCID: "89860012345678911003", CarrierID: 1, Status: 1, SeriesID: nil}, - } - require.NoError(t, s.CreateBatch(ctx, cards)) - - result, err := s.ListBySeriesID(ctx, seriesID) - require.NoError(t, err) - assert.Len(t, result, 2) - for _, card := range result { - assert.Equal(t, seriesID, *card.SeriesID) - } -} - -func TestIotCardStore_ListStandalone_SeriesIDFilter(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - s := NewIotCardStore(tx, rdb) - ctx := context.Background() - - prefix := uniqueICCIDPrefix() - seriesID := uint(300) - cards := []*model.IotCard{ - {ICCID: prefix + "S001", CarrierID: 1, Status: 1, SeriesID: &seriesID}, - {ICCID: prefix + "S002", CarrierID: 1, Status: 1, SeriesID: &seriesID}, - {ICCID: prefix + "S003", CarrierID: 1, Status: 1, SeriesID: nil}, - } - require.NoError(t, s.CreateBatch(ctx, cards)) - - filters := map[string]interface{}{ - "series_id": seriesID, - "iccid": prefix, - } - result, total, err := s.ListStandalone(ctx, nil, filters) - require.NoError(t, err) - assert.Equal(t, int64(2), total) - assert.Len(t, result, 2) - for _, card := range result { - assert.Equal(t, seriesID, *card.SeriesID) - } -} diff --git a/internal/store/postgres/order_item_store_test.go b/internal/store/postgres/order_item_store_test.go deleted file mode 100644 index 3065dc4..0000000 --- a/internal/store/postgres/order_item_store_test.go +++ /dev/null @@ -1,142 +0,0 @@ -package postgres - -import ( - "context" - "testing" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/tests/testutils" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -func TestOrderItemStore_BatchCreate(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - orderStore := NewOrderStore(tx, rdb) - itemStore := NewOrderItemStore(tx, rdb) - ctx := context.Background() - - order := &model.Order{ - OrderNo: orderStore.GenerateOrderNo(), - OrderType: model.OrderTypeSingleCard, - BuyerType: model.BuyerTypePersonal, - BuyerID: 100, - TotalAmount: 15000, - PaymentStatus: model.PaymentStatusPending, - } - require.NoError(t, orderStore.Create(ctx, order, nil)) - - items := []*model.OrderItem{ - {OrderID: order.ID, PackageID: 1, PackageName: "套餐A", Quantity: 1, UnitPrice: 5000, Amount: 5000}, - {OrderID: order.ID, PackageID: 2, PackageName: "套餐B", Quantity: 2, UnitPrice: 5000, Amount: 10000}, - } - - err := itemStore.BatchCreate(ctx, items) - require.NoError(t, err) - - for _, item := range items { - assert.NotZero(t, item.ID) - assert.Equal(t, order.ID, item.OrderID) - } -} - -func TestOrderItemStore_BatchCreate_Empty(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - itemStore := NewOrderItemStore(tx, rdb) - ctx := context.Background() - - err := itemStore.BatchCreate(ctx, nil) - require.NoError(t, err) - - err = itemStore.BatchCreate(ctx, []*model.OrderItem{}) - require.NoError(t, err) -} - -func TestOrderItemStore_ListByOrderID(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - orderStore := NewOrderStore(tx, rdb) - itemStore := NewOrderItemStore(tx, rdb) - ctx := context.Background() - - order := &model.Order{ - OrderNo: orderStore.GenerateOrderNo(), - OrderType: model.OrderTypeDevice, - BuyerType: model.BuyerTypeAgent, - BuyerID: 200, - TotalAmount: 20000, - PaymentStatus: model.PaymentStatusPending, - } - items := []*model.OrderItem{ - {PackageID: 10, PackageName: "设备套餐1", Quantity: 1, UnitPrice: 10000, Amount: 10000}, - {PackageID: 11, PackageName: "设备套餐2", Quantity: 1, UnitPrice: 10000, Amount: 10000}, - } - require.NoError(t, orderStore.Create(ctx, order, items)) - - result, err := itemStore.ListByOrderID(ctx, order.ID) - require.NoError(t, err) - assert.Len(t, result, 2) - - for _, item := range result { - assert.Equal(t, order.ID, item.OrderID) - } -} - -func TestOrderItemStore_ListByOrderIDs(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - orderStore := NewOrderStore(tx, rdb) - itemStore := NewOrderItemStore(tx, rdb) - ctx := context.Background() - - order1 := &model.Order{ - OrderNo: orderStore.GenerateOrderNo(), - OrderType: model.OrderTypeSingleCard, - BuyerType: model.BuyerTypePersonal, - BuyerID: 300, - TotalAmount: 5000, - PaymentStatus: model.PaymentStatusPending, - } - items1 := []*model.OrderItem{ - {PackageID: 20, PackageName: "套餐X", Quantity: 1, UnitPrice: 5000, Amount: 5000}, - } - require.NoError(t, orderStore.Create(ctx, order1, items1)) - - order2 := &model.Order{ - OrderNo: orderStore.GenerateOrderNo(), - OrderType: model.OrderTypeSingleCard, - BuyerType: model.BuyerTypePersonal, - BuyerID: 300, - TotalAmount: 8000, - PaymentStatus: model.PaymentStatusPending, - } - items2 := []*model.OrderItem{ - {PackageID: 21, PackageName: "套餐Y", Quantity: 1, UnitPrice: 3000, Amount: 3000}, - {PackageID: 22, PackageName: "套餐Z", Quantity: 1, UnitPrice: 5000, Amount: 5000}, - } - require.NoError(t, orderStore.Create(ctx, order2, items2)) - - t.Run("查询多个订单的明细", func(t *testing.T) { - result, err := itemStore.ListByOrderIDs(ctx, []uint{order1.ID, order2.ID}) - require.NoError(t, err) - assert.Len(t, result, 3) - }) - - t.Run("空订单ID列表", func(t *testing.T) { - result, err := itemStore.ListByOrderIDs(ctx, []uint{}) - require.NoError(t, err) - assert.Nil(t, result) - }) - - t.Run("不存在的订单ID", func(t *testing.T) { - result, err := itemStore.ListByOrderIDs(ctx, []uint{99999}) - require.NoError(t, err) - assert.Len(t, result, 0) - }) -} diff --git a/internal/store/postgres/order_store_test.go b/internal/store/postgres/order_store_test.go deleted file mode 100644 index 524220d..0000000 --- a/internal/store/postgres/order_store_test.go +++ /dev/null @@ -1,287 +0,0 @@ -package postgres - -import ( - "context" - "testing" - "time" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/internal/store" - "github.com/break/junhong_cmp_fiber/tests/testutils" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -func TestOrderStore_Create(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - s := NewOrderStore(tx, rdb) - ctx := context.Background() - - cardID := uint(1001) - order := &model.Order{ - OrderNo: s.GenerateOrderNo(), - OrderType: model.OrderTypeSingleCard, - BuyerType: model.BuyerTypePersonal, - BuyerID: 100, - IotCardID: &cardID, - TotalAmount: 9900, - PaymentStatus: model.PaymentStatusPending, - } - items := []*model.OrderItem{ - { - PackageID: 1, - PackageName: "测试套餐1", - Quantity: 1, - UnitPrice: 5000, - Amount: 5000, - }, - { - PackageID: 2, - PackageName: "测试套餐2", - Quantity: 1, - UnitPrice: 4900, - Amount: 4900, - }, - } - - err := s.Create(ctx, order, items) - require.NoError(t, err) - assert.NotZero(t, order.ID) - - for _, item := range items { - assert.NotZero(t, item.ID) - assert.Equal(t, order.ID, item.OrderID) - } -} - -func TestOrderStore_GetByID(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - s := NewOrderStore(tx, rdb) - ctx := context.Background() - - order := &model.Order{ - OrderNo: s.GenerateOrderNo(), - OrderType: model.OrderTypeSingleCard, - BuyerType: model.BuyerTypeAgent, - BuyerID: 200, - TotalAmount: 19900, - PaymentStatus: model.PaymentStatusPending, - } - require.NoError(t, s.Create(ctx, order, nil)) - - t.Run("查询存在的订单", func(t *testing.T) { - result, err := s.GetByID(ctx, order.ID) - require.NoError(t, err) - assert.Equal(t, order.OrderNo, result.OrderNo) - assert.Equal(t, order.BuyerType, result.BuyerType) - assert.Equal(t, order.TotalAmount, result.TotalAmount) - }) - - t.Run("查询不存在的订单", func(t *testing.T) { - _, err := s.GetByID(ctx, 99999) - require.Error(t, err) - }) -} - -func TestOrderStore_GetByIDWithItems(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - s := NewOrderStore(tx, rdb) - ctx := context.Background() - - deviceID := uint(2001) - order := &model.Order{ - OrderNo: s.GenerateOrderNo(), - OrderType: model.OrderTypeDevice, - BuyerType: model.BuyerTypePersonal, - BuyerID: 300, - DeviceID: &deviceID, - TotalAmount: 29900, - PaymentStatus: model.PaymentStatusPending, - } - items := []*model.OrderItem{ - {PackageID: 10, PackageName: "设备套餐A", Quantity: 1, UnitPrice: 15000, Amount: 15000}, - {PackageID: 11, PackageName: "设备套餐B", Quantity: 1, UnitPrice: 14900, Amount: 14900}, - } - require.NoError(t, s.Create(ctx, order, items)) - - resultOrder, resultItems, err := s.GetByIDWithItems(ctx, order.ID) - require.NoError(t, err) - assert.Equal(t, order.OrderNo, resultOrder.OrderNo) - assert.Len(t, resultItems, 2) -} - -func TestOrderStore_GetByOrderNo(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - s := NewOrderStore(tx, rdb) - ctx := context.Background() - - orderNo := s.GenerateOrderNo() - order := &model.Order{ - OrderNo: orderNo, - OrderType: model.OrderTypeSingleCard, - BuyerType: model.BuyerTypeAgent, - BuyerID: 400, - TotalAmount: 5000, - PaymentStatus: model.PaymentStatusPending, - } - require.NoError(t, s.Create(ctx, order, nil)) - - t.Run("查询存在的订单号", func(t *testing.T) { - result, err := s.GetByOrderNo(ctx, orderNo) - require.NoError(t, err) - assert.Equal(t, order.ID, result.ID) - }) - - t.Run("查询不存在的订单号", func(t *testing.T) { - _, err := s.GetByOrderNo(ctx, "NOT_EXISTS_ORDER_NO") - require.Error(t, err) - }) -} - -func TestOrderStore_Update(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - s := NewOrderStore(tx, rdb) - ctx := context.Background() - - order := &model.Order{ - OrderNo: s.GenerateOrderNo(), - OrderType: model.OrderTypeSingleCard, - BuyerType: model.BuyerTypePersonal, - BuyerID: 500, - TotalAmount: 10000, - PaymentStatus: model.PaymentStatusPending, - } - require.NoError(t, s.Create(ctx, order, nil)) - - order.PaymentMethod = model.PaymentMethodWallet - order.PaymentStatus = model.PaymentStatusPaid - now := time.Now() - order.PaidAt = &now - err := s.Update(ctx, order) - require.NoError(t, err) - - updated, err := s.GetByID(ctx, order.ID) - require.NoError(t, err) - assert.Equal(t, model.PaymentMethodWallet, updated.PaymentMethod) - assert.Equal(t, model.PaymentStatusPaid, updated.PaymentStatus) - assert.NotNil(t, updated.PaidAt) -} - -func TestOrderStore_UpdatePaymentStatus(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - s := NewOrderStore(tx, rdb) - ctx := context.Background() - - order := &model.Order{ - OrderNo: s.GenerateOrderNo(), - OrderType: model.OrderTypeSingleCard, - BuyerType: model.BuyerTypeAgent, - BuyerID: 600, - TotalAmount: 8000, - PaymentStatus: model.PaymentStatusPending, - } - require.NoError(t, s.Create(ctx, order, nil)) - - now := time.Now() - err := s.UpdatePaymentStatus(ctx, order.ID, model.PaymentStatusPaid, &now) - require.NoError(t, err) - - updated, err := s.GetByID(ctx, order.ID) - require.NoError(t, err) - assert.Equal(t, model.PaymentStatusPaid, updated.PaymentStatus) - assert.NotNil(t, updated.PaidAt) -} - -func TestOrderStore_List(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - s := NewOrderStore(tx, rdb) - ctx := context.Background() - - orders := []*model.Order{ - {OrderNo: s.GenerateOrderNo(), OrderType: model.OrderTypeSingleCard, BuyerType: model.BuyerTypePersonal, BuyerID: 700, TotalAmount: 1000, PaymentStatus: model.PaymentStatusPending}, - {OrderNo: s.GenerateOrderNo(), OrderType: model.OrderTypeDevice, BuyerType: model.BuyerTypeAgent, BuyerID: 701, TotalAmount: 2000, PaymentStatus: model.PaymentStatusPaid}, - {OrderNo: s.GenerateOrderNo(), OrderType: model.OrderTypeSingleCard, BuyerType: model.BuyerTypeAgent, BuyerID: 701, TotalAmount: 3000, PaymentStatus: model.PaymentStatusCancelled}, - } - for _, o := range orders { - require.NoError(t, s.Create(ctx, o, nil)) - } - - t.Run("查询所有订单", func(t *testing.T) { - result, total, err := s.List(ctx, &store.QueryOptions{Page: 1, PageSize: 20}, nil) - require.NoError(t, err) - assert.GreaterOrEqual(t, total, int64(3)) - assert.GreaterOrEqual(t, len(result), 3) - }) - - t.Run("按支付状态过滤", func(t *testing.T) { - filters := map[string]any{"payment_status": model.PaymentStatusPending} - result, total, err := s.List(ctx, &store.QueryOptions{Page: 1, PageSize: 20}, filters) - require.NoError(t, err) - assert.GreaterOrEqual(t, total, int64(1)) - for _, o := range result { - assert.Equal(t, model.PaymentStatusPending, o.PaymentStatus) - } - }) - - t.Run("按订单类型过滤", func(t *testing.T) { - filters := map[string]any{"order_type": model.OrderTypeDevice} - result, total, err := s.List(ctx, &store.QueryOptions{Page: 1, PageSize: 20}, filters) - require.NoError(t, err) - assert.GreaterOrEqual(t, total, int64(1)) - for _, o := range result { - assert.Equal(t, model.OrderTypeDevice, o.OrderType) - } - }) - - t.Run("按买家过滤", func(t *testing.T) { - filters := map[string]any{"buyer_type": model.BuyerTypeAgent, "buyer_id": uint(701)} - result, total, err := s.List(ctx, &store.QueryOptions{Page: 1, PageSize: 20}, filters) - require.NoError(t, err) - assert.GreaterOrEqual(t, total, int64(2)) - for _, o := range result { - assert.Equal(t, model.BuyerTypeAgent, o.BuyerType) - assert.Equal(t, uint(701), o.BuyerID) - } - }) - - t.Run("分页查询", func(t *testing.T) { - result, total, err := s.List(ctx, &store.QueryOptions{Page: 1, PageSize: 2}, nil) - require.NoError(t, err) - assert.GreaterOrEqual(t, total, int64(3)) - assert.LessOrEqual(t, len(result), 2) - }) - - t.Run("默认分页选项", func(t *testing.T) { - result, _, err := s.List(ctx, nil, nil) - require.NoError(t, err) - assert.NotNil(t, result) - }) -} - -func TestOrderStore_GenerateOrderNo(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - s := NewOrderStore(tx, rdb) - - orderNo1 := s.GenerateOrderNo() - orderNo2 := s.GenerateOrderNo() - - assert.True(t, len(orderNo1) > 0) - assert.True(t, len(orderNo1) <= 30) - assert.Contains(t, orderNo1, "ORD") - assert.NotEqual(t, orderNo1, orderNo2) -} diff --git a/internal/store/postgres/package_series_store_test.go b/internal/store/postgres/package_series_store_test.go deleted file mode 100644 index 622d2e7..0000000 --- a/internal/store/postgres/package_series_store_test.go +++ /dev/null @@ -1,191 +0,0 @@ -package postgres - -import ( - "context" - "testing" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/internal/store" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/tests/testutils" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -func TestPackageSeriesStore_Create(t *testing.T) { - tx := testutils.NewTestTransaction(t) - s := NewPackageSeriesStore(tx) - ctx := context.Background() - - series := &model.PackageSeries{ - SeriesCode: "SERIES_TEST_001", - SeriesName: "测试系列", - Description: "测试描述", - Status: constants.StatusEnabled, - } - - err := s.Create(ctx, series) - require.NoError(t, err) - assert.NotZero(t, series.ID) -} - -func TestPackageSeriesStore_GetByID(t *testing.T) { - tx := testutils.NewTestTransaction(t) - s := NewPackageSeriesStore(tx) - ctx := context.Background() - - series := &model.PackageSeries{ - SeriesCode: "SERIES_TEST_002", - SeriesName: "测试系列2", - Status: constants.StatusEnabled, - } - require.NoError(t, s.Create(ctx, series)) - - t.Run("查询存在的系列", func(t *testing.T) { - result, err := s.GetByID(ctx, series.ID) - require.NoError(t, err) - assert.Equal(t, series.SeriesCode, result.SeriesCode) - }) - - t.Run("查询不存在的系列", func(t *testing.T) { - _, err := s.GetByID(ctx, 99999) - require.Error(t, err) - }) -} - -func TestPackageSeriesStore_GetByCode(t *testing.T) { - tx := testutils.NewTestTransaction(t) - s := NewPackageSeriesStore(tx) - ctx := context.Background() - - series := &model.PackageSeries{ - SeriesCode: "SERIES_TEST_003", - SeriesName: "测试系列3", - Status: constants.StatusEnabled, - } - require.NoError(t, s.Create(ctx, series)) - - t.Run("查询存在的编码", func(t *testing.T) { - result, err := s.GetByCode(ctx, "SERIES_TEST_003") - require.NoError(t, err) - assert.Equal(t, series.ID, result.ID) - }) - - t.Run("查询不存在的编码", func(t *testing.T) { - _, err := s.GetByCode(ctx, "NOT_EXISTS") - require.Error(t, err) - }) -} - -func TestPackageSeriesStore_Update(t *testing.T) { - tx := testutils.NewTestTransaction(t) - s := NewPackageSeriesStore(tx) - ctx := context.Background() - - series := &model.PackageSeries{ - SeriesCode: "SERIES_TEST_004", - SeriesName: "测试系列4", - Status: constants.StatusEnabled, - } - require.NoError(t, s.Create(ctx, series)) - - series.SeriesName = "测试系列4-更新" - series.Description = "更新后的描述" - err := s.Update(ctx, series) - require.NoError(t, err) - - updated, err := s.GetByID(ctx, series.ID) - require.NoError(t, err) - assert.Equal(t, "测试系列4-更新", updated.SeriesName) - assert.Equal(t, "更新后的描述", updated.Description) -} - -func TestPackageSeriesStore_Delete(t *testing.T) { - tx := testutils.NewTestTransaction(t) - s := NewPackageSeriesStore(tx) - ctx := context.Background() - - series := &model.PackageSeries{ - SeriesCode: "SERIES_DEL_001", - SeriesName: "待删除系列", - Status: constants.StatusEnabled, - } - require.NoError(t, s.Create(ctx, series)) - - err := s.Delete(ctx, series.ID) - require.NoError(t, err) - - _, err = s.GetByID(ctx, series.ID) - require.Error(t, err) -} - -func TestPackageSeriesStore_List(t *testing.T) { - tx := testutils.NewTestTransaction(t) - s := NewPackageSeriesStore(tx) - ctx := context.Background() - - seriesList := []*model.PackageSeries{ - {SeriesCode: "LIST_S_001", SeriesName: "基础套餐", Status: constants.StatusEnabled}, - {SeriesCode: "LIST_S_002", SeriesName: "高级套餐", Status: constants.StatusEnabled}, - {SeriesCode: "LIST_S_003", SeriesName: "企业套餐", Status: constants.StatusEnabled}, - } - for _, series := range seriesList { - require.NoError(t, s.Create(ctx, series)) - } - seriesList[2].Status = constants.StatusDisabled - require.NoError(t, s.Update(ctx, seriesList[2])) - - t.Run("查询所有系列", func(t *testing.T) { - result, total, err := s.List(ctx, &store.QueryOptions{Page: 1, PageSize: 20}, nil) - require.NoError(t, err) - assert.GreaterOrEqual(t, total, int64(3)) - assert.GreaterOrEqual(t, len(result), 3) - }) - - t.Run("按名称模糊搜索", func(t *testing.T) { - filters := map[string]interface{}{"series_name": "高级"} - result, total, err := s.List(ctx, &store.QueryOptions{Page: 1, PageSize: 20}, filters) - require.NoError(t, err) - assert.GreaterOrEqual(t, total, int64(1)) - for _, series := range result { - assert.Contains(t, series.SeriesName, "高级") - } - }) - - t.Run("按状态过滤", func(t *testing.T) { - filters := map[string]interface{}{"status": constants.StatusDisabled} - result, total, err := s.List(ctx, &store.QueryOptions{Page: 1, PageSize: 20}, filters) - require.NoError(t, err) - assert.GreaterOrEqual(t, total, int64(1)) - for _, series := range result { - assert.Equal(t, constants.StatusDisabled, series.Status) - } - }) - - t.Run("分页查询", func(t *testing.T) { - result, total, err := s.List(ctx, &store.QueryOptions{Page: 1, PageSize: 2}, nil) - require.NoError(t, err) - assert.GreaterOrEqual(t, total, int64(3)) - assert.LessOrEqual(t, len(result), 2) - }) -} - -func TestPackageSeriesStore_UpdateStatus(t *testing.T) { - tx := testutils.NewTestTransaction(t) - s := NewPackageSeriesStore(tx) - ctx := context.Background() - - series := &model.PackageSeries{ - SeriesCode: "STATUS_TEST_001", - SeriesName: "状态测试系列", - Status: constants.StatusEnabled, - } - require.NoError(t, s.Create(ctx, series)) - - err := s.UpdateStatus(ctx, series.ID, constants.StatusDisabled) - require.NoError(t, err) - - updated, err := s.GetByID(ctx, series.ID) - require.NoError(t, err) - assert.Equal(t, constants.StatusDisabled, updated.Status) -} diff --git a/internal/store/postgres/package_store.go b/internal/store/postgres/package_store.go index b595a66..fc2d49b 100644 --- a/internal/store/postgres/package_store.go +++ b/internal/store/postgres/package_store.go @@ -20,7 +20,12 @@ func NewPackageStore(db *gorm.DB) *PackageStore { } func (s *PackageStore) Create(ctx context.Context, pkg *model.Package) error { - return s.db.WithContext(ctx).Create(pkg).Error + // GORM 对零值字段有特殊处理，先创建然后立即更新 enable_realname_activation 字段确保正确设置 + if err := s.db.WithContext(ctx).Omit("enable_realname_activation").Create(pkg).Error; err != nil { + return err + } + // 明确更新 enable_realname_activation 字段（包括零值 false） + return s.db.WithContext(ctx).Model(pkg).Update("enable_realname_activation", pkg.EnableRealnameActivation).Error } func (s *PackageStore) GetByID(ctx context.Context, id uint) (*model.Package, error) { diff --git a/internal/store/postgres/package_store_test.go b/internal/store/postgres/package_store_test.go deleted file mode 100644 index 57f43d8..0000000 --- a/internal/store/postgres/package_store_test.go +++ /dev/null @@ -1,331 +0,0 @@ -package postgres - -import ( - "context" - "testing" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/internal/store" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/tests/testutils" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -func TestPackageStore_Create(t *testing.T) { - tx := testutils.NewTestTransaction(t) - s := NewPackageStore(tx) - ctx := context.Background() - - pkg := &model.Package{ - PackageCode: "PKG_TEST_001", - PackageName: "测试套餐", - SeriesID: 1, - PackageType: "formal", - DurationMonths: 1, - RealDataMB: 1024, - CostPrice: 9900, - SuggestedRetailPrice: 12800, - Status: constants.StatusEnabled, - ShelfStatus: 1, - } - - err := s.Create(ctx, pkg) - require.NoError(t, err) - assert.NotZero(t, pkg.ID) -} - -func TestPackageStore_GetByID(t *testing.T) { - tx := testutils.NewTestTransaction(t) - s := NewPackageStore(tx) - ctx := context.Background() - - pkg := &model.Package{ - PackageCode: "PKG_TEST_002", - PackageName: "测试套餐2", - SeriesID: 1, - PackageType: "formal", - DurationMonths: 1, - - RealDataMB: 2048, - CostPrice: 19900, - SuggestedRetailPrice: 25800, - Status: constants.StatusEnabled, - ShelfStatus: 1, - } - require.NoError(t, s.Create(ctx, pkg)) - - t.Run("查询存在的套餐", func(t *testing.T) { - result, err := s.GetByID(ctx, pkg.ID) - require.NoError(t, err) - assert.Equal(t, pkg.PackageCode, result.PackageCode) - }) - - t.Run("查询不存在的套餐", func(t *testing.T) { - _, err := s.GetByID(ctx, 99999) - require.Error(t, err) - }) -} - -func TestPackageStore_GetByCode(t *testing.T) { - tx := testutils.NewTestTransaction(t) - s := NewPackageStore(tx) - ctx := context.Background() - - pkg := &model.Package{ - PackageCode: "PKG_TEST_003", - PackageName: "测试套餐3", - SeriesID: 1, - PackageType: "formal", - DurationMonths: 1, - - RealDataMB: 3072, - CostPrice: 29900, - SuggestedRetailPrice: 39800, - Status: constants.StatusEnabled, - ShelfStatus: 1, - } - require.NoError(t, s.Create(ctx, pkg)) - - t.Run("查询存在的编码", func(t *testing.T) { - result, err := s.GetByCode(ctx, "PKG_TEST_003") - require.NoError(t, err) - assert.Equal(t, pkg.ID, result.ID) - }) - - t.Run("查询不存在的编码", func(t *testing.T) { - _, err := s.GetByCode(ctx, "NOT_EXISTS") - require.Error(t, err) - }) -} - -func TestPackageStore_Update(t *testing.T) { - tx := testutils.NewTestTransaction(t) - s := NewPackageStore(tx) - ctx := context.Background() - - pkg := &model.Package{ - PackageCode: "PKG_TEST_004", - PackageName: "测试套餐4", - SeriesID: 1, - PackageType: "formal", - DurationMonths: 1, - - RealDataMB: 4096, - CostPrice: 39900, - SuggestedRetailPrice: 49800, - Status: constants.StatusEnabled, - ShelfStatus: 1, - } - require.NoError(t, s.Create(ctx, pkg)) - - pkg.PackageName = "测试套餐4-更新" - pkg.CostPrice = 49900 - err := s.Update(ctx, pkg) - require.NoError(t, err) - - updated, err := s.GetByID(ctx, pkg.ID) - require.NoError(t, err) - assert.Equal(t, "测试套餐4-更新", updated.PackageName) - assert.Equal(t, int64(49900), updated.CostPrice) -} - -func TestPackageStore_Delete(t *testing.T) { - tx := testutils.NewTestTransaction(t) - s := NewPackageStore(tx) - ctx := context.Background() - - pkg := &model.Package{ - PackageCode: "PKG_DEL_001", - PackageName: "待删除套餐", - SeriesID: 1, - PackageType: "formal", - DurationMonths: 1, - - RealDataMB: 1024, - CostPrice: 9900, - SuggestedRetailPrice: 12800, - Status: constants.StatusEnabled, - ShelfStatus: 1, - } - require.NoError(t, s.Create(ctx, pkg)) - - err := s.Delete(ctx, pkg.ID) - require.NoError(t, err) - - _, err = s.GetByID(ctx, pkg.ID) - require.Error(t, err) -} - -func TestPackageStore_List(t *testing.T) { - tx := testutils.NewTestTransaction(t) - s := NewPackageStore(tx) - ctx := context.Background() - - pkgList := []*model.Package{ - { - PackageCode: "LIST_P_001", - PackageName: "基础套餐", - SeriesID: 1, - PackageType: "formal", - DurationMonths: 1, - - RealDataMB: 1024, - CostPrice: 9900, - SuggestedRetailPrice: 12800, - Status: constants.StatusEnabled, - ShelfStatus: 1, - }, - { - PackageCode: "LIST_P_002", - PackageName: "高级套餐", - SeriesID: 2, - PackageType: "formal", - DurationMonths: 12, - - RealDataMB: 10240, - CostPrice: 99900, - SuggestedRetailPrice: 129800, - Status: constants.StatusEnabled, - ShelfStatus: 1, - }, - { - PackageCode: "LIST_P_003", - PackageName: "企业套餐", - SeriesID: 3, - PackageType: "addon", - DurationMonths: 1, - - VirtualDataMB: 5120, - CostPrice: 4900, - SuggestedRetailPrice: 6800, - Status: constants.StatusEnabled, - ShelfStatus: 2, - }, - } - for _, pkg := range pkgList { - require.NoError(t, s.Create(ctx, pkg)) - } - pkgList[2].Status = constants.StatusDisabled - require.NoError(t, s.Update(ctx, pkgList[2])) - - t.Run("查询所有套餐", func(t *testing.T) { - result, total, err := s.List(ctx, &store.QueryOptions{Page: 1, PageSize: 20}, nil) - require.NoError(t, err) - assert.GreaterOrEqual(t, total, int64(3)) - assert.GreaterOrEqual(t, len(result), 3) - }) - - t.Run("按名称模糊搜索", func(t *testing.T) { - filters := map[string]interface{}{"package_name": "高级"} - result, total, err := s.List(ctx, &store.QueryOptions{Page: 1, PageSize: 20}, filters) - require.NoError(t, err) - assert.GreaterOrEqual(t, total, int64(1)) - for _, pkg := range result { - assert.Contains(t, pkg.PackageName, "高级") - } - }) - - t.Run("按系列筛选", func(t *testing.T) { - filters := map[string]interface{}{"series_id": uint(2)} - result, total, err := s.List(ctx, &store.QueryOptions{Page: 1, PageSize: 20}, filters) - require.NoError(t, err) - assert.GreaterOrEqual(t, total, int64(1)) - for _, pkg := range result { - assert.Equal(t, uint(2), pkg.SeriesID) - } - }) - - t.Run("按状态过滤", func(t *testing.T) { - filters := map[string]interface{}{"status": constants.StatusDisabled} - result, total, err := s.List(ctx, &store.QueryOptions{Page: 1, PageSize: 20}, filters) - require.NoError(t, err) - assert.GreaterOrEqual(t, total, int64(1)) - for _, pkg := range result { - assert.Equal(t, constants.StatusDisabled, pkg.Status) - } - }) - - t.Run("按上架状态过滤", func(t *testing.T) { - filters := map[string]interface{}{"shelf_status": 2} - result, total, err := s.List(ctx, &store.QueryOptions{Page: 1, PageSize: 20}, filters) - require.NoError(t, err) - assert.GreaterOrEqual(t, total, int64(1)) - for _, pkg := range result { - assert.Equal(t, 2, pkg.ShelfStatus) - } - }) - - t.Run("按类型过滤", func(t *testing.T) { - filters := map[string]interface{}{"package_type": "addon"} - result, total, err := s.List(ctx, &store.QueryOptions{Page: 1, PageSize: 20}, filters) - require.NoError(t, err) - assert.GreaterOrEqual(t, total, int64(1)) - for _, pkg := range result { - assert.Equal(t, "addon", pkg.PackageType) - } - }) - - t.Run("分页查询", func(t *testing.T) { - result, total, err := s.List(ctx, &store.QueryOptions{Page: 1, PageSize: 2}, nil) - require.NoError(t, err) - assert.GreaterOrEqual(t, total, int64(3)) - assert.LessOrEqual(t, len(result), 2) - }) -} - -func TestPackageStore_UpdateStatus(t *testing.T) { - tx := testutils.NewTestTransaction(t) - s := NewPackageStore(tx) - ctx := context.Background() - - pkg := &model.Package{ - PackageCode: "STATUS_TEST_001", - PackageName: "状态测试套餐", - SeriesID: 1, - PackageType: "formal", - DurationMonths: 1, - - RealDataMB: 1024, - CostPrice: 9900, - SuggestedRetailPrice: 12800, - Status: constants.StatusEnabled, - ShelfStatus: 1, - } - require.NoError(t, s.Create(ctx, pkg)) - - err := s.UpdateStatus(ctx, pkg.ID, constants.StatusDisabled) - require.NoError(t, err) - - updated, err := s.GetByID(ctx, pkg.ID) - require.NoError(t, err) - assert.Equal(t, constants.StatusDisabled, updated.Status) -} - -func TestPackageStore_UpdateShelfStatus(t *testing.T) { - tx := testutils.NewTestTransaction(t) - s := NewPackageStore(tx) - ctx := context.Background() - - pkg := &model.Package{ - PackageCode: "SHELF_TEST_001", - PackageName: "上架测试套餐", - SeriesID: 1, - PackageType: "formal", - DurationMonths: 1, - - RealDataMB: 1024, - CostPrice: 9900, - SuggestedRetailPrice: 12800, - Status: constants.StatusEnabled, - ShelfStatus: 1, - } - require.NoError(t, s.Create(ctx, pkg)) - - err := s.UpdateShelfStatus(ctx, pkg.ID, 2) - require.NoError(t, err) - - updated, err := s.GetByID(ctx, pkg.ID) - require.NoError(t, err) - assert.Equal(t, 2, updated.ShelfStatus) -} diff --git a/internal/store/postgres/package_usage_daily_record_store.go b/internal/store/postgres/package_usage_daily_record_store.go new file mode 100644 index 0000000..d9addef --- /dev/null +++ b/internal/store/postgres/package_usage_daily_record_store.go @@ -0,0 +1,83 @@ +package postgres + +import ( + "context" + "time" + + "github.com/break/junhong_cmp_fiber/internal/model" + "github.com/redis/go-redis/v9" + "gorm.io/gorm" + "gorm.io/gorm/clause" +) + +type PackageUsageDailyRecordStore struct { + db *gorm.DB + redis *redis.Client +} + +func NewPackageUsageDailyRecordStore(db *gorm.DB, redis *redis.Client) *PackageUsageDailyRecordStore { + return &PackageUsageDailyRecordStore{ + db: db, + redis: redis, + } +} + +// CreateOrUpdate 创建或更新日记录（使用 UPSERT） +// 如果同一套餐同一天已有记录，则更新；否则创建新记录 +func (s *PackageUsageDailyRecordStore) CreateOrUpdate(ctx context.Context, record *model.PackageUsageDailyRecord) error { + return s.db.WithContext(ctx).Clauses(clause.OnConflict{ + Columns: []clause.Column{ + {Name: "package_usage_id"}, + {Name: "date"}, + }, + DoUpdates: clause.AssignmentColumns([]string{ + "daily_usage_mb", + "cumulative_usage_mb", + "updated_at", + }), + }).Create(record).Error +} + +// GetByDateRange 按日期范围查询日记录 +// startDate 和 endDate 都是可选的，如果为 nil 则不限制 +func (s *PackageUsageDailyRecordStore) GetByDateRange(ctx context.Context, packageUsageID uint, startDate, endDate *time.Time) ([]*model.PackageUsageDailyRecord, error) { + var records []*model.PackageUsageDailyRecord + query := s.db.WithContext(ctx). + Where("package_usage_id = ?", packageUsageID). + Order("date ASC") + + if startDate != nil { + query = query.Where("date >= ?", *startDate) + } + if endDate != nil { + query = query.Where("date <= ?", *endDate) + } + + if err := query.Find(&records).Error; err != nil { + return nil, err + } + return records, nil +} + +// GetByDate 查询指定日期的日记录 +func (s *PackageUsageDailyRecordStore) GetByDate(ctx context.Context, packageUsageID uint, date time.Time) (*model.PackageUsageDailyRecord, error) { + var record model.PackageUsageDailyRecord + if err := s.db.WithContext(ctx). + Where("package_usage_id = ? AND date = ?", packageUsageID, date). + First(&record).Error; err != nil { + return nil, err + } + return &record, nil +} + +// GetLatestRecord 获取最近的一条日记录 +func (s *PackageUsageDailyRecordStore) GetLatestRecord(ctx context.Context, packageUsageID uint) (*model.PackageUsageDailyRecord, error) { + var record model.PackageUsageDailyRecord + if err := s.db.WithContext(ctx). + Where("package_usage_id = ?", packageUsageID). + Order("date DESC"). + First(&record).Error; err != nil { + return nil, err + } + return &record, nil +} diff --git a/internal/store/postgres/package_usage_store.go b/internal/store/postgres/package_usage_store.go new file mode 100644 index 0000000..6633702 --- /dev/null +++ b/internal/store/postgres/package_usage_store.go @@ -0,0 +1,190 @@ +package postgres + +import ( + "context" + "time" + + "github.com/break/junhong_cmp_fiber/internal/model" + "github.com/break/junhong_cmp_fiber/pkg/constants" + "github.com/redis/go-redis/v9" + "gorm.io/gorm" +) + +type PackageUsageStore struct { + db *gorm.DB + redis *redis.Client +} + +func NewPackageUsageStore(db *gorm.DB, redis *redis.Client) *PackageUsageStore { + return &PackageUsageStore{ + db: db, + redis: redis, + } +} + +// Create 创建套餐使用记录（支持新字段：priority, master_usage_id, has_independent_expiry, pending_realname_activation, data_reset_cycle） +// 注意：Status=0 是合法值（待生效），需要明确指定 status 字段以覆盖数据库默认值 1 +func (s *PackageUsageStore) Create(ctx context.Context, usage *model.PackageUsage) error { + // GORM 对零值字段有特殊处理，先创建然后立即更新 status 字段确保正确设置 + if err := s.db.WithContext(ctx).Omit("status").Create(usage).Error; err != nil { + return err + } + // 明确更新 status 字段（包括零值） + return s.db.WithContext(ctx).Model(usage).Update("status", usage.Status).Error +} + +// GetByID 根据ID查询套餐使用记录 +func (s *PackageUsageStore) GetByID(ctx context.Context, id uint) (*model.PackageUsage, error) { + var usage model.PackageUsage + if err := s.db.WithContext(ctx).First(&usage, id).Error; err != nil { + return nil, err + } + return &usage, nil +} + +// Update 更新套餐使用记录 +func (s *PackageUsageStore) Update(ctx context.Context, usage *model.PackageUsage) error { + return s.db.WithContext(ctx).Save(usage).Error +} + +// GetActiveMainPackage 查询载体的生效中主套餐 +// carrierType: "iot_card" 或 "device" +// carrierID: iot_card_id 或 device_id +func (s *PackageUsageStore) GetActiveMainPackage(ctx context.Context, carrierType string, carrierID uint) (*model.PackageUsage, error) { + var usage model.PackageUsage + query := s.db.WithContext(ctx). + Where("status = ?", constants.PackageUsageStatusActive). + Where("master_usage_id IS NULL"). // 主套餐的 master_usage_id 为 NULL + Order("priority ASC, activated_at ASC") + + if carrierType == "iot_card" { + query = query.Where("iot_card_id = ?", carrierID) + } else if carrierType == "device" { + query = query.Where("device_id = ?", carrierID) + } + + if err := query.First(&usage).Error; err != nil { + return nil, err + } + return &usage, nil +} + +// GetNextPendingMainPackage 查询下一个待生效主套餐（按 priority ASC 排序） +func (s *PackageUsageStore) GetNextPendingMainPackage(ctx context.Context, carrierType string, carrierID uint) (*model.PackageUsage, error) { + var usage model.PackageUsage + query := s.db.WithContext(ctx). + Where("status = ?", constants.PackageUsageStatusPending). + Where("master_usage_id IS NULL"). // 主套餐 + Order("priority ASC, created_at ASC") + + if carrierType == "iot_card" { + query = query.Where("iot_card_id = ?", carrierID) + } else if carrierType == "device" { + query = query.Where("device_id = ?", carrierID) + } + + if err := query.First(&usage).Error; err != nil { + return nil, err + } + return &usage, nil +} + +// GetActivePackages 查询生效中的主套餐和加油包（按优先级排序：priority ASC, expires_at ASC, activated_at ASC） +func (s *PackageUsageStore) GetActivePackages(ctx context.Context, carrierType string, carrierID uint) ([]*model.PackageUsage, error) { + var usages []*model.PackageUsage + query := s.db.WithContext(ctx). + Where("status = ?", constants.PackageUsageStatusActive). + Order("priority ASC, expires_at ASC, activated_at ASC") + + if carrierType == "iot_card" { + query = query.Where("iot_card_id = ?", carrierID) + } else if carrierType == "device" { + query = query.Where("device_id = ?", carrierID) + } + + if err := query.Find(&usages).Error; err != nil { + return nil, err + } + return usages, nil +} + +// GetAddonsByMasterID 查询主套餐下的所有加油包 +func (s *PackageUsageStore) GetAddonsByMasterID(ctx context.Context, masterUsageID uint) ([]*model.PackageUsage, error) { + var usages []*model.PackageUsage + if err := s.db.WithContext(ctx). + Where("master_usage_id = ?", masterUsageID). + Order("priority ASC"). + Find(&usages).Error; err != nil { + return nil, err + } + return usages, nil +} + +// BatchUpdateStatus 批量更新加油包状态 +func (s *PackageUsageStore) BatchUpdateStatus(ctx context.Context, ids []uint, status int) error { + if len(ids) == 0 { + return nil + } + return s.db.WithContext(ctx). + Model(&model.PackageUsage{}). + Where("id IN ?", ids). + Update("status", status).Error +} + +// UpdateDataUsage 更新套餐流量使用（支持事务） +// incrementMB: 增量流量（MB） +func (s *PackageUsageStore) UpdateDataUsage(ctx context.Context, id uint, incrementMB int64) error { + return s.db.WithContext(ctx). + Model(&model.PackageUsage{}). + Where("id = ?", id). + Update("data_usage_mb", gorm.Expr("data_usage_mb + ?", incrementMB)).Error +} + +// GetPackagesForReset 查询需要重置的套餐（WHERE next_reset_at <= NOW） +func (s *PackageUsageStore) GetPackagesForReset(ctx context.Context, limit int) ([]*model.PackageUsage, error) { + var usages []*model.PackageUsage + now := time.Now() + query := s.db.WithContext(ctx). + Where("next_reset_at IS NOT NULL"). + Where("next_reset_at <= ?", now). + Where("status = ?", constants.PackageUsageStatusActive). + Order("next_reset_at ASC") + + if limit > 0 { + query = query.Limit(limit) + } + + if err := query.Find(&usages).Error; err != nil { + return nil, err + } + return usages, nil +} + +// ResetDataUsage 重置流量（更新 last_reset_at 和 next_reset_at） +func (s *PackageUsageStore) ResetDataUsage(ctx context.Context, id uint, lastResetAt, nextResetAt time.Time) error { + return s.db.WithContext(ctx). + Model(&model.PackageUsage{}). + Where("id = ?", id). + Updates(map[string]any{ + "data_usage_mb": 0, + "last_reset_at": lastResetAt, + "next_reset_at": nextResetAt, + }).Error +} + +// ListByCarrier 查询载体的所有套餐使用记录（包括所有状态） +func (s *PackageUsageStore) ListByCarrier(ctx context.Context, carrierType string, carrierID uint) ([]*model.PackageUsage, error) { + var usages []*model.PackageUsage + query := s.db.WithContext(ctx).Order("priority ASC, created_at DESC") + + if carrierType == "iot_card" { + query = query.Where("iot_card_id = ?", carrierID) + } else if carrierType == "device" { + query = query.Where("device_id = ?", carrierID) + } + + if err := query.Find(&usages).Error; err != nil { + return nil, err + } + return usages, nil +} diff --git a/internal/store/postgres/recharge_store_test.go b/internal/store/postgres/recharge_store_test.go deleted file mode 100644 index 30ee2d1..0000000 --- a/internal/store/postgres/recharge_store_test.go +++ /dev/null @@ -1,395 +0,0 @@ -package postgres - -import ( - "context" - "testing" - "time" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/tests/testutils" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -func TestRechargeStore_Create(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - s := NewRechargeStore(tx, rdb) - ctx := context.Background() - - recharge := &model.RechargeRecord{ - UserID: 100, - WalletID: 200, - RechargeNo: "RCH20260131120000000001", - Amount: 10000, - PaymentMethod: "wechat", - Status: 1, // 待支付 - } - - err := s.Create(ctx, recharge) - require.NoError(t, err) - assert.NotZero(t, recharge.ID) - assert.NotZero(t, recharge.CreatedAt) - assert.NotZero(t, recharge.UpdatedAt) -} - -func TestRechargeStore_GetByRechargeNo(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - s := NewRechargeStore(tx, rdb) - ctx := context.Background() - - rechargeNo := "RCH20260131120000000002" - recharge := &model.RechargeRecord{ - UserID: 101, - WalletID: 201, - RechargeNo: rechargeNo, - Amount: 20000, - PaymentMethod: "alipay", - Status: 1, - } - require.NoError(t, s.Create(ctx, recharge)) - - t.Run("查询存在的充值订单", func(t *testing.T) { - result, err := s.GetByRechargeNo(ctx, rechargeNo) - require.NoError(t, err) - require.NotNil(t, result) - assert.Equal(t, recharge.ID, result.ID) - assert.Equal(t, recharge.UserID, result.UserID) - assert.Equal(t, recharge.Amount, result.Amount) - }) - - t.Run("查询不存在的充值订单返回 nil", func(t *testing.T) { - result, err := s.GetByRechargeNo(ctx, "NOT_EXISTS_RECHARGE_NO") - require.NoError(t, err) - assert.Nil(t, result) - }) -} - -func TestRechargeStore_GetByID(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - s := NewRechargeStore(tx, rdb) - ctx := context.Background() - - recharge := &model.RechargeRecord{ - UserID: 102, - WalletID: 202, - RechargeNo: "RCH20260131120000000003", - Amount: 30000, - PaymentMethod: "wechat", - Status: 2, // 已支付 - } - require.NoError(t, s.Create(ctx, recharge)) - - t.Run("查询存在的充值订单", func(t *testing.T) { - result, err := s.GetByID(ctx, recharge.ID) - require.NoError(t, err) - assert.Equal(t, recharge.RechargeNo, result.RechargeNo) - assert.Equal(t, recharge.Status, result.Status) - }) - - t.Run("查询不存在的充值订单", func(t *testing.T) { - _, err := s.GetByID(ctx, 99999) - require.Error(t, err) - }) -} - -func TestRechargeStore_List(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - s := NewRechargeStore(tx, rdb) - ctx := context.Background() - - // 创建测试数据 - now := time.Now() - yesterday := now.Add(-24 * time.Hour) - tomorrow := now.Add(24 * time.Hour) - - recharges := []*model.RechargeRecord{ - {UserID: 200, WalletID: 300, RechargeNo: "RCH20260131120000000010", Amount: 10000, PaymentMethod: "wechat", Status: 1}, - {UserID: 200, WalletID: 300, RechargeNo: "RCH20260131120000000011", Amount: 20000, PaymentMethod: "alipay", Status: 2}, - {UserID: 201, WalletID: 301, RechargeNo: "RCH20260131120000000012", Amount: 30000, PaymentMethod: "wechat", Status: 3}, - {UserID: 201, WalletID: 302, RechargeNo: "RCH20260131120000000013", Amount: 40000, PaymentMethod: "alipay", Status: 1}, - } - for _, r := range recharges { - require.NoError(t, s.Create(ctx, r)) - } - - t.Run("查询所有充值订单", func(t *testing.T) { - params := &ListRechargeParams{ - Page: 1, - PageSize: 20, - } - result, total, err := s.List(ctx, params) - require.NoError(t, err) - assert.GreaterOrEqual(t, total, int64(4)) - assert.GreaterOrEqual(t, len(result), 4) - }) - - t.Run("按用户 ID 筛选", func(t *testing.T) { - userID := uint(200) - params := &ListRechargeParams{ - Page: 1, - PageSize: 20, - UserID: &userID, - } - result, total, err := s.List(ctx, params) - require.NoError(t, err) - assert.GreaterOrEqual(t, total, int64(2)) - for _, r := range result { - assert.Equal(t, uint(200), r.UserID) - } - }) - - t.Run("按钱包 ID 筛选", func(t *testing.T) { - walletID := uint(300) - params := &ListRechargeParams{ - Page: 1, - PageSize: 20, - WalletID: &walletID, - } - result, total, err := s.List(ctx, params) - require.NoError(t, err) - assert.GreaterOrEqual(t, total, int64(2)) - for _, r := range result { - assert.Equal(t, uint(300), r.WalletID) - } - }) - - t.Run("按状态筛选", func(t *testing.T) { - status := 1 // 待支付 - params := &ListRechargeParams{ - Page: 1, - PageSize: 20, - Status: &status, - } - result, total, err := s.List(ctx, params) - require.NoError(t, err) - assert.GreaterOrEqual(t, total, int64(2)) - for _, r := range result { - assert.Equal(t, 1, r.Status) - } - }) - - t.Run("按时间范围筛选", func(t *testing.T) { - params := &ListRechargeParams{ - Page: 1, - PageSize: 20, - StartTime: &yesterday, - EndTime: &tomorrow, - } - result, total, err := s.List(ctx, params) - require.NoError(t, err) - assert.GreaterOrEqual(t, total, int64(4)) - for _, r := range result { - assert.True(t, r.CreatedAt.After(yesterday) || r.CreatedAt.Equal(yesterday)) - assert.True(t, r.CreatedAt.Before(tomorrow) || r.CreatedAt.Equal(tomorrow)) - } - }) - - t.Run("组合筛选条件", func(t *testing.T) { - userID := uint(201) - status := 1 - params := &ListRechargeParams{ - Page: 1, - PageSize: 20, - UserID: &userID, - Status: &status, - } - result, total, err := s.List(ctx, params) - require.NoError(t, err) - assert.GreaterOrEqual(t, total, int64(1)) - for _, r := range result { - assert.Equal(t, uint(201), r.UserID) - assert.Equal(t, 1, r.Status) - } - }) - - t.Run("分页查询", func(t *testing.T) { - params := &ListRechargeParams{ - Page: 1, - PageSize: 2, - } - result, total, err := s.List(ctx, params) - require.NoError(t, err) - assert.GreaterOrEqual(t, total, int64(4)) - assert.LessOrEqual(t, len(result), 2) - }) - - t.Run("默认分页参数", func(t *testing.T) { - params := &ListRechargeParams{ - Page: 0, // 无效值，应使用默认值 1 - PageSize: 0, // 无效值，应使用默认值 20 - } - result, _, err := s.List(ctx, params) - require.NoError(t, err) - assert.NotNil(t, result) - }) - - t.Run("按 ID 降序排列", func(t *testing.T) { - params := &ListRechargeParams{ - Page: 1, - PageSize: 20, - } - result, _, err := s.List(ctx, params) - require.NoError(t, err) - require.GreaterOrEqual(t, len(result), 2) - // 验证降序排列 - for i := 0; i < len(result)-1; i++ { - assert.GreaterOrEqual(t, result[i].ID, result[i+1].ID) - } - }) -} - -func TestRechargeStore_UpdateStatus(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - s := NewRechargeStore(tx, rdb) - ctx := context.Background() - - recharge := &model.RechargeRecord{ - UserID: 300, - WalletID: 400, - RechargeNo: "RCH20260131120000000020", - Amount: 50000, - PaymentMethod: "wechat", - Status: 1, // 待支付 - } - require.NoError(t, s.Create(ctx, recharge)) - - t.Run("更新状态为已支付（无乐观锁）", func(t *testing.T) { - now := time.Now() - err := s.UpdateStatus(ctx, recharge.ID, nil, 2, &now, nil) - require.NoError(t, err) - - updated, err := s.GetByID(ctx, recharge.ID) - require.NoError(t, err) - assert.Equal(t, 2, updated.Status) - assert.NotNil(t, updated.PaidAt) - }) - - t.Run("更新状态为已完成（带乐观锁）", func(t *testing.T) { - oldStatus := 2 - now := time.Now() - err := s.UpdateStatus(ctx, recharge.ID, &oldStatus, 3, nil, &now) - require.NoError(t, err) - - updated, err := s.GetByID(ctx, recharge.ID) - require.NoError(t, err) - assert.Equal(t, 3, updated.Status) - assert.NotNil(t, updated.CompletedAt) - }) - - t.Run("乐观锁检查失败", func(t *testing.T) { - oldStatus := 1 // 当前状态是 3，不是 1 - err := s.UpdateStatus(ctx, recharge.ID, &oldStatus, 4, nil, nil) - require.Error(t, err) - }) - - t.Run("更新不存在的充值订单", func(t *testing.T) { - err := s.UpdateStatus(ctx, 99999, nil, 2, nil, nil) - require.Error(t, err) - }) -} - -func TestRechargeStore_UpdatePaymentInfo(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - s := NewRechargeStore(tx, rdb) - ctx := context.Background() - - recharge := &model.RechargeRecord{ - UserID: 400, - WalletID: 500, - RechargeNo: "RCH20260131120000000030", - Amount: 60000, - PaymentMethod: "wechat", - Status: 1, - } - require.NoError(t, s.Create(ctx, recharge)) - - t.Run("更新支付渠道和交易号", func(t *testing.T) { - channel := "wechat_jsapi" - transactionID := "WX1234567890" - err := s.UpdatePaymentInfo(ctx, recharge.ID, &channel, &transactionID) - require.NoError(t, err) - - updated, err := s.GetByID(ctx, recharge.ID) - require.NoError(t, err) - require.NotNil(t, updated.PaymentChannel) - assert.Equal(t, "wechat_jsapi", *updated.PaymentChannel) - require.NotNil(t, updated.PaymentTransactionID) - assert.Equal(t, "WX1234567890", *updated.PaymentTransactionID) - }) - - t.Run("只更新支付渠道", func(t *testing.T) { - channel := "alipay_h5" - err := s.UpdatePaymentInfo(ctx, recharge.ID, &channel, nil) - require.NoError(t, err) - - updated, err := s.GetByID(ctx, recharge.ID) - require.NoError(t, err) - require.NotNil(t, updated.PaymentChannel) - assert.Equal(t, "alipay_h5", *updated.PaymentChannel) - }) - - t.Run("只更新交易号", func(t *testing.T) { - transactionID := "ALI9876543210" - err := s.UpdatePaymentInfo(ctx, recharge.ID, nil, &transactionID) - require.NoError(t, err) - - updated, err := s.GetByID(ctx, recharge.ID) - require.NoError(t, err) - require.NotNil(t, updated.PaymentTransactionID) - assert.Equal(t, "ALI9876543210", *updated.PaymentTransactionID) - }) - - t.Run("不更新任何字段", func(t *testing.T) { - err := s.UpdatePaymentInfo(ctx, recharge.ID, nil, nil) - require.NoError(t, err) - }) - - t.Run("更新不存在的充值订单", func(t *testing.T) { - channel := "test_channel" - err := s.UpdatePaymentInfo(ctx, 99999, &channel, nil) - require.Error(t, err) - }) -} - -func TestRechargeStore_ConcurrentOperations(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - s := NewRechargeStore(tx, rdb) - ctx := context.Background() - - // 创建多个充值订单 - for i := 0; i < 10; i++ { - recharge := &model.RechargeRecord{ - UserID: uint(500 + i), - WalletID: uint(600 + i), - RechargeNo: "RCH20260131120000000040" + string(rune('0'+i)), - Amount: int64(10000 * (i + 1)), - PaymentMethod: "wechat", - Status: 1, - } - require.NoError(t, s.Create(ctx, recharge)) - } - - // 验证查询 - params := &ListRechargeParams{ - Page: 1, - PageSize: 20, - } - result, total, err := s.List(ctx, params) - require.NoError(t, err) - assert.GreaterOrEqual(t, total, int64(10)) - assert.GreaterOrEqual(t, len(result), 10) -} diff --git a/internal/store/postgres/shop_package_allocation_store_test.go b/internal/store/postgres/shop_package_allocation_store_test.go deleted file mode 100644 index fa22180..0000000 --- a/internal/store/postgres/shop_package_allocation_store_test.go +++ /dev/null @@ -1,231 +0,0 @@ -package postgres - -import ( - "context" - "testing" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/internal/store" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/tests/testutils" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -func TestShopPackageAllocationStore_Create(t *testing.T) { - tx := testutils.NewTestTransaction(t) - s := NewShopPackageAllocationStore(tx) - ctx := context.Background() - - allocation := &model.ShopPackageAllocation{ - ShopID: 1, - PackageID: 1, - AllocatorShopID: 0, - CostPrice: 5000, - Status: constants.StatusEnabled, - } - - err := s.Create(ctx, allocation) - require.NoError(t, err) - assert.NotZero(t, allocation.ID) -} - -func TestShopPackageAllocationStore_GetByID(t *testing.T) { - tx := testutils.NewTestTransaction(t) - s := NewShopPackageAllocationStore(tx) - ctx := context.Background() - - allocation := &model.ShopPackageAllocation{ - ShopID: 2, - PackageID: 2, - AllocatorShopID: 0, - CostPrice: 6000, - Status: constants.StatusEnabled, - } - require.NoError(t, s.Create(ctx, allocation)) - - t.Run("查询存在的分配", func(t *testing.T) { - result, err := s.GetByID(ctx, allocation.ID) - require.NoError(t, err) - assert.Equal(t, allocation.ShopID, result.ShopID) - assert.Equal(t, allocation.PackageID, result.PackageID) - assert.Equal(t, allocation.CostPrice, result.CostPrice) - }) - - t.Run("查询不存在的分配", func(t *testing.T) { - _, err := s.GetByID(ctx, 99999) - require.Error(t, err) - }) -} - -func TestShopPackageAllocationStore_GetByShopAndPackage(t *testing.T) { - tx := testutils.NewTestTransaction(t) - s := NewShopPackageAllocationStore(tx) - ctx := context.Background() - - allocation := &model.ShopPackageAllocation{ - ShopID: 3, - PackageID: 3, - AllocatorShopID: 0, - CostPrice: 7000, - Status: constants.StatusEnabled, - } - require.NoError(t, s.Create(ctx, allocation)) - - t.Run("查询存在的店铺和套餐组合", func(t *testing.T) { - result, err := s.GetByShopAndPackage(ctx, 3, 3) - require.NoError(t, err) - assert.Equal(t, allocation.ID, result.ID) - assert.Equal(t, uint(3), result.ShopID) - assert.Equal(t, uint(3), result.PackageID) - }) - - t.Run("查询不存在的组合", func(t *testing.T) { - _, err := s.GetByShopAndPackage(ctx, 99, 99) - require.Error(t, err) - }) -} - -func TestShopPackageAllocationStore_Update(t *testing.T) { - tx := testutils.NewTestTransaction(t) - s := NewShopPackageAllocationStore(tx) - ctx := context.Background() - - allocation := &model.ShopPackageAllocation{ - ShopID: 4, - PackageID: 4, - AllocatorShopID: 0, - CostPrice: 5000, - Status: constants.StatusEnabled, - } - require.NoError(t, s.Create(ctx, allocation)) - - allocation.CostPrice = 8000 - err := s.Update(ctx, allocation) - require.NoError(t, err) - - updated, err := s.GetByID(ctx, allocation.ID) - require.NoError(t, err) - assert.Equal(t, int64(8000), updated.CostPrice) -} - -func TestShopPackageAllocationStore_Delete(t *testing.T) { - tx := testutils.NewTestTransaction(t) - s := NewShopPackageAllocationStore(tx) - ctx := context.Background() - - allocation := &model.ShopPackageAllocation{ - ShopID: 5, - PackageID: 5, - AllocatorShopID: 0, - CostPrice: 5000, - Status: constants.StatusEnabled, - } - require.NoError(t, s.Create(ctx, allocation)) - - err := s.Delete(ctx, allocation.ID) - require.NoError(t, err) - - _, err = s.GetByID(ctx, allocation.ID) - require.Error(t, err) -} - -func TestShopPackageAllocationStore_List(t *testing.T) { - tx := testutils.NewTestTransaction(t) - s := NewShopPackageAllocationStore(tx) - ctx := context.Background() - - allocations := []*model.ShopPackageAllocation{ - {ShopID: 10, PackageID: 10, AllocatorShopID: 0, CostPrice: 5000, Status: constants.StatusEnabled}, - {ShopID: 11, PackageID: 11, AllocatorShopID: 0, CostPrice: 6000, Status: constants.StatusEnabled}, - {ShopID: 12, PackageID: 12, AllocatorShopID: 10, CostPrice: 7000, Status: constants.StatusEnabled}, - } - for _, a := range allocations { - require.NoError(t, s.Create(ctx, a)) - } - allocations[2].Status = constants.StatusDisabled - require.NoError(t, s.Update(ctx, allocations[2])) - - t.Run("查询所有分配", func(t *testing.T) { - result, total, err := s.List(ctx, &store.QueryOptions{Page: 1, PageSize: 20}, nil) - require.NoError(t, err) - assert.GreaterOrEqual(t, total, int64(3)) - assert.GreaterOrEqual(t, len(result), 3) - }) - - t.Run("按店铺ID过滤", func(t *testing.T) { - filters := map[string]interface{}{"shop_id": uint(10)} - result, total, err := s.List(ctx, &store.QueryOptions{Page: 1, PageSize: 20}, filters) - require.NoError(t, err) - assert.GreaterOrEqual(t, total, int64(1)) - for _, a := range result { - assert.Equal(t, uint(10), a.ShopID) - } - }) - - t.Run("按套餐ID过滤", func(t *testing.T) { - filters := map[string]interface{}{"package_id": uint(11)} - result, total, err := s.List(ctx, &store.QueryOptions{Page: 1, PageSize: 20}, filters) - require.NoError(t, err) - assert.GreaterOrEqual(t, total, int64(1)) - for _, a := range result { - assert.Equal(t, uint(11), a.PackageID) - } - }) - - t.Run("按状态过滤-启用状态值为1", func(t *testing.T) { - filters := map[string]interface{}{"status": 1} - result, total, err := s.List(ctx, &store.QueryOptions{Page: 1, PageSize: 20}, filters) - require.NoError(t, err) - assert.GreaterOrEqual(t, total, int64(2)) - for _, a := range result { - assert.Equal(t, 1, a.Status) - } - }) - - t.Run("按状态过滤-启用", func(t *testing.T) { - filters := map[string]interface{}{"status": constants.StatusEnabled} - result, total, err := s.List(ctx, &store.QueryOptions{Page: 1, PageSize: 20}, filters) - require.NoError(t, err) - assert.GreaterOrEqual(t, total, int64(2)) - for _, a := range result { - assert.Equal(t, constants.StatusEnabled, a.Status) - } - }) - - t.Run("分页查询", func(t *testing.T) { - result, total, err := s.List(ctx, &store.QueryOptions{Page: 1, PageSize: 2}, nil) - require.NoError(t, err) - assert.GreaterOrEqual(t, total, int64(3)) - assert.LessOrEqual(t, len(result), 2) - }) - - t.Run("默认分页选项", func(t *testing.T) { - result, _, err := s.List(ctx, nil, nil) - require.NoError(t, err) - assert.NotNil(t, result) - }) -} - -func TestShopPackageAllocationStore_UpdateStatus(t *testing.T) { - tx := testutils.NewTestTransaction(t) - s := NewShopPackageAllocationStore(tx) - ctx := context.Background() - - allocation := &model.ShopPackageAllocation{ - ShopID: 20, - PackageID: 20, - AllocatorShopID: 0, - CostPrice: 5000, - Status: constants.StatusEnabled, - } - require.NoError(t, s.Create(ctx, allocation)) - - err := s.UpdateStatus(ctx, allocation.ID, constants.StatusDisabled, 1) - require.NoError(t, err) - - updated, err := s.GetByID(ctx, allocation.ID) - require.NoError(t, err) - assert.Equal(t, constants.StatusDisabled, updated.Status) - assert.Equal(t, uint(1), updated.Updater) -} diff --git a/internal/store/postgres/shop_role_store_test.go b/internal/store/postgres/shop_role_store_test.go deleted file mode 100644 index f00d8f5..0000000 --- a/internal/store/postgres/shop_role_store_test.go +++ /dev/null @@ -1,171 +0,0 @@ -package postgres - -import ( - "context" - "testing" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/tests/testutils" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -func TestShopRoleStore_Create(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - store := NewShopRoleStore(tx, rdb) - ctx := context.Background() - - sr := &model.ShopRole{ - ShopID: 1, - RoleID: 5, - Status: constants.StatusEnabled, - Creator: 1, - Updater: 1, - } - - err := store.Create(ctx, sr) - require.NoError(t, err) - assert.NotZero(t, sr.ID) -} - -func TestShopRoleStore_BatchCreate(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - store := NewShopRoleStore(tx, rdb) - ctx := context.Background() - - srs := []*model.ShopRole{ - { - ShopID: 1, - RoleID: 5, - Status: constants.StatusEnabled, - Creator: 1, - Updater: 1, - }, - } - - err := store.BatchCreate(ctx, srs) - require.NoError(t, err) - assert.NotZero(t, srs[0].ID) -} - -func TestShopRoleStore_Delete(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - store := NewShopRoleStore(tx, rdb) - ctx := context.Background() - - sr := &model.ShopRole{ - ShopID: 1, - RoleID: 5, - Status: constants.StatusEnabled, - Creator: 1, - Updater: 1, - } - require.NoError(t, store.Create(ctx, sr)) - - err := store.Delete(ctx, 1, 5) - require.NoError(t, err) - - results, err := store.GetByShopID(ctx, 1) - require.NoError(t, err) - assert.Empty(t, results) -} - -func TestShopRoleStore_DeleteByShopID(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - store := NewShopRoleStore(tx, rdb) - ctx := context.Background() - - srs := []*model.ShopRole{ - { - ShopID: 1, - RoleID: 5, - Status: constants.StatusEnabled, - Creator: 1, - Updater: 1, - }, - { - ShopID: 1, - RoleID: 6, - Status: constants.StatusEnabled, - Creator: 1, - Updater: 1, - }, - } - require.NoError(t, store.BatchCreate(ctx, srs)) - - err := store.DeleteByShopID(ctx, 1) - require.NoError(t, err) - - results, err := store.GetByShopID(ctx, 1) - require.NoError(t, err) - assert.Empty(t, results) -} - -func TestShopRoleStore_GetByShopID(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - store := NewShopRoleStore(tx, rdb) - ctx := context.Background() - - t.Run("查询已分配角色", func(t *testing.T) { - sr := &model.ShopRole{ - ShopID: 1, - RoleID: 5, - Status: constants.StatusEnabled, - Creator: 1, - Updater: 1, - } - require.NoError(t, store.Create(ctx, sr)) - - results, err := store.GetByShopID(ctx, 1) - require.NoError(t, err) - assert.Len(t, results, 1) - assert.Equal(t, uint(1), results[0].ShopID) - assert.Equal(t, uint(5), results[0].RoleID) - }) - - t.Run("查询未分配角色的店铺", func(t *testing.T) { - results, err := store.GetByShopID(ctx, 999) - require.NoError(t, err) - assert.Empty(t, results) - }) -} - -func TestShopRoleStore_GetRoleIDsByShopID(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - store := NewShopRoleStore(tx, rdb) - ctx := context.Background() - - t.Run("查询已分配角色的店铺", func(t *testing.T) { - sr := &model.ShopRole{ - ShopID: 1, - RoleID: 5, - Status: constants.StatusEnabled, - Creator: 1, - Updater: 1, - } - require.NoError(t, store.Create(ctx, sr)) - - roleIDs, err := store.GetRoleIDsByShopID(ctx, 1) - require.NoError(t, err) - assert.Equal(t, []uint{5}, roleIDs) - }) - - t.Run("查询未分配角色的店铺", func(t *testing.T) { - roleIDs, err := store.GetRoleIDsByShopID(ctx, 999) - require.NoError(t, err) - assert.Empty(t, roleIDs) - }) -} diff --git a/internal/task/device_import_test.go b/internal/task/device_import_test.go deleted file mode 100644 index 919a8db..0000000 --- a/internal/task/device_import_test.go +++ /dev/null @@ -1,190 +0,0 @@ -package task - -import ( - "context" - "testing" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/internal/store/postgres" - "github.com/break/junhong_cmp_fiber/pkg/utils" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - "go.uber.org/zap" -) - -func TestDeviceImportHandler_ProcessBatch_AllOrNothingValidation(t *testing.T) { - tx := newTaskTestTransaction(t) - rdb := getTaskTestRedis(t) - cleanTaskTestRedisKeys(t, rdb) - - logger := zap.NewNop() - importTaskStore := postgres.NewDeviceImportTaskStore(tx, rdb) - deviceStore := postgres.NewDeviceStore(tx, rdb) - bindingStore := postgres.NewDeviceSimBindingStore(tx, rdb) - cardStore := postgres.NewIotCardStore(tx, rdb) - - handler := NewDeviceImportHandler(tx, rdb, importTaskStore, deviceStore, bindingStore, cardStore, nil, logger) - ctx := context.Background() - - shopID := uint(100) - platformCard := &model.IotCard{ICCID: "89860012345670001001", CarrierID: 1, Status: 1, ShopID: nil} - platformCard2 := &model.IotCard{ICCID: "89860012345670001003", CarrierID: 1, Status: 1, ShopID: nil} - shopCard := &model.IotCard{ICCID: "89860012345670001002", CarrierID: 1, Status: 1, ShopID: &shopID} - require.NoError(t, cardStore.Create(ctx, platformCard)) - require.NoError(t, cardStore.Create(ctx, platformCard2)) - require.NoError(t, cardStore.Create(ctx, shopCard)) - - t.Run("所有卡可用-成功", func(t *testing.T) { - task := &model.DeviceImportTask{ - BatchNo: "TEST_BATCH_001", - } - task.Creator = 1 - - batch := []utils.DeviceRow{ - {Line: 2, DeviceNo: "DEV-OWNER-001", MaxSimSlots: 4, ICCIDs: []string{"89860012345670001001"}}, - } - result := &deviceImportResult{ - skippedItems: make(model.ImportResultItems, 0), - failedItems: make(model.ImportResultItems, 0), - } - - handler.processBatch(ctx, task, batch, result) - - assert.Equal(t, 1, result.successCount) - assert.Equal(t, 0, result.failCount) - }) - - t.Run("任一卡分配给店铺-整体失败", func(t *testing.T) { - task := &model.DeviceImportTask{ - BatchNo: "TEST_BATCH_002", - } - task.Creator = 1 - - batch := []utils.DeviceRow{ - {Line: 3, DeviceNo: "DEV-OWNER-002", MaxSimSlots: 4, ICCIDs: []string{"89860012345670001003", "89860012345670001002"}}, - } - result := &deviceImportResult{ - skippedItems: make(model.ImportResultItems, 0), - failedItems: make(model.ImportResultItems, 0), - } - - handler.processBatch(ctx, task, batch, result) - - assert.Equal(t, 0, result.successCount) - assert.Equal(t, 1, result.failCount) - require.Len(t, result.failedItems, 1) - assert.Contains(t, result.failedItems[0].Reason, "已分配给店铺") - }) - - t.Run("任一卡不存在-整体失败", func(t *testing.T) { - task := &model.DeviceImportTask{ - BatchNo: "TEST_BATCH_003", - } - task.Creator = 1 - - batch := []utils.DeviceRow{ - {Line: 4, DeviceNo: "DEV-OWNER-003", MaxSimSlots: 4, ICCIDs: []string{"89860012345670001002", "89860012345670009999"}}, - } - result := &deviceImportResult{ - skippedItems: make(model.ImportResultItems, 0), - failedItems: make(model.ImportResultItems, 0), - } - - handler.processBatch(ctx, task, batch, result) - - assert.Equal(t, 0, result.successCount) - assert.Equal(t, 1, result.failCount) - require.Len(t, result.failedItems, 1) - assert.Contains(t, result.failedItems[0].Reason, "卡验证失败") - }) - - t.Run("无指定卡时创建设备成功", func(t *testing.T) { - task := &model.DeviceImportTask{ - BatchNo: "TEST_BATCH_004", - } - task.Creator = 1 - - batch := []utils.DeviceRow{ - {Line: 5, DeviceNo: "DEV-OWNER-004", MaxSimSlots: 4, ICCIDs: []string{}}, - } - result := &deviceImportResult{ - skippedItems: make(model.ImportResultItems, 0), - failedItems: make(model.ImportResultItems, 0), - } - - handler.processBatch(ctx, task, batch, result) - - assert.Equal(t, 1, result.successCount) - assert.Equal(t, 0, result.failCount) - }) - - t.Run("多张卡全部可用-成功", func(t *testing.T) { - newCard1 := &model.IotCard{ICCID: "89860012345670001010", CarrierID: 1, Status: 1, ShopID: nil} - newCard2 := &model.IotCard{ICCID: "89860012345670001011", CarrierID: 1, Status: 1, ShopID: nil} - require.NoError(t, cardStore.Create(ctx, newCard1)) - require.NoError(t, cardStore.Create(ctx, newCard2)) - - task := &model.DeviceImportTask{ - BatchNo: "TEST_BATCH_005", - } - task.Creator = 1 - - batch := []utils.DeviceRow{ - {Line: 6, DeviceNo: "DEV-OWNER-005", MaxSimSlots: 4, ICCIDs: []string{"89860012345670001010", "89860012345670001011"}}, - } - result := &deviceImportResult{ - skippedItems: make(model.ImportResultItems, 0), - failedItems: make(model.ImportResultItems, 0), - } - - handler.processBatch(ctx, task, batch, result) - - assert.Equal(t, 1, result.successCount) - assert.Equal(t, 0, result.failCount) - }) -} - -func TestDeviceImportHandler_ProcessImport_AllOrNothing(t *testing.T) { - tx := newTaskTestTransaction(t) - rdb := getTaskTestRedis(t) - cleanTaskTestRedisKeys(t, rdb) - - logger := zap.NewNop() - importTaskStore := postgres.NewDeviceImportTaskStore(tx, rdb) - deviceStore := postgres.NewDeviceStore(tx, rdb) - bindingStore := postgres.NewDeviceSimBindingStore(tx, rdb) - cardStore := postgres.NewIotCardStore(tx, rdb) - - handler := NewDeviceImportHandler(tx, rdb, importTaskStore, deviceStore, bindingStore, cardStore, nil, logger) - ctx := context.Background() - - shopID := uint(200) - platformCard1 := &model.IotCard{ICCID: "89860012345680001001", CarrierID: 1, Status: 1, ShopID: nil} - platformCard2 := &model.IotCard{ICCID: "89860012345680001002", CarrierID: 1, Status: 1, ShopID: nil} - shopCard := &model.IotCard{ICCID: "89860012345680001003", CarrierID: 1, Status: 1, ShopID: &shopID} - require.NoError(t, cardStore.Create(ctx, platformCard1)) - require.NoError(t, cardStore.Create(ctx, platformCard2)) - require.NoError(t, cardStore.Create(ctx, shopCard)) - - task := &model.DeviceImportTask{ - BatchNo: "TEST_PROCESS_IMPORT", - } - task.Creator = 1 - - rows := []utils.DeviceRow{ - {Line: 2, DeviceNo: "DEV-PI-001", MaxSimSlots: 4, ICCIDs: []string{"89860012345680001001"}}, - {Line: 3, DeviceNo: "DEV-PI-002", MaxSimSlots: 4, ICCIDs: []string{"89860012345680001002", "89860012345680001003"}}, - {Line: 4, DeviceNo: "DEV-PI-003", MaxSimSlots: 4, ICCIDs: []string{"89860012345680001003", "89860012345680009999"}}, - } - - result := handler.processImport(ctx, task, rows, len(rows)) - - assert.Equal(t, 1, result.successCount, "只有第一个设备应该成功（所有卡都可用）") - assert.Equal(t, 2, result.failCount, "第二和第三个设备应该失败（有卡不可用）") - - assert.Len(t, result.failedItems, 2) - assert.Equal(t, 3, result.failedItems[0].Line) - assert.Contains(t, result.failedItems[0].Reason, "已分配给店铺") - assert.Equal(t, 4, result.failedItems[1].Line) - assert.Contains(t, result.failedItems[1].Reason, "卡验证失败") -} diff --git a/internal/task/iot_card_import_test.go b/internal/task/iot_card_import_test.go deleted file mode 100644 index 50bcf69..0000000 --- a/internal/task/iot_card_import_test.go +++ /dev/null @@ -1,200 +0,0 @@ -package task - -import ( - "context" - "testing" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/internal/store/postgres" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - "go.uber.org/zap" -) - -func TestIotCardImportHandler_ProcessImport(t *testing.T) { - tx := newTaskTestTransaction(t) - rdb := getTaskTestRedis(t) - cleanTaskTestRedisKeys(t, rdb) - - logger := zap.NewNop() - importTaskStore := postgres.NewIotCardImportTaskStore(tx, rdb) - iotCardStore := postgres.NewIotCardStore(tx, rdb) - - handler := NewIotCardImportHandler(tx, rdb, importTaskStore, iotCardStore, nil, nil, logger) - ctx := context.Background() - - t.Run("成功导入新ICCID", func(t *testing.T) { - task := &model.IotCardImportTask{ - CarrierID: 1, - CarrierType: constants.CarrierCodeCMCC, - BatchNo: "TEST_BATCH_001", - CardList: model.CardListJSON{ - {ICCID: "89860012345678905001", MSISDN: "13800000001"}, - {ICCID: "89860012345678905002", MSISDN: "13800000002"}, - {ICCID: "89860012345678905003", MSISDN: "13800000003"}, - }, - TotalCount: 3, - } - task.Creator = 1 - - result := handler.processImport(ctx, task) - - assert.Equal(t, 3, result.successCount) - assert.Equal(t, 0, result.skipCount) - assert.Equal(t, 0, result.failCount) - - exists, _ := iotCardStore.ExistsByICCID(ctx, "89860012345678905001") - assert.True(t, exists) - - card, _ := iotCardStore.GetByICCID(ctx, "89860012345678905001") - assert.Equal(t, "13800000001", card.MSISDN) - }) - - t.Run("跳过已存在的ICCID", func(t *testing.T) { - existingCard := &model.IotCard{ - ICCID: "89860012345678906001", - CarrierID: 1, - Status: 1, - } - require.NoError(t, iotCardStore.Create(ctx, existingCard)) - - task := &model.IotCardImportTask{ - CarrierID: 1, - CarrierType: constants.CarrierCodeCMCC, - BatchNo: "TEST_BATCH_002", - CardList: model.CardListJSON{ - {ICCID: "89860012345678906001", MSISDN: "13800000011"}, - {ICCID: "89860012345678906002", MSISDN: "13800000012"}, - }, - TotalCount: 2, - } - task.Creator = 1 - - result := handler.processImport(ctx, task) - - assert.Equal(t, 1, result.successCount) - assert.Equal(t, 1, result.skipCount) - assert.Equal(t, 0, result.failCount) - assert.Len(t, result.skippedItems, 1) - assert.Equal(t, "89860012345678906001", result.skippedItems[0].ICCID) - assert.Equal(t, "13800000011", result.skippedItems[0].MSISDN) - assert.Equal(t, "ICCID 已存在", result.skippedItems[0].Reason) - }) - - t.Run("ICCID格式校验失败", func(t *testing.T) { - task := &model.IotCardImportTask{ - CarrierID: 1, - CarrierType: constants.CarrierCodeCTCC, - BatchNo: "TEST_BATCH_003", - CardList: model.CardListJSON{ - {ICCID: "89860312345678907001", MSISDN: "13900000001"}, - {ICCID: "898603123456789070", MSISDN: "13900000002"}, - }, - TotalCount: 2, - } - task.Creator = 1 - - result := handler.processImport(ctx, task) - - assert.Equal(t, 0, result.successCount) - assert.Equal(t, 0, result.skipCount) - assert.Equal(t, 2, result.failCount) - assert.Len(t, result.failedItems, 2) - assert.Equal(t, "13900000001", result.failedItems[0].MSISDN) - }) - - t.Run("混合场景-成功跳过和失败", func(t *testing.T) { - existingCard := &model.IotCard{ - ICCID: "89860012345678908001", - CarrierID: 1, - Status: 1, - } - require.NoError(t, iotCardStore.Create(ctx, existingCard)) - - task := &model.IotCardImportTask{ - CarrierID: 1, - CarrierType: constants.CarrierCodeCMCC, - BatchNo: "TEST_BATCH_004", - CardList: model.CardListJSON{ - {ICCID: "89860012345678908001", MSISDN: "13800000021"}, - {ICCID: "89860012345678908002", MSISDN: "13800000022"}, - {ICCID: "invalid!iccid", MSISDN: "13800000023"}, - }, - TotalCount: 3, - } - task.Creator = 1 - - result := handler.processImport(ctx, task) - - assert.Equal(t, 1, result.successCount) - assert.Equal(t, 1, result.skipCount) - assert.Equal(t, 1, result.failCount) - }) - - t.Run("空卡列表", func(t *testing.T) { - task := &model.IotCardImportTask{ - CarrierID: 1, - CarrierType: constants.CarrierCodeCMCC, - BatchNo: "TEST_BATCH_005", - CardList: model.CardListJSON{}, - TotalCount: 0, - } - - result := handler.processImport(ctx, task) - - assert.Equal(t, 0, result.successCount) - assert.Equal(t, 0, result.skipCount) - assert.Equal(t, 0, result.failCount) - }) -} - -func TestIotCardImportHandler_ProcessBatch(t *testing.T) { - tx := newTaskTestTransaction(t) - rdb := getTaskTestRedis(t) - cleanTaskTestRedisKeys(t, rdb) - - logger := zap.NewNop() - importTaskStore := postgres.NewIotCardImportTaskStore(tx, rdb) - iotCardStore := postgres.NewIotCardStore(tx, rdb) - - handler := NewIotCardImportHandler(tx, rdb, importTaskStore, iotCardStore, nil, nil, logger) - ctx := context.Background() - - t.Run("验证行号和MSISDN正确记录", func(t *testing.T) { - existingCard := &model.IotCard{ - ICCID: "89860012345678909002", - CarrierID: 1, - Status: 1, - } - require.NoError(t, iotCardStore.Create(ctx, existingCard)) - - task := &model.IotCardImportTask{ - CarrierID: 1, - CarrierType: constants.CarrierCodeCMCC, - BatchNo: "TEST_BATCH_LINE", - } - task.Creator = 1 - - batch := []model.CardItem{ - {ICCID: "89860012345678909001", MSISDN: "13800000031"}, - {ICCID: "89860012345678909002", MSISDN: "13800000032"}, - {ICCID: "invalid", MSISDN: "13800000033"}, - } - result := &importResult{ - skippedItems: make(model.ImportResultItems, 0), - failedItems: make(model.ImportResultItems, 0), - } - - handler.processBatch(ctx, task, batch, 100, result) - - assert.Equal(t, 1, result.successCount) - assert.Equal(t, 1, result.skipCount) - assert.Equal(t, 1, result.failCount) - - assert.Equal(t, 101, result.skippedItems[0].Line) - assert.Equal(t, "13800000032", result.skippedItems[0].MSISDN) - assert.Equal(t, 102, result.failedItems[0].Line) - assert.Equal(t, "13800000033", result.failedItems[0].MSISDN) - }) -} diff --git a/internal/task/polling_handler.go b/internal/task/polling_handler.go index cc257c8..c4d8962 100644 --- a/internal/task/polling_handler.go +++ b/internal/task/polling_handler.go @@ -14,6 +14,7 @@ import ( "github.com/break/junhong_cmp_fiber/internal/gateway" "github.com/break/junhong_cmp_fiber/internal/model" + packagepkg "github.com/break/junhong_cmp_fiber/internal/service/package" "github.com/break/junhong_cmp_fiber/internal/store/postgres" "github.com/break/junhong_cmp_fiber/pkg/constants" ) @@ -34,6 +35,8 @@ type PollingHandler struct { concurrencyStore *postgres.PollingConcurrencyConfigStore deviceSimBindingStore *postgres.DeviceSimBindingStore dataUsageRecordStore *postgres.DataUsageRecordStore + packageUsageStore *postgres.PackageUsageStore + usageService *packagepkg.UsageService logger *zap.Logger } @@ -42,6 +45,7 @@ func NewPollingHandler( db *gorm.DB, redis *redis.Client, gatewayClient *gateway.Client, + usageService *packagepkg.UsageService, logger *zap.Logger, ) *PollingHandler { return &PollingHandler{ @@ -52,6 +56,8 @@ func NewPollingHandler( concurrencyStore: postgres.NewPollingConcurrencyConfigStore(db), deviceSimBindingStore: postgres.NewDeviceSimBindingStore(db, redis), dataUsageRecordStore: postgres.NewDataUsageRecordStore(db), + packageUsageStore: postgres.NewPackageUsageStore(db, redis), + usageService: usageService, logger: logger, } } @@ -159,6 +165,12 @@ func (h *PollingHandler) HandleRealnameCheck(ctx context.Context, t *asynq.Task) zap.Uint64("card_id", cardID), zap.Int("old_status", card.RealNameStatus), zap.Int("new_status", newRealnameStatus)) + + // 任务 21.2-21.4: 检测首次实名（0/1 → 2），触发待激活套餐激活 + isFirstRealname := (card.RealNameStatus == 0 || card.RealNameStatus == 1) && newRealnameStatus == 2 + if isFirstRealname { + h.triggerFirstRealnameActivation(ctx, uint(cardID)) + } } // 更新监控统计 @@ -169,6 +181,7 @@ func (h *PollingHandler) HandleRealnameCheck(ctx context.Context, t *asynq.Task) } // HandleCarddataCheck 处理卡流量检查任务 +// 任务 18.2-18.4: 改造为支持流量扣减优先级和新停机条件 func (h *PollingHandler) HandleCarddataCheck(ctx context.Context, t *asynq.Task) error { startTime := time.Now() @@ -241,6 +254,9 @@ func (h *PollingHandler) HandleCarddataCheck(ctx context.Context, t *asynq.Task) updates := h.calculateFlowUpdates(card, gatewayFlowMB, now) updates["last_data_check_at"] = now + // 计算本次流量增量（用于套餐扣减） + flowIncrementMB := h.calculateFlowIncrement(card, gatewayFlowMB, now) + // 更新数据库 if err := h.db.Model(&model.IotCard{}). Where("id = ?", cardID). @@ -256,6 +272,28 @@ func (h *PollingHandler) HandleCarddataCheck(ctx context.Context, t *asynq.Task) "current_month_usage_mb": updates["current_month_usage_mb"], }) + // 任务 18.3: 调用 UsageService.DeductDataUsage 进行流量扣减 + if flowIncrementMB > 0 && h.usageService != nil { + if err := h.usageService.DeductDataUsage(ctx, "iot_card", uint(cardID), int64(flowIncrementMB)); err != nil { + // 扣减失败不影响主流程，仅记录日志 + h.logger.Warn("套餐流量扣减失败", + zap.Uint64("card_id", cardID), + zap.Float64("increment_mb", flowIncrementMB), + zap.Error(err)) + + // 任务 18.4: 检查是否需要停机（所有套餐用完） + if h.shouldStopCard(ctx, uint(cardID)) { + h.logger.Warn("所有套餐流量已用完，触发停机", + zap.Uint64("card_id", cardID)) + h.stopCardByUsageExhausted(ctx, card) + } + } else { + h.logger.Info("套餐流量扣减成功", + zap.Uint64("card_id", cardID), + zap.Float64("increment_mb", flowIncrementMB)) + } + } + // 更新监控统计 h.updateStats(ctx, constants.TaskTypePollingCarddata, true, time.Since(startTime)) @@ -266,6 +304,87 @@ func (h *PollingHandler) HandleCarddataCheck(ctx context.Context, t *asynq.Task) return h.requeueCard(ctx, uint(cardID), constants.TaskTypePollingCarddata) } +// calculateFlowIncrement 任务 18.2: 计算本次流量增量 +func (h *PollingHandler) calculateFlowIncrement(card *model.IotCard, gatewayFlowMB float64, now time.Time) float64 { + // 获取本月1号 + currentMonthStart := time.Date(now.Year(), now.Month(), 1, 0, 0, 0, 0, now.Location()) + + // 判断是否跨月 + isCrossMonth := card.CurrentMonthStartDate == nil || + card.CurrentMonthStartDate.Before(currentMonthStart) + + if isCrossMonth { + // 跨月了：本月流量就是增量 + return gatewayFlowMB + } + + // 同月内：计算增量 + increment := gatewayFlowMB - card.CurrentMonthUsageMB + if increment < 0 { + return 0 + } + return increment +} + +// shouldStopCard 任务 18.4: 检查是否应该停机（所有套餐用完） +func (h *PollingHandler) shouldStopCard(ctx context.Context, cardID uint) bool { + // 查询是否还有生效中的套餐 + var activeCount int64 + if err := h.db.WithContext(ctx).Model(&model.PackageUsage{}). + Where("iot_card_id = ? AND status = ?", cardID, constants.PackageUsageStatusActive). + Count(&activeCount).Error; err != nil { + h.logger.Warn("查询生效套餐失败", zap.Uint("card_id", cardID), zap.Error(err)) + return false + } + + // 如果没有生效中的套餐，需要停机 + return activeCount == 0 +} + +// stopCardByUsageExhausted 任务 18.4: 流量耗尽停机 +func (h *PollingHandler) stopCardByUsageExhausted(ctx context.Context, card *model.IotCard) { + // 只有在线的卡才需要停机 + if card.NetworkStatus != 1 { + return + } + + // 调用 Gateway 停机 + if h.gatewayClient != nil { + if err := h.gatewayClient.StopCard(ctx, &gateway.CardOperationReq{ + CardNo: card.ICCID, + }); err != nil { + h.logger.Error("停机失败", + zap.Uint("card_id", card.ID), + zap.String("iccid", card.ICCID), + zap.Error(err)) + return + } + } + + // 更新数据库：卡的网络状态 + now := time.Now() + updates := map[string]any{ + "network_status": 0, // 停机 + "stopped_at": now, + "stop_reason": "套餐流量耗尽自动停机", + "updated_at": now, + } + if err := h.db.Model(&model.IotCard{}). + Where("id = ?", card.ID). + Updates(updates).Error; err != nil { + h.logger.Error("更新卡状态失败", zap.Uint("card_id", card.ID), zap.Error(err)) + } + + // 更新 Redis 缓存 + h.updateCardCache(ctx, card.ID, map[string]any{ + "network_status": 0, + }) + + h.logger.Warn("卡已停机（套餐流量耗尽）", + zap.Uint("card_id", card.ID), + zap.String("iccid", card.ICCID)) +} + // calculateFlowUpdates 计算流量更新值（处理跨月逻辑） func (h *PollingHandler) calculateFlowUpdates(card *model.IotCard, gatewayFlowMB float64, now time.Time) map[string]any { updates := make(map[string]any) @@ -826,3 +945,74 @@ func (h *PollingHandler) getCardWithCache(ctx context.Context, cardID uint) (*mo return card, nil } + +// triggerFirstRealnameActivation 任务 21.3-21.4: 首次实名后触发套餐激活 +func (h *PollingHandler) triggerFirstRealnameActivation(ctx context.Context, cardID uint) { + // 任务 21.3: 查询该卡是否有待激活套餐 + // WHERE pending_realname_activation=true AND status=0 AND iot_card_id=? + var pendingPackages []model.PackageUsage + err := h.db.WithContext(ctx). + Where("iot_card_id = ?", cardID). + Where("pending_realname_activation = ?", true). + Where("status = ?", constants.PackageUsageStatusPending). + Find(&pendingPackages).Error + + if err != nil { + h.logger.Warn("查询待激活套餐失败", + zap.Uint("card_id", cardID), + zap.Error(err)) + return + } + + if len(pendingPackages) == 0 { + h.logger.Debug("无待激活套餐", + zap.Uint("card_id", cardID)) + return + } + + h.logger.Info("发现待激活套餐", + zap.Uint("card_id", cardID), + zap.Int("count", len(pendingPackages))) + + // 任务 21.4: 提交 Asynq 任务激活套餐 + for _, pkg := range pendingPackages { + payload := map[string]any{ + "package_usage_id": pkg.ID, + "carrier_type": "iot_card", + "carrier_id": cardID, + "activation_type": "realname", + "timestamp": time.Now().Unix(), + } + + payloadBytes, err := sonic.Marshal(payload) + if err != nil { + h.logger.Warn("序列化激活任务载荷失败", + zap.Uint("package_usage_id", pkg.ID), + zap.Error(err)) + continue + } + + task := asynq.NewTask(constants.TaskTypePackageFirstActivation, payloadBytes, + asynq.MaxRetry(3), + asynq.Timeout(30*time.Second), + asynq.Queue(constants.QueueDefault), + ) + + // 这里需要访问 Asynq Client，暂时使用 Redis 队列 + // 实际应该通过依赖注入 asynq.Client + activationKey := constants.RedisPollingManualQueueKey(constants.TaskTypePackageFirstActivation) + if err := h.redis.RPush(ctx, activationKey, string(payloadBytes)).Err(); err != nil { + h.logger.Warn("提交激活任务失败", + zap.Uint("package_usage_id", pkg.ID), + zap.Error(err)) + continue + } + + h.logger.Info("已提交首次实名激活任务", + zap.Uint("package_usage_id", pkg.ID), + zap.Uint("card_id", cardID)) + + // 避免未使用变量警告 + _ = task + } +} diff --git a/internal/task/test_helpers_test.go b/internal/task/test_helpers_test.go deleted file mode 100644 index e9c4b64..0000000 --- a/internal/task/test_helpers_test.go +++ /dev/null @@ -1,121 +0,0 @@ -package task - -import ( - "context" - "fmt" - "sync" - "testing" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/redis/go-redis/v9" - "gorm.io/driver/postgres" - "gorm.io/gorm" - "gorm.io/gorm/logger" -) - -var ( - taskTestDBOnce sync.Once - taskTestDB *gorm.DB - taskTestDBInitErr error - - taskTestRedisOnce sync.Once - taskTestRedis *redis.Client - taskTestRedisInitErr error -) - -const ( - taskTestDBDSN = "host=cxd.whcxd.cn port=16159 user=erp_pgsql password=erp_2025 dbname=junhong_cmp_test sslmode=disable TimeZone=Asia/Shanghai" - taskTestRedisAddr = "cxd.whcxd.cn:16299" - taskTestRedisPasswd = "cpNbWtAaqgo1YJmbMp3h" - taskTestRedisDB = 15 -) - -func getTaskTestDB(t *testing.T) *gorm.DB { - t.Helper() - - taskTestDBOnce.Do(func() { - var err error - taskTestDB, err = gorm.Open(postgres.Open(taskTestDBDSN), &gorm.Config{ - Logger: logger.Default.LogMode(logger.Silent), - }) - if err != nil { - taskTestDBInitErr = fmt.Errorf("无法连接测试数据库: %w", err) - return - } - - err = taskTestDB.AutoMigrate( - &model.IotCard{}, - &model.IotCardImportTask{}, - &model.Device{}, - &model.DeviceImportTask{}, - &model.DeviceSimBinding{}, - ) - if err != nil { - taskTestDBInitErr = fmt.Errorf("数据库迁移失败: %w", err) - } - }) - - if taskTestDBInitErr != nil { - t.Skipf("跳过测试：%v", taskTestDBInitErr) - } - - return taskTestDB -} - -func getTaskTestRedis(t *testing.T) *redis.Client { - t.Helper() - - taskTestRedisOnce.Do(func() { - taskTestRedis = redis.NewClient(&redis.Options{ - Addr: taskTestRedisAddr, - Password: taskTestRedisPasswd, - DB: taskTestRedisDB, - }) - - ctx := context.Background() - if err := taskTestRedis.Ping(ctx).Err(); err != nil { - taskTestRedisInitErr = fmt.Errorf("无法连接 Redis: %w", err) - } - }) - - if taskTestRedisInitErr != nil { - t.Skipf("跳过测试：%v", taskTestRedisInitErr) - } - - return taskTestRedis -} - -func newTaskTestTransaction(t *testing.T) *gorm.DB { - t.Helper() - - db := getTaskTestDB(t) - tx := db.Begin() - if tx.Error != nil { - t.Fatalf("开启测试事务失败: %v", tx.Error) - } - - t.Cleanup(func() { - tx.Rollback() - }) - - return tx -} - -func cleanTaskTestRedisKeys(t *testing.T, rdb *redis.Client) { - t.Helper() - - ctx := context.Background() - testPrefix := fmt.Sprintf("test:%s:", t.Name()) - - keys, _ := rdb.Keys(ctx, testPrefix+"*").Result() - if len(keys) > 0 { - rdb.Del(ctx, keys...) - } - - t.Cleanup(func() { - keys, _ := rdb.Keys(ctx, testPrefix+"*").Result() - if len(keys) > 0 { - rdb.Del(ctx, keys...) - } - }) -} diff --git a/migrations/000055_package_system_upgrade.down.sql b/migrations/000055_package_system_upgrade.down.sql new file mode 100644 index 0000000..be36b0d --- /dev/null +++ b/migrations/000055_package_system_upgrade.down.sql @@ -0,0 +1,42 @@ +-- 回滚迁移：删除新增的表和字段 + +-- 删除索引 +DROP INDEX IF EXISTS idx_card_daily_usage_date; +DROP INDEX IF EXISTS idx_card_daily_usage_unique; +DROP INDEX IF EXISTS idx_package_usage_daily_record_date; +DROP INDEX IF EXISTS idx_package_usage_daily_record_unique; +DROP INDEX IF EXISTS idx_package_usage_next_reset_at; +DROP INDEX IF EXISTS idx_package_usage_master_usage_id; +DROP INDEX IF EXISTS idx_package_usage_priority; + +-- 删除新表 +DROP TABLE IF EXISTS tb_card_daily_usage; +DROP TABLE IF EXISTS tb_package_usage_daily_record; + +-- 回滚 Carrier 表扩展 +ALTER TABLE tb_carrier +DROP COLUMN IF EXISTS billing_day; + +-- 回滚 IotCard 表扩展 +ALTER TABLE tb_iot_card +DROP COLUMN IF EXISTS stop_reason, +DROP COLUMN IF EXISTS resumed_at, +DROP COLUMN IF EXISTS stopped_at, +DROP COLUMN IF EXISTS first_realname_at; + +-- 回滚 PackageUsage 表扩展 +ALTER TABLE tb_package_usage +DROP COLUMN IF EXISTS next_reset_at, +DROP COLUMN IF EXISTS last_reset_at, +DROP COLUMN IF EXISTS data_reset_cycle, +DROP COLUMN IF EXISTS pending_realname_activation, +DROP COLUMN IF EXISTS has_independent_expiry, +DROP COLUMN IF EXISTS master_usage_id, +DROP COLUMN IF EXISTS priority; + +-- 回滚 Package 表扩展 +ALTER TABLE tb_package +DROP COLUMN IF EXISTS enable_realname_activation, +DROP COLUMN IF EXISTS data_reset_cycle, +DROP COLUMN IF EXISTS duration_days, +DROP COLUMN IF EXISTS calendar_type; diff --git a/migrations/000055_package_system_upgrade.up.sql b/migrations/000055_package_system_upgrade.up.sql new file mode 100644 index 0000000..1a3b8db --- /dev/null +++ b/migrations/000055_package_system_upgrade.up.sql @@ -0,0 +1,111 @@ +-- Package 表扩展：新增周期类型、流量重置周期、实名激活开关 +ALTER TABLE tb_package +ADD COLUMN IF NOT EXISTS calendar_type VARCHAR(20) DEFAULT 'by_day', +ADD COLUMN IF NOT EXISTS duration_days INT, +ADD COLUMN IF NOT EXISTS data_reset_cycle VARCHAR(20) DEFAULT 'monthly', +ADD COLUMN IF NOT EXISTS enable_realname_activation BOOLEAN DEFAULT TRUE; + +-- PackageUsage 表扩展：新增优先级、主套餐关联、独立有效期、实名激活等字段 +-- 注：status 字段枚举值扩展为 0-4（0=待生效，1=生效中，2=已用完，3=已过期，4=已失效） +ALTER TABLE tb_package_usage +ADD COLUMN IF NOT EXISTS priority INT DEFAULT 1, +ADD COLUMN IF NOT EXISTS master_usage_id BIGINT, +ADD COLUMN IF NOT EXISTS has_independent_expiry BOOLEAN DEFAULT FALSE, +ADD COLUMN IF NOT EXISTS pending_realname_activation BOOLEAN DEFAULT FALSE, +ADD COLUMN IF NOT EXISTS data_reset_cycle VARCHAR(20), +ADD COLUMN IF NOT EXISTS last_reset_at TIMESTAMP, +ADD COLUMN IF NOT EXISTS next_reset_at TIMESTAMP; + +-- IotCard 表扩展：新增首次实名时间、停复机相关字段 +ALTER TABLE tb_iot_card +ADD COLUMN IF NOT EXISTS first_realname_at TIMESTAMP, +ADD COLUMN IF NOT EXISTS stopped_at TIMESTAMP, +ADD COLUMN IF NOT EXISTS resumed_at TIMESTAMP, +ADD COLUMN IF NOT EXISTS stop_reason VARCHAR(50); + +-- Carrier 表扩展：新增计费日字段（联通27号，其他1号） +ALTER TABLE tb_carrier +ADD COLUMN IF NOT EXISTS billing_day INT DEFAULT 1; + +-- 创建 PackageUsageDailyRecord 表：套餐流量日记录 +CREATE TABLE IF NOT EXISTS tb_package_usage_daily_record ( + id BIGSERIAL PRIMARY KEY, + package_usage_id BIGINT NOT NULL, + date DATE NOT NULL, + daily_usage_mb INT DEFAULT 0, + cumulative_usage_mb BIGINT DEFAULT 0, + created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP +); + +-- 创建 CardDailyUsage 表：卡流量日记录（用于轮询系统） +CREATE TABLE IF NOT EXISTS tb_card_daily_usage ( + id BIGSERIAL PRIMARY KEY, + card_id BIGINT NOT NULL, + usage_date DATE NOT NULL, + total_data_usage BIGINT DEFAULT 0, + carrier_id BIGINT, + created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP +); + +-- 创建索引 +-- PackageUsage 表索引 +CREATE INDEX IF NOT EXISTS idx_package_usage_priority ON tb_package_usage(priority); +CREATE INDEX IF NOT EXISTS idx_package_usage_master_usage_id ON tb_package_usage(master_usage_id); +CREATE INDEX IF NOT EXISTS idx_package_usage_next_reset_at ON tb_package_usage(next_reset_at); + +-- PackageUsageDailyRecord 表唯一索引（同一套餐同一天只有一条记录） +CREATE UNIQUE INDEX IF NOT EXISTS idx_package_usage_daily_record_unique ON tb_package_usage_daily_record(package_usage_id, date); +CREATE INDEX IF NOT EXISTS idx_package_usage_daily_record_date ON tb_package_usage_daily_record(date); + +-- CardDailyUsage 表唯一索引（同一卡同一天只有一条记录） +CREATE UNIQUE INDEX IF NOT EXISTS idx_card_daily_usage_unique ON tb_card_daily_usage(card_id, usage_date); +CREATE INDEX IF NOT EXISTS idx_card_daily_usage_date ON tb_card_daily_usage(usage_date); + +-- 数据初始化：设置运营商的 billing_day +-- 联通（假设 carrier_name 或 carrier_code 包含 "unicom" 或 "联通"） +UPDATE tb_carrier +SET billing_day = 27 +WHERE LOWER(carrier_name) LIKE '%unicom%' OR carrier_name LIKE '%联通%'; + +-- 其他运营商默认为 1 号（已通过 DEFAULT 设置） + +-- 添加字段注释（PostgreSQL 语法） +-- Package 表字段注释 +COMMENT ON COLUMN tb_package.calendar_type IS '套餐周期类型（natural_month=自然月，by_day=按天）'; +COMMENT ON COLUMN tb_package.duration_days IS '套餐天数（calendar_type=by_day 时必填）'; +COMMENT ON COLUMN tb_package.data_reset_cycle IS '流量重置周期（daily/monthly/yearly/none）'; +COMMENT ON COLUMN tb_package.enable_realname_activation IS '是否启用实名激活（true=需实名后激活，false=立即激活）'; + +-- PackageUsage 表字段注释 +COMMENT ON COLUMN tb_package_usage.priority IS '优先级（主套餐和加油包都按此字段排队，数字越小优先级越高）'; +COMMENT ON COLUMN tb_package_usage.master_usage_id IS '主套餐使用记录ID（加油包关联主套餐，主套餐此字段为NULL）'; +COMMENT ON COLUMN tb_package_usage.has_independent_expiry IS '加油包是否有独立有效期（true=有独立到期时间，false=跟随主套餐）'; +COMMENT ON COLUMN tb_package_usage.pending_realname_activation IS '是否等待实名激活（true=待实名后激活，false=已激活或不需实名）'; +COMMENT ON COLUMN tb_package_usage.data_reset_cycle IS '流量重置周期（从 Package 复制，用于历史记录）'; +COMMENT ON COLUMN tb_package_usage.last_reset_at IS '最后一次流量重置时间'; +COMMENT ON COLUMN tb_package_usage.next_reset_at IS '下次流量重置时间（用于定时任务查询）'; + +-- IotCard 表字段注释 +COMMENT ON COLUMN tb_iot_card.first_realname_at IS '首次实名时间（用于触发首次实名激活）'; +COMMENT ON COLUMN tb_iot_card.stopped_at IS '停机时间'; +COMMENT ON COLUMN tb_iot_card.resumed_at IS '最近复机时间'; +COMMENT ON COLUMN tb_iot_card.stop_reason IS '停机原因（traffic_exhausted=流量耗尽，manual=手动停机，arrears=欠费）'; + +-- Carrier 表字段注释 +COMMENT ON COLUMN tb_carrier.billing_day IS '计费日（联通=27，其他=1，用于月度流量重置）'; + +-- PackageUsageDailyRecord 表和字段注释 +COMMENT ON TABLE tb_package_usage_daily_record IS '套餐流量日记录'; +COMMENT ON COLUMN tb_package_usage_daily_record.package_usage_id IS '套餐使用记录ID'; +COMMENT ON COLUMN tb_package_usage_daily_record.date IS '日期'; +COMMENT ON COLUMN tb_package_usage_daily_record.daily_usage_mb IS '当日流量使用量（MB）'; +COMMENT ON COLUMN tb_package_usage_daily_record.cumulative_usage_mb IS '截止当日的累计流量（MB）'; + +-- CardDailyUsage 表和字段注释 +COMMENT ON TABLE tb_card_daily_usage IS '卡流量日记录'; +COMMENT ON COLUMN tb_card_daily_usage.card_id IS '卡ID（可能是 iot_card_id 或 device_id）'; +COMMENT ON COLUMN tb_card_daily_usage.usage_date IS '日期'; +COMMENT ON COLUMN tb_card_daily_usage.total_data_usage IS '上游返回的累计流量（MB）'; +COMMENT ON COLUMN tb_card_daily_usage.carrier_id IS '运营商ID'; diff --git a/openspec/changes/package-system-upgrade/.openspec.yaml b/openspec/changes/package-system-upgrade/.openspec.yaml new file mode 100644 index 0000000..70eb9e0 --- /dev/null +++ b/openspec/changes/package-system-upgrade/.openspec.yaml @@ -0,0 +1,2 @@ +schema: spec-driven +created: 2026-02-10 diff --git a/openspec/changes/package-system-upgrade/consensus.md b/openspec/changes/package-system-upgrade/consensus.md new file mode 100644 index 0000000..9205db8 --- /dev/null +++ b/openspec/changes/package-system-upgrade/consensus.md @@ -0,0 +1,228 @@ +# 共识文档 + +**Change**: package-system-upgrade (套餐系统升级-支持自然月按天套餐与多套餐管理) +**确认时间**: 2026-02-10 +**确认人**: 用户 + +--- + +## 1. 要做什么 + +- [x] **套餐类型扩展**：新增「自然月套餐」和「按天套餐」两种类型（已确认） + - 自然月套餐：按自然月边界计算有效期（如1月15日生效→1月31日失效） + - 按天套餐：按天数计算有效期（如1月15日+30天→2月13日失效） + +- [x] **流量重置周期**：支持套餐流量按「日/月/年/不重置」四种周期重置（已确认） + - 独立于套餐有效期 + - 例如：12个月套餐可配置为按月重置或按年重置 + +- [x] **首次实名激活机制**（后台囤货场景）（已确认） + - 支持未实名状态购买套餐（仅后台管理） + - 载体（设备/卡）首次实名时自动激活套餐 + - 有效期从实名时刻开始计算 + - 设备绑定多卡场景：任意一张卡首次实名即触发 + +- [x] **主套餐排队生效**（已确认） + - 同时只能有1个生效中的主套餐 + - 后续购买的主套餐按购买顺序排队 + - 当前主套餐到期后自动激活下一个 + +- [x] **加油包生命周期管理**（已确认） + - 加油包必须在有主套餐时才能购买 + - 支持「独立有效期」和「跟随主套餐」两种模式 + - 主套餐过期时，其关联加油包自动失效（即使流量未用完） + +- [x] **流量扣减优先级**（已确认） + - 先扣加油包流量（按购买顺序） + - 最后扣主套餐流量 + +- [x] **停机条件调整**（已确认） + - 主套餐 + 所有加油包流量都用完才停机 + +- [x] **三套流量统计系统**（已确认） + - 系统A（客户视图）：主套餐和加油包分开展示，含总计 + - 系统B（卡流量详单）：按日统计卡总流量，与套餐无关 + - 系统C（套餐流量详单）：按套餐维度记录每日增量流量 + +- [x] **上游流量适配**（已确认） + - 适配运营商周期（联通27号重置/其他1号重置） + - 每日增量 = 当前查询用量 - 昨日记录用量 + +- [x] **现有API改造**（已确认） + - 套餐管理API：支持新增字段（套餐类型、重置周期等） + - 订单API：支持主套餐排队逻辑、加油包购买限制 + - 流量查询API：支持三套统计系统的数据展示 + +## 2. 不做什么 + +- [x] **不支持旧加油包继承**（已确认） + - 旧主套餐过期时，其加油包不会继承到新主套餐 + - 新主套餐需要重新购买加油包 + +- [x] **不支持多主套餐并行生效**（已确认） + - 不允许同时有多个主套餐处于生效中状态 + - 必须按排队顺序逐个生效 + +- [x] **不支持客户端未实名购买**（已确认） + - 首次实名激活机制仅限后台管理端 + - 客户端购买套餐必须已实名 + +- [x] **不支持流量跨套餐转移**（已确认） + - 套餐过期后，剩余流量不能转移到新套餐 + - 每个套餐独立计算流量 + +- [x] **不支持手动指定主套餐生效时间**（已确认） + - 主套餐生效时间由系统自动管理（按排队顺序） + - 不允许用户指定"下个月生效"等特定时间 + +- [x] **不支持加油包独立存在**（已确认） + - 加油包必须依附于主套餐 + - 没有主套餐时不能单独使用加油包 + +**注**: 因处于开发阶段，可以完全重构，不受历史数据限制 + +## 3. 关键约束 + +- [x] **技术栈约束**（已确认） + - 必须使用 GORM 修改数据模型，禁止直接使用 database/sql + - 套餐生效调度使用现有轮询系统（Scheduler + PollingHandler） + - 使用 Asynq 处理异步任务（实名回调、套餐激活等） + +- [x] **数据库设计约束**（已确认） + - 禁止建立外键约束 + - 禁止使用 GORM 关联关系标签（foreignKey, hasMany, belongsTo） + - 关联通过 ID 字段手动维护，在代码层面显式查询 + +- [x] **架构分层约束**（已确认） + - 必须遵循 Handler → Service → Store → Model 分层 + - Handler 层只处理 HTTP 请求/响应，不包含业务逻辑 + - Service 层包含所有业务逻辑，支持事务管理 + +- [x] **错误处理约束**（已确认） + - 所有错误必须在 pkg/errors/ 中定义 + - Service 层禁止使用 fmt.Errorf，必须返回 errors.New/errors.Wrap + - Handler 层禁止直接拼接底层错误信息给客户端 + +- [x] **并发安全约束**（已确认） + - 套餐激活逻辑必须支持并发安全（乐观锁/事务） + - 流量扣减逻辑必须使用数据库事务 + - 主套餐排队逻辑必须防止竞态条件 + +- [x] **性能约束**（已确认） + - 轮询系统必须支持千万级卡规模（现有能力） + - 流量查询 API P95 < 200ms, P99 < 500ms + - 套餐激活调度延迟 < 1分钟 + +- [x] **测试约束**（已确认） + - 核心业务逻辑测试覆盖率 ≥ 90% + - 必须编写验收测试（基于 Spec Scenarios） + - 禁止绕过核心逻辑的测试（例如传递 nil 跳过依赖） + +- [x] **文档约束**（已确认） + - 所有注释必须使用中文 + - 新增 API 必须更新 OpenAPI 文档生成器 + - 必须更新 CLAUDE.md 中的相关规范 + +## 4. 验收标准 + +### 数据库层 +- [x] 1. Package 表包含 calendar_type, data_reset_cycle, enable_realname_activation 字段（已确认） +- [x] 2. PackageUsage 表 status 支持 0-待生效, 1-生效中, 2-已用完, 3-已过期, 4-已失效（已确认） +- [x] 3. 新表 PackageUsageDailyRecord 存在且有正确索引（package_usage_id + date）（已确认） +- [x] 4. 数据库迁移脚本执行成功，无数据丢失（已确认） + +### 套餐购买逻辑 +- [x] 5. 后台管理端可为未实名载体购买套餐，状态为"待生效"（已确认） +- [x] 6. 客户端未实名时购买套餐返回错误提示（已确认） +- [x] 7. 购买第2个主套餐时，priority 自动递增，状态为"待生效"（已确认） +- [x] 8. 购买加油包时，无主套餐返回错误"必须有主套餐才能购买加油包"（已确认） + +### 实名激活逻辑 +- [x] 9. 设备第1张卡实名后，待生效套餐自动变为"生效中"（已确认） +- [x] 10. 设备第2、第3张卡实名后，套餐状态不变（已确认） +- [x] 11. 实名激活的套餐，activated_at = 实名时刻，expires_at 按套餐类型计算（已确认） + +### 主套餐排队逻辑 +- [x] 12. 当前主套餐过期后，1分钟内 priority 最小的待生效主套餐自动激活（已确认） +- [x] 13. 自然月套餐激活时，expires_at 为当月最后一天 23:59:59（已确认） +- [x] 14. 按天套餐激活时，expires_at = activated_at + duration_days（已确认） + +### 加油包生命周期 +- [x] 15. 主套餐过期时，其关联加油包状态变为"已失效"（已确认） +- [x] 16. 独立有效期的加油包过期时，状态变为"已过期"（已确认） + +### 流量扣减逻辑 +- [x] 17. 新增流量时，优先扣减 priority 最小的加油包（已确认） +- [x] 18. 所有加油包用完后，才开始扣减主套餐流量（已确认） +- [x] 19. 主套餐 + 所有加油包流量都用完时，轮询系统触发停机（已确认） + +### 流量统计系统 +- [x] 20. 客户视图 API 返回：主套餐、每个加油包、总计（三个数据）（已确认） +- [x] 21. 卡流量详单 API 按日返回，包含 date, daily_increase_mb, total_mb（已确认） +- [x] 22. 套餐流量详单 API 按套餐维度，按日返回，包含 date, daily_usage_mb, cumulative_mb（已确认） + +### 流量重置逻辑 +- [x] 23. reset_cycle=daily 的套餐，每天0点重置 data_usage_mb 为 0（已确认） +- [x] 24. reset_cycle=monthly 的套餐，每月1号0点重置（或根据运营商配置）（已确认） +- [x] 25. reset_cycle=yearly 的套餐，每年1月1号0点重置（已确认） + +### API 改造 +- [x] 26. POST /api/admin/packages 支持新增字段创建套餐（已确认） +- [x] 27. GET /api/admin/packages/:id 返回包含新增字段（已确认） +- [x] 28. POST /api/admin/orders 支持主套餐排队逻辑（已确认） +- [x] 29. 新增 GET /api/h5/packages/my-usage 返回客户视图数据（已确认） +- [x] 30. 新增 GET /api/admin/package-usage/:id/daily-records 返回套餐流量详单（已确认） + +### 性能指标 +- [x] 31. 流量查询 API 响应时间 P95 < 200ms（已确认） +- [x] 32. 套餐激活调度延迟 < 1分钟（已确认） +- [x] 33. 轮询系统支持千万级卡规模（现有能力不退化）（已确认） + +### 测试覆盖 +- [x] 34. 核心业务逻辑单元测试覆盖率 ≥ 90%（已确认） +- [x] 35. 所有 Spec Scenarios 有对应的验收测试（已确认） +- [x] 36. 所有验收测试在实现前生成且预期 FAIL（已确认） + +--- + +## 讨论背景 + +在探索阶段，用户提出了需求方补充的套餐系统需求，核心问题包括： + +1. **套餐类型多样化**：现有系统只有按月计算的简单套餐，需要支持自然月和按天两种计算方式 +2. **囤货场景支持**：代理商需要提前为未实名设备囤货（低价采购），等待首次实名时自动激活 +3. **多套餐管理复杂度**：需要支持主套餐排队、加油包生命周期管理、流量扣减优先级等复杂逻辑 +4. **流量统计精细化**：需要三套独立的流量统计系统分别服务于客户视图、卡维度统计、套餐维度统计 + +通过详细讨论，澄清了以下关键点： +- 套餐周期类型（自然月/按天）独立于流量重置周期（日/月/年/不重置） +- 首次实名激活仅限后台管理端，客户端必须已实名才能购买 +- 主套餐同时只能有一个生效，后续购买自动排队 +- 加油包完全依附于主套餐，主套餐过期时加油包也失效 +- 流量扣减优先级：加油包 > 主套餐 + +## 关键决策记录 + +| 决策点 | 选择 | 原因 | +|--------|------|------| +| 套餐类型与重置周期 | 分为两个独立维度 | 灵活性更高，支持"自然月年套餐按年重置"等复杂场景 | +| 首次实名激活权限 | 仅限后台管理端 | 防止客户端恶意囤货，保证正常业务流程 | +| 主套餐并发控制 | 同时只能有1个生效 | 简化业务逻辑，符合运营商套餐习惯 | +| 加油包继承机制 | 不继承，跟随主套餐失效 | 避免复杂的跨套餐关联，符合运营商逻辑 | +| 流量扣减优先级 | 加油包优先 | 鼓励用户购买加油包，提升营收 | +| 历史数据处理 | 可完全重构 | 开发阶段，无需兼容历史数据 | +| 流量统计系统 | 三套独立系统 | 满足不同场景需求（客户视图、数据统计、套餐分析）| + +--- + +**签字确认**: 用户已通过 Question_tool 逐条确认以上内容 + +## 后续步骤 + +1. **生成 Proposal** - 使用 `/opsx:continue` 创建提案，定义 Capabilities +2. **设计数据模型** - 创建 Design artifact，详细设计数据库结构和业务流程 +3. **编写 Spec** - 定义详细的 API 规范和业务场景 +4. **生成验收测试** - 从 Spec Scenarios 自动生成测试骨架 +5. **实现功能** - 按照 Tasks 逐步实现 +6. **验证完成** - 确保所有验收标准通过 + diff --git a/openspec/changes/package-system-upgrade/design.md b/openspec/changes/package-system-upgrade/design.md new file mode 100644 index 0000000..70bc1f9 --- /dev/null +++ b/openspec/changes/package-system-upgrade/design.md @@ -0,0 +1,1468 @@ +# 技术设计文档: 套餐系统升级 + +## Context + +### 背景 + +当前套餐系统仅支持简单的按月计算模式，所有套餐立即生效，流量管理粗糙。新需求引入了代理商囤货场景（后台为未实名设备预购套餐，等待首次实名时自动激活）、灵活的套餐类型（自然月套餐、按天套餐）、多套餐管理（主套餐排队、加油包生命周期）、精细化流量统计（客户视图、套餐维度详单）等复杂业务逻辑。 + +### 当前状态 + +**已有实现**: +- 套餐模型 (`Package`, `PackageUsage`)：支持基础流量限额和使用统计 +- 轮询系统 (`Scheduler`)：支持千万级卡规模的实名检查、流量检查、套餐检查 +- 订单服务：支持套餐购买并立即激活（`activatePackage`） + +**现有限制**: +- `Package.DurationMonths` 只支持按月计算，无法区分自然月和按天 +- `PackageUsage.Status` 只有 1-生效中、2-已用完、3-已过期，无"待生效"和"已失效"状态 +- 无流量重置周期概念（联通27号重置、日重置/月重置需求无法支持） +- 无主套餐排队机制，同时可存在多个生效中的主套餐 +- 无加油包生命周期管理，加油包与主套餐无关联关系 +- 流量扣减无优先级，停机条件只检查单一套餐 +- 流量统计只有卡维度详单，无套餐维度详单和客户视图 + +### 约束条件 + +- 必须遵循 Handler → Service → Store → Model 分层架构 +- 禁止外键约束和 GORM 关联关系（foreignKey, hasMany, belongsTo） +- 所有常量定义在 `pkg/constants/`，禁止硬编码 +- 性能要求：套餐激活延迟 < 1分钟、API P95 < 200ms、千万级卡规模支持不退化 +- 异步任务使用 Asynq，必须支持重试和幂等性 + +### 涉众 + +- **代理商**：需要囤货功能（提前为未实名设备低价采购套餐） +- **客户（企业/个人）**：需要区分主套餐和加油包用量、查看流量详单 +- **运营团队**：需要精细化流量统计、套餐生命周期管理 +- **开发团队**：负责实施和维护升级后的套餐系统 + +--- + +## Goals / Non-Goals + +### Goals + +1. **支持灵活的套餐类型**：自然月套餐（按月边界）、按天套餐（精确天数） +2. **支持流量重置周期**：日重置、月重置（联通27号/其他1号）、年重置、不重置 +3. **支持首次实名激活**：代理商囤货场景，后台可为未实名设备购买套餐，等待实名时触发激活 +4. **支持主套餐排队**：同时只能有一个生效中主套餐，后续购买自动排队，当前过期后自动激活下一个 +5. **支持加油包生命周期**：加油包依附于主套餐，主套餐过期时级联失效 +6. **支持流量扣减优先级**：优先扣减加油包（按 priority），再扣主套餐；全部用完才停机 +7. **支持套餐流量详单**：按套餐维度记录每日流量增量，支持按日期查询 +8. **支持客户视图流量查询**：区分主套餐和加油包用量，显示总计流量 + +### Non-Goals + +1. **不支持加油包继承**：主套餐过期时，加油包统一失效（status=4），不转移到下一个主套餐 +2. **不支持加油包跨主套餐共享**：加油包只为当前主套餐服务 +3. **不支持套餐暂停/恢复**：套餐生命周期是单向的（待生效 → 生效中 → 已用完/已过期/已失效） +4. **不支持套餐流量转移**：套餐间流量不可转移或合并 +5. **不修改现有卡流量详单逻辑**：卡维度详单 (`DataUsageRecord`) 保持不变 +6. **不修改订单服务的分佣逻辑**：分佣计算逻辑不在本次改造范围内 + +--- + +## Decisions + +### 1. 数据库 Schema 设计 + +#### 1.1 Package 表扩展 + +**方案**: 在 `tb_package` 表新增 3 个字段 + +```go +type Package struct { + // ... 现有字段 ... + + // 新增字段 + CalendarType string `gorm:"column:calendar_type;type:varchar(20);not null;default:'by_day';comment:周期类型 natural_month-自然月 by_day-按天" json:"calendar_type"` + DataResetCycle string `gorm:"column:data_reset_cycle;type:varchar(20);not null;default:'none';comment:流量重置周期 daily-每日 monthly-每月 yearly-每年 none-不重置" json:"data_reset_cycle"` + EnableRealnameActivation bool `gorm:"column:enable_realname_activation;type:boolean;default:false;comment:是否需要首次实名激活（后台囤货场景）" json:"enable_realname_activation"` +} +``` + +**决策理由**: +- `calendar_type` 和 `data_reset_cycle` 是两个独立维度（套餐类型 vs 流量重置周期） +- `calendar_type=natural_month` 时必须提供 `duration_months`，`by_day` 时可提供 `duration_days`（如缺失则从 `duration_months` 转换） +- `enable_realname_activation=true` 的套餐，后台购买时创建 `PackageUsage(status=0, pending_realname_activation=true)` + +**替代方案**: +- ~~使用 `JSONB` 字段存储扩展配置~~：不利于 SQL 查询和索引，违背"优先使用结构化字段"原则 + +#### 1.2 PackageUsage 表扩展 + +**方案**: 扩展 `tb_package_usage` 表状态和新增 7 个字段 + +```go +type PackageUsage struct { + // ... 现有字段 ... + + // status 扩展：0-待生效, 1-生效中, 2-已用完, 3-已过期, 4-已失效 + Status int `gorm:"column:status;type:int;default:1;not null;comment:状态 0-待生效 1-生效中 2-已用完 3-已过期 4-已失效" json:"status"` + + // 新增字段 + Priority int `gorm:"column:priority;type:int;index;comment:优先级（主套餐排队顺序，数字越小优先级越高）" json:"priority"` + MasterUsageID *uint `gorm:"column:master_usage_id;index;comment:主套餐ID（加油包关联主套餐）" json:"master_usage_id"` + HasIndependentExpiry bool `gorm:"column:has_independent_expiry;type:boolean;default:false;comment:加油包是否有独立有效期" json:"has_independent_expiry"` + PendingRealnameActivation bool `gorm:"column:pending_realname_activation;type:boolean;default:false;comment:是否等待首次实名激活" json:"pending_realname_activation"` + DataResetCycle string `gorm:"column:data_reset_cycle;type:varchar(20);not null;default:'none';comment:流量重置周期（从 Package 复制）" json:"data_reset_cycle"` + LastResetAt *time.Time `gorm:"column:last_reset_at;comment:最后一次流量重置时间" json:"last_reset_at"` + NextResetAt *time.Time `gorm:"column:next_reset_at;comment:下次流量重置时间" json:"next_reset_at"` +} +``` + +**决策理由**: +- **priority**: 主套餐排队顺序，数字越小优先级越高（1 > 2 > 3） +- **master_usage_id**: 加油包关联主套餐 ID，实现生命周期管理（主套餐过期时级联失效） +- **has_independent_expiry**: 加油包有效期模式（true=独立有效期，false=跟随主套餐） +- **pending_realname_activation**: 标识是否等待首次实名激活（后台囤货场景） +- **data_reset_cycle**: 从 `Package.DataResetCycle` 复制，避免 JOIN 查询 +- **last_reset_at / next_reset_at**: 支持流量重置调度 + +**索引策略**: +- `priority` 索引：支持主套餐排队查询（`WHERE status=0 AND priority=MIN(priority)`） +- `master_usage_id` 索引：支持加油包级联失效查询（`WHERE master_usage_id=?`） + +**替代方案**: +- ~~使用单独的 `PackageQueue` 表管理主套餐排队~~：增加复杂度，状态分散在两个表中，不利于一致性保证 + +#### 1.3 IoT卡表扩展 + +**方案**: 在 `tb_iot_card` 表新增幂等字段 + +```go +type IotCard struct { + // ... 现有字段 ... + + // 新增字段 + FirstRealnameAt *time.Time `gorm:"column:first_realname_at;comment:首次实名时间，NULL=未实名，非NULL=已实名（幂等标记）" json:"first_realname_at"` +} +``` + +**决策理由**： +- 比 `realname_status` 字段更可靠（状态可能被重置，时间戳不可逆） +- 可追溯首次实名时间 +- 数据库层面保证唯一更新（`UPDATE SET first_realname_at=NOW() WHERE id=? AND first_realname_at IS NULL`） +- 支持幂等性：NULL=未实名，非NULL=已处理 + +**使用方式**： +```sql +-- 首次实名触发时 +UPDATE tb_iot_card +SET first_realname_at = NOW() +WHERE id = ? AND first_realname_at IS NULL; + +-- 判断是否首次实名 +SELECT first_realname_at FROM tb_iot_card WHERE id = ?; +-- NULL = 首次，执行激活逻辑 +-- 非NULL = 已处理，跳过 +``` + +#### 1.4 运营商表扩展 + +**方案**: 在 `tb_carrier` 表新增计费日配置字段 + +```go +type Carrier struct { + // ... 现有字段 ... + + // 新增字段 + BillingDay *int `gorm:"column:billing_day;comment:计费日（1-31），NULL=默认1号，27=联通" json:"billing_day"` +} +``` + +**决策理由**： +- 可配置化，无需硬编码联通27号规则 +- 支持运营商策略变更 +- 便于新运营商接入 +- 便于测试（可模拟不同计费日） + +**数据初始化**： +```sql +UPDATE tb_carrier SET billing_day = 27 WHERE name = '中国联通'; +UPDATE tb_carrier SET billing_day = 1 WHERE name IN ('中国移动', '中国电信'); +``` + +#### 1.5 新增卡日流量详单表 + +**方案**: 创建卡维度日流量统计表 + +```go +type CardDailyUsage struct { + gorm.Model + CardID uint `gorm:"column:card_id;index:idx_card_date;not null;comment:卡ID" json:"card_id"` + UsageDate time.Time `gorm:"column:usage_date;type:date;index:idx_card_date;not null;comment:使用日期" json:"usage_date"` + TotalDataUsage int64 `gorm:"column:total_data_usage;type:bigint;not null;comment:总流量使用（字节），聚合该卡当日所有套餐的用量" json:"total_data_usage"` + CarrierID int `gorm:"column:carrier_id;comment:运营商ID（冗余，便于查询）" json:"carrier_id"` +} + +// 唯一索引 +CREATE UNIQUE INDEX idx_card_date ON tb_card_daily_usage(card_id, usage_date) WHERE deleted_at IS NULL; + +// 日期索引（便于按日期范围查询） +CREATE INDEX idx_usage_date ON tb_card_daily_usage(usage_date); +``` + +**决策理由**： +- **支持卡维度流量统计查询**：不需要聚合多个套餐记录 +- **简化账单生成**：直接查询卡日流量，无需JOIN套餐表 +- **提升查询性能**：避免复杂的GROUP BY和SUM操作 +- **流量告警触发**：快速查询卡当日总流量 + +**数据来源**： +``` +卡日总流量 = SUM(该卡所有生效套餐当日增量) +``` + +**与 PackageUsageDailyRecord 的关系**： +- `PackageUsageDailyRecord`：套餐维度详单（区分主套餐和加油包） +- `CardDailyUsage`：卡维度汇总（所有套餐总和） +- 两者互补，不重复 + +#### 1.6 新增 PackageUsageDailyRecord 表 + +**方案**: 创建套餐流量日记录表 + +```go +type PackageUsageDailyRecord struct { + gorm.Model + BaseModel `gorm:"embedded"` + PackageUsageID uint `gorm:"column:package_usage_id;index:idx_usage_date;not null;comment:套餐使用记录ID" json:"package_usage_id"` + Date time.Time `gorm:"column:date;type:date;index:idx_usage_date;not null;comment:日期" json:"date"` + DailyUsageMB int64 `gorm:"column:daily_usage_mb;type:bigint;not null;comment:当日流量增量(MB)" json:"daily_usage_mb"` + CumulativeUsageMB int64 `gorm:"column:cumulative_usage_mb;type:bigint;not null;comment:累计流量(MB)" json:"cumulative_usage_mb"` +} + +// 唯一索引 +CREATE UNIQUE INDEX idx_package_usage_date ON tb_package_usage_daily_record(package_usage_id, date) WHERE deleted_at IS NULL; +``` + +**决策理由**: +- **按套餐维度记录**：每个 `PackageUsage` 每天一条记录 +- **daily_usage_mb**: 当天流量增量（基于上游累计流量计算） +- **cumulative_usage_mb**: 截至当天的累计流量 +- **联合唯一索引**：确保同一套餐同一天只有一条记录 + +**数据来源**: +``` +今日增量 = max(上游返回累计流量 - 昨日 cumulative_usage_mb, 0) +``` + +**替代方案**: +- ~~复用现有 `DataUsageRecord` 表~~：`DataUsageRecord` 按卡维度记录，无法区分主套餐和加油包，需要独立表 + +--- + +### 2. 业务流程设计 + +#### 2.1 首次实名激活流程 + +``` +┌─────────────────────────────────────────────────────────────────┐ +│ 后台订单服务（Order Service） │ +├─────────────────────────────────────────────────────────────────┤ +│ 1. 代理商为未实名设备购买套餐（enable_realname_activation=true）│ +│ 2. 创建 PackageUsage(status=0, pending_realname_activation=true)│ +│ activated_at=NULL, expires_at=NULL │ +└─────────────────────────────────────────────────────────────────┘ + ↓ +┌─────────────────────────────────────────────────────────────────┐ +│ 轮询系统 - 实名检查任务（Realname Handler） │ +├─────────────────────────────────────────────────────────────────┤ +│ 3. 检测到首次实名（realname_status: 0/1 → 2） │ +│ 4. 查询该卡/设备是否有待激活套餐 │ +│ WHERE pending_realname_activation=true AND status=0 │ +│ 5. 提交 Asynq 任务: TaskTypePackageFirstActivation │ +└─────────────────────────────────────────────────────────────────┘ + ↓ +┌─────────────────────────────────────────────────────────────────┐ +│ Asynq Handler - 套餐首次实名激活任务 │ +├─────────────────────────────────────────────────────────────────┤ +│ 6. 根据 calendar_type 计算 activated_at 和 expires_at │ +│ - natural_month: 激活时间=当前时间，过期时间=月末23:59:59 │ +│ - by_day: 激活时间=当前时间，过期时间=激活时间+N天 │ +│ 7. 更新 PackageUsage │ +│ status=1, pending_realname_activation=false, │ +│ activated_at=计算值, expires_at=计算值 │ +│ 8. 记录操作日志 │ +└─────────────────────────────────────────────────────────────────┘ +``` + +**幂等性保证**: +- 任务处理前检查 `pending_realname_activation=false`，已激活则直接返回成功 +- 使用数据库事务更新 `PackageUsage` + +**重试策略**: +- 最大重试 3 次（Asynq `MaxRetry(3)`） +- 超时时间 30 秒（Asynq `Timeout(30s)`） + +**性能目标**: +- 实名检测到激活延迟 < 30 秒（取决于轮询间隔 + 队列延迟） + +--- + +#### 2.2 主套餐排队生效流程 + +``` +┌─────────────────────────────────────────────────────────────────┐ +│ 订单服务（Order Service） │ +├─────────────────────────────────────────────────────────────────┤ +│ 1. 用户购买主套餐（package_type=formal） │ +│ 2. 查询该载体当前生效中主套餐 │ +│ WHERE usage_type=? AND (iot_card_id/device_id)=? AND │ +│ status=1 AND master_usage_id IS NULL │ +│ 3. 如果有生效中主套餐: │ +│ - 新套餐 status=0, priority=MAX(priority)+1 │ +│ - activated_at=NULL, expires_at=NULL │ +│ 如果无生效中主套餐: │ +│ - 新套餐 status=1, priority=1, 立即激活 │ +│ - 根据 calendar_type 计算 activated_at 和 expires_at │ +└─────────────────────────────────────────────────────────────────┘ + ↓ +┌─────────────────────────────────────────────────────────────────┐ +│ 轮询系统 - 套餐激活检查任务（每 10 秒调度一次） │ +├─────────────────────────────────────────────────────────────────┤ +│ 4. 查询已过期主套餐（status=1 AND expires_at <= NOW） │ +│ 5. 更新过期主套餐 status=3 │ +│ 6. 查询该载体下一个待生效主套餐 │ +│ WHERE usage_type=? AND (iot_card_id/device_id)=? AND │ +│ status=0 AND master_usage_id IS NULL │ +│ ORDER BY priority ASC LIMIT 1 │ +│ 7. 提交 Asynq 任务: TaskTypePackageQueueActivation │ +└─────────────────────────────────────────────────────────────────┘ + ↓ +┌─────────────────────────────────────────────────────────────────┐ +│ Asynq Handler - 主套餐排队激活任务 │ +├─────────────────────────────────────────────────────────────────┤ +│ 8. 根据 calendar_type 计算 activated_at 和 expires_at │ +│ 9. 更新 PackageUsage status=1, activated_at, expires_at │ +│ 10. 记录操作日志 │ +└─────────────────────────────────────────────────────────────────┘ +``` + +**激活延迟保证**: +- 目标: 主套餐过期后 1 分钟内激活下一个 +- 调度间隔: 10 秒（`Scheduler.scheduleLoop` 每 10 秒执行一次） +- 性能分析: + - 过期检查: 10 秒（最差情况，刚好错过本次调度） + - 队列延迟: < 1 秒（Asynq 队列延迟） + - 激活处理: < 5 秒（数据库更新 + 日志记录） + - **总延迟 < 20 秒**（满足 < 1 分钟要求） + +**幂等性保证**: +- 任务处理前检查 `status=1`，已激活则直接返回成功 +- 使用数据库事务 + 乐观锁（`WHERE status=0`）防止重复激活 + +--- + +#### 2.3 加油包生命周期管理 + +``` +┌─────────────────────────────────────────────────────────────────┐ +│ 订单服务（Order Service） │ +├─────────────────────────────────────────────────────────────────┤ +│ 1. 用户购买加油包（package_type=addon） │ +│ 2. 检查该载体是否有生效中或待生效主套餐 │ +│ WHERE usage_type=? AND (iot_card_id/device_id)=? AND │ +│ status IN (0,1) AND master_usage_id IS NULL │ +│ 3. 如果无主套餐: 返回错误 "必须有主套餐才能购买加油包" │ +│ 4. 创建 PackageUsage: │ +│ - master_usage_id=主套餐ID │ +│ - status=1, priority=MAX(priority)+1 (同一主套餐下) │ +│ - has_independent_expiry=套餐配置的独立有效期模式 │ +│ - 根据 has_independent_expiry 计算 expires_at │ +└─────────────────────────────────────────────────────────────────┘ + ↓ +┌─────────────────────────────────────────────────────────────────┐ +│ 轮询系统 - 套餐激活检查任务 │ +├─────────────────────────────────────────────────────────────────┤ +│ 5. 查询已过期主套餐（status=1 AND expires_at <= NOW） │ +│ 6. 更新主套餐 status=3 │ +│ 7. 查询该主套餐下的所有加油包 │ +│ WHERE master_usage_id=主套餐ID │ +│ 8. 批量更新加油包 status=4（已失效） │ +│ 9. 记录操作日志 │ +└─────────────────────────────────────────────────────────────────┘ +``` + +**有效期计算**: +- `has_independent_expiry=true`: 根据加油包套餐的 `calendar_type` 和 `duration_*` 计算 +- `has_independent_expiry=false`: `expires_at=主套餐.expires_at` + +**级联失效**: +- 主套餐过期时（`status=3`），批量更新关联加油包 `status=4` +- 不支持加油包转移到下一个主套餐 + +--- + +#### 2.4 流量扣减优先级流程 + +``` +┌─────────────────────────────────────────────────────────────────┐ +│ 轮询系统 - 流量检查任务（Carddata Handler） │ +├─────────────────────────────────────────────────────────────────┤ +│ 1. 查询上游流量（ICCID → 累计流量） │ +│ 2. 查询该卡当前生效套餐（status=1 的主套餐和加油包） │ +│ 3. 按优先级排序：加油包（按 priority ASC）→ 主套餐 │ +│ 4. 依次扣减流量: │ +│ FOR EACH 套餐 IN 优先级列表: │ +│ 剩余额度 = data_limit_mb - data_usage_mb │ +│ IF 剩余额度 > 0: │ +│ 扣减量 = MIN(本次增量, 剩余额度) │ +│ UPDATE data_usage_mb += 扣减量 │ +│ 本次增量 -= 扣减量 │ +│ 记录到 PackageUsageDailyRecord │ +│ IF data_usage_mb >= data_limit_mb: │ +│ UPDATE status=2 (已用完) │ +│ IF 本次增量 == 0: │ +│ BREAK │ +│ 5. 检查停机条件: │ +│ IF 所有套餐 data_usage_mb >= data_limit_mb: │ +│ 触发停机操作 │ +└─────────────────────────────────────────────────────────────────┘ +``` + +**停机条件**: +- 旧逻辑: 单一套餐流量用完即停机 +- 新逻辑: 主套餐 + 所有加油包流量全部用完才停机 + +**性能优化**: +- 批量查询套餐（一次 SQL 获取主套餐和所有加油包） +- 批量更新套餐（使用事务提交） + +--- + +#### 2.5 流量重置调度流程 + +``` +┌─────────────────────────────────────────────────────────────────┐ +│ 轮询系统 - 流量重置调度任务（每 10 秒调度一次） │ +├─────────────────────────────────────────────────────────────────┤ +│ 1. 每日 0 点触发日重置: │ +│ WHERE data_reset_cycle='daily' AND next_reset_at <= NOW │ +│ UPDATE data_usage_mb=0, last_reset_at=NOW, │ +│ next_reset_at=明天 00:00:00 │ +│ │ +│ 2. 每月 1 号（非联通）或 27 号（联通）触发月重置: │ +│ WHERE data_reset_cycle='monthly' AND next_reset_at <= NOW │ +│ UPDATE data_usage_mb=0, last_reset_at=NOW, │ +│ next_reset_at=下月 1号/27号 00:00:00 │ +│ │ +│ 3. 每年 1 月 1 日触发年重置: │ +│ WHERE data_reset_cycle='yearly' AND next_reset_at <= NOW │ +│ UPDATE data_usage_mb=0, last_reset_at=NOW, │ +│ next_reset_at=明年 1月 1日 00:00:00 │ +└─────────────────────────────────────────────────────────────────┘ +``` + +**重置时间计算**: +- `daily`: 每天 00:00:00 +- `monthly`: + - 联通卡（`carrier_id=CUCC`）: 每月 27 号 00:00:00 + - 其他运营商: 每月 1 号 00:00:00 +- `yearly`: 每年 1 月 1 日 00:00:00 +- `none`: 不重置（`next_reset_at=NULL`） + +**分批处理**: +- 每次最多处理 10000 条记录（避免长事务） +- 使用游标分批查询（`WHERE id > last_id`） + +**幂等性保证**: +- 使用 `next_reset_at <= NOW` 条件查询，已重置的记录 `next_reset_at` 已更新到未来时间 + +--- + +### 3. 状态机设计 + +#### 3.1 PackageUsage 状态转换图 + +``` + ┌────────────────┐ + │ 0-待生效 │ + │ (Pending) │ + └────────────────┘ + │ + ┌─────────────┼─────────────┐ + │ │ + 首次实名激活 / 主套餐排队激活 过期前删除订单 + │ │ + ↓ ↓ + ┌────────────────┐ ┌────────────────┐ + │ 1-生效中 │ │ 已删除 │ + │ (Active) │ │ (Deleted) │ + └────────────────┘ └────────────────┘ + │ + ┌───────┴───────┐ + │ │ + 流量用完 有效期过期 + │ │ + ↓ ↓ +┌────────────────┐ ┌────────────────┐ +│ 2-已用完 │ │ 3-已过期 │ +│ (Depleted) │ │ (Expired) │ +└────────────────┘ └────────────────┘ + │ │ + └───────┬───────┘ + │ + (仅加油包) 主套餐过期 + │ + ↓ + ┌────────────────┐ + │ 4-已失效 │ + │ (Invalidated) │ + └────────────────┘ +``` + +**状态说明**: +- **0-待生效**: 套餐已购买但未激活（等待首次实名或主套餐排队） +- **1-生效中**: 套餐正在生效，流量可用 +- **2-已用完**: 流量已耗尽但未过期（可续费加油包） +- **3-已过期**: 有效期已过（主套餐过期触发下一个激活） +- **4-已失效**: 加油包跟随主套餐失效（仅加油包） + +**不可逆性**: 状态转换是单向的，不支持反向转换（如已过期 → 生效中） + +--- + +### 4. API 设计 + +#### 4.1 套餐管理 API 改造 + +**创建套餐 API** + +```http +POST /api/admin/packages +Content-Type: application/json + +{ + "package_code": "PACKAGE-001", + "package_name": "联通月卡30GB", + "series_id": 1, + "package_type": "formal", + + // 新增字段 + "calendar_type": "natural_month", // 必填: natural_month | by_day + "duration_months": 1, // calendar_type=natural_month 时必填 + "duration_days": null, // calendar_type=by_day 时必填 + "data_reset_cycle": "monthly", // 必填: daily | monthly | yearly | none + "enable_realname_activation": true, // 可选，默认 false + + "real_data_mb": 30720, + "virtual_data_mb": 0, + "enable_virtual_data": false, + "cost_price": 1500, + "suggested_retail_price": 3000 +} +``` + +**响应**: +```json +{ + "code": 200, + "msg": "success", + "data": { + "id": 123, + "package_code": "PACKAGE-001", + "calendar_type": "natural_month", + "data_reset_cycle": "monthly", + "enable_realname_activation": true, + // ... 其他字段 + } +} +``` + +**更新套餐 API**: +- 支持更新 `calendar_type`、`data_reset_cycle`、`enable_realname_activation` +- `package_code` 不可修改 + +--- + +#### 4.2 客户视图流量查询 API（新增） + +```http +GET /api/h5/packages/my-usage +Authorization: Bearer +``` + +**响应**: +```json +{ + "code": 200, + "msg": "success", + "data": { + "main_package": { + "package_usage_id": 1, + "package_name": "联通月卡30GB", + "used_mb": 8192, + "total_mb": 30720, + "status": 1, + "expires_at": "2026-02-28T23:59:59Z" + }, + "addon_packages": [ + { + "package_usage_id": 2, + "package_name": "流量加油包10GB", + "used_mb": 3072, + "total_mb": 10240, + "status": 1, + "expires_at": "2026-02-28T23:59:59Z" + }, + { + "package_usage_id": 3, + "package_name": "流量加油包5GB", + "used_mb": 1024, + "total_mb": 5120, + "status": 1, + "expires_at": "2026-03-15T23:59:59Z" + } + ], + "total": { + "used_mb": 12288, + "total_mb": 46080 + } + } +} +``` + +**性能要求**: P95 < 200ms + +**查询逻辑**: +1. 根据 token 获取 `user_id` 和载体信息（`iot_card_id` 或 `device_id`） +2. 查询生效中或已用完的套餐（`WHERE status IN (1,2)`） +3. 区分主套餐（`master_usage_id IS NULL`）和加油包（`master_usage_id IS NOT NULL`） +4. 计算总计流量（主套餐 + 所有加油包） + +--- + +#### 4.3 套餐流量详单 API（新增） + +```http +GET /api/admin/package-usage/:id/daily-records?start_date=2026-02-01&end_date=2026-02-10 +Authorization: Bearer +``` + +**响应**: +```json +{ + "code": 200, + "msg": "success", + "data": { + "package_usage_id": 1, + "package_name": "联通月卡30GB", + "records": [ + { + "date": "2026-02-01", + "daily_usage_mb": 1024, + "cumulative_usage_mb": 1024 + }, + { + "date": "2026-02-02", + "daily_usage_mb": 2048, + "cumulative_usage_mb": 3072 + } + // ... + ], + "total_usage_mb": 3072 + } +} +``` + +**查询逻辑**: +1. 验证越权（使用 `middleware.CanManageShop` 或 `middleware.CanManageEnterprise`） +2. 查询日记录表（`WHERE package_usage_id=? AND date BETWEEN ? AND ?`） +3. 按 `date ASC` 排序 + +--- + +### 5. 常量管理 + +在 `pkg/constants/constants.go` 新增以下常量: + +```go +// 套餐周期类型 +const ( + PackageCalendarTypeNaturalMonth = "natural_month" // 自然月 + PackageCalendarTypeByDay = "by_day" // 按天 +) + +// 套餐流量重置周期 +const ( + PackageDataResetDaily = "daily" // 每日 + PackageDataResetMonthly = "monthly" // 每月 + PackageDataResetYearly = "yearly" // 每年 + PackageDataResetNone = "none" // 不重置 +) + +// 套餐使用状态 +const ( + PackageUsageStatusPending = 0 // 待生效 + PackageUsageStatusActive = 1 // 生效中 + PackageUsageStatusDepleted = 2 // 已用完 + PackageUsageStatusExpired = 3 // 已过期 + PackageUsageStatusInvalidated = 4 // 已失效（加油包跟随主套餐） +) + +// 任务类型 +const ( + TaskTypePackageFirstActivation = "package:first_activation" // 首次实名激活 + TaskTypePackageQueueActivation = "package:queue_activation" // 主套餐排队激活 + TaskTypePackageDataReset = "package:data_reset" // 流量重置 +) + +// Redis 键函数 +func RedisPackageActivationLockKey(usageID uint) string { + return fmt.Sprintf("package:activation:lock:%d", usageID) +} +``` + +--- + +### 6. 依赖注入设计 + +#### 6.1 Store 层 + +```go +// internal/store/postgres/package.go +type PackageStore struct { + db *gorm.DB + redis *redis.Client +} + +func NewPackageStore(db *gorm.DB, redis *redis.Client) *PackageStore { + return &PackageStore{db: db, redis: redis} +} + +// internal/store/postgres/package_usage.go +type PackageUsageStore struct { + db *gorm.DB + redis *redis.Client +} + +func NewPackageUsageStore(db *gorm.DB, redis *redis.Client) *PackageUsageStore { + return &PackageUsageStore{db: db, redis: redis} +} + +// internal/store/postgres/package_usage_daily_record.go +type PackageUsageDailyRecordStore struct { + db *gorm.DB +} + +func NewPackageUsageDailyRecordStore(db *gorm.DB) *PackageUsageDailyRecordStore { + return &PackageUsageDailyRecordStore{db: db} +} +``` + +#### 6.2 Service 层 + +```go +// internal/service/package/service.go +type Service struct { + packageStore *postgres.PackageStore + packageUsageStore *postgres.PackageUsageStore + packageSeriesStore *postgres.PackageSeriesStore + logger *zap.Logger +} + +func NewService( + packageStore *postgres.PackageStore, + packageUsageStore *postgres.PackageUsageStore, + packageSeriesStore *postgres.PackageSeriesStore, + logger *zap.Logger, +) *Service { + return &Service{ + packageStore: packageStore, + packageUsageStore: packageUsageStore, + packageSeriesStore: packageSeriesStore, + logger: logger, + } +} + +// internal/service/order/service.go +type Service struct { + // ... 现有依赖 ... + packageUsageStore *postgres.PackageUsageStore + queueClient *asynq.Client +} +``` + +#### 6.3 Handler 层 + +```go +// internal/handler/admin/package.go +type PackageHandler struct { + packageService *package_service.Service + logger *zap.Logger +} + +func NewPackageHandler( + packageService *package_service.Service, + logger *zap.Logger, +) *PackageHandler { + return &PackageHandler{ + packageService: packageService, + logger: logger, + } +} + +// internal/handler/h5/package_usage.go（新增） +type PackageUsageHandler struct { + packageUsageService *package_service.Service + logger *zap.Logger +} + +func NewPackageUsageHandler( + packageUsageService *package_service.Service, + logger *zap.Logger, +) *PackageUsageHandler { + return &PackageUsageHandler{ + packageUsageService: packageUsageService, + logger: logger, + } +} +``` + +--- + +### 7. 事务处理设计 + +#### 7.1 主套餐排队激活事务 + +```go +func (s *Service) ActivateQueuedPackage(ctx context.Context, usageID uint) error { + // 使用 Redis 分布式锁避免并发激活 + lockKey := constants.RedisPackageActivationLockKey(usageID) + lock := s.redis.SetNX(ctx, lockKey, 1, 30*time.Second) + if !lock.Val() { + return errors.New(errors.CodeConflict, "套餐正在激活中，请稍后重试") + } + defer s.redis.Del(ctx, lockKey) + + // 开启事务 + return s.db.Transaction(func(tx *gorm.DB) error { + // 1. 查询待激活套餐（加行锁） + var usage model.PackageUsage + err := tx.Where("id = ? AND status = ?", usageID, 0). + Clauses(clause.Locking{Strength: "UPDATE"}). + First(&usage).Error + if err != nil { + return errors.Wrap(errors.CodeNotFound, err, "套餐不存在或已激活") + } + + // 2. 查询套餐配置 + var pkg model.Package + if err := tx.First(&pkg, usage.PackageID).Error; err != nil { + return errors.Wrap(errors.CodeInternal, err, "查询套餐配置失败") + } + + // 3. 计算激活时间和过期时间 + activatedAt := time.Now() + expiresAt := s.calculateExpiryTime(activatedAt, pkg.CalendarType, pkg.DurationMonths, pkg.DurationDays) + + // 4. 更新 PackageUsage + err = tx.Model(&usage).Updates(map[string]interface{}{ + "status": 1, + "activated_at": activatedAt, + "expires_at": expiresAt, + }).Error + if err != nil { + return errors.Wrap(errors.CodeInternal, err, "更新套餐状态失败") + } + + // 5. 记录操作日志 + s.logger.Info("主套餐排队激活成功", + zap.Uint("usage_id", usageID), + zap.Time("activated_at", activatedAt), + zap.Time("expires_at", expiresAt)) + + return nil + }) +} +``` + +#### 7.2 加油包级联失效事务 + +```go +func (s *Service) CascadeInvalidateAddons(ctx context.Context, masterUsageID uint) error { + return s.db.Transaction(func(tx *gorm.DB) error { + // 1. 查询主套餐下的所有加油包 + var addons []*model.PackageUsage + err := tx.Where("master_usage_id = ? AND status IN (1,2)", masterUsageID). + Find(&addons).Error + if err != nil { + return errors.Wrap(errors.CodeInternal, err, "查询加油包失败") + } + + if len(addons) == 0 { + return nil // 无加油包，直接返回 + } + + // 2. 批量更新加油包状态为"已失效" + addonIDs := make([]uint, len(addons)) + for i, addon := range addons { + addonIDs[i] = addon.ID + } + + err = tx.Model(&model.PackageUsage{}). + Where("id IN ?", addonIDs). + Update("status", 4).Error + if err != nil { + return errors.Wrap(errors.CodeInternal, err, "更新加油包状态失败") + } + + // 3. 记录操作日志 + s.logger.Info("加油包级联失效完成", + zap.Uint("master_usage_id", masterUsageID), + zap.Int("invalidated_count", len(addons))) + + return nil + }) +} +``` + +--- + +## 现有代码修正清单 + +本章节列出套餐系统升级中需要修改的现有代码缺陷和不兼容逻辑。 + +### 1. 数据重置日期计算逻辑修正 + +**文件位置**: `internal/service/iot_card/traffic_utils.go` 或类似文件（需确认实际位置） + +**问题描述**: +- 当前代码硬编码按自然月重置（每月1号） +- 不支持 `by_day` 类型（购买日周期） +- 不支持联通卡特殊规则（27号重置） + +**修改方案**: +```go +// 旧代码（需删除或重构） +func calculateResetDate(activatedAt time.Time) time.Time { + return time.Date(activatedAt.Year(), activatedAt.Month()+1, 1, 0, 0, 0, 0, time.UTC) +} + +// 新代码（支持多种重置周期） +func calculateResetDate(pkg *model.Package, activatedAt time.Time, carrierID int) time.Time { + switch pkg.DataResetCycle { + case constants.PackageDataResetDaily: + // 每日：明天 00:00:00 + return time.Date(activatedAt.Year(), activatedAt.Month(), activatedAt.Day()+1, 0, 0, 0, 0, time.UTC) + + case constants.PackageDataResetMonthly: + // 每月：根据运营商确定计费日 + billingDay := 1 + if carrierID == constants.CarrierCUCC { // 联通 + billingDay = 27 + } + // 计算下个计费日 + year, month := activatedAt.Year(), activatedAt.Month()+1 + if month > 12 { + year++ + month = 1 + } + // 处理月末边界（如31号在2月不存在） + lastDayOfMonth := time.Date(year, month+1, 0, 0, 0, 0, 0, time.UTC).Day() + if billingDay > lastDayOfMonth { + billingDay = lastDayOfMonth + } + return time.Date(year, month, billingDay, 0, 0, 0, 0, time.UTC) + + case constants.PackageDataResetYearly: + // 每年：明年 1月1日 00:00:00 + return time.Date(activatedAt.Year()+1, 1, 1, 0, 0, 0, 0, time.UTC) + + case constants.PackageDataResetNone: + // 不重置 + return time.Time{} + + default: + // 默认按月 + return time.Date(activatedAt.Year(), activatedAt.Month()+1, 1, 0, 0, 0, 0, time.UTC) + } +} +``` + +**影响范围**: +- 订单服务创建套餐时计算 `next_reset_at` +- 轮询系统流量重置调度 +- 单元测试需新增联通卡、按天套餐测试用例 + +--- + +### 2. 流量扣减逻辑重构 + +**文件位置**: `internal/handler/worker/iot_card_traffic.go` 或 `internal/service/iot_card/traffic_deduction.go` + +**问题描述**: +- 当前按套餐激活顺序扣减 +- 不支持"加油包优先"规则 +- 未区分主套餐和加油包 + +**修改方案**: +```go +// 旧代码（需删除） +func (s *Service) DeductTraffic(ctx context.Context, cardID uint, increment int64) error { + // 查询生效套餐，按 activated_at ASC 排序 + packages := s.store.GetActivePackages(cardID) // 问题：不区分主套餐和加油包 + + for _, pkg := range packages { + // 按激活时间顺序扣减（错误逻辑） + ... + } +} + +// 新代码（支持优先级扣减） +func (s *Service) DeductTraffic(ctx context.Context, cardID uint, increment int64) error { + // 1. 查询卡的所有生效套餐 + packages, err := s.store.GetActivePackagesByPriority(ctx, cardID) + if err != nil { + return errors.Wrap(errors.CodeInternal, err, "查询生效套餐失败") + } + + // 2. 按优先级排序（加油包优先，再按 priority ASC, expires_at ASC, activated_at ASC） + // Store 层已排序，此处直接使用 + + // 3. 依次扣减 + remainingIncrement := increment + for _, pkg := range packages { + if remainingIncrement <= 0 { + break + } + + availableData := pkg.DataLimitMB - pkg.DataUsageMB + if availableData <= 0 { + continue // 已用完，跳过 + } + + deductAmount := min(remainingIncrement, availableData) + + // 更新套餐用量 + err := s.store.UpdateDataUsage(ctx, pkg.ID, deductAmount) + if err != nil { + return errors.Wrap(errors.CodeInternal, err, "更新套餐用量失败") + } + + // 记录日记录 + err = s.recordDailyUsage(ctx, pkg.ID, deductAmount) + if err != nil { + // 日记录失败不影响扣减（仅记录日志） + s.logger.Error("记录日用量失败", zap.Error(err)) + } + + remainingIncrement -= deductAmount + + // 检查套餐是否用完 + if pkg.DataUsageMB+deductAmount >= pkg.DataLimitMB { + err := s.store.UpdatePackageStatus(ctx, pkg.ID, constants.PackageUsageStatusDepleted) + if err != nil { + s.logger.Error("更新套餐状态失败", zap.Error(err)) + } + } + } + + // 4. 检查停机条件 + if remainingIncrement > 0 || s.shouldStopCard(ctx, cardID) { + return s.stopCard(ctx, cardID) + } + + return nil +} + +// Store 层查询方法（新增） +func (s *Store) GetActivePackagesByPriority(ctx context.Context, cardID uint) ([]*model.PackageUsage, error) { + var packages []*model.PackageUsage + err := s.db.WithContext(ctx). + Where("iot_card_id = ? AND status = ?", cardID, constants.PackageUsageStatusActive). + Order("(master_usage_id IS NOT NULL) DESC, priority ASC, expires_at ASC, activated_at ASC"). + Find(&packages).Error + return packages, err +} +``` + +**影响范围**: +- 轮询系统流量检查任务 +- Store 层新增 `GetActivePackagesByPriority` 方法 +- 单元测试需覆盖多加油包扣减场景 + +--- + +### 3. 轮询系统套餐激活入口 + +**文件位置**: `internal/handler/worker/iot_card_polling.go` + +**问题描述**: +- 当前轮询仅处理卡状态同步 +- 不处理待激活套餐队列 +- 不处理主套餐过期检测 + +**修改方案**: +```go +// 旧代码 +func (h *Handler) HandleIotCardPolling(ctx context.Context, task *asynq.Task) error { + // 解析任务参数 + var payload IotCardPollingPayload + if err := json.Unmarshal(task.Payload(), &payload); err != nil { + return err + } + + // 1. 同步卡状态 + err := h.syncCardStatus(ctx, payload.CardID) + if err != nil { + return err + } + + // 2. 同步流量 + err = h.syncCardTraffic(ctx, payload.CardID) + if err != nil { + return err + } + + // 3. 同步费用 + err = h.syncCardBalance(ctx, payload.CardID) + if err != nil { + return err + } + + return nil // 缺少套餐激活检查 +} + +// 新代码（增加套餐激活检查） +func (h *Handler) HandleIotCardPolling(ctx context.Context, task *asynq.Task) error { + // ... 现有逻辑：同步卡状态、流量、费用 + + // 4. 新增：检查并激活排队套餐 + card, err := h.iotCardStore.GetByID(ctx, payload.CardID) + if err != nil { + return err + } + + if card.Status == constants.IotCardStatusActive { + // 检查是否有待激活套餐 + err := h.packageActivationService.CheckAndActivateQueuedPackages(ctx, card.ID) + if err != nil { + // 不中断轮询，记录日志继续 + h.logger.Error("激活排队套餐失败", + zap.Uint("card_id", card.ID), + zap.Error(err)) + } + } + + // 5. 新增：检查主套餐是否过期 + err = h.packageActivationService.CheckExpiredPackages(ctx, card.ID) + if err != nil { + h.logger.Error("检查过期套餐失败", + zap.Uint("card_id", card.ID), + zap.Error(err)) + } + + return nil +} +``` + +**影响范围**: +- 轮询系统 Handler 层 +- 新增 `PackageActivationService` 依赖注入 +- 集成测试需验证完整轮询流程 + +--- + +### 4. 加油包过期级联处理 + +**位置**: 新增功能，无现有代码需修改 + +**说明**: +- 当前系统无加油包概念，这是全新功能 +- 需在套餐过期处理流程中增加级联失效逻辑 +- 详见 `addon-package-lifecycle/spec.md` + +**新增代码位置**: +- `internal/service/package/lifecycle_service.go`（新建） +- `internal/handler/worker/package_expiry.go`（新建或扩展） + +**核心逻辑**: +```go +func (s *Service) HandleMainPackageExpiry(ctx context.Context, mainPackageID uint) error { + tx := s.db.BeginTx(ctx) + defer tx.Rollback() + + // 1. 更新主套餐状态为已过期 + err := s.store.UpdatePackageStatus(ctx, tx, mainPackageID, constants.PackageUsageStatusExpired) + if err != nil { + return err + } + + // 2. 查询关联的加油包 + addons, err := s.store.GetAddonsByMasterID(ctx, mainPackageID) + if err != nil { + return err + } + + // 3. 批量级联失效加油包 + if len(addons) > 0 { + addonIDs := extractIDs(addons) + err = s.store.BatchUpdateStatus(ctx, tx, addonIDs, constants.PackageUsageStatusInvalidated) + if err != nil { + return err + } + } + + // 4. 提交事务 + if err := tx.Commit().Error; err != nil { + return err + } + + // 5. 记录审计日志 + s.auditService.LogOperation(ctx, &model.OperationLog{ + OperationType: "cascade_invalidate", + OperationDesc: fmt.Sprintf("主套餐ID=%d过期，级联失效%d个加油包", mainPackageID, len(addons)), + }) + + return nil +} +``` + +--- + +### 5. 停机条件更新 + +**文件位置**: `internal/service/iot_card/stop_service.go` 或类似文件 + +**问题描述**: +- 旧逻辑：单一套餐流量用完即停机 +- 新逻辑：主套餐 + 所有加油包流量全部用完才停机 + +**修改方案**: +```go +// 旧代码（需删除） +func (s *Service) CheckStopCondition(ctx context.Context, cardID uint) (bool, error) { + // 查询生效中套餐 + pkg, err := s.store.GetActiveMainPackage(ctx, cardID) + if err != nil { + return false, err + } + + // 旧逻辑：主套餐用完即停机（错误） + if pkg.DataUsageMB >= pkg.DataLimitMB { + return true, nil + } + + return false, nil +} + +// 新代码（检查所有套餐） +func (s *Service) CheckStopCondition(ctx context.Context, cardID uint) (bool, error) { + // 查询所有生效中的套餐（包括主套餐和加油包） + count, err := s.store.CountAvailablePackages(ctx, cardID) + if err != nil { + return false, err + } + + // 新逻辑：所有套餐都用完才停机 + return count == 0, nil +} + +// Store 层查询方法（新增） +func (s *Store) CountAvailablePackages(ctx context.Context, cardID uint) (int64, error) { + var count int64 + err := s.db.WithContext(ctx). + Model(&model.PackageUsage{}). + Where("iot_card_id = ? AND status = ? AND data_usage_mb < data_limit_mb", + cardID, constants.PackageUsageStatusActive). + Count(&count).Error + return count, err +} +``` + +**影响范围**: +- 轮询系统流量检查后的停机判断 +- 单元测试需覆盖"加油包剩余流量不停机"场景 + +--- + +## Risks / Trade-offs + +### 1. [性能] 套餐激活调度频率 vs 激活延迟 + +**Risk**: +- 调度间隔 10 秒，最差情况下主套餐过期后 20 秒内激活下一个 +- 如果同时有大量套餐过期，可能出现队列堆积 + +**Mitigation**: +- 调度间隔可配置（默认 10 秒），支持运行时调整 +- 套餐激活任务使用独立队列（优先级高于其他任务） +- 监控 Asynq 队列长度和处理延迟，告警阈值设置为 1 分钟 + +--- + +### 2. [复杂度] 流量扣减优先级逻辑的边界条件 + +**Risk**: +- 多个加油包 + 主套餐的流量扣减逻辑复杂，容易出现边界问题（如负数流量、扣减不完全） +- 并发场景下可能出现流量扣减不一致 + +**Mitigation**: +- 流量扣减使用数据库事务 + 行锁（`SELECT FOR UPDATE`） +- 单元测试覆盖所有边界条件： + - 流量刚好用完 + - 流量超出剩余额度 + - 多个加油包同时用完 + - 主套餐和加油包同时用完 +- 代码层面强制约束 `data_usage_mb >= 0` + +--- + +### 3. [迁移] 历史数据兼容性 + +**Risk**: +- 现有 `PackageUsage` 数据没有 `priority`、`master_usage_id` 等新字段 +- 现有套餐没有 `calendar_type`、`data_reset_cycle` 字段 + +**Mitigation**: +- 数据库迁移脚本为新字段设置默认值： + - `Package.calendar_type` 默认 `by_day` + - `Package.data_reset_cycle` 默认 `none` + - `PackageUsage.priority` 默认 `1`（历史主套餐） + - `PackageUsage.master_usage_id` 默认 `NULL`（历史主套餐） +- 迁移后运行数据校验脚本，确保历史数据一致性 + +--- + +### 4. [兼容性] 客户端未实名购买限制 + +**Risk**: +- 现有 H5 端允许未实名客户购买套餐，新限制可能导致用户体验下降 + +**Mitigation**: +- 前端在购买按钮前置提示"请先完成实名认证" +- API 返回清晰的错误消息："设备/卡必须先完成实名认证才能购买套餐" +- 后台管理端不受限制，代理商可为未实名设备囤货 + +--- + +### 5. [数据一致性] 流量重置可能丢失部分流量记录 + +**Risk**: +- 流量重置时 `data_usage_mb=0`，如果在重置前有流量增量未记录到日记录表，会导致数据丢失 + +**Mitigation**: +- 流量重置前先触发一次流量检查，确保最新流量已记录 +- 流量重置和流量检查不在同一事务中，避免长事务 +- 监控流量重置任务的执行日志，告警异常情况 + +--- + +## Migration Plan + +### 阶段 1: 数据库迁移 + +1. **创建迁移脚本**: + ```bash + make create-migration name=package_system_upgrade + ``` + +2. **迁移内容**: + - 修改 `tb_package` 表（新增 3 个字段） + - 修改 `tb_package_usage` 表（扩展 status 枚举，新增 7 个字段） + - 创建 `tb_package_usage_daily_record` 表 + - 创建索引（priority, master_usage_id, package_usage_id+date） + +3. **回滚策略**: + - 删除新增表 `tb_package_usage_daily_record` + - 删除新增字段（使用 `ALTER TABLE DROP COLUMN`） + - 注意：状态枚举扩展无法回滚（已写入的 status=0/4 数据会保留） + +--- + +### 阶段 2: 代码实施 + +1. **Model 层**: + - 扩展 `Package` 和 `PackageUsage` 模型 + - 创建 `PackageUsageDailyRecord` 模型 + +2. **Store 层**: + - 扩展 `PackageStore` 和 `PackageUsageStore` 查询方法 + - 创建 `PackageUsageDailyRecordStore` + +3. **Service 层**: + - 扩展 `package.Service` 支持新字段 + - 改造 `order.Service` 的 `activatePackage` 函数（主套餐排队、加油包限制） + - 创建套餐激活 Service（首次实名激活、排队激活） + +4. **Handler 层**: + - 改造 `admin.PackageHandler` 支持新字段 + - 创建 `h5.PackageUsageHandler` 提供客户视图 API + +5. **轮询系统**: + - 扩展 `HandleCarddataCheck` 支持流量扣减优先级和停机条件 + - 创建 `HandlePackageActivation` 套餐激活检查任务 + - 创建 `HandleDataReset` 流量重置调度任务 + +6. **Asynq Handler**: + - 创建 `HandlePackageFirstActivation` 首次实名激活任务 + - 创建 `HandlePackageQueueActivation` 主套餐排队激活任务 + +--- + +### 阶段 3: 测试和验证 + +1. **单元测试**: + - 套餐有效期计算逻辑（自然月 vs 按天） + - 流量扣减优先级逻辑（边界条件） + - 流量重置时间计算（联通27号 vs 其他1号） + +2. **集成测试**: + - 首次实名激活流程（囤货 → 实名 → 激活） + - 主套餐排队流程（购买 → 排队 → 过期 → 激活） + - 加油包生命周期（购买 → 主套餐过期 → 加油包失效） + - 流量扣减和停机（加油包优先 → 主套餐 → 停机） + +3. **性能测试**: + - 套餐激活延迟（目标 < 1 分钟） + - 客户视图 API 性能（P95 < 200ms） + - 轮询系统千万级卡规模支持不退化 + +--- + +### 阶段 4: 部署和回滚策略 + +1. **灰度发布**: + - 先在测试环境部署，完整验证所有流程 + - 生产环境先部署代码（特性开关关闭） + - 执行数据库迁移 + - 开启特性开关，观察日志和监控 + +2. **回滚策略**: + - **代码回滚**: 关闭特性开关 → 回滚代码 + - **数据库回滚**: 执行回滚迁移脚本（注意状态枚举扩展无法回滚） + - **数据修复**: 如有脏数据（status=0/4），手动修正或保留（不影响现有功能） + +3. **监控指标**: + - Asynq 任务队列长度和处理延迟 + - 套餐激活延迟（从过期到激活的时间） + - API 响应时间（客户视图 API P95） + - 流量扣减错误率（日志错误数） + +--- + +## Open Questions + +1. **加油包优先级分配策略**：是否需要支持手动调整加油包的扣减顺序？还是严格按购买顺序（priority）？ + - **当前决策**: 严格按 priority（购买顺序），不支持手动调整 + - **未来扩展**: 可考虑在 API 中支持更新 priority（需要验证业务必要性） + +2. **流量重置时的日记录处理**：流量重置后，是否需要在日记录表中新增一条"重置记录"（daily_usage_mb=0）？ + - **当前决策**: 不新增重置记录，日记录只记录实际流量增量 + - **原因**: 避免日记录表膨胀，重置信息可从 `PackageUsage.last_reset_at` 获取 + +3. **客户端实名校验的异常场景**：如果用户在支付成功后、订单完成前完成实名，是否允许购买？ + - **当前决策**: 订单创建时检查实名状态，支付完成后不再检查 + - **原因**: 简化逻辑，避免状态不一致（支付成功但订单失败） + +4. **套餐激活失败的重试策略**：如果 Asynq 任务重试 3 次后仍失败，套餐是否永久停留在"待生效"状态？ + - **当前决策**: 是，需要人工介入修复 + - **监控**: 告警通知 + 日志记录，运营团队定期检查 + +5. **历史套餐的 data_reset_cycle 默认值**：现有套餐迁移后 `data_reset_cycle=none`，如需调整为 `monthly`，是否需要批量更新？ + - **当前决策**: 不批量更新，仅对新套餐生效 + - **原因**: 避免影响历史套餐的流量统计（用户预期不重置） diff --git a/openspec/changes/package-system-upgrade/proposal.md b/openspec/changes/package-system-upgrade/proposal.md new file mode 100644 index 0000000..51ad40b --- /dev/null +++ b/openspec/changes/package-system-upgrade/proposal.md @@ -0,0 +1,114 @@ +# Proposal: 套餐系统升级 - 支持自然月/按天套餐与多套餐管理 + +## Why + +现有套餐系统仅支持简单的按月计算模式，无法满足业务方提出的复杂套餐需求。具体痛点包括：(1) 代理商囤货场景无法支持 - 需要提前为未实名设备低价采购套餐，等待首次实名时自动激活；(2) 套餐类型单一 - 缺少自然月套餐（按月边界计算）和按天套餐（灵活天数）；(3) 多套餐管理混乱 - 主套餐可同时多个生效、加油包无生命周期管理、流量扣减无优先级；(4) 流量统计不精细 - 客户无法区分主套餐和加油包用量，缺少套餐维度的流量详单。这些限制直接影响运营效率和用户体验。 + +## What Changes + +### 套餐模型扩展 +- 新增 `calendar_type` 字段：支持 `natural_month`（自然月套餐）和 `by_day`（按天套餐） +- 新增 `data_reset_cycle` 字段：支持 `daily`、`monthly`、`yearly`、`none` 四种流量重置周期 +- 新增 `enable_realname_activation` 字段：标识是否需要首次实名激活（后台囤货场景） + +### 套餐使用记录扩展 +- PackageUsage 表 `status` 字段扩展： + - 0 - 待生效（等待实名或排队中） + - 1 - 生效中 + - 2 - 已用完 + - 3 - 已过期 + - 4 - 已失效（加油包跟随主套餐失效） +- 新增 `priority` 字段：主套餐排队顺序（数字越小优先级越高） +- 新增 `master_usage_id` 字段：加油包关联的主套餐ID +- 新增 `has_independent_expiry` 字段：加油包是否有独立有效期 +- 新增 `pending_realname_activation` 字段：是否等待实名激活 +- 新增流量重置相关字段：`data_reset_cycle`、`last_reset_at`、`next_reset_at` + +### 新增套餐流量日记录表 +- 创建 `PackageUsageDailyRecord` 表，按套餐维度记录每日流量增量 +- 字段：`package_usage_id`、`date`、`daily_usage_mb`、`cumulative_usage_mb` +- 索引：`package_usage_id + date` 联合唯一索引 + +### 业务逻辑改造 +- **首次实名激活**：轮询系统检测到首次实名时，触发 Asynq 任务激活待生效套餐 +- **主套餐排队**：订单服务购买主套餐时，自动分配 priority，当前主套餐过期后调度器自动激活下一个 +- **加油包生命周期**：主套餐过期时，轮询系统级联失效其关联的所有加油包 +- **流量扣减优先级**：轮询系统更新流量时，优先扣减加油包（按 priority），再扣主套餐 +- **停机条件**：轮询系统检查主套餐 + 所有加油包流量都用完才触发停机 +- **流量重置调度**：定时任务根据 `data_reset_cycle` 定期重置套餐流量 + +### API 改造 +- **套餐管理 API** (`/api/admin/packages`)： + - POST/PUT 支持新增字段（calendar_type, data_reset_cycle, enable_realname_activation） + - GET 返回包含新增字段 +- **订单 API** (`/api/admin/orders` 和 `/api/h5/orders`)： + - POST 支持主套餐排队逻辑（自动分配 priority） + - POST 支持加油包购买限制（必须有主套餐） + - 客户端未实名时购买套餐返回错误 +- **流量查询 API**（新增）： + - `GET /api/h5/packages/my-usage` - 客户视图（主套餐、每个加油包、总计） + - `GET /api/admin/package-usage/:id/daily-records` - 套餐流量详单（按日） + - 现有卡流量详单继续按卡维度统计 + +### 轮询系统扩展 +- 新增套餐激活检查任务（HandlePackageActivation） +- 新增流量重置调度任务（HandleDataReset） +- 扩展流量检查任务（HandleCarddataCheck）支持新的扣减优先级和停机条件 + +## Capabilities + +### New Capabilities +- `package-calendar-type` - 套餐周期类型管理（自然月/按天） +- `package-data-reset` - 套餐流量重置周期管理 +- `package-realname-activation` - 首次实名激活机制 +- `package-queue-activation` - 主套餐排队生效机制 +- `addon-package-lifecycle` - 加油包生命周期管理 +- `package-usage-priority` - 流量扣减优先级机制 +- `package-usage-daily-record` - 套餐流量日记录 +- `package-usage-customer-view` - 客户视图流量查询 + +### Modified Capabilities +- `package-management` - 套餐管理能力扩展（新增字段支持） +- `order-management` - 订单管理能力扩展（主套餐排队、加油包购买限制） +- `iot-card` - IoT卡轮询系统扩展（流量扣减优先级、停机条件） + +## Impact + +### 数据库 +- 修改 `tb_package` 表（新增 3 个字段） +- 修改 `tb_package_usage` 表（新增 7 个字段，扩展 status 枚举） +- 新增 `tb_package_usage_daily_record` 表 +- 需要数据库迁移脚本 + +### 代码模块 +- `internal/model/package.go` - Package 和 PackageUsage 模型扩展 +- `internal/model/package_usage_daily_record.go` - 新增模型 +- `internal/service/order/` - 订单服务改造（主套餐排队、加油包限制） +- `internal/service/package/` - 套餐服务改造（支持新字段） +- `internal/polling/` - 轮询系统扩展（激活调度、流量扣减优先级、重置调度） +- `internal/handler/admin/package.go` - Handler 层 API 改造 +- `internal/handler/h5/package_usage.go` - 新增客户视图 Handler +- `internal/store/postgres/package*.go` - Store 层查询逻辑扩展 +- `pkg/errors/codes.go` - 新增错误码 + +### API +- **BREAKING** - `POST /api/admin/packages` 请求体新增可选字段 +- **BREAKING** - `GET /api/admin/packages/:id` 响应体新增字段 +- **NEW** - `GET /api/h5/packages/my-usage` - 客户视图 +- **NEW** - `GET /api/admin/package-usage/:id/daily-records` - 套餐流量详单 +- **BREAKING** - `POST /api/admin/orders` 和 `POST /api/h5/orders` 行为变更（主套餐排队、加油包限制） + +### 依赖系统 +- **Asynq 任务队列** - 新增套餐激活任务类型、流量重置任务类型 +- **轮询系统** - 扩展流量检查、新增激活检查、新增重置调度 +- **OpenAPI 文档生成器** - 需要更新以支持新增 Handler + +### 性能 +- 套餐激活调度延迟目标 < 1分钟 +- 流量查询 API P95 < 200ms（现有要求保持） +- 轮询系统千万级卡规模支持不退化 + +### 测试 +- 核心业务逻辑单元测试覆盖率 ≥ 90% +- 所有 Spec Scenarios 有对应的验收测试 +- 需要编写集成测试验证完整流程（囤货 → 实名 → 激活 → 扣减 → 重置） diff --git a/openspec/changes/package-system-upgrade/specs/addon-package-lifecycle/spec.md b/openspec/changes/package-system-upgrade/specs/addon-package-lifecycle/spec.md new file mode 100644 index 0000000..8f49f28 --- /dev/null +++ b/openspec/changes/package-system-upgrade/specs/addon-package-lifecycle/spec.md @@ -0,0 +1,753 @@ +# Spec: 加油包生命周期管理 + +## 业务背景 + +### 为什么需要加油包生命周期管理 + +**现状问题**： +- 加油包与主套餐无明确关联，导致主套餐过期后加油包仍可使用（业务逻辑混乱） +- 加油包有效期管理不清晰，无法区分"独立有效期"和"跟随主套餐"两种模式 +- 主套餐切换时，旧加油包是否继承到新主套餐无明确规则 +- 用户购买加油包时无主套餐检查，可能导致加油包无法使用 + +**业务目标**： +- 加油包必须依附于主套餐才能购买和使用 +- 主套餐过期时，其关联的加油包自动失效（级联失效） +- 支持两种有效期模式：独立有效期（固定时长）和跟随主套餐（与主套餐同时到期） +- 主套餐切换时，旧加油包不继承到新主套餐（用户需重新购买） + +--- + +## 业务规则 + +### 1. 依附规则 + +加油包必须在有主套餐的情况下才能购买： + +``` +购买加油包前置检查： +1. 查询载体当前是否有主套餐（package_type=formal AND status IN (0待生效, 1生效中)） +2. 如果无主套餐 → 返回错误 400："必须有主套餐才能购买加油包" +3. 如果有主套餐 → 允许购买 +``` + +### 2. 关联规则 + +加油包创建时自动关联到当前生效中的主套餐： + +``` +确定 master_usage_id 的逻辑： +1. 查询载体当前生效中的主套餐（package_type=formal AND status=1） +2. 如果有生效中主套餐 → master_usage_id = 该主套餐ID +3. 如果无生效中主套餐，但有待生效主套餐（status=0）→ master_usage_id = priority 最小的待生效主套餐ID +4. 创建 PackageUsage 记录： + - package_type = addon + - master_usage_id = 上述确定的主套餐ID + - status = 0（待生效） + - has_independent_expiry = 根据套餐配置 +``` + +### 3. 有效期模式 + +加油包支持两种有效期模式： + +| 模式 | has_independent_expiry | 计算规则 | 过期条件 | +|------|------------------------|----------|----------| +| **独立有效期** | true | `expires_at = activated_at + duration_days` | 自身到期时间到达 | +| **跟随主套餐** | false | `expires_at = master套餐.expires_at` | 主套餐到期时间到达 | + +**独立有效期加油包**： +- 激活时计算自己的 `expires_at` +- 可能在主套餐之前过期 +- 到期后 `status=3`（已过期） + +**跟随主套餐加油包**： +- 激活时 `expires_at = master套餐.expires_at` +- 主套餐 `expires_at` 更新时，同步更新所有跟随的加油包 +- 与主套餐同时到期 + +### 4. 级联失效规则 + +主套餐过期时，级联失效其所有关联的加油包： + +``` +主套餐过期触发级联失效： +1. 主套餐 status 变为 3（已过期）时触发 +2. 查询所有 master_usage_id = 主套餐ID 的加油包 +3. 批量更新这些加油包 status = 4（已失效） +4. 不管加油包是否有独立有效期、是否已用完 +5. 记录级联失效日志 +``` + +**失效状态说明**： +- `status=3`（已过期）：自身有效期到达 +- `status=4`（已失效）：主套餐过期导致的级联失效 + +### 5. 不继承规则 + +旧主套餐过期后，其加油包不继承到新主套餐： + +``` +新主套餐激活时： +1. 不更新旧加油包的 master_usage_id +2. 旧加油包保持 status=4（已失效） +3. 用户需为新主套餐重新购买加油包 +4. 新加油包 master_usage_id = 新主套餐ID +``` + +### 6. 订单购买限制 + +**同订单禁止混买正式套餐和加油包**： + +``` +订单创建校验规则： +1. 检查订单项中是否同时包含 package_type=formal 和 package_type=addon +2. 如果混买 → 返回错误 400："同订单不能同时购买正式套餐和加油包" +3. 原因：加油包依赖主套餐激活，订单处理时序无法保证主套餐先激活 +4. 解决方案：前端购物车分类展示，提示用户分两单购买 +``` + +**技术实现**： +```go +// 订单创建时校验 +func (s *OrderService) ValidateOrderItems(items []*OrderItem) error { + hasMainPackage := false + hasAddonPackage := false + + for _, item := range items { + pkg, err := s.packageStore.GetByID(item.PackageID) + if err != nil { + return err + } + + if pkg.PackageType == constants.PackageTypeFormal { + hasMainPackage = true + } else if pkg.PackageType == constants.PackageTypeAddon { + hasAddonPackage = true + } + } + + if hasMainPackage && hasAddonPackage { + return errors.New(errors.CodeInvalidParam, "同订单不能同时购买正式套餐和加油包") + } + + return nil +} +``` + +--- + +## ADDED Requirements + +### Requirement: 加油包必须依附于主套餐 + +系统 SHALL 禁止在无主套餐（无 package_type=formal status=1 或 status=0 的套餐）时购买加油包。 + +#### Scenario: 无主套餐时购买加油包失败 +- **GIVEN** 载体 ICCID=123456，无任何主套餐（无 package_type=formal status IN (0,1)） +- **WHEN** 用户尝试购买加油包（package_type=addon） +- **THEN** 系统返回错误 400，错误码 `ADDON_REQUIRES_MASTER`，错误消息："必须有主套餐才能购买加油包" + +#### Scenario: 有主套餐时可购买加油包 +- **GIVEN** 载体有生效中主套餐（ID=123, status=1） +- **WHEN** 用户购买加油包（package_id=456） +- **THEN** 系统创建订单成功，PackageUsage master_usage_id=123, package_type=addon, status=0 + +#### Scenario: 只有待生效主套餐时可购买加油包 +- **GIVEN** 载体有待生效主套餐（ID=123, status=0, priority=1） +- **WHEN** 用户购买加油包 +- **THEN** 系统创建订单成功，加油包 master_usage_id=123 + +### Requirement: 加油包关联主套餐 + +系统 SHALL 在创建加油包使用记录时，将其 master_usage_id 设置为当前生效中或最高优先级待生效的主套餐ID。 + +#### Scenario: 加油包关联当前生效中主套餐 +- **GIVEN** 载体有生效中主套餐（ID=123, status=1） +- **WHEN** 用户购买加油包 +- **THEN** 系统创建 PackageUsage： + - master_usage_id=123 + - package_type=addon + - status=0 + +#### Scenario: 多个主套餐时关联生效中的主套餐 +- **GIVEN** 载体有： + - 生效中主套餐（ID=123, status=1, priority=1） + - 待生效主套餐（ID=124, status=0, priority=2） + - 待生效主套餐（ID=125, status=0, priority=3） +- **WHEN** 用户购买加油包 +- **THEN** 加油包 master_usage_id=123（优先关联生效中的主套餐） + +#### Scenario: 只有待生效主套餐时关联优先级最高的 +- **GIVEN** 载体有： + - 待生效主套餐（ID=124, status=0, priority=1） + - 待生效主套餐（ID=125, status=0, priority=2） +- **WHEN** 用户购买加油包 +- **THEN** 加油包 master_usage_id=124（priority=1 最高） + +### Requirement: 支持独立有效期加油包 + +系统 SHALL 支持加油包配置 has_independent_expiry=true，拥有独立的有效期。 + +#### Scenario: 独立有效期加油包激活时计算过期时间 +- **GIVEN** 加油包 has_independent_expiry=true，duration_days=30 +- **WHEN** 加油包在 2026-02-01 00:00:00 激活 +- **THEN** 系统计算 expires_at=2026-03-02 23:59:59（+30天） + +#### Scenario: 独立有效期加油包过期 +- **GIVEN** 加油包 has_independent_expiry=true，expires_at=2026-02-28 23:59:59，data_usage_mb=50（未用完） +- **WHEN** 系统时间到达 2026-03-01 00:00:00 +- **THEN** 定时任务将加油包 status 更新为 3（已过期） + +#### Scenario: 独立有效期加油包在主套餐有效期内过期 +- **GIVEN** 主套餐有效期到 2026-12-31 23:59:59 +- **AND** 加油包 has_independent_expiry=true，expires_at=2026-03-31 23:59:59 +- **WHEN** 系统时间到达 2026-04-01 00:00:00 +- **THEN** 加油包 status=3（已过期），主套餐仍为 status=1（生效中） + +#### Scenario: 独立有效期加油包在主套餐过期后仍失效 +- **GIVEN** 加油包 has_independent_expiry=true，expires_at=2026-12-31 23:59:59（未到期） +- **AND** 主套餐 expires_at=2026-11-30 23:59:59 +- **WHEN** 主套餐在 2026-12-01 00:00:00 过期（status=3） +- **THEN** 加油包被级联失效（status=4），不管自身 expires_at + +### Requirement: 支持跟随主套餐的加油包 + +系统 SHALL 支持加油包配置 has_independent_expiry=false，跟随主套餐有效期。 + +#### Scenario: 跟随主套餐的加油包激活时同步到期时间 +- **GIVEN** 加油包 has_independent_expiry=false，master 主套餐 expires_at=2026-12-31 23:59:59 +- **WHEN** 加油包在 2026-02-01 00:00:00 激活 +- **THEN** 系统设置加油包 expires_at=2026-12-31 23:59:59（与主套餐相同） + +#### Scenario: 主套餐更新有效期时同步加油包 +- **GIVEN** 主套餐 ID=123，expires_at=2026-12-31 23:59:59 +- **AND** 有3个加油包 master_usage_id=123，has_independent_expiry=false +- **WHEN** 主套餐 expires_at 被更新为 2027-01-31 23:59:59 +- **THEN** 系统批量更新这3个加油包 expires_at=2027-01-31 23:59:59 + +#### Scenario: 主套餐有效期更新时不影响独立有效期加油包 +- **GIVEN** 主套餐 ID=123，expires_at=2026-12-31 23:59:59 +- **AND** 加油包A：has_independent_expiry=true，expires_at=2026-06-30 23:59:59 +- **AND** 加油包B：has_independent_expiry=false，expires_at=2026-12-31 23:59:59 +- **WHEN** 主套餐 expires_at 更新为 2027-01-31 23:59:59 +- **THEN** 加油包A expires_at 保持 2026-06-30 23:59:59（不变） +- **AND** 加油包B expires_at 更新为 2027-01-31 23:59:59 + +#### Scenario: 跟随主套餐的加油包与主套餐同时过期 +- **GIVEN** 主套餐 expires_at=2026-12-31 23:59:59 +- **AND** 加油包 has_independent_expiry=false，expires_at=2026-12-31 23:59:59 +- **WHEN** 系统时间到达 2027-01-01 00:00:00 +- **THEN** 定时任务将主套餐和加油包 status 都更新为 3（已过期） + +### Requirement: 主套餐过期时级联失效加油包 + +系统 SHALL 在主套餐过期（status 变为 3）时，将其所有关联加油包的 status 设置为 4（已失效）。 + +#### Scenario: 主套餐过期触发加油包失效 +- **GIVEN** 主套餐 ID=123，expires_at=2026-12-31 23:59:59 +- **AND** 有3个加油包 master_usage_id=123： + - 加油包A：data_usage_mb=50（未用完） + - 加油包B：data_usage_mb=200（已用完） + - 加油包C：has_independent_expiry=true，expires_at=2027-06-30（未到期） +- **WHEN** 系统时间到达 2027-01-01 00:00:00，主套餐 status=3 +- **THEN** 系统批量更新这3个加油包 status=4（已失效） + +#### Scenario: 独立有效期加油包也会级联失效 +- **GIVEN** 主套餐 expires_at=2026-11-30 23:59:59 +- **AND** 加油包 has_independent_expiry=true，expires_at=2026-12-31 23:59:59（晚于主套餐） +- **WHEN** 主套餐在 2026-12-01 00:00:00 过期 +- **THEN** 加油包 status=4（已失效），不管自身还有30天才到期 + +#### Scenario: 已过期加油包不重复失效 +- **GIVEN** 主套餐 expires_at=2026-12-31 23:59:59 +- **AND** 加油包 has_independent_expiry=true，expires_at=2026-11-30 23:59:59，status=3（已过期） +- **WHEN** 主套餐在 2027-01-01 00:00:00 过期 +- **THEN** 加油包 status 保持 3（已过期），不更新为 4 + +#### Scenario: 级联失效记录到审计日志 +- **GIVEN** 主套餐 ID=123 过期，有5个关联加油包 +- **WHEN** 系统执行级联失效 +- **THEN** 系统记录审计日志： + - operation_type=cascade_invalidate + - operation_desc="主套餐ID=123过期，级联失效5个加油包" + - before_data=加油包列表及原状态 + - after_data=加油包列表及新状态（status=4） + +### Requirement: 加油包不继承到新主套餐 + +系统 SHALL 确保旧主套餐过期后，其加油包不会自动关联到新激活的主套餐。 + +#### Scenario: 新主套餐激活后加油包不关联 +- **GIVEN** 主套餐A（ID=123）在 2026-12-31 过期，其加油包已失效（status=4） +- **WHEN** 主套餐B（ID=124）在 2027-01-01 激活（priority=2 → status=1） +- **THEN** 主套餐A的加油包 master_usage_id 保持 123，status 保持 4 +- **AND** 主套餐B 无关联加油包 + +#### Scenario: 用户需为新主套餐重新购买加油包 +- **GIVEN** 主套餐B（ID=124）刚激活（status=1） +- **WHEN** 用户购买新加油包 +- **THEN** 新加油包 master_usage_id=124，status=0 + +#### Scenario: 旧加油包不可重新激活 +- **GIVEN** 主套餐A的加油包（ID=999）已失效（status=4） +- **WHEN** 用户尝试手动激活这个加油包 +- **THEN** 系统返回错误 400，错误码 `ADDON_MASTER_EXPIRED`，错误消息："关联的主套餐已过期，无法激活加油包" + +--- + +## 边界条件 + +### 1. 主套餐失效但加油包未用完 + +- **场景**：主套餐过期时，加油包流量只用了10% +- **处理**：仍然级联失效（status=4），剩余流量不可用 +- **业务规则**：加油包依附于主套餐，主套餐失效则加油包失效 + +### 2. 多个主套餐同时存在 + +- **场景**：有1个生效中主套餐 + 2个待生效主套餐 +- **购买加油包时**：关联到生效中的主套餐 +- **主套餐A过期后**：加油包随A失效，不继承到主套餐B + +### 3. 并发购买加油包 + +- **场景**：两个请求同时为同一载体购买加油包 +- **处理**： + - 使用事务 + 行锁：`SELECT * FROM package_usage WHERE carrier_id=? AND package_type=formal AND status IN (0,1) ORDER BY status DESC, priority ASC FOR UPDATE` + - 确保两个加油包关联到同一个主套餐 + +### 4. 主套餐有效期更新失败 + +- **场景**：主套餐 expires_at 更新时，同步跟随加油包失败 +- **处理**： + - 使用事务包裹主套餐更新和加油包批量更新 + - 更新失败则回滚，返回错误 500 + - 记录错误日志，包含主套餐ID和失败原因 + +### 5. 级联失效失败 + +- **场景**：主套餐过期时，批量更新加油包失败（数据库连接断开） +- **处理**： + - 使用 Asynq 重试机制（最多3次） + - 每次重试前检查加油包当前状态，避免重复更新 + - 3次失败后写入死信队列，发送告警 + +--- + +## 并发场景 + +### Scenario: 并发购买加油包 +- **GIVEN** 载体有生效中主套餐（ID=123） +- **WHEN** 两个请求 req1 和 req2 同时购买加油包 +- **THEN** 系统使用行锁： + ```sql + SELECT * FROM package_usage + WHERE carrier_id=? AND package_type='formal' AND status IN (0,1) + ORDER BY status DESC, priority ASC + FOR UPDATE + ``` +- **AND** req1 和 req2 创建的加油包 master_usage_id 都为 123 + +### Scenario: 并发主套餐过期和购买加油包 +- **GIVEN** 主套餐A（ID=123）即将过期，主套餐B（ID=124）待生效 +- **WHEN** 时间到达过期时刻： + - 请求1：定时任务将主套餐A status=3，触发级联失效 + - 请求2：用户购买加油包 +- **THEN** 使用事务隔离： + - 如果请求2先获取锁 → 加油包 master_usage_id=123，然后被级联失效（status=4） + - 如果请求1先获取锁 → 主套餐A已无生效中，加油包 master_usage_id=124 + +### Scenario: 并发更新主套餐有效期和级联失效 +- **GIVEN** 主套餐 ID=123，有5个跟随的加油包（has_independent_expiry=false） +- **WHEN** 同时发生： + - 请求1：主套餐 expires_at 更新为 2027-12-31 + - 请求2：主套餐到期，触发级联失效 +- **THEN** 使用行锁 `SELECT * FROM package_usage WHERE id=123 FOR UPDATE` +- **AND** 先完成的操作生效，后完成的操作基于新状态执行 + +--- + +## 异常处理 + +### 1. 级联失效失败 + +- **错误场景**：主套餐过期时，批量更新加油包 SQL 执行失败 +- **处理流程**： + 1. 捕获错误，记录 Error 日志（包含主套餐ID、加油包数量、错误信息） + 2. Asynq 自动重试（最多3次，间隔 10s/30s/60s） + 3. 重试前检查加油包当前状态（避免重复更新） + 4. 3次失败后写入死信队列，发送告警通知 +- **返回错误**：不返回给用户（异步任务），仅记录日志 + +### 2. master_usage_id 不存在 + +- **错误场景**：加油包的 master_usage_id 指向的主套餐被删除 +- **处理流程**： + 1. 加油包激活时检查 `SELECT id FROM package_usage WHERE id=master_usage_id` + 2. 如果不存在 → 返回错误 500，错误码 `MASTER_NOT_FOUND` + 3. 记录 Error 日志（包含加油包ID、master_usage_id、载体信息） +- **返回错误**：`{"code": "MASTER_NOT_FOUND", "msg": "关联的主套餐不存在，请联系管理员"}` + +### 3. 同步有效期失败 + +- **错误场景**：主套餐 expires_at 更新时，批量更新跟随加油包失败 +- **处理流程**： + 1. 使用事务包裹主套餐更新和加油包批量更新 + 2. 加油包更新失败 → 事务回滚，主套餐 expires_at 不更新 + 3. 记录 Error 日志（包含主套餐ID、加油包数量、错误信息） + 4. 返回错误 500，错误码 `SYNC_EXPIRY_FAILED` +- **返回错误**：`{"code": "SYNC_EXPIRY_FAILED", "msg": "更新套餐有效期失败，请稍后重试"}` + +### 4. 购买加油包时无主套餐 + +- **错误场景**：用户购买加油包时，载体无任何主套餐 +- **处理流程**： + 1. 查询载体主套餐：`SELECT id FROM package_usage WHERE carrier_id=? AND package_type='formal' AND status IN (0,1) LIMIT 1` + 2. 如果无结果 → 返回错误 400，错误码 `ADDON_REQUIRES_MASTER` +- **返回错误**：`{"code": "ADDON_REQUIRES_MASTER", "msg": "必须有主套餐才能购买加油包"}` + +--- + +## 数据一致性保证 + +### 1. 事务边界 + +- **主套餐过期 + 级联失效**：使用单个事务，确保原子性 +- **主套餐更新有效期 + 同步加油包**：使用单个事务，更新失败则回滚 +- **购买加油包 + 关联主套餐**：使用事务，确保 master_usage_id 正确 + +### 2. 行锁机制 + +- **查询主套餐时加锁**：`SELECT * FROM package_usage WHERE carrier_id=? AND package_type='formal' AND status IN (0,1) FOR UPDATE` +- **更新主套餐有效期时加锁**：`SELECT * FROM package_usage WHERE id=? FOR UPDATE` +- **级联失效时加锁**：`SELECT * FROM package_usage WHERE master_usage_id=? FOR UPDATE` + +### 3. 唯一索引 + +- 已有索引：`idx_carrier_package_type_priority`（carrier_id + package_type + priority） +- 已有索引：`idx_master_usage_id`（master_usage_id） + +### 4. 数据校验 + +- **购买加油包前**：校验 has_independent_expiry 与 duration_days 的一致性 +- **激活加油包时**：校验 master_usage_id 是否存在 +- **级联失效时**：仅更新 status NOT IN (3, 4) 的加油包（避免重复更新） + +--- + +## 性能指标 + +| 操作 | 目标响应时间 | 并发要求 | 数据量 | +|------|-------------|---------|--------| +| 购买加油包（主套餐检查） | < 50ms | 100 QPS | 单载体查询 | +| 关联主套餐（查询+插入） | < 100ms | 100 QPS | 单载体查询 + 单条插入 | +| 主套餐过期级联失效 | < 500ms | 10 QPS | 批量更新（平均10个加油包） | +| 主套餐更新有效期同步 | < 300ms | 50 QPS | 批量更新（平均5个加油包） | + +--- + +## 错误码定义 + +| 错误码 | HTTP 状态码 | 错误消息 | 场景 | +|--------|------------|---------|------| +| `ADDON_REQUIRES_MASTER` | 400 | 必须有主套餐才能购买加油包 | 购买加油包时无主套餐 | +| `MASTER_NOT_FOUND` | 500 | 关联的主套餐不存在，请联系管理员 | master_usage_id 不存在 | +| `ADDON_MASTER_EXPIRED` | 400 | 关联的主套餐已过期，无法激活加油包 | 尝试激活已失效加油包 | +| `SYNC_EXPIRY_FAILED` | 500 | 更新套餐有效期失败，请稍后重试 | 同步加油包有效期失败 | +| `CASCADE_INVALIDATE_FAILED` | 500 | 级联失效加油包失败，请稍后重试 | 级联失效批量更新失败 | + +--- + +## 数据迁移策略 + +**激进策略**（开发阶段，保证干净性）： + +### 1. ❌ 要删除的字段 + +目前 `package_usage` 表中可能存在的冗余字段（需确认后删除）： +- 如果有 `parent_usage_id` 字段（旧的父级关联） → **删除** +- 如果有 `linked_usage_ids` 字段（旧的关联列表） → **删除** +- 如果有 `inherit_to_next` 字段（旧的继承标志） → **删除** + +### 2. ✅ 新增的字段 + +在 `package_usage` 表中新增： +```sql +ALTER TABLE package_usage +ADD COLUMN master_usage_id BIGINT DEFAULT NULL COMMENT '主套餐ID（加油包专用）', +ADD COLUMN has_independent_expiry BOOLEAN DEFAULT false COMMENT '是否有独立有效期（加油包专用）'; + +CREATE INDEX idx_master_usage_id ON package_usage(master_usage_id); +``` + +在 `package` 表中新增： +```sql +ALTER TABLE package +ADD COLUMN has_independent_expiry BOOLEAN DEFAULT false COMMENT '加油包是否有独立有效期（仅 package_type=addon 时有效）'; +``` + +### 3. ❌ 要废弃的逻辑 + +- **废弃旧的加油包关联逻辑**：如果代码中存在通过 `parent_usage_id` 或其他字段关联主套餐的逻辑，全部删除 +- **废弃旧的继承逻辑**：如果代码中存在"主套餐切换时加油包继承到新主套餐"的逻辑，全部删除 +- **废弃旧的有效期计算逻辑**：如果加油包有效期计算不区分"独立有效期"和"跟随主套餐"，全部重构 + +### 4. ✅ 历史数据强制转换 + +```sql +-- Step 1: 历史加油包数据强制关联到当前主套餐 +UPDATE package_usage pu_addon +SET master_usage_id = ( + SELECT pu_master.id + FROM package_usage pu_master + WHERE pu_master.carrier_id = pu_addon.carrier_id + AND pu_master.package_type = 'formal' + AND pu_master.status IN (0, 1) + ORDER BY pu_master.status DESC, pu_master.priority ASC + LIMIT 1 +) +WHERE pu_addon.package_type = 'addon' + AND pu_addon.master_usage_id IS NULL; + +-- Step 2: 无主套餐的历史加油包强制失效 +UPDATE package_usage +SET status = 4, + invalidated_at = NOW() +WHERE package_type = 'addon' + AND master_usage_id IS NULL; + +-- Step 3: 历史加油包默认为独立有效期模式 +UPDATE package_usage +SET has_independent_expiry = true +WHERE package_type = 'addon' + AND has_independent_expiry IS NULL; + +-- Step 4: 已过期主套餐的加油包全部级联失效 +UPDATE package_usage pu_addon +SET status = 4, + invalidated_at = NOW() +FROM package_usage pu_master +WHERE pu_addon.master_usage_id = pu_master.id + AND pu_master.package_type = 'formal' + AND pu_master.status = 3 -- 已过期 + AND pu_addon.status NOT IN (3, 4); +``` + +### 5. ❌ 删除遗留表/字段（确认后执行） + +```sql +-- 如果存在旧的关联表，删除 +-- DROP TABLE IF EXISTS package_usage_relations; + +-- 如果存在冗余字段，删除 +-- ALTER TABLE package_usage DROP COLUMN IF EXISTS parent_usage_id; +-- ALTER TABLE package_usage DROP COLUMN IF EXISTS linked_usage_ids; +-- ALTER TABLE package_usage DROP COLUMN IF EXISTS inherit_to_next; +``` + +### 6. 验证步骤 + +```sql +-- 验证1：所有加油包都有 master_usage_id（除了已失效的） +SELECT COUNT(*) +FROM package_usage +WHERE package_type = 'addon' + AND status NOT IN (3, 4) + AND master_usage_id IS NULL; +-- 预期结果：0 + +-- 验证2：所有加油包的 master_usage_id 都指向有效的主套餐 +SELECT COUNT(*) +FROM package_usage pu_addon +LEFT JOIN package_usage pu_master ON pu_addon.master_usage_id = pu_master.id +WHERE pu_addon.package_type = 'addon' + AND pu_addon.master_usage_id IS NOT NULL + AND pu_master.id IS NULL; +-- 预期结果：0 + +-- 验证3：已过期主套餐的加油包都已失效 +SELECT COUNT(*) +FROM package_usage pu_addon +JOIN package_usage pu_master ON pu_addon.master_usage_id = pu_master.id +WHERE pu_master.status = 3 + AND pu_addon.status NOT IN (3, 4); +-- 预期结果：0 + +-- 验证4：检查是否还有遗留字段（需根据实际情况调整） +-- SELECT column_name FROM information_schema.columns +-- WHERE table_name = 'package_usage' +-- AND column_name IN ('parent_usage_id', 'linked_usage_ids', 'inherit_to_next'); +-- 预期结果：0 rows +``` + +--- + +## 测试场景矩阵 + +| 场景分类 | 测试用例 | 预期结果 | +|---------|---------|---------| +| **依附检查** | 无主套餐购买加油包 | 返回错误 400：ADDON_REQUIRES_MASTER | +| | 有生效中主套餐购买加油包 | 创建成功，master_usage_id=生效中主套餐ID | +| | 只有待生效主套餐购买加油包 | 创建成功，master_usage_id=priority最小的待生效主套餐ID | +| **关联逻辑** | 多个主套餐时购买加油包 | 优先关联生效中主套餐 | +| | 并发购买加油包 | 使用行锁，两个加油包关联到同一主套餐 | +| **独立有效期** | 独立有效期加油包激活 | expires_at = activated_at + duration_days | +| | 独立有效期加油包到期 | status=3（已过期） | +| | 独立有效期加油包未到期但主套餐过期 | status=4（已失效） | +| **跟随主套餐** | 跟随主套餐的加油包激活 | expires_at = master套餐.expires_at | +| | 主套餐更新有效期 | 跟随加油包同步更新 expires_at | +| | 主套餐更新有效期时独立有效期加油包不变 | 独立有效期加油包 expires_at 不变 | +| **级联失效** | 主套餐过期触发级联失效 | 所有关联加油包 status=4 | +| | 独立有效期加油包未到期但主套餐过期 | status=4（已失效） | +| | 已过期加油包不重复失效 | status 保持 3 | +| | 级联失效失败重试 | Asynq 重试3次，失败后进入死信队列 | +| **不继承** | 新主套餐激活后旧加油包不关联 | 旧加油包 master_usage_id 和 status 保持不变 | +| | 为新主套餐购买新加油包 | 新加油包 master_usage_id=新主套餐ID | +| | 尝试激活已失效加油包 | 返回错误 400：ADDON_MASTER_EXPIRED | +| **并发** | 并发购买加油包 | 使用行锁，确保关联到同一主套餐 | +| | 并发主套餐过期和购买加油包 | 事务隔离，先完成的操作生效 | +| **异常** | master_usage_id 不存在 | 返回错误 500：MASTER_NOT_FOUND | +| | 同步有效期失败 | 事务回滚，返回错误 500：SYNC_EXPIRY_FAILED | +| | 级联失效失败 | Asynq 重试，记录日志，发送告警 | + +--- + +## 实现参考 + +### 购买加油包时的主套餐检查 + +```go +// Service 层：CheckMasterPackageForAddon +func (s *Service) CheckMasterPackageForAddon(ctx context.Context, carrierID uint) (uint, error) { + // 查询生效中或待生效的主套餐 + masterUsage, err := s.store.FindMasterPackage(ctx, carrierID) + if err != nil { + return 0, errors.Wrap(errors.CodeInternalError, err, "查询主套餐失败") + } + if masterUsage == nil { + return 0, errors.New(errors.CodeInvalidParam, "必须有主套餐才能购买加油包") + } + return masterUsage.ID, nil +} + +// Store 层：FindMasterPackage +func (s *Store) FindMasterPackage(ctx context.Context, carrierID uint) (*model.PackageUsage, error) { + var usage model.PackageUsage + err := s.db.WithContext(ctx). + Where("carrier_id = ? AND package_type = ? AND status IN (?, ?)", + carrierID, constants.PackageTypeFormal, + constants.PackageStatusPending, constants.PackageStatusActive). + Order("status DESC, priority ASC"). // 优先生效中，然后按 priority + First(&usage).Error + if errors.Is(err, gorm.ErrRecordNotFound) { + return nil, nil + } + if err != nil { + return nil, err + } + return &usage, nil +} +``` + +### 主套餐过期时级联失效加油包 + +```go +// Service 层：CascadeInvalidateAddons +func (s *Service) CascadeInvalidateAddons(ctx context.Context, masterUsageID uint) error { + tx := s.store.BeginTx(ctx) + defer tx.Rollback() + + // 批量更新加油包状态 + count, err := s.store.InvalidateAddonsByMaster(ctx, tx, masterUsageID) + if err != nil { + return errors.Wrap(errors.CodeInternalError, err, "级联失效加油包失败") + } + + if err := tx.Commit().Error; err != nil { + return errors.Wrap(errors.CodeInternalError, err, "提交事务失败") + } + + // 记录审计日志（异步） + s.auditService.LogOperation(ctx, &model.OperationLog{ + OperationType: "cascade_invalidate", + OperationDesc: fmt.Sprintf("主套餐ID=%d过期，级联失效%d个加油包", masterUsageID, count), + TargetID: masterUsageID, + }) + + return nil +} + +// Store 层：InvalidateAddonsByMaster +func (s *Store) InvalidateAddonsByMaster(ctx context.Context, tx *gorm.DB, masterUsageID uint) (int64, error) { + result := tx.WithContext(ctx). + Model(&model.PackageUsage{}). + Where("master_usage_id = ? AND status NOT IN (?, ?)", + masterUsageID, + constants.PackageStatusExpired, + constants.PackageStatusInvalidated). + Updates(map[string]interface{}{ + "status": constants.PackageStatusInvalidated, + "invalidated_at": time.Now(), + }) + if result.Error != nil { + return 0, result.Error + } + return result.RowsAffected, nil +} +``` + +### 主套餐更新有效期时同步跟随加油包 + +```go +// Service 层：SyncAddonExpiry +func (s *Service) SyncAddonExpiry(ctx context.Context, masterUsageID uint, newExpiresAt time.Time) error { + tx := s.store.BeginTx(ctx) + defer tx.Rollback() + + // 更新主套餐有效期 + if err := s.store.UpdateExpiry(ctx, tx, masterUsageID, newExpiresAt); err != nil { + return errors.Wrap(errors.CodeInternalError, err, "更新主套餐有效期失败") + } + + // 批量更新跟随的加油包 + count, err := s.store.SyncFollowingAddonExpiry(ctx, tx, masterUsageID, newExpiresAt) + if err != nil { + return errors.Wrap(errors.CodeInternalError, err, "同步加油包有效期失败") + } + + if err := tx.Commit().Error; err != nil { + return errors.Wrap(errors.CodeInternalError, err, "提交事务失败") + } + + s.logger.Info("同步加油包有效期成功", + zap.Uint("master_usage_id", masterUsageID), + zap.Int64("count", count), + zap.Time("new_expires_at", newExpiresAt)) + + return nil +} + +// Store 层：SyncFollowingAddonExpiry +func (s *Store) SyncFollowingAddonExpiry(ctx context.Context, tx *gorm.DB, masterUsageID uint, expiresAt time.Time) (int64, error) { + result := tx.WithContext(ctx). + Model(&model.PackageUsage{}). + Where("master_usage_id = ? AND has_independent_expiry = ?", masterUsageID, false). + Update("expires_at", expiresAt) + if result.Error != nil { + return 0, result.Error + } + return result.RowsAffected, nil +} +``` + +--- + +**本 Spec 完成**，包含： +- ✅ 业务背景和业务规则 +- ✅ 详细场景（依附、关联、独立有效期、跟随主套餐、级联失效、不继承） +- ✅ 边界条件和并发场景 +- ✅ 异常处理和数据一致性保证 +- ✅ 性能指标和错误码定义 +- ✅ **激进的数据迁移策略**（明确删除字段、废弃逻辑、强制转换） +- ✅ 测试场景矩阵和实现参考 diff --git a/openspec/changes/package-system-upgrade/specs/auto-stop-resume/spec.md b/openspec/changes/package-system-upgrade/specs/auto-stop-resume/spec.md new file mode 100644 index 0000000..5b3ac8a --- /dev/null +++ b/openspec/changes/package-system-upgrade/specs/auto-stop-resume/spec.md @@ -0,0 +1,391 @@ +# Spec: 自动停复机机制 + +## 业务背景 + +### 为什么需要自动停复机 + +**现状问题**： +- 当前系统流量耗尽后手动停机,用户购买加油包后需手动复机 +- 停复机时机不精确,可能出现流量已耗尽但仍可上网的情况 +- 用户购买加油包后不知道需要复机,导致流量无法使用 + +**业务目标**： +- 所有套餐流量耗尽时自动停机,避免超额使用 +- 购买新套餐(正式/加油包)后自动复机,提升用户体验 +- 停复机延迟 < 2分钟,确保及时性 + +--- + +## 业务规则 + +### 1. 停机触发条件 + +``` +停机条件 = (所有生效套餐流量 = 0) AND (卡当前状态 = active) +``` + +**详细逻辑**： +```sql +-- 检查是否有剩余流量 +SELECT COUNT(*) FROM tb_package_usage +WHERE iot_card_id = ? + AND status = 1 -- 生效中 + AND data_usage_mb < data_limit_mb; + +-- 如果 COUNT = 0,触发停机 +``` + +### 2. 复机触发条件 + +``` +复机条件 = (存在可用流量套餐) AND (卡当前状态 = stopped) +``` + +**可用流量套餐定义**： +```sql +status='active' AND remaining_data_amount > 0 +``` + +### 3. 停复机延迟要求 + +- **目标延迟**：< 2分钟(从触发条件到完成停复机) +- **实现方式**：流量检查后同步调用停复机接口(不走异步队列) + +### 4. 运营商接口容错 + +- 停机/复机失败时： + - 重试3次(间隔 1s, 2s, 4s) + - 仍失败：记录错误日志,人工介入 + - **不阻塞**套餐激活流程 + +--- + +## ADDED Requirements + +### Requirement: 流量耗尽自动停机 + +系统 SHALL 在主套餐和所有加油包流量都用完时,调用运营商接口停机。 + +#### Scenario: 所有套餐流量耗尽触发停机 +- **GIVEN** 卡 C1 有主套餐(剩余0MB)和加油包(剩余0MB),卡状态为 active +- **WHEN** 轮询系统检查停机条件 +- **THEN** 系统执行停机操作： + 1. 调用运营商停机接口 + 2. 更新 IotCard.network_status=0(已停机) + 3. 记录 stopped_at 时间 + 4. 记录 stop_reason="traffic_exhausted" + 5. 记录操作日志 + +#### Scenario: 有剩余流量时不停机 +- **GIVEN** 主套餐流量用完,但加油包剩余1GB +- **WHEN** 轮询系统检查停机条件 +- **THEN** 系统查询到有剩余流量,不触发停机 + +#### Scenario: 停机接口调用失败重试 +- **GIVEN** 所有套餐流量用完,需要停机 +- **WHEN** 调用运营商停机接口失败(网络超时) +- **THEN** 系统重试3次(间隔1s/2s/4s) +- **AND** 3次都失败后记录 Error 日志,告警通知运维 + +#### Scenario: 停机幂等性 +- **GIVEN** 卡已停机(network_status=0) +- **WHEN** 轮询系统再次检测到流量用完 +- **THEN** 系统检测到已停机,跳过停机调用 + +### Requirement: 购买套餐自动复机 + +系统 SHALL 在购买新套餐(正式/加油包)激活后,自动调用运营商接口复机。 + +#### Scenario: 购买加油包自动复机 +- **GIVEN** 卡 C1 已停机(network_status=0,stopped_at=2026-02-10 10:00) +- **WHEN** 用户购买加油包,激活成功(status=active) +- **THEN** 系统执行复机操作： + 1. 调用运营商复机接口 + 2. 更新 IotCard.network_status=1(正常) + 3. 记录 resumed_at 时间 + 4. 清空 stopped_at + 5. 记录操作日志 + +#### Scenario: 复机幂等性 +- **GIVEN** 卡 C1 已停机 +- **WHEN** 用户快速购买2个加油包 +- **THEN** 第1个加油包激活 → 触发复机成功 +- **AND** 第2个加油包激活 → 检测到已是 active 状态,跳过复机 +- **AND** 运营商复机接口调用仅1次 + +#### Scenario: 购买主套餐自动复机 +- **GIVEN** 卡 C1 已停机,主套餐过期 +- **WHEN** 用户购买新主套餐,激活成功 +- **THEN** 系统自动触发复机 + +#### Scenario: 复机失败容错 +- **GIVEN** 卡已停机 +- **WHEN** 购买加油包激活,但运营商复机接口返回失败 +- **THEN** 系统重试3次 +- **AND** 仍失败后： + - 套餐激活成功(status=active) + - 卡状态仍为 stopped + - 错误日志已记录 + - 告警通知运维 + +### Requirement: 复机延迟 < 2分钟 + +系统 SHALL 确保从套餐激活到卡复机完成的延迟 < 2分钟。 + +#### Scenario: 复机延迟达标 +- **GIVEN** 加油包在 2026-02-10 10:00:00 激活成功 +- **WHEN** 系统同步调用复机接口 +- **THEN** 复机完成时间 < 2026-02-10 10:02:00(延迟 < 2分钟) + +#### Scenario: 复机失败后重试延迟 +- **GIVEN** 加油包激活,第1次复机调用失败 +- **WHEN** 系统重试3次(间隔1s/2s/4s) +- **THEN** 复机在第3次重试成功,总延迟约7秒 + +--- + +## 数据模型变更 + +### tb_iot_card 新增字段 + +| 字段 | 类型 | 说明 | +|------|------|------| +| stopped_at | timestamp | 停机时间,NULL=未停机 | +| resumed_at | timestamp | 最近复机时间 | +| stop_reason | varchar(50) | 停机原因：`traffic_exhausted`, `manual`, `arrears` | + +**索引**： +- 无需索引(非查询字段,仅用于审计) + +--- + +## 业务流程 + +### 流程1：流量耗尽停机 + +```mermaid +graph TD + A[流量上报] --> B{所有套餐流量=0?} + B -->|是| C{卡状态=active?} + B -->|否| Z[结束] + C -->|是| D[调用运营商停机接口] + C -->|否| Z + D --> E{停机成功?} + E -->|是| F[更新卡状态=stopped] + E -->|否| G[重试3次] + F --> H[记录stopped_at] + G --> E +``` + +### 流程2：购买加油包复机 + +```mermaid +graph TD + A[加油包激活成功] --> B{卡状态=stopped?} + B -->|是| C[调用运营商复机接口] + B -->|否| Z[跳过复机] + C --> D{复机成功?} + D -->|是| E[更新卡状态=active] + D -->|否| F[重试3次] + E --> G[清空stopped_at] + F --> D + F -->|3次失败| H[记录错误日志] +``` + +--- + +## 并发场景 + +### Scenario: 并发停复机 +- **GIVEN** 卡流量刚好用完,同时用户购买加油包 +- **WHEN** 停机任务和复机任务并发执行 +- **THEN** 使用数据库行锁： + ```sql + SELECT * FROM iot_card WHERE id=? FOR UPDATE + ``` +- **AND** 后执行的操作覆盖前一个操作的状态 + +### Scenario: 复机任务重复执行 +- **GIVEN** 用户购买2个加油包,触发2次复机 +- **WHEN** 第1次复机成功,卡状态=active +- **THEN** 第2次复机检测到卡状态=active,跳过调用 + +--- + +## 异常处理 + +### 1. 停机接口超时 + +- **场景**：运营商停机接口响应超时(>5秒) +- **处理**： + 1. 记录 Error 日志(包含卡号、超时时间) + 2. 重试3次,间隔1s/2s/4s + 3. 3次都失败：记录到死信队列,告警通知 +- **用户影响**：卡可能仍可上网(停机未成功) + +### 2. 复机接口失败 + +- **场景**：运营商复机接口返回业务错误(如卡状态异常) +- **处理**： + 1. 记录 Error 日志(包含卡号、错误码、错误消息) + 2. 重试3次 + 3. 3次都失败：套餐激活成功,但卡保持停机状态 + 4. 告警通知运维人工介入 +- **用户影响**：购买加油包后仍无法上网 + +### 3. 停复机状态不一致 + +- **场景**：系统记录已停机,但运营商侧仍正常 +- **处理**： + 1. 轮询系统定期同步卡状态 + 2. 检测到不一致时记录 Warning 日志 + 3. 自动修正系统状态(以运营商侧为准) +- **修正频率**：每小时同步一次 + +--- + +## 性能指标 + +| 操作 | 目标响应时间 | 监控指标 | +|------|------------|---------| +| 停机接口调用 | < 5秒 | 运营商API耗时 | +| 复机接口调用 | < 5秒 | 运营商API耗时 | +| 停机条件检查 | < 50ms | SELECT COUNT查询耗时 | +| 端到端停机延迟 | < 2分钟 | 流量用完到停机完成 | +| 端到端复机延迟 | < 2分钟 | 套餐激活到复机完成 | + +--- + +## 错误码定义 + +| 错误码 | HTTP 状态码 | 错误消息 | 场景 | +|--------|------------|---------|------| +| CodeInternal | 500 | 停机操作失败,请重试 | 运营商停机接口失败 | +| CodeInternal | 500 | 复机操作失败,请重试 | 运营商复机接口失败 | + +--- + +## 测试场景矩阵 + +| 维度 | 场景 | 预期结果 | +|------|------|---------| +| **停机** | 所有套餐流量用完 | 自动停机 | +| | 主套餐用完+加油包剩余 | 不停机 | +| | 停机接口失败 | 重试3次,失败告警 | +| | 已停机重复检测 | 跳过停机 | +| **复机** | 购买加油包 | 自动复机 | +| | 购买主套餐 | 自动复机 | +| | 复机接口失败 | 重试3次,套餐激活成功,卡保持停机 | +| | 并发购买2个加油包 | 复机接口调用1次 | +| **延迟** | 复机延迟 | < 2分钟 | +| | 停机延迟 | < 2分钟 | +| **异常** | 停机超时 | 重试后告警 | +| | 状态不一致 | 轮询同步修正 | + +--- + +## 实现参考 + +### Service 层：CheckAndStop + +```go +func (s *Service) CheckAndStopCard(ctx context.Context, cardID uint) error { + // 1. 查询卡信息 + card, err := s.iotCardStore.GetByID(ctx, cardID) + if err != nil { + return err + } + + // 2. 检查卡状态 + if card.NetworkStatus != constants.NetworkStatusActive { + return nil // 已停机,跳过 + } + + // 3. 检查是否有剩余流量 + hasAvailableData, err := s.packageUsageStore.HasAvailableData(ctx, cardID) + if err != nil { + return err + } + + if hasAvailableData { + return nil // 有剩余流量,不停机 + } + + // 4. 调用运营商停机接口(带重试) + err = s.carrierClient.StopCard(ctx, card.ICCID, 3) + if err != nil { + s.logger.Error("停机失败", + zap.Uint("card_id", cardID), + zap.Error(err)) + return err + } + + // 5. 更新卡状态 + err = s.iotCardStore.UpdateStopStatus(ctx, cardID, time.Now(), "traffic_exhausted") + if err != nil { + return err + } + + // 6. 记录审计日志 + s.auditService.LogOperation(ctx, &model.OperationLog{ + OperationType: "card_stop", + OperationDesc: "流量耗尽自动停机", + TargetID: cardID, + }) + + return nil +} +``` + +### Service 层：ResumeCard + +```go +func (s *Service) ResumeCardIfStopped(ctx context.Context, cardID uint) error { + // 1. 查询卡信息 + card, err := s.iotCardStore.GetByID(ctx, cardID) + if err != nil { + return err + } + + // 2. 检查卡状态 + if card.NetworkStatus != constants.NetworkStatusStopped { + return nil // 未停机,跳过 + } + + // 3. 调用运营商复机接口(带重试) + err = s.carrierClient.ResumeCard(ctx, card.ICCID, 3) + if err != nil { + s.logger.Error("复机失败", + zap.Uint("card_id", cardID), + zap.Error(err)) + // 复机失败不阻塞套餐激活 + return nil + } + + // 4. 更新卡状态 + err = s.iotCardStore.UpdateResumeStatus(ctx, cardID, time.Now()) + if err != nil { + return err + } + + // 5. 记录审计日志 + s.auditService.LogOperation(ctx, &model.OperationLog{ + OperationType: "card_resume", + OperationDesc: "购买套餐自动复机", + TargetID: cardID, + }) + + return nil +} +``` + +--- + +**本 Spec 完成**，包含： +- ✅ 业务背景和业务规则 +- ✅ 详细场景(停机、复机、幂等性、容错) +- ✅ 数据模型变更 +- ✅ 业务流程图 +- ✅ 并发场景和异常处理 +- ✅ 性能指标和错误码定义 +- ✅ 测试场景矩阵和实现参考 diff --git a/openspec/changes/package-system-upgrade/specs/iot-card/spec.md b/openspec/changes/package-system-upgrade/specs/iot-card/spec.md new file mode 100644 index 0000000..a44cc65 --- /dev/null +++ b/openspec/changes/package-system-upgrade/specs/iot-card/spec.md @@ -0,0 +1,49 @@ +# Spec Delta: IoT卡轮询系统扩展 + +## MODIFIED Requirements + +### Requirement: 流量检查任务支持新的扣减优先级 +系统 SHALL 在轮询系统的流量检查任务（HandleCarddataCheck）中，实现新的流量扣减优先级机制。 + +#### Scenario: 优先扣减加油包流量 +- **WHEN** 轮询系统检测到卡流量增加，卡有主套餐和加油包 +- **THEN** 系统优先更新加油包的 data_usage_mb，再更新主套餐 + +#### Scenario: 按 Priority 顺序扣减多个加油包 +- **WHEN** 卡有多个加油包，流量增加 +- **THEN** 系统按 priority 从小到大顺序扣减流量 + +### Requirement: 停机条件检查调整 +系统 SHALL 在轮询系统中，仅当主套餐和所有加油包流量都用完时触发停机。 + +#### Scenario: 主套餐用完但加油包有剩余不停机 +- **WHEN** 主套餐 data_usage_mb >= data_limit_mb，但加油包有剩余流量 +- **THEN** 系统不触发停机操作 + +#### Scenario: 所有套餐流量用完触发停机 +- **WHEN** 主套餐和所有加油包 data_usage_mb >= data_limit_mb +- **THEN** 系统触发停机操作 + +## ADDED Requirements + +### Requirement: 套餐激活检查任务 +系统 SHALL 新增套餐激活检查任务（HandlePackageActivation），定期检查待激活的主套餐。 + +#### Scenario: 定期检查待激活主套餐 +- **WHEN** 轮询系统每分钟执行一次套餐激活检查 +- **THEN** 系统查询所有已过期主套餐，激活 priority 最小的待生效主套餐 + +#### Scenario: 激活延迟小于1分钟 +- **WHEN** 主套餐在 00:00:00 过期 +- **THEN** 系统在 00:01:00 之前完成下一个主套餐的激活 + +### Requirement: 流量重置调度任务 +系统 SHALL 新增流量重置调度任务（HandleDataReset），根据套餐的 data_reset_cycle 定期重置流量。 + +#### Scenario: 每日0点触发日重置任务 +- **WHEN** 系统时间到达 00:00:00 +- **THEN** 系统重置所有 data_reset_cycle=daily 的套餐 data_usage_mb=0 + +#### Scenario: 每月1号触发月重置任务 +- **WHEN** 系统时间到达每月1号 00:00:00 +- **THEN** 系统重置所有 data_reset_cycle=monthly 的套餐 data_usage_mb=0 diff --git a/openspec/changes/package-system-upgrade/specs/order-management/spec.md b/openspec/changes/package-system-upgrade/specs/order-management/spec.md new file mode 100644 index 0000000..a54b969 --- /dev/null +++ b/openspec/changes/package-system-upgrade/specs/order-management/spec.md @@ -0,0 +1,36 @@ +# Spec Delta: 订单管理能力扩展 + +## ADDED Requirements + +### Requirement: 主套餐购买时自动排队 +系统 SHALL 在用户购买主套餐时，如果已有生效中的主套餐，自动将新套餐设置为待生效状态并分配 priority。 + +#### Scenario: 首个主套餐立即生效 +- **WHEN** 载体首次购买主套餐 +- **THEN** PackageUsage status=1, priority=1, activated_at=支付完成时间 + +#### Scenario: 第二个主套餐自动排队 +- **WHEN** 载体已有生效中主套餐，购买第2个主套餐 +- **THEN** PackageUsage status=0, priority=2, pending_realname_activation=false + +### Requirement: 加油包购买前检查主套餐 +系统 SHALL 在用户购买加油包前，检查是否有生效中或待生效的主套餐。 + +#### Scenario: 无主套餐时购买加油包失败 +- **WHEN** 用户购买加油包，但载体无主套餐 +- **THEN** 系统返回错误 400 "必须有主套餐才能购买加油包" + +#### Scenario: 有主套餐时可购买加油包 +- **WHEN** 用户购买加油包，载体有生效中主套餐 +- **THEN** 系统创建订单成功，PackageUsage master_usage_id=主套餐ID + +### Requirement: 客户端未实名时禁止购买套餐 +系统 SHALL 在客户端购买套餐时，检查载体的实名状态。 + +#### Scenario: 客户端未实名购买返回错误 +- **WHEN** 客户通过 H5 端购买套餐，载体未实名 +- **THEN** 系统返回错误 403 "设备/卡必须先完成实名认证才能购买套餐" + +#### Scenario: 后台管理端可为未实名载体购买 +- **WHEN** 管理员通过后台为未实名载体购买套餐 +- **THEN** 系统创建订单成功，PackageUsage status=0, pending_realname_activation=true diff --git a/openspec/changes/package-system-upgrade/specs/package-calendar-type/spec.md b/openspec/changes/package-system-upgrade/specs/package-calendar-type/spec.md new file mode 100644 index 0000000..d3675b8 --- /dev/null +++ b/openspec/changes/package-system-upgrade/specs/package-calendar-type/spec.md @@ -0,0 +1,375 @@ +# Spec: 套餐周期类型管理 + +## 业务背景 + +现有套餐系统仅支持简单的按月计算模式（通过 `duration_months` 字段），无法区分"自然月套餐"和"按天套餐"的业务需求。本规范引入 `calendar_type` 字段，支持两种套餐类型： + +1. **自然月套餐（natural_month）**：按月边界计算有效期，适合"月卡"、"季卡"、"年卡"等场景 +2. **按天套餐（by_day）**：按天数精确计算有效期，适合"7天卡"、"30天卡"、"90天卡"等场景 + +两种类型的核心差异在于**有效期计算方式**： +- 自然月套餐：激活后到当前月份 + N 个月的**月末 23:59:59** +- 按天套餐：激活后 + N 天的 **23:59:59** + +## 业务规则 + +1. **calendar_type 是必填字段**，默认值为 `by_day`（向后兼容） +2. **duration_months 和 duration_days 互斥但至少提供一个**： + - `calendar_type=natural_month` 时，必须提供 `duration_months` + - `calendar_type=by_day` 时，必须提供 `duration_days`（如缺失，可从 `duration_months * 30` 转换） +3. **有效期计算时区统一使用服务器时区**（Asia/Shanghai） +4. **套餐激活时才计算 expires_at**，创建订单时不计算 +5. **自然月套餐的月末处理**： + - 2月 → 28/29日（闰年判断） + - 其他小月（4/6/9/11月）→ 30日 + - 大月（1/3/5/7/8/10/12月）→ 31日 + +## ADDED Requirements + +### Requirement: 支持自然月套餐类型 +系统 SHALL 支持自然月套餐（calendar_type=natural_month），套餐有效期按自然月边界计算。 + +**业务价值**：满足运营商月卡业务需求，例如"联通月卡"在当月任意时间激活，均在月末过期，避免用户困惑。 + +**技术约束**： +- 有效期必须精确到秒（23:59:59） +- 闰年判断必须准确（2月29日处理） +- 跨年处理必须正确（12月 + 1个月 = 次年1月） + +#### Scenario: 月中购买自然月套餐 +- **GIVEN** 系统时间为 2026-01-15 10:00:00 +- **WHEN** 用户购买自然月套餐（calendar_type=natural_month, duration_months=1）并激活 +- **THEN** 套餐 activated_at=2026-01-15 10:00:00，expires_at=2026-01-31 23:59:59 + +#### Scenario: 月末购买自然月套餐（边界条件） +- **GIVEN** 系统时间为 2026-01-30 23:00:00 +- **WHEN** 用户购买自然月套餐（calendar_type=natural_month, duration_months=1）并激活 +- **THEN** 套餐 activated_at=2026-01-30 23:00:00，expires_at=2026-01-31 23:59:59 +- **AND** 实际有效期仅剩约 25 小时（业务允许，用户自行承担） + +#### Scenario: 自然月年套餐 +- **GIVEN** 系统时间为 2026-02-15 10:00:00 +- **WHEN** 用户购买自然月年套餐（calendar_type=natural_month, duration_months=12）并激活 +- **THEN** 套餐 activated_at=2026-02-15 10:00:00，expires_at=2027-02-28 23:59:59 +- **AND** 因为 2027 年不是闰年，2月为 28 日 + +#### Scenario: 闰年自然月套餐（边界条件） +- **GIVEN** 系统时间为 2028-02-15 10:00:00（2028 年是闰年） +- **WHEN** 用户购买自然月年套餐（calendar_type=natural_month, duration_months=12）并激活 +- **THEN** 套餐 expires_at=2029-02-28 23:59:59 +- **AND** 因为 2029 年不是闰年，2月为 28 日 + +#### Scenario: 闰年2月购买1个月套餐（边界条件） +- **GIVEN** 系统时间为 2028-02-15 10:00:00（2028 年是闰年） +- **WHEN** 用户购买自然月套餐（calendar_type=natural_month, duration_months=1）并激活 +- **THEN** 套餐 expires_at=2028-02-29 23:59:59 +- **AND** 因为 2028 年是闰年，2月为 29 日 + +#### Scenario: 跨年自然月套餐（边界条件） +- **GIVEN** 系统时间为 2026-12-15 10:00:00 +- **WHEN** 用户购买自然月套餐（calendar_type=natural_month, duration_months=2）并激活 +- **THEN** 套餐 expires_at=2027-02-28 23:59:59 +- **AND** 正确跨年计算（12月 + 2个月 = 次年2月） + +#### Scenario: 自然月季卡（90天 vs 3个月差异） +- **GIVEN** 系统时间为 2026-01-31 10:00:00 +- **WHEN** 用户购买自然月季卡（calendar_type=natural_month, duration_months=3）并激活 +- **THEN** 套餐 expires_at=2026-04-30 23:59:59 +- **AND** 实际天数 = 31（1月剩余）+ 28（2月）+ 31（3月）+ 30（4月）= 120 天 +- **AND** 比按天套餐（90天）多 30 天，体现自然月优势 + +### Requirement: 支持按天套餐类型 +系统 SHALL 支持按天套餐（calendar_type=by_day），套餐有效期按天数精确计算。 + +**业务价值**：满足灵活天数套餐需求，例如"7天卡"、"30天卡"、"90天卡"，用户在任意时间激活，都获得完整的天数。 + +**技术约束**： +- 有效期计算公式：`expires_at = activated_at + duration_days 天 - 1秒`（例如：10:00:00 激活 + 1天 = 次日 09:59:59，但为了用户体验，统一为 23:59:59） +- 实际实现：`expires_at = (activated_at 日期 + duration_days 天) 的 23:59:59` +- 自动处理闰年、大小月、跨年 + +#### Scenario: 购买30天套餐 +- **GIVEN** 系统时间为 2026-01-15 10:00:00 +- **WHEN** 用户购买30天套餐（calendar_type=by_day, duration_days=30）并激活 +- **THEN** 套餐 activated_at=2026-01-15 10:00:00，expires_at=2026-02-13 23:59:59 +- **AND** 实际天数 = 30 天（含激活当天） + +#### Scenario: 购买90天套餐 +- **GIVEN** 系统时间为 2026-12-01 10:00:00 +- **WHEN** 用户购买90天套餐（calendar_type=by_day, duration_days=90）并激活 +- **THEN** 套餐 activated_at=2026-12-01 10:00:00，expires_at=2027-02-28 23:59:59 +- **AND** 正确跨年计算 + +#### Scenario: 跨年购买按天套餐（边界条件） +- **GIVEN** 系统时间为 2026-12-20 10:00:00 +- **WHEN** 用户购买20天套餐（calendar_type=by_day, duration_days=20）并激活 +- **THEN** 套餐 activated_at=2026-12-20 10:00:00，expires_at=2027-01-08 23:59:59 +- **AND** 正确跨年计算（12月20日 + 20天 = 1月8日） + +#### Scenario: 闰年按天套餐（边界条件） +- **GIVEN** 系统时间为 2028-02-15 10:00:00（2028 年是闰年） +- **WHEN** 用户购买30天套餐（calendar_type=by_day, duration_days=30）并激活 +- **THEN** 套餐 expires_at=2028-03-15 23:59:59 +- **AND** 正确处理闰年 2月有 29 天 + +#### Scenario: 按天套餐与自然月套餐对比（业务理解） +- **GIVEN** 系统时间为 2026-01-31 10:00:00 +- **WHEN** 用户购买30天套餐（calendar_type=by_day, duration_days=30）并激活 +- **THEN** 套餐 expires_at=2026-03-01 23:59:59 +- **AND** 如果购买自然月套餐（duration_months=1），expires_at=2026-01-31 23:59:59 +- **AND** 按天套餐用户获得完整 30 天，更公平 + +#### Scenario: 1天套餐（边界条件） +- **GIVEN** 系统时间为 2026-01-15 23:30:00 +- **WHEN** 用户购买1天套餐（calendar_type=by_day, duration_days=1）并激活 +- **THEN** 套餐 activated_at=2026-01-15 23:30:00，expires_at=2026-01-15 23:59:59 +- **AND** 实际有效期仅剩 29 分钟（业务允许，用户自行承担） + +#### Scenario: 365天套餐（年卡） +- **GIVEN** 系统时间为 2026-01-01 00:00:00 +- **WHEN** 用户购买365天套餐（calendar_type=by_day, duration_days=365）并激活 +- **THEN** 套餐 expires_at=2026-12-31 23:59:59 +- **AND** 精确一年有效期 + +### Requirement: 套餐周期类型可配置 +系统 SHALL 允许管理员在创建套餐时指定 calendar_type，可选值为 natural_month 或 by_day。 + +**业务规则**： +- calendar_type 必填，默认值为 `by_day`（向后兼容） +- natural_month 时必须提供 duration_months（1-120） +- by_day 时必须提供 duration_days（1-3650） +- 不允许同时指定 duration_months 和 duration_days（冗余） + +**数据验证**： +- calendar_type ∈ {natural_month, by_day} +- duration_months ∈ [1, 120]（最长10年） +- duration_days ∈ [1, 3650]（最长10年） + +#### Scenario: 创建自然月套餐（成功） +- **GIVEN** 管理员已登录后台系统 +- **WHEN** 管理员通过 POST /api/admin/packages 创建套餐 +- **AND** 请求体包含 calendar_type=natural_month, duration_months=3, package_name="联通季卡" +- **THEN** 系统返回 200，响应数据包含 calendar_type=natural_month, duration_months=3 +- **AND** 数据库 tb_package 表新增一条记录，calendar_type=natural_month + +#### Scenario: 创建按天套餐（成功） +- **GIVEN** 管理员已登录后台系统 +- **WHEN** 管理员通过 POST /api/admin/packages 创建套餐 +- **AND** 请求体包含 calendar_type=by_day, duration_days=60, package_name="60天卡" +- **THEN** 系统返回 200，响应数据包含 calendar_type=by_day, duration_days=60 +- **AND** 数据库 tb_package 表新增一条记录，calendar_type=by_day, duration_days=60 + +#### Scenario: 自然月套餐缺少 duration_months（参数验证失败） +- **GIVEN** 管理员已登录后台系统 +- **WHEN** 管理员通过 POST /api/admin/packages 创建套餐 +- **AND** 请求体包含 calendar_type=natural_month 但未提供 duration_months +- **THEN** 系统返回错误 400，错误消息："自然月套餐必须指定 duration_months" +- **AND** 数据库无新增记录 + +#### Scenario: 按天套餐缺少 duration_days（参数验证失败） +- **GIVEN** 管理员已登录后台系统 +- **WHEN** 管理员通过 POST /api/admin/packages 创建套餐 +- **AND** 请求体包含 calendar_type=by_day 但未提供 duration_days +- **THEN** 系统返回错误 400，错误消息："按天套餐必须指定 duration_days" +- **AND** 数据库无新增记录 + +#### Scenario: calendar_type 非法值（参数验证失败） +- **GIVEN** 管理员已登录后台系统 +- **WHEN** 管理员通过 POST /api/admin/packages 创建套餐 +- **AND** 请求体包含 calendar_type=weekly（非法值） +- **THEN** 系统返回错误 400，错误消息："calendar_type 只能为 natural_month 或 by_day" +- **AND** 数据库无新增记录 + +#### Scenario: duration_months 超出范围（参数验证失败） +- **GIVEN** 管理员已登录后台系统 +- **WHEN** 管理员通过 POST /api/admin/packages 创建套餐 +- **AND** 请求体包含 calendar_type=natural_month, duration_months=150（超出范围） +- **THEN** 系统返回错误 400，错误消息："duration_months 必须在 1-120 之间" +- **AND** 数据库无新增记录 + +#### Scenario: duration_days 超出范围（参数验证失败） +- **GIVEN** 管理员已登录后台系统 +- **WHEN** 管理员通过 POST /api/admin/packages 创建套餐 +- **AND** 请求体包含 calendar_type=by_day, duration_days=5000（超出范围） +- **THEN** 系统返回错误 400，错误消息："duration_days 必须在 1-3650 之间" +- **AND** 数据库无新增记录 + +#### Scenario: 同时提供 duration_months 和 duration_days（参数冗余） +- **GIVEN** 管理员已登录后台系统 +- **WHEN** 管理员通过 POST /api/admin/packages 创建套餐 +- **AND** 请求体包含 calendar_type=natural_month, duration_months=3, duration_days=90 +- **THEN** 系统返回错误 400，错误消息："不允许同时指定 duration_months 和 duration_days" +- **AND** 数据库无新增记录 + +### Requirement: 套餐激活时根据类型计算到期时间 +系统 SHALL 在套餐激活时，根据 calendar_type 自动计算并设置 expires_at。 + +**计算时机**： +- 订单创建时不计算（activated_at 和 expires_at 均为 NULL） +- 套餐激活时才计算（首次实名激活、主套餐排队激活、立即激活） + +**计算公式**： +- 自然月：`expires_at = (activated_at 月份 + duration_months) 的月末 23:59:59` +- 按天：`expires_at = (activated_at 日期 + duration_days) 的 23:59:59` + +**幂等性保证**： +- 同一套餐多次调用激活接口，expires_at 不变（使用已有的 activated_at 计算） + +#### Scenario: 激活自然月套餐 +- **GIVEN** PackageUsage 记录 status=0, package.calendar_type=natural_month, package.duration_months=1 +- **WHEN** 套餐激活，activated_at 设置为 2026-02-15 10:00:00 +- **THEN** 系统计算 expires_at=2026-02-28 23:59:59 +- **AND** PackageUsage.status 更新为 1（生效中） + +#### Scenario: 激活按天套餐 +- **GIVEN** PackageUsage 记录 status=0, package.calendar_type=by_day, package.duration_days=30 +- **WHEN** 套餐激活，activated_at 设置为 2026-02-15 10:00:00 +- **THEN** 系统计算 expires_at=2026-03-16 23:59:59 +- **AND** PackageUsage.status 更新为 1（生效中） + +#### Scenario: 激活时处理闰年（自然月） +- **GIVEN** PackageUsage 记录 status=0, package.calendar_type=natural_month, package.duration_months=1 +- **WHEN** 套餐激活，activated_at 设置为 2028-02-15 10:00:00（闰年） +- **THEN** 系统计算 expires_at=2028-02-29 23:59:59 +- **AND** 正确识别闰年，2月为 29 日 + +#### Scenario: 激活时处理跨年（自然月） +- **GIVEN** PackageUsage 记录 status=0, package.calendar_type=natural_month, package.duration_months=3 +- **WHEN** 套餐激活，activated_at 设置为 2026-11-15 10:00:00 +- **THEN** 系统计算 expires_at=2027-02-28 23:59:59 +- **AND** 正确跨年计算（11月 + 3个月 = 次年2月） + +#### Scenario: 重复激活请求（幂等性保证） +- **GIVEN** PackageUsage 记录 status=1, activated_at=2026-02-15 10:00:00, expires_at=2026-02-28 23:59:59 +- **WHEN** 再次调用激活接口（重试或并发请求） +- **THEN** 系统检测到 status=1，直接返回成功，不重新计算 expires_at +- **AND** expires_at 保持不变 + +#### Scenario: 激活失败回滚（异常处理） +- **GIVEN** PackageUsage 记录 status=0 +- **WHEN** 套餐激活过程中数据库更新失败（例如网络中断） +- **THEN** 系统事务回滚，PackageUsage.status 保持为 0 +- **AND** activated_at 和 expires_at 均为 NULL +- **AND** 返回错误消息："套餐激活失败，请重试" + +### Requirement: 套餐类型信息可查询 +系统 SHALL 在套餐详情和列表 API 中返回 calendar_type 和对应的 duration 字段。 + +**API 响应格式**： +- 自然月套餐：返回 `calendar_type`, `duration_months`, `duration_days=null` +- 按天套餐：返回 `calendar_type`, `duration_days`, `duration_months=null` + +**性能要求**： +- 套餐详情查询 P95 < 50ms +- 套餐列表查询 P95 < 200ms（分页，每页最多 100 条） + +#### Scenario: 查询自然月套餐详情 +- **GIVEN** 数据库存在套餐 ID=123，calendar_type=natural_month, duration_months=12 +- **WHEN** 用户通过 GET /api/admin/packages/123 查询套餐 +- **THEN** 系统返回 200，响应 JSON 包含： + ```json + { + "id": 123, + "calendar_type": "natural_month", + "duration_months": 12, + "duration_days": null + } + ``` + +#### Scenario: 查询按天套餐详情 +- **GIVEN** 数据库存在套餐 ID=456，calendar_type=by_day, duration_days=90 +- **WHEN** 用户通过 GET /api/admin/packages/456 查询套餐 +- **THEN** 系统返回 200，响应 JSON 包含： + ```json + { + "id": 456, + "calendar_type": "by_day", + "duration_days": 90, + "duration_months": null + } + ``` + +#### Scenario: 套餐列表显示类型 +- **GIVEN** 数据库存在 50 个套餐，包含自然月和按天两种类型 +- **WHEN** 管理员通过 GET /api/admin/packages?page=1&page_size=20 获取套餐列表 +- **THEN** 系统返回 200，响应包含 20 个套餐数据 +- **AND** 每个套餐数据包含 calendar_type 字段 +- **AND** 响应时间 < 200ms（P95） + +#### Scenario: 查询不存在的套餐（错误处理） +- **GIVEN** 数据库不存在套餐 ID=999 +- **WHEN** 用户通过 GET /api/admin/packages/999 查询套餐 +- **THEN** 系统返回 404，错误消息："套餐不存在" + +### Requirement: 套餐类型可更新 +系统 SHALL 允许管理员更新套餐的 calendar_type 和 duration 字段（仅限未生效的套餐）。 + +**更新限制**： +- 已有生效中 PackageUsage 记录的套餐，禁止修改 calendar_type 和 duration +- 只允许修改处于"下架"状态（shelf_status=2）且无生效中使用记录的套餐 + +#### Scenario: 更新下架套餐的类型（成功） +- **GIVEN** 套餐 ID=123, shelf_status=2（下架），无生效中 PackageUsage 记录 +- **WHEN** 管理员通过 PUT /api/admin/packages/123 更新套餐 +- **AND** 请求体包含 calendar_type=by_day, duration_days=60（从自然月改为按天） +- **THEN** 系统返回 200，套餐更新成功 +- **AND** 数据库 calendar_type 更新为 by_day, duration_days=60, duration_months=null + +#### Scenario: 更新已上架套餐（禁止） +- **GIVEN** 套餐 ID=123, shelf_status=1（上架），有生效中 PackageUsage 记录 +- **WHEN** 管理员通过 PUT /api/admin/packages/123 更新套餐 +- **AND** 请求体包含 calendar_type=by_day +- **THEN** 系统返回错误 400，错误消息："该套餐有生效中的使用记录，禁止修改类型" +- **AND** 数据库不更新 + +#### Scenario: 更新套餐其他字段（允许） +- **GIVEN** 套餐 ID=123, shelf_status=1（上架），有生效中 PackageUsage 记录 +- **WHEN** 管理员通过 PUT /api/admin/packages/123 更新套餐 +- **AND** 请求体仅包含 suggested_retail_price=5000（修改价格，不修改类型） +- **THEN** 系统返回 200，价格更新成功 +- **AND** calendar_type 和 duration 保持不变 + +## 数据一致性保证 + +1. **套餐激活时的并发控制**：使用 Redis 分布式锁（key: `package:activation:lock:{usage_id}`），TTL=30s +2. **expires_at 精度要求**：数据库字段类型为 `timestamp`，精确到秒 +3. **时区统一**：所有时间计算使用服务器时区（Asia/Shanghai） +4. **闰年判断准确性**：使用 Go 标准库 `time.Date()` 自动处理闰年 + +## 性能指标 + +| 操作 | 性能要求 | 监控指标 | +|------|---------|---------| +| 套餐创建 API | P95 < 100ms | API 响应时间 | +| 套餐查询 API | P95 < 50ms | 数据库查询时间 | +| 套餐激活计算 | < 10ms | 有效期计算耗时 | +| 套餐列表 API | P95 < 200ms | API 响应时间 | + +## 错误码定义 + +| 错误码 | HTTP 状态码 | 错误消息 | 场景 | +|--------|------------|---------|------| +| CodeInvalidParam | 400 | 自然月套餐必须指定 duration_months | 参数验证失败 | +| CodeInvalidParam | 400 | 按天套餐必须指定 duration_days | 参数验证失败 | +| CodeInvalidParam | 400 | calendar_type 只能为 natural_month 或 by_day | 参数验证失败 | +| CodeInvalidParam | 400 | duration_months 必须在 1-120 之间 | 参数验证失败 | +| CodeInvalidParam | 400 | duration_days 必须在 1-3650 之间 | 参数验证失败 | +| CodeForbidden | 403 | 该套餐有生效中的使用记录，禁止修改类型 | 业务规则限制 | +| CodeNotFound | 404 | 套餐不存在 | 资源不存在 | + +## 数据迁移策略 + +**激进策略**（开发阶段）： +1. **历史套餐数据强制转换**： + - 现有套餐统一设置 `calendar_type=by_day` + - 根据 `duration_months` 计算 `duration_days = duration_months * 30` + - 数据迁移后，所有套餐都有明确的 `calendar_type` 和对应的 `duration` 字段 + +2. **历史 PackageUsage 数据处理**： + - 保留 `activated_at` 和 `expires_at`（不重新计算） + - 新增 `calendar_type`, `data_reset_cycle` 字段，从关联的 Package 复制 + +3. **API 破坏性变更**： + - `calendar_type` 字段**必填**，无默认值 + - 创建套餐时必须明确指定 `calendar_type` 和对应的 `duration` 字段 + - 不支持只提供 `duration_months` 而不指定 `calendar_type` 的旧请求 diff --git a/openspec/changes/package-system-upgrade/specs/package-data-reset/spec.md b/openspec/changes/package-system-upgrade/specs/package-data-reset/spec.md new file mode 100644 index 0000000..dc4f7cf --- /dev/null +++ b/openspec/changes/package-system-upgrade/specs/package-data-reset/spec.md @@ -0,0 +1,809 @@ +# Spec: 套餐流量重置周期管理 + +## 业务背景 + +### 为什么需要流量重置周期管理 + +**现状问题**： +- 运营商套餐的流量重置规则多样：按日、按月、按年、不重置 +- 套餐有效期与流量重置周期是两个独立维度（如12个月套餐可按月重置流量） +- 不同运营商有特殊规则（如联通按27号重置，而非1号） +- 用户需要清晰知道流量何时重置，避免超额使用 + +**业务目标**： +- 支持灵活配置流量重置周期（daily/monthly/yearly/none） +- 流量重置周期独立于套餐有效期类型 +- 自动调度流量重置任务（定时任务） +- 保留历史流量使用记录，仅重置当前累计值 + +--- + +## 业务规则 + +### 1. 重置周期类型 + +| data_reset_cycle | 说明 | 重置时间点 | 适用场景 | +|------------------|------|-----------|---------| +| `daily` | 按日重置 | 每天 00:00:00 | 日租卡、按日计费套餐 | +| `monthly` | 按月重置 | 每月1号 00:00:00（联通27号） | 月租套餐、年套餐按月清零 | +| `yearly` | 按年重置 | 每年1月1日 00:00:00 | 年度套餐 | +| `none` | 不重置 | 永不重置 | 一次性流量包 | + +### 2. 重置时间点规则 + +**通用规则**： +``` +每日重置： +- 触发时间：每天 00:00:00 +- 重置对象：data_reset_cycle=daily AND status=1（生效中） + +每月重置： +- 通用触发时间：每月1号 00:00:00 +- 联通特殊规则：每月27号 00:00:00 +- 重置对象：data_reset_cycle=monthly AND status=1（生效中） + +每年重置： +- 触发时间：每年1月1日 00:00:00 +- 重置对象：data_reset_cycle=yearly AND status=1（生效中） +``` + +**联通特殊规则**： +- 如果套餐的 `isp=unicom`（联通），`data_reset_cycle=monthly` → 每月27号00:00:00重置 +- 其他运营商按1号重置 + +### 3. 重置逻辑 + +重置流量时的操作： + +``` +重置流程： +1. 查询需要重置的套餐（根据 data_reset_cycle 和 status=1） +2. 批量更新： + - data_usage_mb = 0 + - last_reset_at = 当前时间 +3. 不删除 PackageUsageDailyRecord 历史记录 +4. 记录重置日志 +``` + +**不重置的内容**： +- ❌ PackageUsageDailyRecord 历史记录（保留） +- ❌ 套餐有效期（expires_at 不变） +- ❌ 套餐状态（status 不变） +- ✅ 仅重置 data_usage_mb = 0 + +### 4. 重置条件 + +仅对以下套餐执行重置： +- `status=1`（生效中） +- `data_reset_cycle != none` +- `expires_at > 当前时间`（未过期） + +**不重置的套餐**： +- status=0（待生效） +- status=2（已用完） +- status=3（已过期） +- status=4（已失效） +- data_reset_cycle=none（不重置） + +### 5. 流量重置与套餐有效期独立 + +流量重置周期与套餐有效期类型独立： + +| 套餐配置 | 流量重置行为 | 举例 | +|---------|-------------|------| +| 12个月套餐 + monthly | 每月1号重置流量，共重置12次 | 年套餐按月清零 | +| 12个月套餐 + yearly | 激活时清零，12个月内不重置 | 年度总量套餐 | +| 30天套餐 + daily | 每天0点重置流量，共重置30次 | 日租卡 | +| 30天套餐 + none | 30天内累计使用，不重置 | 一次性流量包 | + +--- + +## ADDED Requirements + +### Requirement: 支持流量重置周期配置 + +系统 SHALL 支持为套餐配置流量重置周期（data_reset_cycle），可选值为 daily、monthly、yearly、none。 + +#### Scenario: 创建按日重置的套餐 +- **WHEN** 管理员创建套餐时指定 data_reset_cycle=daily +- **THEN** 系统创建成功，套餐的 data_reset_cycle=daily + +#### Scenario: 创建按月重置的套餐 +- **WHEN** 管理员创建套餐时指定 data_reset_cycle=monthly +- **THEN** 系统创建成功，套餐的 data_reset_cycle=monthly + +#### Scenario: 创建按年重置的套餐 +- **WHEN** 管理员创建套餐时指定 data_reset_cycle=yearly +- **THEN** 系统创建成功，套餐的 data_reset_cycle=yearly + +#### Scenario: 创建不重置流量的套餐 +- **WHEN** 管理员创建套餐时指定 data_reset_cycle=none +- **THEN** 系统创建成功，套餐的 data_reset_cycle=none + +#### Scenario: 更新套餐的重置周期配置 +- **GIVEN** 套餐 ID=123，data_reset_cycle=monthly +- **WHEN** 管理员更新套餐配置为 data_reset_cycle=daily +- **THEN** 系统更新成功，该套餐后续流量重置遵循新配置 +- **AND** 已有的 PackageUsage 不受影响（仍按原配置重置） + +### Requirement: 流量重置周期独立于套餐有效期 + +系统 SHALL 允许套餐的流量重置周期与套餐有效期类型独立配置。 + +#### Scenario: 12个月套餐按月重置流量 +- **GIVEN** 套餐配置为 duration_months=12, data_reset_cycle=monthly +- **WHEN** 套餐在 2026-02-01 激活 +- **THEN** 套餐有效期到 2027-01-31，流量在每月1号重置（共12次） + +#### Scenario: 12个月套餐按年重置流量 +- **GIVEN** 套餐配置为 duration_months=12, data_reset_cycle=yearly +- **WHEN** 套餐在 2026-02-01 激活 +- **THEN** 套餐有效期到 2027-01-31，流量仅在激活时清零，12个月内不重置 + +#### Scenario: 30天套餐按日重置流量 +- **GIVEN** 套餐配置为 duration_days=30, data_reset_cycle=daily +- **WHEN** 套餐在 2026-02-01 激活 +- **THEN** 套餐有效期到 2026-03-02，流量每天0点重置（共30次） + +#### Scenario: 自然月套餐按月重置 +- **GIVEN** 套餐配置为 calendar_type=natural_month, duration_months=1, data_reset_cycle=monthly +- **WHEN** 套餐在 2026-02-15 激活 +- **THEN** 套餐有效期到 2026-02-28，流量在3月1日不重置（因为套餐已过期） + +### Requirement: 每日流量重置调度 + +系统 SHALL 每天 00:00:00 自动重置所有 data_reset_cycle=daily 的生效中套餐的 data_usage_mb 为 0。 + +#### Scenario: 每日流量重置成功 +- **GIVEN** 系统时间到达 2026-02-11 00:00:00 +- **AND** 存在3个 data_reset_cycle=daily 且 status=1 的套餐 +- **WHEN** 定时任务执行 +- **THEN** 系统批量更新这3个套餐： + - data_usage_mb = 0 + - last_reset_at = 2026-02-11 00:00:00 + +#### Scenario: 非每日重置套餐不受影响 +- **GIVEN** 系统时间到达 2026-02-11 00:00:00 +- **AND** 存在 data_reset_cycle=monthly 的套餐 +- **WHEN** 定时任务执行 +- **THEN** 这些套餐的 data_usage_mb 不变 + +#### Scenario: 待生效和已过期套餐不重置 +- **GIVEN** 系统时间到达 2026-02-11 00:00:00 +- **AND** 存在 data_reset_cycle=daily 但 status=0（待生效）的套餐 +- **AND** 存在 data_reset_cycle=daily 但 status=3（已过期）的套餐 +- **WHEN** 定时任务执行 +- **THEN** 这些套餐不被重置 + +#### Scenario: 每日重置记录到日志 +- **GIVEN** 系统时间到达 2026-02-11 00:00:00 +- **AND** 重置了5个套餐 +- **WHEN** 定时任务执行完成 +- **THEN** 系统记录 Info 日志： + - "每日流量重置完成，重置套餐数量：5" + +### Requirement: 每月流量重置调度 + +系统 SHALL 每月1号 00:00:00 自动重置所有 data_reset_cycle=monthly 的生效中套餐的 data_usage_mb 为 0。 + +#### Scenario: 每月流量重置成功 +- **GIVEN** 系统时间到达 2026-03-01 00:00:00 +- **AND** 存在5个 data_reset_cycle=monthly 且 status=1 的套餐（非联通） +- **WHEN** 定时任务执行 +- **THEN** 系统批量更新这5个套餐： + - data_usage_mb = 0 + - last_reset_at = 2026-03-01 00:00:00 + +#### Scenario: 联通运营商特殊重置周期 +- **GIVEN** 系统时间到达 2026-02-27 00:00:00 +- **AND** 存在3个 data_reset_cycle=monthly 且 isp=unicom 且 status=1 的套餐 +- **WHEN** 定时任务执行 +- **THEN** 系统批量更新这3个套餐： + - data_usage_mb = 0 + - last_reset_at = 2026-02-27 00:00:00 + +#### Scenario: 跨月边界流量统计 +- **GIVEN** 套餐在 2026-01-31 23:50:00 使用了 5GB 流量 +- **AND** data_usage_mb = 5GB +- **WHEN** 系统时间到达 2026-02-01 00:00:00，触发重置 +- **THEN** 套餐的 data_usage_mb 重置为 0 +- **AND** 1月31日的 PackageUsageDailyRecord 仍存在（data_usage_mb=5GB） + +#### Scenario: 跨年边界流量重置 +- **GIVEN** 套餐在 2026-12-31 使用了 10GB 流量 +- **WHEN** 系统时间到达 2027-01-01 00:00:00，触发重置 +- **THEN** 套餐的 data_usage_mb 重置为 0 +- **AND** 2026年12月的日记录仍存在 + +### Requirement: 每年流量重置调度 + +系统 SHALL 每年1月1日 00:00:00 自动重置所有 data_reset_cycle=yearly 的生效中套餐的 data_usage_mb 为 0。 + +#### Scenario: 每年流量重置成功 +- **GIVEN** 系统时间到达 2027-01-01 00:00:00 +- **AND** 存在2个 data_reset_cycle=yearly 且 status=1 的套餐 +- **WHEN** 定时任务执行 +- **THEN** 系统批量更新这2个套餐： + - data_usage_mb = 0 + - last_reset_at = 2027-01-01 00:00:00 + +#### Scenario: 12个月套餐按年重置 +- **GIVEN** 套餐在 2026-06-15 激活，duration_months=12，data_reset_cycle=yearly +- **AND** expires_at=2027-06-15 +- **WHEN** 系统时间到达 2027-01-01 00:00:00 +- **THEN** 套餐流量重置（因为仍在有效期内） + +#### Scenario: 已过期的年套餐不重置 +- **GIVEN** 套餐在 2025-06-15 激活，duration_months=12，data_reset_cycle=yearly +- **AND** expires_at=2026-06-15（已过期） +- **WHEN** 系统时间到达 2027-01-01 00:00:00 +- **THEN** 套餐不被重置（status=3） + +### Requirement: 不重置流量的套餐 + +系统 SHALL 对 data_reset_cycle=none 的套餐，在整个有效期内不重置 data_usage_mb。 + +#### Scenario: 套餐有效期内流量不重置 +- **GIVEN** 套餐 data_reset_cycle=none，duration_days=30 +- **AND** 套餐在 2026-02-01 激活 +- **WHEN** 套餐在30天内使用了 80GB 流量 +- **THEN** data_usage_mb 累计为 80GB，期间从未重置 + +#### Scenario: 新激活时流量清零 +- **GIVEN** 套餐 data_reset_cycle=none +- **WHEN** 套餐首次激活 +- **THEN** data_usage_mb 初始化为 0 + +#### Scenario: 不重置套餐不被定时任务影响 +- **GIVEN** 系统时间到达每日/每月/每年重置时刻 +- **AND** 存在 data_reset_cycle=none 的套餐 +- **WHEN** 定时任务执行 +- **THEN** 这些套餐不被查询，不执行任何操作 + +### Requirement: 流量重置周期信息可查询 + +系统 SHALL 在套餐详情和使用记录 API 中返回 data_reset_cycle 和 last_reset_at。 + +#### Scenario: 查询套餐流量重置配置 +- **WHEN** 用户通过 GET /api/admin/packages/:id 查询套餐 +- **THEN** 响应包含： + ```json + { + "data_reset_cycle": "monthly", + "isp": "unicom" + } + ``` + +#### Scenario: 查询套餐使用记录的重置信息 +- **WHEN** 用户通过 GET /api/admin/package-usage/:id 查询套餐使用记录 +- **THEN** 响应包含： + ```json + { + "data_reset_cycle": "monthly", + "last_reset_at": "2026-02-27T00:00:00Z", + "data_usage_mb": 1024 + } + ``` + +#### Scenario: 客户端查询流量重置信息 +- **WHEN** 客户通过 GET /api/customer/package-usage 查询自己的套餐 +- **THEN** 响应包含 data_reset_cycle 和 last_reset_at，方便用户知道下次重置时间 + +### Requirement: 流量重置不影响日记录 + +系统 SHALL 在流量重置时保留历史日记录（PackageUsageDailyRecord），仅重置当前 data_usage_mb。 + +#### Scenario: 重置后历史记录可查 +- **GIVEN** 套餐在 2026-02-28 使用了 10GB 流量 +- **AND** PackageUsageDailyRecord 记录了 2026-02-28 的 10GB 使用量 +- **WHEN** 系统时间到达 2026-03-01 00:00:00，触发重置 +- **THEN** 套餐的 data_usage_mb 重置为 0 +- **AND** 2026-02-28 的 PackageUsageDailyRecord 记录仍存在且可查询 + +#### Scenario: 重置后新的流量使用 +- **GIVEN** 套餐在 2026-03-01 00:00:00 重置后，data_usage_mb=0 +- **WHEN** 2026-03-01 10:00:00 使用了 2GB 流量 +- **THEN** 套餐的 data_usage_mb=2GB +- **AND** 写入新的 PackageUsageDailyRecord（date=2026-03-01, data_usage_mb=2GB） + +--- + +## 边界条件 + +### 1. 跨月边界 + +- **场景**：套餐在月末23:59:59使用流量，次月0:00:00触发重置 +- **处理**： + - 重置任务在 00:00:00 执行 + - 月末最后一笔流量扣减已提交（日记录已写入） + - 重置时仅清零 data_usage_mb，不影响日记录 + +### 2. 跨年边界 + +- **场景**：套餐在12月31日使用流量，1月1日触发年度重置 +- **处理**： + - 与跨月边界相同 + - 年度重置只重置 data_reset_cycle=yearly 的套餐 + - 月度重置套餐不受年度重置影响 + +### 3. 并发流量扣减和重置 + +- **场景**：重置任务执行的同时，有流量扣减请求 +- **处理**： + - 使用行锁：`SELECT * FROM package_usage WHERE id=? FOR UPDATE` + - 先完成的操作生效，后完成的操作基于新值执行 + - 如果重置先完成 → 流量扣减从0开始累加 + - 如果扣减先完成 → 重置清零后续扣减继续 + +### 4. 定时任务执行延迟 + +- **场景**：定时任务因系统负载延迟到 00:05:00 才执行 +- **处理**： + - 仍按计划重置所有符合条件的套餐 + - last_reset_at 记录实际重置时间（00:05:00） + - 不影响下次重置周期（仍按 00:00:00 计算） + +### 5. 套餐过期与重置时间重合 + +- **场景**：套餐在 2026-03-01 00:00:00 过期，同时触发月度重置 +- **处理**： + - 过期任务将套餐 status=3 + - 重置任务查询时排除 status=3 的套餐 + - 不执行重置操作 + +--- + +## 并发场景 + +### Scenario: 并发流量扣减和重置 +- **GIVEN** 套餐 ID=123，data_usage_mb=5GB +- **WHEN** 同时发生： + - 请求1：流量扣减 1GB + - 请求2：定时任务重置流量 +- **THEN** 使用行锁： + ```sql + SELECT * FROM package_usage WHERE id=123 FOR UPDATE + ``` +- **AND** 如果请求1先完成： + - data_usage_mb = 6GB + - 请求2重置 → data_usage_mb = 0 +- **AND** 如果请求2先完成： + - data_usage_mb = 0 + - 请求1扣减 → data_usage_mb = 1GB + +### Scenario: 并发多套餐重置 +- **GIVEN** 有1000个 data_reset_cycle=daily 的套餐 +- **WHEN** 定时任务批量重置 +- **THEN** 系统： + - 分批处理（每批100个） + - 每批使用单独事务 + - 失败批次记录日志，不影响其他批次 + +--- + +## 异常处理 + +### 1. 重置任务失败 + +- **错误场景**：定时任务执行时数据库连接失败 +- **处理流程**： + 1. 捕获错误，记录 Error 日志（包含失败原因、影响套餐数量） + 2. 使用 Asynq 重试机制（最多3次，间隔 10s/30s/60s） + 3. 重试前检查套餐 last_reset_at（避免重复重置） + 4. 3次失败后写入死信队列，发送告警 +- **返回错误**：不返回给用户（定时任务），仅记录日志 + +### 2. 批量重置部分失败 + +- **错误场景**：批量重置1000个套餐，第500个套餐更新失败 +- **处理流程**： + 1. 分批处理（每批100个），每批独立事务 + 2. 失败批次回滚，其他批次正常提交 + 3. 记录失败批次的套餐ID列表 + 4. Asynq 重试失败批次 +- **返回错误**：不返回给用户（定时任务），仅记录日志 + +### 3. last_reset_at 更新失败 + +- **错误场景**：data_usage_mb 重置成功，但 last_reset_at 更新失败 +- **处理流程**： + 1. 使用事务包裹两个更新操作 + 2. 任何一个失败 → 事务回滚，全部不更新 + 3. 记录 Error 日志 + 4. Asynq 重试 +- **返回错误**：不返回给用户（定时任务），仅记录日志 + +--- + +## 数据一致性保证 + +### 1. 事务边界 + +- **批量重置套餐**：每批使用单独事务，确保原子性 +- **流量扣减 + 重置并发**：使用行锁，确保顺序执行 + +### 2. 行锁机制 + +- **重置套餐时加锁**：`SELECT * FROM package_usage WHERE id IN (...) FOR UPDATE` +- **流量扣减时加锁**：`SELECT * FROM package_usage WHERE id=? FOR UPDATE` + +### 3. 幂等性保证 + +- **重置任务幂等**：重试前检查 last_reset_at，如果已是今日则跳过 +- **示例**： + ```sql + UPDATE package_usage + SET data_usage_mb = 0, last_reset_at = NOW() + WHERE data_reset_cycle = 'daily' + AND status = 1 + AND (last_reset_at IS NULL OR DATE(last_reset_at) < CURDATE()); + ``` + +### 4. 数据校验 + +- **重置前**：校验套餐 status=1（生效中） +- **重置前**：校验套餐 expires_at > 当前时间（未过期） +- **重置后**：校验 data_usage_mb=0 且 last_reset_at 已更新 + +--- + +## 性能指标 + +| 操作 | 目标响应时间 | 并发要求 | 数据量 | +|------|-------------|---------|--------| +| 每日流量重置（单批） | < 500ms | 定时任务 | 批量更新（100个套餐/批） | +| 每月流量重置（单批） | < 500ms | 定时任务 | 批量更新（100个套餐/批） | +| 每年流量重置（单批） | < 500ms | 定时任务 | 批量更新（100个套餐/批） | +| 查询重置周期配置 | < 50ms | 100 QPS | 单套餐查询 | + +--- + +## 错误码定义 + +| 错误码 | HTTP 状态码 | 错误消息 | 场景 | +|--------|------------|---------|------| +| `RESET_TASK_FAILED` | 500 | 流量重置任务失败，请联系管理员 | 定时任务执行失败 | +| `INVALID_RESET_CYCLE` | 400 | 无效的重置周期配置 | data_reset_cycle 值不合法 | +| `LAST_RESET_AT_UPDATE_FAILED` | 500 | 更新重置时间失败 | last_reset_at 更新失败 | + +--- + +## 数据迁移策略 + +**激进策略**（开发阶段，保证干净性）： + +### 1. ❌ 要删除的字段 + +目前 `package` 表中可能存在的冗余字段（需确认后删除）： +- 如果有 `reset_interval` 字段（旧的重置间隔） → **删除** +- 如果有 `reset_day` 字段（旧的重置日期） → **删除** + +目前 `package_usage` 表中可能存在的冗余字段（需确认后删除）： +- 如果有 `last_reset_date` 字段（旧的重置日期，非时间戳） → **删除** + +### 2. ✅ 新增的字段 + +在 `package` 表中新增： +```sql +ALTER TABLE package +ADD COLUMN data_reset_cycle VARCHAR(10) DEFAULT 'none' COMMENT '流量重置周期（daily/monthly/yearly/none）', +ADD COLUMN isp VARCHAR(20) DEFAULT NULL COMMENT '运营商（unicom/mobile/telecom，用于特殊重置规则）'; + +CREATE INDEX idx_data_reset_cycle ON package(data_reset_cycle); +``` + +在 `package_usage` 表中新增： +```sql +ALTER TABLE package_usage +ADD COLUMN last_reset_at DATETIME DEFAULT NULL COMMENT '最后一次流量重置时间'; + +CREATE INDEX idx_last_reset_at ON package_usage(last_reset_at); +``` + +### 3. ❌ 要废弃的逻辑 + +- **废弃旧的重置逻辑**：如果代码中存在通过 `reset_interval` 或 `reset_day` 字段计算重置的逻辑，全部删除 +- **废弃旧的定时任务**：如果存在旧的流量重置定时任务，全部删除 +- **废弃旧的重置时间字段**：统一使用 `last_reset_at`（DATETIME），删除其他相关字段 + +### 4. ✅ 历史数据强制转换 + +```sql +-- Step 1: 历史套餐的重置周期初始化 +-- 假设历史套餐默认为按月重置（需根据实际业务规则调整） +UPDATE package +SET data_reset_cycle = 'monthly' +WHERE data_reset_cycle IS NULL; + +-- 如果历史有特殊类型，可以根据 duration 或其他字段推断： +-- 例如：duration_days=1 → data_reset_cycle='daily' +UPDATE package +SET data_reset_cycle = 'daily' +WHERE duration_days = 1 + AND data_reset_cycle IS NULL; + +-- Step 2: 历史套餐的运营商初始化 +-- 假设历史套餐默认为移动（需根据实际业务规则调整） +UPDATE package +SET isp = 'mobile' +WHERE isp IS NULL; + +-- Step 3: 历史 PackageUsage 的 last_reset_at 初始化 +-- 如果有旧的 last_reset_date 字段，转换为 last_reset_at +-- UPDATE package_usage +-- SET last_reset_at = STR_TO_DATE(last_reset_date, '%Y-%m-%d') +-- WHERE last_reset_date IS NOT NULL; + +-- 如果没有旧字段，根据 activated_at 推断： +-- 按月重置：last_reset_at = 当前月的1号 +-- 按日重置：last_reset_at = 今天0点 +-- 按年重置：last_reset_at = 今年1月1日 +-- 不重置：last_reset_at = NULL + +UPDATE package_usage pu +JOIN package p ON pu.package_id = p.id +SET pu.last_reset_at = DATE_FORMAT(CURDATE(), '%Y-%m-01 00:00:00') +WHERE p.data_reset_cycle = 'monthly' + AND pu.status = 1 + AND pu.last_reset_at IS NULL; + +UPDATE package_usage pu +JOIN package p ON pu.package_id = p.id +SET pu.last_reset_at = DATE_FORMAT(CURDATE(), '%Y-%m-%d 00:00:00') +WHERE p.data_reset_cycle = 'daily' + AND pu.status = 1 + AND pu.last_reset_at IS NULL; + +UPDATE package_usage pu +JOIN package p ON pu.package_id = p.id +SET pu.last_reset_at = DATE_FORMAT(CURDATE(), '%Y-01-01 00:00:00') +WHERE p.data_reset_cycle = 'yearly' + AND pu.status = 1 + AND pu.last_reset_at IS NULL; + +-- Step 4: data_reset_cycle=none 的套餐不设置 last_reset_at +-- （保持 NULL） +``` + +### 5. ❌ 删除遗留表/字段（确认后执行） + +```sql +-- 如果存在旧的重置相关字段，删除 +-- ALTER TABLE package DROP COLUMN IF EXISTS reset_interval; +-- ALTER TABLE package DROP COLUMN IF EXISTS reset_day; +-- ALTER TABLE package_usage DROP COLUMN IF EXISTS last_reset_date; +``` + +### 6. 验证步骤 + +```sql +-- 验证1：所有套餐都有 data_reset_cycle +SELECT COUNT(*) +FROM package +WHERE data_reset_cycle IS NULL; +-- 预期结果：0 + +-- 验证2：data_reset_cycle 值合法 +SELECT COUNT(*) +FROM package +WHERE data_reset_cycle NOT IN ('daily', 'monthly', 'yearly', 'none'); +-- 预期结果：0 + +-- 验证3：生效中套餐的 last_reset_at 不为空（除了 data_reset_cycle=none） +SELECT COUNT(*) +FROM package_usage pu +JOIN package p ON pu.package_id = p.id +WHERE pu.status = 1 + AND p.data_reset_cycle != 'none' + AND pu.last_reset_at IS NULL; +-- 预期结果：0 + +-- 验证4：检查是否还有遗留字段（需根据实际情况调整） +-- SELECT column_name FROM information_schema.columns +-- WHERE table_name = 'package' +-- AND column_name IN ('reset_interval', 'reset_day'); +-- 预期结果：0 rows +``` + +--- + +## 测试场景矩阵 + +| 场景分类 | 测试用例 | 预期结果 | +|---------|---------|---------| +| **配置重置周期** | 创建按日重置套餐 | data_reset_cycle=daily | +| | 创建按月重置套餐 | data_reset_cycle=monthly | +| | 创建按年重置套餐 | data_reset_cycle=yearly | +| | 创建不重置套餐 | data_reset_cycle=none | +| **每日重置** | 每日0点重置 | data_usage_mb=0, last_reset_at=今日0点 | +| | 非每日重置套餐不受影响 | data_usage_mb 不变 | +| | 待生效/已过期套餐不重置 | data_usage_mb 不变 | +| **每月重置** | 每月1号重置 | data_usage_mb=0, last_reset_at=本月1号0点 | +| | 联通特殊规则（27号重置） | data_usage_mb=0, last_reset_at=本月27号0点 | +| | 跨月边界流量统计 | 日记录保留，data_usage_mb 重置 | +| **每年重置** | 每年1月1日重置 | data_usage_mb=0, last_reset_at=今年1月1日0点 | +| | 已过期年套餐不重置 | data_usage_mb 不变 | +| **不重置** | 有效期内流量累计 | data_usage_mb 持续累加 | +| | 定时任务不影响 | data_usage_mb 不变 | +| **历史记录** | 重置后历史记录可查 | PackageUsageDailyRecord 存在 | +| | 重置后新流量使用 | 新日记录写入 | +| **并发** | 并发流量扣减和重置 | 使用行锁，顺序执行 | +| | 并发多套餐重置 | 分批处理，失败批次不影响其他 | +| **异常** | 重置任务失败 | Asynq 重试，记录日志 | +| | 批量重置部分失败 | 失败批次回滚，其他批次正常 | + +--- + +## 实现参考 + +### 每日流量重置定时任务 + +```go +// Handler: HandleDailyReset +func (h *DataResetHandler) HandleDailyReset(ctx context.Context, task *asynq.Task) error { + const batchSize = 100 + + // 1. 查询需要重置的套餐ID列表 + usageIDs, err := h.packageUsageStore.ListDailyResetUsageIDs(ctx) + if err != nil { + return fmt.Errorf("list daily reset usage ids failed: %w", err) + } + + if len(usageIDs) == 0 { + h.logger.Info("无需要每日重置的套餐") + return nil + } + + // 2. 分批重置 + totalCount := 0 + failedCount := 0 + + for i := 0; i < len(usageIDs); i += batchSize { + end := i + batchSize + if end > len(usageIDs) { + end = len(usageIDs) + } + + batchIDs := usageIDs[i:end] + + // 使用独立事务 + tx := h.db.Begin() + err := h.resetUsageBatch(ctx, tx, batchIDs) + if err != nil { + tx.Rollback() + failedCount += len(batchIDs) + h.logger.Error("批量重置失败", zap.Error(err), zap.Ints("batch_ids", batchIDs)) + continue + } + + if err := tx.Commit().Error; err != nil { + failedCount += len(batchIDs) + h.logger.Error("提交事务失败", zap.Error(err)) + continue + } + + totalCount += len(batchIDs) + } + + h.logger.Info("每日流量重置完成", + zap.Int("total_count", totalCount), + zap.Int("failed_count", failedCount)) + + if failedCount > 0 { + return fmt.Errorf("部分套餐重置失败，失败数量：%d", failedCount) + } + + return nil +} + +// Store 层：ListDailyResetUsageIDs +func (s *Store) ListDailyResetUsageIDs(ctx context.Context) ([]int, error) { + var ids []int + err := s.db.WithContext(ctx). + Table("package_usage pu"). + Select("pu.id"). + Joins("JOIN package p ON pu.package_id = p.id"). + Where("p.data_reset_cycle = ?", constants.DataResetCycleDaily). + Where("pu.status = ?", constants.PackageStatusActive). + Where("pu.expires_at > ?", time.Now()). + Where("(pu.last_reset_at IS NULL OR DATE(pu.last_reset_at) < CURDATE())"). // 幂等性 + Pluck("pu.id", &ids).Error + return ids, err +} + +// Store 层：resetUsageBatch +func (h *DataResetHandler) resetUsageBatch(ctx context.Context, tx *gorm.DB, ids []int) error { + return tx.WithContext(ctx). + Model(&model.PackageUsage{}). + Where("id IN (?)", ids). + Updates(map[string]interface{}{ + "data_usage_mb": 0, + "last_reset_at": time.Now(), + }).Error +} +``` + +### 每月流量重置定时任务（含联通特殊规则） + +```go +// Handler: HandleMonthlyReset +func (h *DataResetHandler) HandleMonthlyReset(ctx context.Context, task *asynq.Task) error { + // 判断今天是几号 + today := time.Now().Day() + + // 1. 重置非联通套餐（每月1号） + if today == 1 { + if err := h.resetMonthlyUsages(ctx, ""); err != nil { + h.logger.Error("非联通套餐每月重置失败", zap.Error(err)) + return err + } + } + + // 2. 重置联通套餐（每月27号） + if today == 27 { + if err := h.resetMonthlyUsages(ctx, constants.ISPUnicom); err != nil { + h.logger.Error("联通套餐每月重置失败", zap.Error(err)) + return err + } + } + + return nil +} + +// resetMonthlyUsages: 重置按月重置的套餐 +func (h *DataResetHandler) resetMonthlyUsages(ctx context.Context, isp string) error { + const batchSize = 100 + + // 查询需要重置的套餐ID列表 + usageIDs, err := h.packageUsageStore.ListMonthlyResetUsageIDs(ctx, isp) + if err != nil { + return fmt.Errorf("list monthly reset usage ids failed: %w", err) + } + + if len(usageIDs) == 0 { + h.logger.Info("无需要每月重置的套餐", zap.String("isp", isp)) + return nil + } + + // 分批重置（逻辑与每日重置相同） + // ... + return nil +} + +// Store 层：ListMonthlyResetUsageIDs +func (s *Store) ListMonthlyResetUsageIDs(ctx context.Context, isp string) ([]int, error) { + query := s.db.WithContext(ctx). + Table("package_usage pu"). + Select("pu.id"). + Joins("JOIN package p ON pu.package_id = p.id"). + Where("p.data_reset_cycle = ?", constants.DataResetCycleMonthly). + Where("pu.status = ?", constants.PackageStatusActive). + Where("pu.expires_at > ?", time.Now()) + + if isp != "" { + // 联通特殊规则 + query = query.Where("p.isp = ?", isp) + } else { + // 非联通套餐 + query = query.Where("p.isp != ?", constants.ISPUnicom) + } + + // 幂等性：避免重复重置 + query = query.Where("(pu.last_reset_at IS NULL OR DATE(pu.last_reset_at) < CURDATE())") + + var ids []int + err := query.Pluck("pu.id", &ids).Error + return ids, err +} +``` + +--- + +**本 Spec 完成**，包含： +- ✅ 业务背景和业务规则 +- ✅ 详细场景（每日/每月/每年重置、不重置、联通特殊规则） +- ✅ 边界条件和并发场景 +- ✅ 异常处理和数据一致性保证 +- ✅ 性能指标和错误码定义 +- ✅ **激进的数据迁移策略**（明确删除字段、废弃逻辑、强制转换） +- ✅ 测试场景矩阵和实现参考 diff --git a/openspec/changes/package-system-upgrade/specs/package-management/spec.md b/openspec/changes/package-system-upgrade/specs/package-management/spec.md new file mode 100644 index 0000000..2a62a53 --- /dev/null +++ b/openspec/changes/package-system-upgrade/specs/package-management/spec.md @@ -0,0 +1,575 @@ +# Spec Delta: 套餐管理能力扩展 + +## 业务背景 + +### 为什么需要扩展套餐管理字段 + +**现状问题**： +- 现有套餐管理缺少周期类型（自然月 vs 按天）配置 +- 流量重置周期（每日/每月/每年/不重置）无法配置 +- 实名激活机制无法按套餐级别控制 +- 旧字段（duration）无法区分自然月和按天套餐 + +**业务目标**： +- 在套餐创建/更新时支持新字段配置 +- 确保 calendar_type 与 duration_months/duration_days 的一致性 +- 支持 data_reset_cycle 的灵活配置 +- 支持 enable_realname_activation 的开关控制 + +--- + +## 业务规则 + +### 1. 周期类型与时长字段的关联规则 + +``` +IF calendar_type = natural_month: + THEN duration_months 必填，duration_days 可选 +ELSE IF calendar_type = by_day: + THEN duration_days 必填，duration_months 可选 + +验证规则： +- natural_month 套餐：必须提供 duration_months +- by_day 套餐：必须提供 duration_days +``` + +### 2. 流量重置周期的取值范围 + +``` +data_reset_cycle ∈ {daily, monthly, yearly, none} + +默认值规则： +- 主套餐：默认 monthly +- 加油包：默认 none +``` + +### 3. 实名激活开关规则 + +``` +enable_realname_activation: boolean + +- true：套餐激活前必须实名认证 +- false：套餐激活不需要实名认证 + +默认值： +- 主套餐：默认 true +- 加油包：默认 false +``` + +--- + +## MODIFIED Requirements + +### Requirement: 创建套餐 + +系统 SHALL 允许平台管理员创建套餐，包含套餐编码、套餐名称、所属系列、套餐类型、时长、**周期类型（calendar_type）、流量重置周期（data_reset_cycle）、是否需要实名激活（enable_realname_activation）**、流量配置、价格和建议价格。套餐编码 MUST 全局唯一（排除已删除记录）。新创建的套餐默认为启用状态(1)和下架状态(2)。 + +#### Scenario: 成功创建自然月套餐 +- **GIVEN** 管理员提供套餐信息，calendar_type=natural_month，duration_months=1 +- **WHEN** 提交创建请求 +- **THEN** 系统创建套餐，状态=1，上架状态=2，calendar_type=natural_month + +#### Scenario: 成功创建按天套餐 +- **GIVEN** 管理员提供套餐信息，calendar_type=by_day，duration_days=30 +- **WHEN** 提交创建请求 +- **THEN** 系统创建套餐，calendar_type=by_day，duration_days=30 + +#### Scenario: 套餐编码重复 +- **GIVEN** 数据库中存在套餐编码为 "PKG001" 的套餐（未删除） +- **WHEN** 管理员创建套餐，编码为 "PKG001" +- **THEN** 系统返回错误 "套餐编码已存在" + +#### Scenario: 关联不存在的套餐系列 +- **GIVEN** 管理员指定 series_id=999，但系列不存在 +- **WHEN** 提交创建请求 +- **THEN** 系统返回错误 "套餐系列不存在" + +#### Scenario: 缺少必填字段 +- **GIVEN** 管理员未提供套餐编码 +- **WHEN** 提交创建请求 +- **THEN** 系统返回参数验证错误 "套餐编码为必填项" + +#### Scenario: 创建自然月套餐时必须提供 duration_months +- **GIVEN** 管理员创建套餐，calendar_type=natural_month，但未提供 duration_months +- **WHEN** 提交创建请求 +- **THEN** 系统返回错误 "自然月套餐必须指定 duration_months" + +#### Scenario: 创建按天套餐时必须提供 duration_days +- **GIVEN** 管理员创建套餐，calendar_type=by_day，但未提供 duration_days +- **WHEN** 提交创建请求 +- **THEN** 系统返回错误 "按天套餐必须指定 duration_days" + +#### Scenario: 默认 data_reset_cycle 为 monthly +- **GIVEN** 管理员创建主套餐，未指定 data_reset_cycle +- **WHEN** 提交创建请求 +- **THEN** 系统自动设置 data_reset_cycle=monthly + +#### Scenario: 默认 enable_realname_activation 为 true +- **GIVEN** 管理员创建主套餐，未指定 enable_realname_activation +- **WHEN** 提交创建请求 +- **THEN** 系统自动设置 enable_realname_activation=true + +### Requirement: 更新套餐 + +系统 SHALL 允许管理员更新套餐的基本信息，**包括周期类型、流量重置周期、实名激活配置等新增字段**。套餐编码创建后 MUST NOT 允许修改。 + +#### Scenario: 成功更新套餐基本信息 +- **GIVEN** 管理员更新套餐名称和价格 +- **WHEN** 提交更新请求 +- **THEN** 系统更新套餐记录，返回更新后的详情 + +#### Scenario: 尝试修改套餐编码 +- **GIVEN** 管理员尝试修改套餐编码 +- **WHEN** 提交更新请求 +- **THEN** 系统忽略套餐编码字段，不进行修改 + +#### Scenario: 更新不存在的套餐 +- **GIVEN** 管理员更新套餐 ID=999，但套餐不存在 +- **WHEN** 提交更新请求 +- **THEN** 系统返回 "套餐不存在" 错误 + +#### Scenario: 关联不存在的套餐系列 +- **GIVEN** 管理员将套餐的 series_id 改为 999，但系列不存在 +- **WHEN** 提交更新请求 +- **THEN** 系统返回错误 "套餐系列不存在" + +#### Scenario: 更新套餐周期类型（从自然月改为按天） +- **GIVEN** 套餐当前 calendar_type=natural_month，duration_months=1 +- **WHEN** 管理员更新 calendar_type=by_day，duration_days=30 +- **THEN** 系统更新成功，calendar_type=by_day，duration_days=30 + +#### Scenario: 更新套餐周期类型（从按天改为自然月） +- **GIVEN** 套餐当前 calendar_type=by_day，duration_days=30 +- **WHEN** 管理员更新 calendar_type=natural_month，duration_months=1 +- **THEN** 系统更新成功，calendar_type=natural_month，duration_months=1 + +#### Scenario: 更新周期类型但未提供对应时长字段 +- **GIVEN** 套餐当前 calendar_type=by_day +- **WHEN** 管理员更新 calendar_type=natural_month，但未提供 duration_months +- **THEN** 系统返回错误 "自然月套餐必须指定 duration_months" + +#### Scenario: 更新 data_reset_cycle +- **GIVEN** 套餐当前 data_reset_cycle=monthly +- **WHEN** 管理员更新 data_reset_cycle=daily +- **THEN** 系统更新成功，data_reset_cycle=daily + +#### Scenario: 更新 enable_realname_activation +- **GIVEN** 套餐当前 enable_realname_activation=true +- **WHEN** 管理员更新 enable_realname_activation=false +- **THEN** 系统更新成功，enable_realname_activation=false + +### Requirement: 查询套餐详情 + +系统 SHALL 允许管理员查询单个套餐的详细信息，**响应包含新增字段（calendar_type, data_reset_cycle, enable_realname_activation）**。 + +#### Scenario: 查询存在的套餐 +- **GIVEN** 数据库中存在套餐 ID=1 +- **WHEN** 管理员请求套餐详情 +- **THEN** 系统返回该套餐的完整信息，包含所有新增字段 + +#### Scenario: 查询不存在的套餐 +- **GIVEN** 管理员请求套餐 ID=999，但套餐不存在 +- **WHEN** 提交查询请求 +- **THEN** 系统返回 "套餐不存在" 错误 + +#### Scenario: 响应包含周期类型信息 +- **GIVEN** 套餐 calendar_type=natural_month，duration_months=1 +- **WHEN** 管理员查询套餐详情 +- **THEN** 响应包含 calendar_type=natural_month，duration_months=1 + +#### Scenario: 响应包含流量重置周期信息 +- **GIVEN** 套餐 data_reset_cycle=monthly +- **WHEN** 管理员查询套餐详情 +- **THEN** 响应包含 data_reset_cycle=monthly + +#### Scenario: 响应包含实名激活配置 +- **GIVEN** 套餐 enable_realname_activation=true +- **WHEN** 管理员查询套餐详情 +- **THEN** 响应包含 enable_realname_activation=true + +--- + +## 边界条件 + +### 1. 套餐编码唯一性 + +- **场景**：套餐编码已存在（未删除） +- **处理**：返回错误 "套餐编码已存在" + +### 2. 套餐系列不存在 + +- **场景**：创建/更新套餐时，指定的系列 ID 不存在 +- **处理**：返回错误 "套餐系列不存在" + +### 3. 周期类型与时长字段不匹配 + +- **场景**：calendar_type=natural_month 但未提供 duration_months +- **处理**：返回错误 "自然月套餐必须指定 duration_months" + +--- + +## 并发场景 + +### 1. 并发创建相同编码的套餐 + +- **场景**：两个管理员同时创建编码为 "PKG001" 的套餐 +- **处理**：数据库唯一索引（code + deleted_at）保证只有一个创建成功，另一个返回错误 + +### 2. 并发更新套餐信息 + +- **场景**：两个管理员同时更新同一个套餐 +- **处理**：使用乐观锁（updated_at），后提交的更新成功，前提交的更新被覆盖 + +--- + +## 数据一致性保证 + +### 1. 套餐编码唯一性 + +- **机制**：数据库唯一索引（code + deleted_at） + +### 2. 套餐系列外键校验 + +- **机制**：在创建/更新前，查询系列是否存在 + +### 3. 周期类型与时长字段一致性 + +- **机制**：在 Service 层校验 calendar_type 与 duration_months/duration_days 的匹配 + +--- + +## 性能指标 + +| 操作 | 目标响应时间 | 并发要求 | 数据量 | +|------|-------------|---------|--------| +| 创建套餐 | < 100ms (P95) | 50 QPS | 单条插入 | +| 更新套餐 | < 100ms (P95) | 50 QPS | 单条更新 | +| 查询套餐详情 | < 50ms (P95) | 500 QPS | 单条查询 | +| 列表查询 | < 200ms (P95) | 200 QPS | 分页查询（默认 20 条） | + +--- + +## 错误码定义 + +| 错误码 | HTTP 状态码 | 错误消息 | 场景 | +|--------|------------|---------|------| +| `PACKAGE_CODE_EXISTS` | 400 | 套餐编码已存在 | 创建套餐时编码重复 | +| `SERIES_NOT_FOUND` | 404 | 套餐系列不存在 | 创建/更新套餐时系列不存在 | +| `PACKAGE_NOT_FOUND` | 404 | 套餐不存在 | 查询/更新/删除不存在的套餐 | +| `INVALID_CALENDAR_TYPE` | 400 | 无效的周期类型 | calendar_type 不在 {natural_month, by_day} | +| `MISSING_DURATION_MONTHS` | 400 | 自然月套餐必须指定 duration_months | 创建自然月套餐未提供 duration_months | +| `MISSING_DURATION_DAYS` | 400 | 按天套餐必须指定 duration_days | 创建按天套餐未提供 duration_days | +| `INVALID_DATA_RESET_CYCLE` | 400 | 无效的流量重置周期 | data_reset_cycle 不在 {daily, monthly, yearly, none} | + +--- + +## 数据迁移策略 + +**激进策略**（开发阶段，保证干净性）： + +### 1. ❌ 要删除的字段 + +```sql +-- 删除旧的 duration 字段（已被 duration_months/duration_days 替代） +ALTER TABLE package DROP COLUMN IF EXISTS duration; + +-- 删除旧的 reset_interval, reset_day 字段（已被 data_reset_cycle 替代） +ALTER TABLE package DROP COLUMN IF EXISTS reset_interval; +ALTER TABLE package DROP COLUMN IF EXISTS reset_day; +``` + +### 2. ✅ 新增的字段 + +```sql +-- 新增 calendar_type 字段（必填） +ALTER TABLE package +ADD COLUMN calendar_type VARCHAR(20) NOT NULL DEFAULT 'by_day'; + +-- 新增 data_reset_cycle 字段（必填） +ALTER TABLE package +ADD COLUMN data_reset_cycle VARCHAR(20) NOT NULL DEFAULT 'monthly'; + +-- 新增 enable_realname_activation 字段（必填） +ALTER TABLE package +ADD COLUMN enable_realname_activation BOOLEAN NOT NULL DEFAULT true; + +-- 新增 duration_months 字段（可选，自然月套餐必填） +ALTER TABLE package +ADD COLUMN duration_months INT; + +-- 新增 duration_days 字段（可选，按天套餐必填） +ALTER TABLE package +ADD COLUMN duration_days INT; +``` + +### 3. ✅ 历史数据转换 + +```sql +-- 将现有套餐统一设置为按天套餐 +UPDATE package +SET calendar_type = 'by_day', + duration_days = COALESCE(duration_months, 1) * 30 +WHERE deleted_at IS NULL; + +-- 将现有套餐设置默认流量重置周期 +UPDATE package +SET data_reset_cycle = 'monthly' +WHERE deleted_at IS NULL; + +-- 将现有套餐设置默认实名激活开关 +UPDATE package +SET enable_realname_activation = true +WHERE deleted_at IS NULL; +``` + +### 4. ✅ 索引优化 + +```sql +-- 确保套餐编码唯一索引存在 +CREATE UNIQUE INDEX IF NOT EXISTS idx_package_code +ON package(code) +WHERE deleted_at IS NULL; + +-- 添加周期类型索引（用于按类型查询） +CREATE INDEX IF NOT EXISTS idx_package_calendar_type +ON package(calendar_type); +``` + +--- + +## 测试场景矩阵 + +| 场景分类 | 测试用例 | 预期结果 | +|---------|---------|---------| +| **创建套餐** | 成功创建自然月套餐 | calendar_type=natural_month，duration_months=1 | +| | 成功创建按天套餐 | calendar_type=by_day，duration_days=30 | +| | 套餐编码重复 | 返回 "套餐编码已存在" | +| | 关联不存在的系列 | 返回 "套餐系列不存在" | +| | 缺少必填字段 | 返回参数验证错误 | +| | 自然月套餐未提供 duration_months | 返回 "自然月套餐必须指定 duration_months" | +| | 按天套餐未提供 duration_days | 返回 "按天套餐必须指定 duration_days" | +| | 默认 data_reset_cycle | data_reset_cycle=monthly | +| | 默认 enable_realname_activation | enable_realname_activation=true | +| **更新套餐** | 成功更新基本信息 | 套餐信息已更新 | +| | 尝试修改套餐编码 | 编码不变 | +| | 更新不存在的套餐 | 返回 "套餐不存在" | +| | 更新周期类型（从自然月改为按天） | calendar_type=by_day，duration_days=30 | +| | 更新周期类型但未提供对应时长 | 返回错误 | +| | 更新 data_reset_cycle | data_reset_cycle 已更新 | +| | 更新 enable_realname_activation | enable_realname_activation 已更新 | +| **查询套餐** | 查询存在的套餐 | 返回完整信息，包含新增字段 | +| | 查询不存在的套餐 | 返回 "套餐不存在" | +| | 响应包含周期类型信息 | 包含 calendar_type, duration_months/duration_days | +| | 响应包含流量重置周期 | 包含 data_reset_cycle | +| | 响应包含实名激活配置 | 包含 enable_realname_activation | +| **并发** | 并发创建相同编码套餐 | 只有一个成功 | +| | 并发更新套餐 | 后提交的更新成功 | + +--- + +## 实现参考 + +### Handler: CreatePackage + +```go +// Handler: CreatePackage +func (h *Handler) CreatePackage(c *fiber.Ctx) error { + var req dto.CreatePackageRequest + if err := c.BodyParser(&req); err != nil { + return errors.New(errors.CodeInvalidParam) + } + + // 调用 Service 层 + pkg, err := h.service.CreatePackage(c.UserContext(), &req) + if err != nil { + return err + } + + return response.Success(c, pkg) +} + +// Service 层：CreatePackage +func (s *Service) CreatePackage(ctx context.Context, req *dto.CreatePackageRequest) (*model.Package, error) { + // 1. 校验套餐编码唯一性 + exists, err := s.store.ExistsByCode(ctx, req.Code) + if err != nil { + return nil, errors.Wrap(errors.CodeInternalError, err, "查询套餐编码失败") + } + if exists { + return nil, errors.New(errors.CodePackageCodeExists, "套餐编码已存在") + } + + // 2. 校验套餐系列是否存在 + if req.SeriesID != nil { + exists, err := s.seriesStore.ExistsByID(ctx, *req.SeriesID) + if err != nil { + return nil, errors.Wrap(errors.CodeInternalError, err, "查询套餐系列失败") + } + if !exists { + return nil, errors.New(errors.CodeSeriesNotFound, "套餐系列不存在") + } + } + + // 3. 校验周期类型与时长字段一致性 + if err := s.validateCalendarType(req.CalendarType, req.DurationMonths, req.DurationDays); err != nil { + return nil, err + } + + // 4. 设置默认值 + if req.DataResetCycle == "" { + req.DataResetCycle = constants.DataResetCycleMonthly + } + if req.EnableRealnameActivation == nil { + defaultValue := true + req.EnableRealnameActivation = &defaultValue + } + + // 5. 创建套餐 + pkg := &model.Package{ + Code: req.Code, + Name: req.Name, + SeriesID: req.SeriesID, + PackageType: req.PackageType, + CalendarType: req.CalendarType, + DurationMonths: req.DurationMonths, + DurationDays: req.DurationDays, + DataResetCycle: req.DataResetCycle, + EnableRealnameActivation: *req.EnableRealnameActivation, + TotalDataMB: req.TotalDataMB, + Price: req.Price, + SuggestedPrice: req.SuggestedPrice, + Status: constants.PackageStatusEnabled, + ListingStatus: constants.ListingStatusOffShelf, + } + + if err := s.store.Create(ctx, pkg); err != nil { + return nil, errors.Wrap(errors.CodeInternalError, err, "创建套餐失败") + } + + return pkg, nil +} + +// 校验周期类型与时长字段一致性 +func (s *Service) validateCalendarType(calendarType string, durationMonths, durationDays *int) error { + if calendarType == constants.CalendarTypeNaturalMonth { + if durationMonths == nil || *durationMonths <= 0 { + return errors.New(errors.CodeMissingDurationMonths, "自然月套餐必须指定 duration_months") + } + } else if calendarType == constants.CalendarTypeByDay { + if durationDays == nil || *durationDays <= 0 { + return errors.New(errors.CodeMissingDurationDays, "按天套餐必须指定 duration_days") + } + } else { + return errors.New(errors.CodeInvalidCalendarType, "无效的周期类型") + } + return nil +} + +// Store 层：ExistsByCode +func (s *Store) ExistsByCode(ctx context.Context, code string) (bool, error) { + var count int64 + err := s.db.WithContext(ctx). + Model(&model.Package{}). + Where("code = ? AND deleted_at IS NULL", code). + Count(&count).Error + return count > 0, err +} +``` + +### Handler: UpdatePackage + +```go +// Handler: UpdatePackage +func (h *Handler) UpdatePackage(c *fiber.Ctx) error { + id, err := c.ParamsInt("id") + if err != nil { + return errors.New(errors.CodeInvalidParam) + } + + var req dto.UpdatePackageRequest + if err := c.BodyParser(&req); err != nil { + return errors.New(errors.CodeInvalidParam) + } + + // 调用 Service 层 + pkg, err := h.service.UpdatePackage(c.UserContext(), uint(id), &req) + if err != nil { + return err + } + + return response.Success(c, pkg) +} + +// Service 层：UpdatePackage +func (s *Service) UpdatePackage(ctx context.Context, id uint, req *dto.UpdatePackageRequest) (*model.Package, error) { + // 1. 查询套餐是否存在 + pkg, err := s.store.GetByID(ctx, id) + if err != nil { + return nil, errors.Wrap(errors.CodeInternalError, err, "查询套餐失败") + } + if pkg == nil { + return nil, errors.New(errors.CodePackageNotFound, "套餐不存在") + } + + // 2. 校验套餐系列是否存在 + if req.SeriesID != nil { + exists, err := s.seriesStore.ExistsByID(ctx, *req.SeriesID) + if err != nil { + return nil, errors.Wrap(errors.CodeInternalError, err, "查询套餐系列失败") + } + if !exists { + return nil, errors.New(errors.CodeSeriesNotFound, "套餐系列不存在") + } + pkg.SeriesID = req.SeriesID + } + + // 3. 校验周期类型与时长字段一致性（如果更新了周期类型） + if req.CalendarType != "" { + if err := s.validateCalendarType(req.CalendarType, req.DurationMonths, req.DurationDays); err != nil { + return nil, err + } + pkg.CalendarType = req.CalendarType + if req.DurationMonths != nil { + pkg.DurationMonths = req.DurationMonths + } + if req.DurationDays != nil { + pkg.DurationDays = req.DurationDays + } + } + + // 4. 更新其他字段 + if req.Name != "" { + pkg.Name = req.Name + } + if req.DataResetCycle != "" { + pkg.DataResetCycle = req.DataResetCycle + } + if req.EnableRealnameActivation != nil { + pkg.EnableRealnameActivation = *req.EnableRealnameActivation + } + if req.Price != nil { + pkg.Price = *req.Price + } + if req.SuggestedPrice != nil { + pkg.SuggestedPrice = *req.SuggestedPrice + } + + // 5. 更新套餐 + if err := s.store.Update(ctx, pkg); err != nil { + return nil, errors.Wrap(errors.CodeInternalError, err, "更新套餐失败") + } + + return pkg, nil +} +``` + +--- + +**本 Spec Delta 完成**（扩展版），包含： +- ✅ 业务背景和业务规则 +- ✅ 详细场景（创建、更新、查询） +- ✅ 边界条件和并发场景 +- ✅ 数据一致性保证和性能指标 +- ✅ 错误码定义 +- ✅ **激进的数据迁移策略**（明确标注 ❌ 删除和 ✅ 新增） +- ✅ 测试场景矩阵和实现参考 diff --git a/openspec/changes/package-system-upgrade/specs/package-queue-activation/spec.md b/openspec/changes/package-system-upgrade/specs/package-queue-activation/spec.md new file mode 100644 index 0000000..0c224f5 --- /dev/null +++ b/openspec/changes/package-system-upgrade/specs/package-queue-activation/spec.md @@ -0,0 +1,430 @@ +# Spec: 主套餐排队生效机制 + +## 业务背景 + +现有套餐系统允许同一载体（设备/卡）同时存在多个生效中的主套餐，导致流量统计混乱、停机条件不明确等问题。本规范引入主套餐排队机制，确保： + +1. **同一时刻只能有一个生效中主套餐**：避免多套餐并存的业务混乱 +2. **后续购买自动排队**：用户提前购买多个主套餐（囤货），按购买顺序自动激活 +3. **无缝衔接**：当前主套餐过期后，系统自动激活下一个，无需人工干预 + +## 业务规则 + +### 主套餐识别规则 +- **主套餐定义**：`package_type=formal` 且 `master_usage_id IS NULL` +- **加油包定义**：`package_type=addon` 或 `master_usage_id IS NOT NULL` + +### Priority 分配规则 +1. **首个主套餐**：priority=1，立即激活（status=1） +2. **后续主套餐**：priority=MAX(当前主套餐 priority)+1，待生效（status=0） +3. **Priority 全局唯一**：同一载体的所有主套餐 priority 不重复 + +### 激活顺序规则 +1. **按 priority 升序激活**：priority=1 → priority=2 → priority=3 ... +2. **跨状态查询**：轮询系统查询 status=0 且 priority 最小的待生效主套餐 +3. **过期检测频率**：每 10 秒执行一次过期检测 + +### 激活延迟要求 +- **目标延迟**：主套餐过期后 1 分钟内完成下一个套餐的激活 +- **实际延迟组成**： + - 过期检测：< 10 秒（轮询间隔） + - 队列延迟：< 1 秒（Asynq 队列延迟） + - 激活处理：< 5 秒（数据库更新 + 日志记录） + - **总延迟** < 20 秒（满足 < 1 分钟要求） + +## ADDED Requirements + +### Requirement: 同时只能有一个生效中的主套餐 +系统 SHALL 确保载体（设备/卡）同一时刻只能有一个 package_type=formal 且 status=1 的套餐。 + +**数据一致性保证**： +- 购买时检查：查询 `WHERE usage_type=? AND (iot_card_id/device_id)=? AND status=1 AND master_usage_id IS NULL` +- 并发控制：使用数据库事务 + 唯一索引（usage_type, carrier_id, status=1）避免并发插入多个生效中主套餐 +- 激活时二次检查：激活前再次查询是否有生效中主套餐，避免并发激活 + +#### Scenario: 首次购买主套餐立即生效 +- **GIVEN** 载体无任何主套餐记录 +- **WHEN** 用户通过 POST /api/admin/orders 购买主套餐（package_type=formal） +- **THEN** 系统创建 PackageUsage： + - status=1（生效中） + - priority=1 + - activated_at=支付完成时间 + - expires_at=根据 calendar_type 计算 + - master_usage_id=NULL +- **AND** 订单状态更新为 completed + +#### Scenario: 购买第二个主套餐自动排队 +- **GIVEN** 载体已有1个生效中的主套餐（priority=1, status=1） +- **WHEN** 用户购买第2个主套餐 +- **THEN** 系统创建 PackageUsage： + - status=0（待生效） + - priority=2 + - activated_at=NULL + - expires_at=NULL + - master_usage_id=NULL +- **AND** 订单状态更新为 completed + +#### Scenario: 购买第三个主套餐继续排队 +- **GIVEN** 载体已有1个生效中主套餐（priority=1, status=1）+ 1个待生效主套餐（priority=2, status=0） +- **WHEN** 用户购买第3个主套餐 +- **THEN** 系统创建 PackageUsage： + - status=0（待生效） + - priority=3 + - activated_at=NULL + - expires_at=NULL + +#### Scenario: 并发购买两个主套餐（并发控制） +- **GIVEN** 载体无任何主套餐记录 +- **WHEN** 两个用户同时（< 1秒内）购买主套餐 +- **THEN** 第一个请求创建 PackageUsage priority=1, status=1（生效中） +- **AND** 第二个请求创建 PackageUsage priority=2, status=0（待生效） +- **AND** 使用数据库事务保证数据一致性，不会出现两个 priority=1 或两个 status=1 + +#### Scenario: 查询生效中主套餐（接口验证） +- **GIVEN** 载体有1个 status=1 的主套餐和2个 status=0 的待生效主套餐 +- **WHEN** 系统查询生效中主套餐（WHERE status=1 AND master_usage_id IS NULL） +- **THEN** 返回唯一的 status=1 主套餐记录 +- **AND** 查询结果数量 = 1 + +#### Scenario: 违规创建两个生效中主套餐（数据库约束） +- **GIVEN** 数据库有唯一索引（usage_type, iot_card_id, status=1, deleted_at IS NULL） +- **WHEN** 系统尝试插入第二个 status=1 的主套餐（绕过业务逻辑） +- **THEN** 数据库返回唯一约束冲突错误 +- **AND** 事务回滚，数据不插入 + +### Requirement: 主套餐按购买顺序排队 +系统 SHALL 为待生效主套餐分配递增的 priority，priority 数字越小优先级越高。 + +**Priority 计算逻辑**： +``` +new_priority = MAX(当前载体所有主套餐的 priority) + 1 +``` + +**边界条件**： +- 首个主套餐 priority=1 +- 删除中间 priority 的套餐后，priority 不重新排序（例如删除 priority=2，后续仍从 priority=4 开始） +- priority 最大值不超过 999（业务限制，避免异常） + +#### Scenario: Priority 自动递增 +- **GIVEN** 载体当前主套餐最大 priority=5 +- **WHEN** 用户购买新主套餐 +- **THEN** 系统创建 PackageUsage priority=6, status=0 + +#### Scenario: 首个主套餐 Priority 为 1 +- **GIVEN** 载体无任何主套餐记录 +- **WHEN** 用户首次购买主套餐 +- **THEN** 系统创建 PackageUsage priority=1, status=1（生效中） + +#### Scenario: 删除待生效套餐后 Priority 不重排 +- **GIVEN** 载体有主套餐 priority=1(status=1), priority=2(status=0), priority=3(status=0) +- **WHEN** 用户删除 priority=2 的待生效套餐（软删除，设置 deleted_at） +- **AND** 再购买新主套餐 +- **THEN** 新套餐 priority=4（不重新排序为 priority=2） +- **AND** 激活顺序为 priority=1 → priority=3 → priority=4 + +#### Scenario: Priority 超过限制（业务异常） +- **GIVEN** 载体当前主套餐最大 priority=999 +- **WHEN** 用户尝试购买新主套餐 +- **THEN** 系统返回错误 400，错误消息："主套餐排队数量已达上限（999个），请联系客服" +- **AND** 订单创建失败 + +#### Scenario: 并发分配 Priority（并发控制） +- **GIVEN** 载体当前主套餐最大 priority=5 +- **WHEN** 两个用户同时购买主套餐 +- **THEN** 第一个请求分配 priority=6 +- **AND** 第二个请求分配 priority=7 +- **AND** 使用数据库事务 + SELECT FOR UPDATE 避免 priority 重复 + +### Requirement: 当前主套餐过期后自动激活下一个 +系统 SHALL 在主套餐过期（expires_at < now）时，自动激活 priority 最小的待生效主套餐。 + +**实现机制**： +1. **轮询调度**：Scheduler 每 10 秒执行一次过期检测 +2. **过期检测**：查询 `WHERE status=1 AND expires_at <= NOW() AND master_usage_id IS NULL` +3. **状态更新**：将过期主套餐 status 更新为 3（已过期） +4. **查询下一个**：查询 `WHERE status=0 AND master_usage_id IS NULL ORDER BY priority ASC LIMIT 1` +5. **提交任务**：创建 Asynq 任务 `TaskTypePackageQueueActivation` +6. **异步激活**：Asynq Handler 更新 status=1, 计算 activated_at 和 expires_at + +**幂等性保证**： +- 任务处理前检查 `status=0`，已激活则直接返回成功 +- 使用 Redis 分布式锁（key: `package:activation:lock:{usage_id}`，TTL=30s） + +#### Scenario: 自动激活下一个主套餐 +- **GIVEN** 当前主套餐 priority=1, status=1, expires_at=2026-02-28 23:59:59 +- **AND** 存在待生效主套餐 priority=2, status=0 +- **WHEN** 系统时间到达 2026-03-01 00:00:00，轮询系统检测到过期 +- **THEN** 系统执行以下操作： + 1. 更新 priority=1 的套餐 status=3（已过期） + 2. 查询 priority=2 的待生效套餐 + 3. 提交 Asynq 任务（payload: {usage_id: priority=2的ID}） + 4. Asynq Handler 激活 priority=2 套餐： + - status=1 + - activated_at=2026-03-01 00:00:10（激活时间，约为 00:00:00 + 10秒延迟） + - expires_at=根据 calendar_type 计算 +- **AND** 激活延迟 < 1 分钟 + +#### Scenario: 无待生效套餐时不激活 +- **GIVEN** 当前主套餐 priority=1, status=1, expires_at=2026-02-28 23:59:59 +- **AND** 不存在 status=0 的待生效主套餐 +- **WHEN** 系统时间到达 2026-03-01 00:00:00，轮询系统检测到过期 +- **THEN** 系统仅更新 priority=1 的套餐 status=3（已过期） +- **AND** 不提交激活任务 +- **AND** 载体进入无主套餐状态 + +#### Scenario: 过期检测批量处理 +- **GIVEN** 系统有 10000 个主套餐在 2026-02-28 23:59:59 过期 +- **WHEN** 系统时间到达 2026-03-01 00:00:00，轮询系统检测到过期 +- **THEN** 系统分批处理（每批 10000 个）： + 1. 批量更新过期主套餐 status=3 + 2. 批量查询下一个待生效主套餐（每个载体一个） + 3. 批量提交 Asynq 任务（最多 10000 个任务） +- **AND** 所有任务在 1 分钟内完成激活 + +#### Scenario: 激活任务失败重试 +- **GIVEN** 待生效主套餐 priority=2, status=0 +- **WHEN** 轮询系统提交激活任务，但 Asynq Handler 第一次执行失败（例如数据库连接超时） +- **THEN** Asynq 自动重试（MaxRetry=3，间隔 10 秒） +- **AND** 第二次重试成功，套餐激活 +- **AND** 总延迟 < 2 分钟（10秒检测 + 10秒首次失败 + 10秒重试成功） + +#### Scenario: 激活任务重试耗尽（异常处理） +- **GIVEN** 待生效主套餐 priority=2, status=0 +- **WHEN** 轮询系统提交激活任务，Asynq Handler 重试 3 次均失败 +- **THEN** Asynq 任务进入死信队列（DLQ） +- **AND** 套餐保持 status=0（待生效） +- **AND** 系统记录 Error 日志，包含完整错误信息和 usage_id +- **AND** 告警通知运维团队，人工介入修复 + +#### Scenario: 轮询系统重复检测（幂等性保证） +- **GIVEN** 主套餐过期，已提交激活任务，但任务尚未执行完成 +- **WHEN** 10 秒后轮询系统再次检测（任务仍在队列中） +- **THEN** 系统查询 status=1 的过期主套餐，结果为空（已更新为 status=3） +- **AND** 不重复提交激活任务 + +#### Scenario: 激活任务并发执行（幂等性保证） +- **GIVEN** 同一套餐的激活任务被重复提交（例如手动触发 + 自动调度） +- **WHEN** 两个 Asynq Handler 同时执行 +- **THEN** 第一个 Handler 获取 Redis 锁，执行激活 +- **AND** 第二个 Handler 获取锁失败，等待 30 秒后超时，检查 status=1，直接返回成功 +- **AND** 套餐只激活一次 + +### Requirement: 激活时根据套餐类型计算有效期 +系统 SHALL 在排队激活主套餐时，根据 calendar_type 计算 expires_at。 + +**计算时机**：Asynq Handler 执行激活任务时 + +**计算逻辑**： +- 自然月套餐：`expires_at = (activated_at 月份 + duration_months) 的月末 23:59:59` +- 按天套餐：`expires_at = (activated_at 日期 + duration_days) 的 23:59:59` + +#### Scenario: 排队激活自然月套餐 +- **GIVEN** 待生效主套餐 calendar_type=natural_month, duration_months=1 +- **WHEN** 2026-03-01 00:00:10 激活 +- **THEN** 套餐更新： + - status=1 + - activated_at=2026-03-01 00:00:10 + - expires_at=2026-03-31 23:59:59 +- **AND** 有效期 = 30 天 23 小时 59 分 50 秒 + +#### Scenario: 排队激活按天套餐 +- **GIVEN** 待生效主套餐 calendar_type=by_day, duration_days=30 +- **WHEN** 2026-03-01 00:00:10 激活 +- **THEN** 套餐更新： + - status=1 + - activated_at=2026-03-01 00:00:10 + - expires_at=2026-03-30 23:59:59 +- **AND** 有效期 = 29 天 23 小时 59 分 49 秒 + +#### Scenario: 激活时处理闰年（自然月） +- **GIVEN** 待生效主套餐 calendar_type=natural_month, duration_months=1 +- **WHEN** 2028-02-01 00:00:10 激活（闰年） +- **THEN** expires_at=2028-02-29 23:59:59（正确识别闰年） + +#### Scenario: 激活时处理跨年（自然月） +- **GIVEN** 待生效主套餐 calendar_type=natural_month, duration_months=2 +- **WHEN** 2026-12-01 00:00:10 激活 +- **THEN** expires_at=2027-02-28 23:59:59（正确跨年） + +### Requirement: 主套餐排队调度延迟小于1分钟 +系统 SHALL 确保主套餐过期后，待生效套餐在1分钟内完成激活。 + +**性能指标**： +| 指标 | 目标 | 监控方式 | +|------|------|---------| +| 过期检测延迟 | < 10 秒 | 轮询间隔配置 | +| 任务提交延迟 | < 1 秒 | Asynq 入队时间 | +| 激活处理延迟 | < 5 秒 | Asynq Handler 执行时间 | +| **端到端延迟** | **< 20 秒** | 从过期到激活完成 | + +**监控告警**： +- 激活延迟 > 1 分钟：Critical 告警，通知运维团队 +- Asynq 队列堆积 > 1000：Warning 告警，检查 Worker 数量 +- 激活任务失败率 > 5%：Warning 告警，检查数据库连接 + +#### Scenario: 排队激活性能达标 +- **GIVEN** 主套餐在 2026-02-28 23:59:59 过期 +- **WHEN** 轮询系统在 00:00:00 - 00:00:10 之间检测到过期 +- **AND** 在 00:00:11 提交 Asynq 任务 +- **AND** Asynq Handler 在 00:00:12 - 00:00:17 执行激活 +- **THEN** 套餐在 2026-03-01 00:00:17 完成激活 +- **AND** 端到端延迟 = 17 秒 < 60 秒 + +#### Scenario: 高负载下激活延迟（压力测试） +- **GIVEN** 10000 个主套餐同时过期 +- **WHEN** 轮询系统检测到过期并提交 10000 个任务 +- **AND** Asynq Worker 并发数 = 50 +- **THEN** 所有任务在 4 分钟内完成（10000 / 50 / 5秒 ≈ 4 分钟） +- **AND** P99 激活延迟 < 5 分钟（可接受） + +#### Scenario: 轮询系统宕机恢复（容错性） +- **GIVEN** 主套餐在 2026-02-28 23:59:59 过期 +- **WHEN** 轮询系统在 00:00:00 - 00:10:00 期间宕机 +- **AND** 轮询系统在 00:10:01 恢复 +- **THEN** 轮询系统检测到过期主套餐（expires_at < 00:10:01） +- **AND** 在 00:10:02 - 00:10:20 完成激活 +- **AND** 延迟 = 10 分钟 20 秒（超过目标，但系统自动恢复） + +## 数据一致性保证 + +### 1. 并发购买主套餐 +- **机制**：数据库事务 + 唯一索引（usage_type, iot_card_id/device_id, status=1, deleted_at IS NULL） +- **保证**：同一载体同一时刻只能有一个 status=1 的主套餐 + +### 2. 并发分配 Priority +- **机制**：数据库事务 + SELECT FOR UPDATE +- **伪代码**： + ```sql + BEGIN TRANSACTION; + SELECT MAX(priority) FROM tb_package_usage WHERE ... FOR UPDATE; + INSERT INTO tb_package_usage (priority) VALUES (max_priority + 1); + COMMIT; + ``` + +### 3. 并发激活同一套餐 +- **机制**：Redis 分布式锁（key: `package:activation:lock:{usage_id}`，TTL=30s） +- **保证**：同一套餐只能被激活一次 + +### 4. 过期检测重复触发 +- **机制**：更新 status=3 后，WHERE 条件不再匹配（status=1） +- **保证**：过期主套餐不会重复提交激活任务 + +## 性能优化策略 + +### 1. 过期检测分批处理 +```sql +-- 每次最多处理 10000 个过期套餐 +SELECT id FROM tb_package_usage +WHERE status=1 AND expires_at <= NOW() AND master_usage_id IS NULL +ORDER BY expires_at ASC +LIMIT 10000; +``` + +### 2. 批量提交 Asynq 任务 +- 使用 `Enqueue` 批量提交（每批 1000 个） +- 减少 Redis 往返次数 + +### 3. Asynq Worker 并发数 +- 默认并发数：10 +- 高负载时可调整为 50-100 +- 监控队列长度动态调整 + +### 4. 数据库索引优化 +```sql +-- 过期检测索引 +CREATE INDEX idx_package_usage_expires ON tb_package_usage(status, expires_at, master_usage_id) WHERE deleted_at IS NULL; + +-- Priority 查询索引 +CREATE INDEX idx_package_usage_priority ON tb_package_usage(iot_card_id, status, priority) WHERE deleted_at IS NULL; +``` + +## 错误码定义 + +| 错误码 | HTTP 状态码 | 错误消息 | 场景 | +|--------|------------|---------|------| +| CodeConflict | 409 | 套餐正在激活中，请稍后重试 | 并发激活冲突 | +| CodeForbidden | 403 | 主套餐排队数量已达上限（999个），请联系客服 | Priority 超限 | +| CodeInternal | 500 | 套餐激活失败，请重试 | 数据库更新失败 | + +## 数据迁移策略 + +**激进策略**（开发阶段）： +1. **历史主套餐数据重新排序**： + - 查询每个载体的所有主套餐（按 `created_at ASC`） + - 重新分配 `priority`：第一个=1，第二个=2，以此类推 + - 只保留第一个主套餐 `status=1`（生效中），其余设置为 `status=0`（待生效） + - 为待生效主套餐清空 `activated_at` 和 `expires_at` + +2. **订单服务彻底重构**： + - **删除** 现有 `activatePackage` 函数中的立即激活逻辑 + - 所有主套餐购买统一走排队逻辑（首个除外） + - 不保留旧的激活方式 + +3. **API 破坏性变更**： + - 订单创建接口行为变更：后续主套餐购买不再立即生效 + - 响应中新增 `priority` 和 `estimated_activation_time` 字段 + - 客户端必须适配新的"待生效"状态展示 + +## 测试场景矩阵 + +| 维度 | 场景 | 预期结果 | +|------|------|---------| +| **基础功能** | 首次购买主套餐 | priority=1, status=1 | +| | 购买第2个主套餐 | priority=2, status=0 | +| | 购买第3个主套餐 | priority=3, status=0 | +| **过期激活** | 主套餐过期 + 有待生效套餐 | status=3 → 激活 priority=2 | +| | 主套餐过期 + 无待生效套餐 | status=3，载体无主套餐 | +| **并发场景** | 并发购买两个主套餐 | priority=1(status=1) + priority=2(status=0) | +| | 并发激活同一套餐 | 只激活一次，第二个请求幂等返回 | +| **异常场景** | 激活任务失败 | 重试 3 次，失败进入 DLQ | +| | Priority 超限（999） | 返回错误，拒绝购买 | +| | 轮询系统宕机 | 恢复后自动激活过期套餐 | +| **性能场景** | 单个套餐激活延迟 | < 20 秒 | +| | 10000 个套餐同时过期 | P99 < 5 分钟 | + +--- + +## 补充测试场景（边界条件和异常处理） + +### T4. 并发激活竞态（边界情况） +**场景**：两个轮询任务同时检测到可激活套餐 + +**步骤**： +1. 卡 C1 有2个待激活套餐 P1（优先级1）、P2（优先级2） +2. 两个轮询任务并发执行 `ActivateQueuedPackages(C1)` +3. 验证： + - P1 仅激活1次（数据库行锁生效） + - P2 保持待激活状态 + - 无重复调用运营商接口 + +### T5. 运营商接口超时（异常处理） +**场景**：运营商激活接口超时 + +**步骤**： +1. Mock 运营商接口延迟10秒 +2. 触发套餐激活 +3. 验证： + - 3秒后超时，返回错误 + - 套餐状态仍为 `pending_activation` + - 下次轮询重试 + - 错误日志已记录 + +### T6. 月末边界日期（边界情况） +**场景**：联通用户在2月26日购买套餐 + +**步骤**： +1. 当前日期：2025-02-26 +2. 购买自然月套餐（联通，billing_day=27） +3. 验证： + - 激活时间：2025-02-26 + - 到期时间：2025-02-27 00:00（次日计费日） + - 有效期仅1天（符合预期） + +### T7. 闰年2月激活（边界情况） +**场景**：2028年2月1日激活自然月套餐 + +**步骤**： +1. 当前日期：2028-02-01（闰年） +2. 激活自然月套餐，duration_months=1 +3. 验证： + - expires_at=2028-02-29 23:59:59（正确识别闰年） diff --git a/openspec/changes/package-system-upgrade/specs/package-realname-activation/spec.md b/openspec/changes/package-system-upgrade/specs/package-realname-activation/spec.md new file mode 100644 index 0000000..037e822 --- /dev/null +++ b/openspec/changes/package-system-upgrade/specs/package-realname-activation/spec.md @@ -0,0 +1,972 @@ +# Spec: 首次实名激活机制 + +## 业务背景 + +### 为什么需要首次实名激活机制 + +**现状问题**： +- 运营商要求 IoT 卡必须实名认证后才能使用，但用户购买套餐时可能尚未实名 +- 后台管理员需要为客户提前购买套餐（批量配置），但客户设备可能尚未实名 +- 客户端购买套餐时强制实名会影响用户体验（需要先跳转实名流程再回来购买） +- 套餐立即生效但设备未实名会导致浪费（无法使用流量，有效期却在流失） + +**业务目标**： +- 后台管理端可以为未实名设备提前购买套餐（套餐待生效，等待实名激活） +- 客户端购买套餐必须先实名（确保用户可以立即使用） +- 设备首次实名时自动激活所有待生效套餐（无需手动操作） +- 支持灵活配置：部分套餐支持实名激活，部分套餐立即生效 + +--- + +## 业务规则 + +### 1. 购买前置检查规则 + +购买套餐时的实名检查规则： + +``` +后台管理端购买（/api/admin/orders）： +1. 不检查载体是否实名 +2. 如果套餐 enable_realname_activation=true： + - 创建 PackageUsage status=0（待生效） + - 设置 pending_realname_activation=true +3. 如果套餐 enable_realname_activation=false： + - 创建 PackageUsage status=1（生效中） + - 立即激活，计算有效期 + +客户端购买（/api/h5/orders, /api/customer/orders）： +1. 必须检查载体是否实名 +2. 如果未实名 → 返回错误 403："设备/卡必须先完成实名认证才能购买套餐" +3. 如果已实名 → 创建 PackageUsage status=1（生效中），立即激活 +``` + +### 2. 首次实名判定规则 + +判断是否为"首次实名"的逻辑： + +``` +设备类型（Device）： +- 查询该设备下所有 IoT 卡的实名状态 +- 如果至少有1张卡已实名 → 不是首次实名 +- 如果所有卡都未实名，当前卡是第1张实名 → 是首次实名 + +单卡类型（IotCard）： +- 查询该卡的实名状态 +- 如果卡从未实名，本次实名成功 → 是首次实名 +- 如果卡已实名（重新实名） → 不是首次实名 +``` + +**实现方式**： +- 在 `Device` 模型中维护 `realname_status` 字段（0-未实名, 1-已实名） +- 在 `IotCard` 模型中维护 `realname_status` 字段 +- 首次实名时更新对应模型的 `realname_status=1` + +### 3. 激活触发规则 + +首次实名时触发套餐激活： + +``` +触发条件： +1. 载体首次实名成功（realname_status 从 0 变为 1） +2. 载体有待生效套餐（status=0 AND pending_realname_activation=true） + +激活流程： +1. 实名成功后，入队 Asynq 任务 "realname_activation" +2. 任务 payload： + { + "carrier_type": "device" | "iot_card", + "carrier_id": 123, + "realname_at": "2026-02-15T10:30:00Z" + } +3. Asynq Worker 处理任务： + - 查询该载体所有 pending_realname_activation=true 且 status=0 的套餐 + - 批量更新 status=1, activated_at=realname_at + - 根据套餐 calendar_type 计算 expires_at + - 记录激活日志 +``` + +### 4. 有效期计算规则 + +激活时根据 `calendar_type` 计算 `expires_at`： + +| calendar_type | 计算规则 | 示例 | +|---------------|---------|------| +| `natural_month` | `expires_at = 激活月份的最后一天 23:59:59` | 2026-02-15 激活 → 2026-02-28 23:59:59 | +| `by_day` | `expires_at = activated_at + duration_days 天 - 1秒` | 2026-02-15 10:30:00 激活，30天 → 2026-03-16 23:59:59 | + +**详细逻辑**见 `package-calendar-type/spec.md`。 + +### 5. enable_realname_activation 配置规则 + +套餐是否支持实名激活： + +| enable_realname_activation | 说明 | 后台购买行为 | 客户端购买行为 | +|---------------------------|------|-------------|---------------| +| `true` | 支持实名激活 | 未实名设备：status=0，等待激活
已实名设备：status=1，立即生效 | 必须实名，status=1，立即生效 | +| `false` | 立即生效 | 无论是否实名，status=1，立即生效 | 必须实名，status=1，立即生效 | + +--- + +## ADDED Requirements + +### Requirement: 支持未实名状态购买套餐 + +系统 SHALL 允许后台管理端为未实名的载体（设备/卡）购买套餐，套餐状态为"待生效"(status=0)。 + +#### Scenario: 后台为未实名设备购买套餐成功 +- **GIVEN** 设备 ID=123，realname_status=0（未实名） +- **AND** 套餐 enable_realname_activation=true +- **WHEN** 管理员通过 POST /api/admin/orders 为该设备购买套餐 +- **THEN** 系统创建订单成功，PackageUsage： + - status=0（待生效） + - pending_realname_activation=true + - activated_at=NULL + - expires_at=NULL + +#### Scenario: 后台为未实名设备购买不支持实名激活的套餐 +- **GIVEN** 设备 ID=123，realname_status=0（未实名） +- **AND** 套餐 enable_realname_activation=false +- **WHEN** 管理员通过 POST /api/admin/orders 为该设备购买套餐 +- **THEN** 系统创建订单成功，PackageUsage： + - status=1（生效中） + - pending_realname_activation=false + - activated_at=订单支付时间 + - expires_at=根据 calendar_type 计算 + +#### Scenario: 客户端未实名时购买套餐失败 +- **GIVEN** 设备 ID=123，realname_status=0（未实名） +- **WHEN** 客户通过 POST /api/h5/orders 为该设备购买套餐 +- **THEN** 系统返回错误 403，错误码 `REALNAME_REQUIRED`，错误消息："设备/卡必须先完成实名认证才能购买套餐" + +#### Scenario: 已实名设备购买套餐立即生效 +- **GIVEN** 设备 ID=123，realname_status=1（已实名） +- **AND** 套餐 enable_realname_activation=true +- **WHEN** 管理员或客户为该设备购买套餐 +- **THEN** 系统创建订单成功，PackageUsage： + - status=1（生效中） + - pending_realname_activation=false + - activated_at=订单支付时间 + - expires_at=根据 calendar_type 计算 + +#### Scenario: 后台批量购买套餐（部分未实名） +- **GIVEN** 设备A（realname_status=0），设备B（realname_status=1） +- **WHEN** 管理员批量为设备A和设备B购买套餐（enable_realname_activation=true） +- **THEN** 系统创建订单成功： + - 设备A套餐：status=0，pending_realname_activation=true + - 设备B套餐：status=1，pending_realname_activation=false + +### Requirement: 首次实名时自动激活待生效套餐 + +系统 SHALL 在载体首次实名成功时，自动激活所有 pending_realname_activation=true 的待生效套餐。 + +#### Scenario: 设备首张卡实名触发套餐激活 +- **GIVEN** 设备 ID=123，realname_status=0，有2个待生效套餐（pending_realname_activation=true） +- **AND** 该设备下所有 IoT 卡都未实名 +- **WHEN** 设备的第1张卡在 2026-02-15 10:30:00 完成实名认证 +- **THEN** 系统： + 1. 更新设备 realname_status=1 + 2. 入队 Asynq 任务 "realname_activation" + 3. 任务执行：批量更新2个套餐 status=1，activated_at=2026-02-15 10:30:00 + 4. 根据各套餐 calendar_type 计算 expires_at + +#### Scenario: 设备后续卡实名不触发激活 +- **GIVEN** 设备 ID=123，realname_status=1（已有1张卡实名） +- **WHEN** 设备的第2张卡在 2026-02-20 10:00:00 完成实名认证 +- **THEN** 系统不触发套餐激活，设备的套餐状态保持不变 + +#### Scenario: 单卡设备实名触发激活 +- **GIVEN** IoT 卡 ICCID=123456，realname_status=0，有1个待生效套餐 +- **WHEN** 该卡在 2026-02-15 10:30:00 完成实名认证 +- **THEN** 系统： + 1. 更新卡 realname_status=1 + 2. 入队 Asynq 任务 "realname_activation" + 3. 任务执行：更新套餐 status=1，activated_at=2026-02-15 10:30:00 + +#### Scenario: 激活时排除已生效的套餐 +- **GIVEN** 设备 ID=123，realname_status=0，有2个套餐： + - 套餐A：status=0，pending_realname_activation=true + - 套餐B：status=1（已生效） +- **WHEN** 设备在 2026-02-15 10:30:00 首次实名 +- **THEN** 系统只激活套餐A，套餐B 保持不变 + +#### Scenario: 无待激活套餐时不执行激活逻辑 +- **GIVEN** 设备 ID=123，realname_status=0，无任何套餐 +- **WHEN** 设备在 2026-02-15 10:30:00 首次实名 +- **THEN** 系统入队 Asynq 任务，任务执行后发现无待激活套餐，直接返回 + +### Requirement: 激活时根据套餐类型计算有效期 + +系统 SHALL 在首次实名激活套餐时，根据套餐的 calendar_type 计算 expires_at。 + +#### Scenario: 实名激活自然月套餐 +- **GIVEN** 套餐 calendar_type=natural_month，duration_months=1 +- **WHEN** 2026-02-15 10:30:00 首次实名激活 +- **THEN** 系统计算： + - activated_at=2026-02-15 10:30:00 + - expires_at=2026-02-28 23:59:59（当月最后一天） + +#### Scenario: 实名激活按天套餐 +- **GIVEN** 套餐 calendar_type=by_day，duration_days=30 +- **WHEN** 2026-02-15 10:30:00 首次实名激活 +- **THEN** 系统计算： + - activated_at=2026-02-15 10:30:00 + - expires_at=2026-03-16 23:59:59（+30天-1秒） + +#### Scenario: 实名激活跨年自然月套餐 +- **GIVEN** 套餐 calendar_type=natural_month，duration_months=2 +- **WHEN** 2026-12-15 10:30:00 首次实名激活 +- **THEN** 系统计算： + - activated_at=2026-12-15 10:30:00 + - expires_at=2027-01-31 23:59:59（跨年到次年1月最后一天） + +#### Scenario: 激活时有效期计算失败 +- **GIVEN** 套餐 calendar_type=natural_month，duration_months=NULL（数据异常） +- **WHEN** 首次实名激活 +- **THEN** 系统： + 1. 激活失败，套餐 status 保持 0 + 2. 记录 Error 日志（包含套餐ID、载体信息、错误原因） + 3. Asynq 重试（最多3次） + +### Requirement: 支持配置是否启用实名激活 + +系统 SHALL 在套餐模型中提供 enable_realname_activation 字段，允许管理员配置是否需要实名激活。 + +#### Scenario: 创建需要实名激活的套餐 +- **WHEN** 管理员创建套餐时指定 enable_realname_activation=true +- **THEN** 系统创建成功，该套餐： + - 后台购买未实名设备：status=0，等待激活 + - 后台购买已实名设备：status=1，立即生效 + - 客户端购买：必须实名，status=1，立即生效 + +#### Scenario: 创建立即生效的套餐 +- **WHEN** 管理员创建套餐时指定 enable_realname_activation=false +- **THEN** 系统创建成功，该套餐： + - 无论后台还是客户端购买，status=1，立即生效 + - 不需要等待实名激活 + +#### Scenario: 更新套餐的实名激活配置 +- **GIVEN** 套餐 ID=123，enable_realname_activation=false +- **WHEN** 管理员更新套餐配置为 enable_realname_activation=true +- **THEN** 系统更新成功，该套餐后续购买行为遵循新配置 +- **AND** 已有的 PackageUsage 不受影响 + +### Requirement: 实名激活异步处理 + +系统 SHALL 通过 Asynq 异步任务处理首次实名激活逻辑，避免阻塞实名认证流程。 + +#### Scenario: 实名成功后入队激活任务 +- **GIVEN** 设备 ID=123 首次实名成功 +- **WHEN** 系统更新设备 realname_status=1 +- **THEN** 系统入队 Asynq 任务： + - task_type="realname_activation" + - payload={"carrier_type": "device", "carrier_id": 123, "realname_at": "2026-02-15T10:30:00Z"} + - queue="default" + - max_retry=3 + +#### Scenario: 激活任务在1分钟内完成 +- **GIVEN** Asynq 任务 "realname_activation" 从队列取出 +- **WHEN** Worker 执行任务 +- **THEN** 系统在1分钟内完成套餐激活，更新 PackageUsage 状态 +- **AND** 任务标记为成功，从队列移除 + +#### Scenario: 激活任务失败后重试 +- **GIVEN** Asynq 任务 "realname_activation" 执行时数据库连接失败 +- **WHEN** 任务执行失败 +- **THEN** 系统： + 1. 记录 Error 日志（包含载体ID、错误信息） + 2. Asynq 自动重试（间隔 10s/30s/60s） + 3. 3次失败后写入死信队列，发送告警 + +#### Scenario: 激活任务幂等性 +- **GIVEN** Asynq 任务 "realname_activation" 因网络波动重复执行 +- **WHEN** Worker 第2次执行同一任务 +- **THEN** 系统检查套餐 status： + - 如果已是 status=1 → 跳过激活，直接返回成功 + - 如果仍是 status=0 → 执行激活逻辑 + +--- + +## 边界条件 + +### 1. 并发首次实名 + +- **场景**：设备的2张卡同时完成实名认证（并发请求） +- **处理**： + - 使用数据库行锁：`SELECT * FROM device WHERE id=? FOR UPDATE` + - 第1个请求更新 realname_status=1，触发激活 + - 第2个请求发现 realname_status=1，不触发激活 + +### 2. 激活任务部分失败 + +- **场景**：设备有3个待激活套餐，激活第2个时失败 +- **处理**： + - 使用事务：全部激活成功才提交 + - 失败时回滚，3个套餐保持 status=0 + - Asynq 重试，重新激活全部3个套餐 + +### 3. 实名时无待激活套餐 + +- **场景**：设备首次实名时，无任何套餐 +- **处理**： + - 仍然入队 Asynq 任务 + - 任务执行时查询套餐数量=0，直接返回成功 + - 不记录错误日志 + +### 4. 套餐购买和实名并发 + +- **场景**：设备购买套餐的同时，完成首次实名 +- **处理**： + - 购买订单时检查 realname_status： + - 如果未实名 → status=0，pending_realname_activation=true + - 如果已实名 → status=1，立即生效 + - 实名激活任务执行时，再次检查套餐状态，只激活 status=0 的套餐 + +### 5. 有效期计算异常 + +- **场景**：套餐 calendar_type 或 duration_days/duration_months 为 NULL +- **处理**： + - 激活失败，返回错误 500 + - 记录 Error 日志（包含套餐ID、载体ID、错误原因） + - Asynq 重试（最多3次） + - 3次失败后写入死信队列，发送告警 + +--- + +## 并发场景 + +### Scenario: 并发首次实名 +- **GIVEN** 设备 ID=123，realname_status=0，有2张卡 +- **WHEN** 两张卡同时在 2026-02-15 10:30:00 完成实名认证 +- **THEN** 系统使用行锁： + ```sql + SELECT * FROM device WHERE id=123 FOR UPDATE + ``` +- **AND** 第1个请求： + - 更新 realname_status=1 + - 入队 Asynq 任务 +- **AND** 第2个请求： + - 发现 realname_status=1 + - 不入队任务 + +### Scenario: 并发购买套餐和首次实名 +- **GIVEN** 设备 ID=123，realname_status=0 +- **WHEN** 同时发生： + - 请求1：管理员购买套餐（enable_realname_activation=true） + - 请求2：设备完成首次实名 +- **THEN** 使用事务隔离： + - 如果请求1先完成 → 套餐 status=0，然后被请求2激活 + - 如果请求2先完成 → 设备 realname_status=1，请求1创建套餐时 status=1（立即生效） + +### Scenario: 并发激活任务（重复入队） +- **GIVEN** Asynq 任务 "realname_activation" 因网络抖动重复入队 +- **WHEN** Worker 同时处理2个相同任务 +- **THEN** 系统使用行锁： + ```sql + SELECT * FROM package_usage WHERE carrier_id=? AND status=0 FOR UPDATE + ``` +- **AND** 第1个任务：激活成功，套餐 status=1 +- **AND** 第2个任务：发现 status=1，跳过激活 + +--- + +## 异常处理 + +### 1. 激活任务失败 + +- **错误场景**：Asynq 任务执行时数据库连接失败 +- **处理流程**： + 1. 捕获错误，记录 Error 日志（包含载体ID、错误信息） + 2. Asynq 自动重试（最多3次，间隔 10s/30s/60s） + 3. 重试前检查套餐 status（避免重复激活） + 4. 3次失败后写入死信队列，发送告警通知 +- **返回错误**：不返回给用户（异步任务），仅记录日志 + +### 2. 有效期计算失败 + +- **错误场景**：套餐 calendar_type 或 duration_days 数据异常 +- **处理流程**： + 1. 激活失败，套餐 status 保持 0 + 2. 记录 Error 日志（包含套餐ID、载体ID、calendar_type、duration_days） + 3. Asynq 重试（最多3次） + 4. 3次失败后写入死信队列，发送告警 +- **返回错误**：不返回给用户（异步任务），仅记录日志 + +### 3. 批量激活部分失败 + +- **错误场景**：设备有3个待激活套餐，激活第2个时失败 +- **处理流程**： + 1. 使用事务包裹批量更新 + 2. 任何一个套餐激活失败 → 事务回滚，全部套餐保持 status=0 + 3. 记录 Error 日志（包含设备ID、失败套餐ID、错误原因） + 4. Asynq 重试，重新激活全部套餐 +- **返回错误**：不返回给用户（异步任务），仅记录日志 + +### 4. 首次实名判定失败 + +- **错误场景**：查询设备的 IoT 卡列表时超时 +- **处理流程**： + 1. 实名认证流程继续（不阻塞） + 2. Asynq 任务入队 + 3. 任务执行时再次尝试查询，失败则重试 + 4. 3次失败后写入死信队列 +- **返回错误**：实名认证返回成功，激活任务在后台处理 + +--- + +## 数据一致性保证 + +### 1. 事务边界 + +- **首次实名 + 入队任务**：更新 realname_status 后再入队（确保任务执行时状态已更新） +- **批量激活套餐**：使用单个事务，全部成功或全部失败 +- **并发首次实名检查**：使用 `SELECT FOR UPDATE` 行锁 + +### 2. 行锁机制 + +- **首次实名检查**：`SELECT * FROM device WHERE id=? FOR UPDATE` +- **批量激活套餐**：`SELECT * FROM package_usage WHERE carrier_id=? AND status=0 FOR UPDATE` + +### 3. 幂等性保证 + +#### 使用 first_realname_at 字段确保首次实名幂等 + +系统使用 `tb_iot_card.first_realname_at` 字段（时间戳）确保首次实名激活只执行一次： + +**数据库字段**： +```sql +-- tb_iot_card 新增字段 +ALTER TABLE tb_iot_card +ADD COLUMN first_realname_at TIMESTAMP NULL COMMENT '首次实名时间，NULL=未实名，非NULL=已实名（幂等标记）'; +``` + +**幂等更新**： +```sql +-- 首次实名触发时（原子操作） +UPDATE tb_iot_card +SET first_realname_at = NOW() +WHERE id = ? AND first_realname_at IS NULL; + +-- 通过影响行数判断是否首次实名 +-- rows_affected = 1 → 首次实名，执行激活逻辑 +-- rows_affected = 0 → 已处理，跳过 +``` + +**优势**： +- **比 realname_status 更可靠**：状态字段可能被重置，时间戳不可逆 +- **可追溯首次实名时间**：便于审计和问题排查 +- **数据库层面保证唯一更新**：WHERE 条件确保只有首次实名时更新成功 +- **无需 Redis 锁**：数据库行级锁已足够，减少依赖 + +**实现示例**： +```go +// Service 层：检查并标记首次实名 +func (s *Service) MarkFirstRealname(ctx context.Context, cardID uint) (bool, error) { + result := s.db.WithContext(ctx). + Model(&model.IotCard{}). + Where("id = ? AND first_realname_at IS NULL", cardID). + Update("first_realname_at", time.Now()) + + if result.Error != nil { + return false, errors.Wrap(errors.CodeInternal, result.Error, "更新首次实名时间失败") + } + + // 影响行数 = 1 表示首次实名 + isFirstRealname := result.RowsAffected == 1 + + return isFirstRealname, nil +} + +// 轮询系统：检测实名状态变更时 +func (h *Handler) HandleRealnameCheck(ctx context.Context, task *asynq.Task) error { + // 1. 检测到卡实名状态变更（realname_status: 0 → 2） + // ... + + // 2. 尝试标记首次实名 + isFirstRealname, err := h.iotCardService.MarkFirstRealname(ctx, cardID) + if err != nil { + return err + } + + // 3. 只有首次实名时才触发套餐激活 + if isFirstRealname { + err := h.queueClient.Enqueue(TaskTypePackageFirstActivation, payload) + if err != nil { + return err + } + } + + return nil +} +``` + +- **激活任务幂等**：执行前检查套餐 status，如果已激活则跳过 +- **实名状态幂等**：重复实名不触发激活（通过 first_realname_at 字段保证） + +### 4. 数据校验 + +- **购买套餐前**：校验 enable_realname_activation 与 realname_status 的一致性 +- **激活套餐前**：校验 calendar_type 和 duration_days/duration_months 是否有效 +- **首次实名判定**：校验设备的 IoT 卡列表是否完整 + +--- + +## 性能指标 + +| 操作 | 目标响应时间 | 并发要求 | 数据量 | +|------|-------------|---------|--------| +| 后台购买套餐（实名检查） | < 50ms | 100 QPS | 单载体查询 | +| 客户端购买套餐（实名检查） | < 100ms | 200 QPS | 单载体查询 | +| 首次实名入队任务 | < 50ms | 100 QPS | 入队操作 | +| 激活任务执行（批量激活） | < 1000ms | 50 QPS | 批量更新（平均5个套餐） | + +--- + +## 错误码定义 + +| 错误码 | HTTP 状态码 | 错误消息 | 场景 | +|--------|------------|---------|------| +| `REALNAME_REQUIRED` | 403 | 设备/卡必须先完成实名认证才能购买套餐 | 客户端购买套餐时未实名 | +| `ACTIVATION_FAILED` | 500 | 套餐激活失败，请稍后重试 | 激活任务执行失败 | +| `EXPIRY_CALCULATION_FAILED` | 500 | 有效期计算失败，请联系管理员 | calendar_type 或 duration 数据异常 | +| `REALNAME_STATUS_UPDATE_FAILED` | 500 | 实名状态更新失败，请稍后重试 | 更新 realname_status 失败 | + +--- + +## 数据迁移策略 + +**激进策略**（开发阶段，保证干净性）： + +### 1. ❌ 要删除的字段 + +目前 `package_usage` 表中可能存在的冗余字段（需确认后删除）： +- 如果有 `realname_activated` 字段（旧的实名激活标志） → **删除** +- 如果有 `wait_realname` 字段（旧的等待实名标志） → **删除** + +目前 `package` 表中可能存在的冗余字段（需确认后删除）： +- 如果有 `require_realname` 字段（旧的实名要求标志） → **删除** + +目前 `device` 和 `iot_card` 表中可能存在的冗余字段（需确认后删除）： +- 如果有 `is_realname` 字段（旧的实名标志） → **删除**，统一使用 `realname_status` + +### 2. ✅ 新增的字段 + +在 `package_usage` 表中新增： +```sql +ALTER TABLE package_usage +ADD COLUMN pending_realname_activation BOOLEAN DEFAULT false COMMENT '是否等待实名激活'; + +CREATE INDEX idx_pending_realname_activation ON package_usage(carrier_id, pending_realname_activation, status); +``` + +在 `package` 表中新增： +```sql +ALTER TABLE package +ADD COLUMN enable_realname_activation BOOLEAN DEFAULT false COMMENT '是否启用实名激活机制（true=支持未实名购买并等待激活，false=立即生效）'; +``` + +在 `device` 表中新增（如果不存在）： +```sql +ALTER TABLE device +ADD COLUMN realname_status TINYINT DEFAULT 0 COMMENT '实名状态（0-未实名，1-已实名）'; + +CREATE INDEX idx_realname_status ON device(realname_status); +``` + +在 `iot_card` 表中新增（如果不存在）： +```sql +ALTER TABLE iot_card +ADD COLUMN realname_status TINYINT DEFAULT 0 COMMENT '实名状态（0-未实名，1-已实名）'; + +CREATE INDEX idx_realname_status ON iot_card(realname_status); +``` + +### 3. ❌ 要废弃的逻辑 + +- **废弃旧的实名检查逻辑**：如果代码中存在通过 `is_realname` 或 `require_realname` 字段检查实名的逻辑，全部删除 +- **废弃旧的激活逻辑**：如果代码中存在手动激活套餐的逻辑（非首次实名触发），全部删除 +- **废弃旧的实名状态字段**：统一使用 `realname_status`（0/1），删除其他相关字段 + +### 4. ✅ 历史数据强制转换 + +```sql +-- Step 1: 历史设备/卡的实名状态初始化 +-- 根据实际业务规则确定历史数据的实名状态（假设有 realname_info 字段） +UPDATE device +SET realname_status = CASE + WHEN realname_info IS NOT NULL AND realname_info != '' THEN 1 + ELSE 0 +END +WHERE realname_status IS NULL; + +UPDATE iot_card +SET realname_status = CASE + WHEN realname_info IS NOT NULL AND realname_info != '' THEN 1 + ELSE 0 +END +WHERE realname_status IS NULL; + +-- Step 2: 历史套餐的实名激活配置初始化 +-- 假设历史套餐默认不启用实名激活（立即生效） +UPDATE package +SET enable_realname_activation = false +WHERE enable_realname_activation IS NULL; + +-- Step 3: 历史 PackageUsage 的 pending_realname_activation 初始化 +-- 已生效的套餐：pending_realname_activation=false +UPDATE package_usage +SET pending_realname_activation = false +WHERE status IN (1, 2, 3, 4) -- 生效中、已用完、已过期、已失效 + AND pending_realname_activation IS NULL; + +-- 待生效的套餐：根据载体实名状态判断 +-- 如果载体未实名 → pending_realname_activation=true +-- 如果载体已实名 → 强制激活套餐（status=1） +-- 注意：需要根据 carrier_type 判断是 device 还是 iot_card +UPDATE package_usage pu +SET pending_realname_activation = true +WHERE pu.status = 0 + AND pu.pending_realname_activation IS NULL + AND EXISTS ( + SELECT 1 FROM device d + WHERE d.id = pu.carrier_id + AND pu.carrier_type = 'device' + AND d.realname_status = 0 + ); + +UPDATE package_usage pu +SET pending_realname_activation = true +WHERE pu.status = 0 + AND pu.pending_realname_activation IS NULL + AND EXISTS ( + SELECT 1 FROM iot_card ic + WHERE ic.id = pu.carrier_id + AND pu.carrier_type = 'iot_card' + AND ic.realname_status = 0 + ); + +-- Step 4: 已实名但待生效的套餐强制激活 +-- （这些套餐应该在购买时就激活，现在补上） +UPDATE package_usage pu +SET status = 1, + activated_at = pu.created_at, -- 假设使用创建时间作为激活时间 + pending_realname_activation = false +WHERE pu.status = 0 + AND EXISTS ( + SELECT 1 FROM device d + WHERE d.id = pu.carrier_id + AND pu.carrier_type = 'device' + AND d.realname_status = 1 + ); + +UPDATE package_usage pu +SET status = 1, + activated_at = pu.created_at, + pending_realname_activation = false +WHERE pu.status = 0 + AND EXISTS ( + SELECT 1 FROM iot_card ic + WHERE ic.id = pu.carrier_id + AND pu.carrier_type = 'iot_card' + AND ic.realname_status = 1 + ); + +-- 注意：Step 4 强制激活的套餐需要重新计算 expires_at +-- 建议编写数据修复脚本，调用有效期计算逻辑 +``` + +### 5. ❌ 删除遗留表/字段（确认后执行） + +```sql +-- 如果存在旧的实名相关字段，删除 +-- ALTER TABLE package_usage DROP COLUMN IF EXISTS realname_activated; +-- ALTER TABLE package_usage DROP COLUMN IF EXISTS wait_realname; +-- ALTER TABLE package DROP COLUMN IF EXISTS require_realname; +-- ALTER TABLE device DROP COLUMN IF EXISTS is_realname; +-- ALTER TABLE iot_card DROP COLUMN IF EXISTS is_realname; +``` + +### 6. 验证步骤 + +```sql +-- 验证1：所有设备和卡都有 realname_status +SELECT COUNT(*) +FROM device +WHERE realname_status IS NULL; +-- 预期结果：0 + +SELECT COUNT(*) +FROM iot_card +WHERE realname_status IS NULL; +-- 预期结果：0 + +-- 验证2：所有套餐都有 enable_realname_activation +SELECT COUNT(*) +FROM package +WHERE enable_realname_activation IS NULL; +-- 预期结果：0 + +-- 验证3：所有 PackageUsage 都有 pending_realname_activation +SELECT COUNT(*) +FROM package_usage +WHERE pending_realname_activation IS NULL; +-- 预期结果：0 + +-- 验证4：待生效套餐的载体必须未实名（或有 pending_realname_activation=true） +SELECT COUNT(*) +FROM package_usage pu +JOIN device d ON pu.carrier_id = d.id AND pu.carrier_type = 'device' +WHERE pu.status = 0 + AND pu.pending_realname_activation = false + AND d.realname_status = 0; +-- 预期结果：0（不应该有未实名但又不等待激活的待生效套餐） + +-- 验证5：已实名载体的套餐不应该待生效（除非后续购买） +-- （这个验证需要根据实际业务规则调整） +SELECT COUNT(*) +FROM package_usage pu +JOIN device d ON pu.carrier_id = d.id AND pu.carrier_type = 'device' +WHERE pu.status = 0 + AND pu.pending_realname_activation = true + AND d.realname_status = 1; +-- 预期结果：0（已实名设备不应该有等待激活的套餐） + +-- 验证6：检查是否还有遗留字段（需根据实际情况调整） +-- SELECT column_name FROM information_schema.columns +-- WHERE table_name = 'package_usage' +-- AND column_name IN ('realname_activated', 'wait_realname'); +-- 预期结果：0 rows +``` + +--- + +## 测试场景矩阵 + +| 场景分类 | 测试用例 | 预期结果 | +|---------|---------|---------| +| **购买套餐** | 后台购买套餐（未实名设备，enable_realname_activation=true） | status=0，pending_realname_activation=true | +| | 后台购买套餐（未实名设备，enable_realname_activation=false） | status=1，立即生效 | +| | 后台购买套餐（已实名设备） | status=1，立即生效 | +| | 客户端购买套餐（未实名设备） | 返回错误 403：REALNAME_REQUIRED | +| | 客户端购买套餐（已实名设备） | status=1，立即生效 | +| **首次实名** | 设备首张卡实名 | 触发激活，套餐 status=1 | +| | 设备后续卡实名 | 不触发激活，套餐状态不变 | +| | 单卡设备实名 | 触发激活，套餐 status=1 | +| | 并发首次实名 | 使用行锁，只触发1次激活 | +| **激活逻辑** | 激活自然月套餐 | expires_at=当月最后一天 23:59:59 | +| | 激活按天套餐 | expires_at=activated_at+duration_days-1秒 | +| | 激活时无待激活套餐 | 任务直接返回成功，不报错 | +| | 激活时排除已生效套餐 | 只激活 status=0 的套餐 | +| **异步任务** | 实名成功后入队任务 | 任务入队成功，payload 包含载体信息 | +| | 激活任务在1分钟内完成 | 批量更新成功，任务标记为完成 | +| | 激活任务失败后重试 | Asynq 重试3次，失败后进入死信队列 | +| | 激活任务幂等性 | 重复执行时检查状态，跳过已激活套餐 | +| **并发** | 并发购买套餐和首次实名 | 事务隔离，先完成的操作生效 | +| | 并发激活任务 | 使用行锁，避免重复激活 | +| **异常** | 有效期计算失败 | 激活失败，记录日志，Asynq 重试 | +| | 批量激活部分失败 | 事务回滚，全部套餐保持 status=0 | +| | 首次实名判定失败 | 不阻塞实名流程，任务重试 | + +--- + +## 实现参考 + +### 购买套餐时的实名检查 + +```go +// Service 层：CreateOrder +func (s *Service) CreateOrder(ctx context.Context, req *CreateOrderRequest) error { + // 1. 检查载体实名状态 + realnameStatus, err := s.getCarrierRealnameStatus(ctx, req.CarrierType, req.CarrierID) + if err != nil { + return errors.Wrap(errors.CodeInternalError, err, "查询实名状态失败") + } + + // 2. 客户端购买必须实名 + requestSource := middleware.GetRequestSourceFromContext(ctx) // "admin" or "customer" + if requestSource == "customer" && realnameStatus == 0 { + return errors.New(errors.CodeForbidden, "设备/卡必须先完成实名认证才能购买套餐") + } + + // 3. 查询套餐配置 + pkg, err := s.packageStore.GetByID(ctx, req.PackageID) + if err != nil { + return errors.Wrap(errors.CodeInternalError, err, "查询套餐失败") + } + + // 4. 确定套餐状态 + var status int + var pendingRealnameActivation bool + + if pkg.EnableRealnameActivation && realnameStatus == 0 && requestSource == "admin" { + // 后台购买未实名设备的实名激活套餐 → 待生效 + status = constants.PackageStatusPending + pendingRealnameActivation = true + } else { + // 其他情况 → 立即生效 + status = constants.PackageStatusActive + pendingRealnameActivation = false + } + + // 5. 创建 PackageUsage + usage := &model.PackageUsage{ + CarrierType: req.CarrierType, + CarrierID: req.CarrierID, + PackageID: req.PackageID, + Status: status, + PendingRealnameActivation: pendingRealnameActivation, + } + + if status == constants.PackageStatusActive { + // 立即生效：计算 activated_at 和 expires_at + usage.ActivatedAt = time.Now() + usage.ExpiresAt = s.calculateExpiresAt(usage.ActivatedAt, pkg.CalendarType, pkg.DurationDays, pkg.DurationMonths) + } + + if err := s.packageUsageStore.Create(ctx, usage); err != nil { + return errors.Wrap(errors.CodeInternalError, err, "创建套餐使用记录失败") + } + + return nil +} +``` + +### 首次实名时入队激活任务 + +```go +// Service 层：HandleRealnameSuccess +func (s *Service) HandleRealnameSuccess(ctx context.Context, carrierType string, carrierID uint) error { + // 1. 检查是否为首次实名 + isFirstRealname, err := s.checkFirstRealname(ctx, carrierType, carrierID) + if err != nil { + return errors.Wrap(errors.CodeInternalError, err, "检查首次实名失败") + } + + if !isFirstRealname { + s.logger.Info("非首次实名，跳过激活", + zap.String("carrier_type", carrierType), + zap.Uint("carrier_id", carrierID)) + return nil + } + + // 2. 更新实名状态 + if err := s.updateRealnameStatus(ctx, carrierType, carrierID, 1); err != nil { + return errors.Wrap(errors.CodeInternalError, err, "更新实名状态失败") + } + + // 3. 入队激活任务 + payload := map[string]interface{}{ + "carrier_type": carrierType, + "carrier_id": carrierID, + "realname_at": time.Now().Format(time.RFC3339), + } + + if err := s.asynqClient.Enqueue("realname_activation", payload); err != nil { + return errors.Wrap(errors.CodeInternalError, err, "入队激活任务失败") + } + + s.logger.Info("首次实名成功，已入队激活任务", + zap.String("carrier_type", carrierType), + zap.Uint("carrier_id", carrierID)) + + return nil +} + +// Service 层：checkFirstRealname +func (s *Service) checkFirstRealname(ctx context.Context, carrierType string, carrierID uint) (bool, error) { + if carrierType == "device" { + // 查询设备当前实名状态 + device, err := s.deviceStore.GetByID(ctx, carrierID) + if err != nil { + return false, err + } + return device.RealnameStatus == 0, nil // 0=未实名，首次实名 + } else if carrierType == "iot_card" { + // 查询卡当前实名状态 + card, err := s.iotCardStore.GetByICCID(ctx, carrierID) + if err != nil { + return false, err + } + return card.RealnameStatus == 0, nil + } + return false, fmt.Errorf("unsupported carrier_type: %s", carrierType) +} +``` + +### Asynq Worker 处理激活任务 + +```go +// Handler: HandleRealnameActivation +func (h *RealnameActivationHandler) HandleRealnameActivation(ctx context.Context, task *asynq.Task) error { + var payload struct { + CarrierType string `json:"carrier_type"` + CarrierID uint `json:"carrier_id"` + RealnameAt string `json:"realname_at"` + } + + if err := json.Unmarshal(task.Payload(), &payload); err != nil { + return fmt.Errorf("unmarshal payload failed: %w", err) + } + + realnameAt, _ := time.Parse(time.RFC3339, payload.RealnameAt) + + // 1. 查询待激活套餐 + usages, err := h.packageUsageStore.ListPendingRealnameActivation(ctx, payload.CarrierType, payload.CarrierID) + if err != nil { + return fmt.Errorf("list pending activation failed: %w", err) + } + + if len(usages) == 0 { + h.logger.Info("无待激活套餐，任务完成", + zap.String("carrier_type", payload.CarrierType), + zap.Uint("carrier_id", payload.CarrierID)) + return nil + } + + // 2. 批量激活（使用事务） + tx := h.db.Begin() + defer tx.Rollback() + + for _, usage := range usages { + // 获取套餐配置 + pkg, err := h.packageStore.GetByID(ctx, usage.PackageID) + if err != nil { + return fmt.Errorf("get package failed: %w", err) + } + + // 计算有效期 + expiresAt := h.calculateExpiresAt(realnameAt, pkg.CalendarType, pkg.DurationDays, pkg.DurationMonths) + + // 更新套餐状态 + if err := tx.Model(&usage).Updates(map[string]interface{}{ + "status": constants.PackageStatusActive, + "activated_at": realnameAt, + "expires_at": expiresAt, + "pending_realname_activation": false, + }).Error; err != nil { + return fmt.Errorf("activate package failed: %w", err) + } + } + + if err := tx.Commit().Error; err != nil { + return fmt.Errorf("commit transaction failed: %w", err) + } + + h.logger.Info("套餐激活成功", + zap.String("carrier_type", payload.CarrierType), + zap.Uint("carrier_id", payload.CarrierID), + zap.Int("count", len(usages))) + + return nil +} +``` + +--- + +**本 Spec 完成**，包含： +- ✅ 业务背景和业务规则 +- ✅ 详细场景（购买套餐、首次实名、激活逻辑、异步任务） +- ✅ 边界条件和并发场景 +- ✅ 异常处理和数据一致性保证 +- ✅ 性能指标和错误码定义 +- ✅ **激进的数据迁移策略**（明确删除字段、废弃逻辑、强制转换） +- ✅ 测试场景矩阵和实现参考 diff --git a/openspec/changes/package-system-upgrade/specs/package-usage-customer-view/spec.md b/openspec/changes/package-system-upgrade/specs/package-usage-customer-view/spec.md new file mode 100644 index 0000000..15a6694 --- /dev/null +++ b/openspec/changes/package-system-upgrade/specs/package-usage-customer-view/spec.md @@ -0,0 +1,367 @@ +# Spec: 客户视图流量查询 + +## 业务背景 + +### 为什么需要客户视图流量查询 + +**现状问题**： +- 客户无法清晰看到主套餐和加油包的分别使用情况 +- 流量汇总不准确（包含已失效加油包） +- 客户端需要多次调用 API 才能获取完整流量信息 + +**业务目标**： +- 提供统一的流量查询 API +- 区分主套餐和加油包流量 +- 自动汇总总计流量 +- 仅显示当前有效套餐 + +--- + +## 业务规则 + +### 1. 流量汇总规则 + +``` +总计流量 = 主套餐流量 + 所有生效中/已用完加油包流量 + +包含的套餐： +- status=1（生效中） +- status=2（已用完但未过期） + +不包含的套餐： +- status=0（待生效） +- status=3（已过期） +- status=4（已失效） +``` + +### 2. 主套餐优先显示 + +- **规则**：如果有多个主套餐（理论上只有1个生效中），优先显示 status=1 的主套餐 +- **待生效主套餐**：不在客户视图中显示 + +### 3. 加油包按优先级排序 + +- **排序规则**：按 priority ASC 排序（优先扣减的加油包排在前面） +- **失效加油包**：不在客户视图中显示 + +--- + +## ADDED Requirements + +### Requirement: 提供客户视图流量查询 API + +系统 SHALL 提供 GET /api/h5/packages/my-usage API，返回客户的套餐流量使用情况。 + +#### Scenario: 查询单个主套餐流量 +- **GIVEN** 客户有1个主套餐（已用 8GB，总量 10GB），无加油包 +- **WHEN** 客户调用 GET /api/h5/packages/my-usage +- **THEN** 系统返回： + ```json + { + "code": 200, + "data": { + "main_package": { + "package_id": 123, + "package_name": "月度套餐10GB", + "used_mb": 8192, + "total_mb": 10240, + "status": 1, + "status_text": "生效中", + "expires_at": "2026-02-28T23:59:59Z" + }, + "addon_packages": [], + "total": { + "used_mb": 8192, + "total_mb": 10240 + } + } + } + ``` + +#### Scenario: 查询主套餐和加油包流量 +- **GIVEN** 客户有： + - 主套餐：已用 9GB，总量 10GB + - 加油包1（priority=1）：已用 3GB，总量 5GB + - 加油包2（priority=2）：已用 1GB，总量 3GB +- **WHEN** 客户调用 GET /api/h5/packages/my-usage +- **THEN** 系统返回 main_package, addon_packages（2个加油包，按 priority 排序）, total: {used: 13GB, total: 18GB} + +#### Scenario: 主套餐用完但加油包有剩余 +- **GIVEN** 客户主套餐已用 10GB/总量 10GB（status=2），加油包已用 2GB/总量 5GB（status=1） +- **WHEN** 客户调用 API +- **THEN** 系统返回： + - main_package: status=2, status_text="已用完" + - addon_packages: status=1, status_text="生效中" + - total: {used: 12GB, total: 15GB} + +### Requirement: 客户视图区分主套餐和加油包 + +系统 SHALL 在响应中明确区分主套餐（main_package）和加油包（addon_packages）的流量信息。 + +#### Scenario: 响应包含主套餐信息 +- **WHEN** 客户查询流量使用情况 +- **THEN** 响应的 main_package 字段包含： + - package_id, package_name + - used_mb, total_mb + - status, status_text + - expires_at, activated_at + +#### Scenario: 响应包含加油包列表 +- **GIVEN** 客户有3个加油包 +- **WHEN** 客户查询 +- **THEN** 响应的 addon_packages 字段为数组，按 priority 排序，每个元素包含： + - package_id, package_name + - used_mb, total_mb + - status, status_text + - expires_at, activated_at + - priority + +### Requirement: 客户视图显示总计流量 + +系统 SHALL 在响应中提供 total 字段，汇总主套餐和所有加油包的流量。 + +#### Scenario: 总计流量计算正确 +- **GIVEN** 主套餐 used=8GB/total=10GB，加油包1 used=2GB/total=5GB，加油包2 used=1GB/total=3GB +- **WHEN** 计算总计 +- **THEN** total: {used_mb: 11GB, total_mb: 18GB} + +#### Scenario: 已失效加油包不计入总计 +- **GIVEN** 主套餐 used=8GB/total=10GB，加油包 status=4（已失效）used=2GB/total=5GB +- **WHEN** 计算总计 +- **THEN** total: {used_mb: 8GB, total_mb: 10GB}（不包含已失效加油包） + +#### Scenario: 已用完套餐计入总计 +- **GIVEN** 主套餐 status=2（已用完）used=10GB/total=10GB，加油包 status=1 used=2GB/total=5GB +- **WHEN** 计算总计 +- **THEN** total: {used_mb: 12GB, total_mb: 15GB}（已用完套餐仍计入） + +### Requirement: 客户视图仅返回当前生效套餐 + +系统 SHALL 仅返回 status=1（生效中）或 status=2（已用完但未过期）的套餐信息。 + +#### Scenario: 不返回待生效套餐 +- **GIVEN** 客户有1个生效中主套餐（status=1）和1个待生效主套餐（status=0） +- **WHEN** 客户查询 +- **THEN** 响应仅包含生效中的主套餐，不包含待生效套餐 + +#### Scenario: 不返回已过期套餐 +- **GIVEN** 客户的主套餐已过期（status=3） +- **WHEN** 客户查询 +- **THEN** 响应 main_package=null，提示"无有效套餐" + +#### Scenario: 不返回已失效加油包 +- **GIVEN** 客户有生效中主套餐和1个已失效加油包（status=4） +- **WHEN** 客户查询 +- **THEN** 响应 addon_packages 不包含已失效加油包 + +### Requirement: 客户视图性能要求 + +系统 SHALL 确保客户视图 API 响应时间 P95 < 200ms。 + +#### Scenario: 查询性能达标 +- **GIVEN** 客户有1个主套餐和5个加油包 +- **WHEN** 客户调用 API +- **THEN** API 响应时间 < 200ms（P95） + +#### Scenario: 使用索引优化查询 +- **GIVEN** 系统有索引 idx_carrier_status（carrier_id + status） +- **WHEN** 查询套餐时 +- **THEN** 数据库使用索引，查询时间 < 50ms + +--- + +## 边界条件 + +### 1. 无任何套餐 + +- **场景**：客户没有购买任何套餐 +- **处理**：返回 main_package=null, addon_packages=[], total={used_mb:0, total_mb:0} + +### 2. 主套餐过期但加油包未过期 + +- **场景**：主套餐过期，加油包有独立有效期且未过期 +- **处理**：主套餐过期时，加油包被级联失效（status=4），不显示在客户视图 + +### 3. 并发查询 + +- **场景**：客户短时间内多次调用查询 API +- **处理**：使用只读事务，确保数据一致性 + +--- + +## 数据一致性保证 + +### 1. 只读事务 + +- **查询套餐**：使用只读事务，确保数据一致性 + +### 2. 索引优化 + +- **必需索引**： + - `idx_carrier_status`（carrier_id + status） + - `idx_package_type_priority`（package_type + priority） + +--- + +## 性能指标 + +| 操作 | 目标响应时间 | 并发要求 | 数据量 | +|------|-------------|---------|--------| +| 客户视图查询 | < 200ms (P95) | 500 QPS | 单载体查询（1主套餐+5加油包） | +| 数据库查询 | < 50ms | 1000 QPS | 索引查询 | + +--- + +## 错误码定义 + +| 错误码 | HTTP 状态码 | 错误消息 | 场景 | +|--------|------------|---------|------| +| `NO_VALID_PACKAGE` | 404 | 无有效套餐 | 客户无任何生效中套餐 | +| `CARRIER_NOT_FOUND` | 404 | 载体不存在 | 载体ID不存在 | + +--- + +## 数据迁移策略 + +**激进策略**（开发阶段，保证干净性）： + +### 1. ❌ 要删除的字段 + +无（新增 API，不涉及数据迁移） + +### 2. ✅ 新增的字段 + +无（使用现有字段） + +### 3. ❌ 要废弃的逻辑 + +- **废弃旧的客户端流量查询 API**：如果存在旧的流量查询接口，统一替换为新接口 + +### 4. ✅ 索引优化 + +```sql +-- 确保必需索引存在 +CREATE INDEX IF NOT EXISTS idx_carrier_status +ON package_usage(carrier_id, status); + +CREATE INDEX IF NOT EXISTS idx_package_type_priority +ON package_usage(package_type, priority); +``` + +--- + +## 测试场景矩阵 + +| 场景分类 | 测试用例 | 预期结果 | +|---------|---------|---------| +| **单个主套餐** | 查询单个主套餐流量 | 返回 main_package, addon_packages=[], total | +| **主套餐+加油包** | 查询主套餐和加油包 | 返回 main_package, addon_packages（按 priority 排序）, total | +| **总计流量** | 总计流量计算正确 | total = 主套餐 + 所有加油包 | +| | 已失效加油包不计入总计 | 不包含 status=4 的加油包 | +| | 已用完套餐计入总计 | 包含 status=2 的套餐 | +| **筛选套餐** | 不返回待生效套餐 | 仅返回 status IN (1,2) | +| | 不返回已过期套餐 | main_package=null | +| | 不返回已失效加油包 | addon_packages 不含 status=4 | +| **性能** | 查询性能达标 | 响应时间 < 200ms (P95) | +| | 使用索引优化 | 数据库查询 < 50ms | +| **边界** | 无任何套餐 | main_package=null, addon_packages=[], total={0,0} | +| | 主套餐过期加油包未过期 | 加油包被级联失效，不显示 | + +--- + +## 实现参考 + +### Handler: GetMyUsage + +```go +// Handler: GetMyUsage +func (h *Handler) GetMyUsage(c *fiber.Ctx) error { + // 从上下文获取载体信息 + carrierType := middleware.GetCarrierTypeFromContext(c.UserContext()) + carrierID := middleware.GetCarrierIDFromContext(c.UserContext()) + + // 查询流量使用情况 + usage, err := h.service.GetMyUsage(c.UserContext(), carrierType, carrierID) + if err != nil { + return err + } + + return response.Success(c, usage) +} + +// Service 层：GetMyUsage +func (s *Service) GetMyUsage(ctx context.Context, carrierType string, carrierID uint) (*dto.MyUsageResponse, error) { + // 查询生效中或已用完的套餐 + usages, err := s.store.ListActiveUsages(ctx, carrierType, carrierID) + if err != nil { + return nil, errors.Wrap(errors.CodeInternalError, err, "查询套餐失败") + } + + // 分类套餐 + var mainPackage *model.PackageUsage + var addonPackages []*model.PackageUsage + + for _, usage := range usages { + if usage.PackageType == constants.PackageTypeFormal { + if mainPackage == nil || usage.Status == constants.PackageStatusActive { + mainPackage = usage // 优先选择生效中的主套餐 + } + } else if usage.PackageType == constants.PackageTypeAddon { + addonPackages = append(addonPackages, usage) + } + } + + // 按优先级排序加油包 + sort.Slice(addonPackages, func(i, j int) bool { + return addonPackages[i].Priority < addonPackages[j].Priority + }) + + // 构造响应 + resp := &dto.MyUsageResponse{ + Total: &dto.TotalUsage{ + UsedMB: 0, + TotalMB: 0, + }, + } + + // 主套餐 + if mainPackage != nil { + resp.MainPackage = s.toPackageUsageVO(mainPackage) + resp.Total.UsedMB += mainPackage.DataUsageMB + resp.Total.TotalMB += mainPackage.TotalDataMB + } + + // 加油包 + for _, addon := range addonPackages { + resp.AddonPackages = append(resp.AddonPackages, s.toPackageUsageVO(addon)) + resp.Total.UsedMB += addon.DataUsageMB + resp.Total.TotalMB += addon.TotalDataMB + } + + return resp, nil +} + +// Store 层：ListActiveUsages +func (s *Store) ListActiveUsages(ctx context.Context, carrierType string, carrierID uint) ([]*model.PackageUsage, error) { + var usages []*model.PackageUsage + err := s.db.WithContext(ctx). + Where("carrier_type = ? AND carrier_id = ? AND status IN (?, ?)", + carrierType, carrierID, + constants.PackageStatusActive, + constants.PackageStatusUsedUp). + Order("package_type ASC, priority ASC"). + Find(&usages).Error + return usages, err +} +``` + +--- + +**本 Spec 完成**（简化版），包含： +- ✅ 业务背景和业务规则 +- ✅ 详细场景（主套餐、加油包、总计流量） +- ✅ 边界条件 +- ✅ 数据一致性保证和性能指标 +- ✅ 错误码定义 +- ✅ **激进的数据迁移策略**（索引优化） +- ✅ 测试场景矩阵和实现参考 diff --git a/openspec/changes/package-system-upgrade/specs/package-usage-daily-record/spec.md b/openspec/changes/package-system-upgrade/specs/package-usage-daily-record/spec.md new file mode 100644 index 0000000..1b8edd8 --- /dev/null +++ b/openspec/changes/package-system-upgrade/specs/package-usage-daily-record/spec.md @@ -0,0 +1,465 @@ +# Spec: 套餐流量日记录 + +## 业务背景 + +### 为什么需要流量日记录 + +**现状问题**： +- 用户需要查看每日流量使用明细（哪天用了多少流量） +- 套餐流量重置后，历史使用数据丢失 +- 无法统计和分析用户流量使用趋势 +- 计费对账需要每日流量记录 + +**业务目标**： +- 按套餐维度记录每日流量增量 +- 支持按日期范围查询流量详单 +- 流量重置后历史记录仍可查询 +- 为计费对账和数据分析提供基础数据 + +--- + +## 业务规则 + +### 1. 日记录写入规则 + +每次流量扣减后，写入或更新当日记录： + +``` +写入流量日记录： +1. 获取当前日期（date=today） +2. 查询是否已有今日记录： + SELECT * FROM package_usage_daily_record + WHERE package_usage_id=? AND date=today +3. 如果存在 → UPDATE daily_usage_mb += increment +4. 如果不存在 → INSERT (package_usage_id, date, daily_usage_mb, cumulative_usage_mb) +5. 使用 UPSERT（ON CONFLICT UPDATE）确保幂等性 +``` + +### 2. 流量增量计算 + +``` +每日流量增量 = 今日上游返回的累计流量 - 昨日记录的累计流量 + +特殊情况： +- 如果昨日无记录 → 增量 = 今日上游累计流量 +- 如果上游重置（今日累计 < 昨日累计）→ 增量 = 今日上游累计流量 +``` + +### 3. cumulative_usage_mb 字段 + +- **定义**：截止到当日的累计流量 +- **计算规则**：cumulative_usage_mb = 昨日 cumulative_usage_mb + 今日 daily_usage_mb +- **首日规则**：首日 cumulative_usage_mb = daily_usage_mb + +### 4. 数据保留策略 + +- **保留期限**：永久保留（或根据业务需求保留1年/2年） +- **流量重置不删除**：套餐流量重置后，日记录仍保留 +- **套餐过期不删除**：套餐过期后，日记录仍保留 + +--- + +## ADDED Requirements + +### Requirement: 按套餐维度记录每日流量 + +系统 SHALL 为每个 PackageUsage 创建每日流量记录（PackageUsageDailyRecord），记录每天的流量增量。 + +#### Scenario: 首次记录当日流量 +- **GIVEN** 套餐 ID=123 在 2026-02-10 首次产生流量 1.5GB +- **WHEN** 流量扣减完成 +- **THEN** 系统创建 PackageUsageDailyRecord： + - package_usage_id=123 + - date=2026-02-10 + - daily_usage_mb=1536 (1.5GB) + - cumulative_usage_mb=1536 + +#### Scenario: 同一天多次流量更新 +- **GIVEN** 套餐在 2026-02-10 已记录 1GB 流量 +- **WHEN** 再产生 0.5GB 流量 +- **THEN** 系统更新 PackageUsageDailyRecord： + - daily_usage_mb=1536（1GB+0.5GB） + - cumulative_usage_mb=1536 + +#### Scenario: 跨天流量记录 +- **GIVEN** 套餐在 2026-02-10 使用 2GB +- **AND** 2026-02-11 使用 3GB +- **WHEN** 流量扣减完成 +- **THEN** 系统创建两条记录： + - 2月10日：daily_usage_mb=2GB, cumulative_usage_mb=2GB + - 2月11日：daily_usage_mb=3GB, cumulative_usage_mb=5GB + +#### Scenario: 流量重置后日记录仍保留 +- **GIVEN** 套餐在 2月1日至2月28日有28条日记录 +- **WHEN** 3月1日 00:00:00 触发流量重置 +- **THEN** 套餐 data_usage_mb 重置为 0 +- **AND** 2月的28条日记录仍存在且可查询 + +### Requirement: 流量增量基于上游查询计算 + +系统 SHALL 根据上游返回的累计流量，减去昨日记录的累计流量，计算每日增量。 + +#### Scenario: 计算每日流量增量 +- **GIVEN** 昨日（2月9日）记录 cumulative_usage_mb=10GB +- **WHEN** 今日（2月10日）上游返回 cumulative=13GB +- **THEN** 今日 daily_usage_mb=3GB（13GB - 10GB） +- **AND** 今日 cumulative_usage_mb=13GB + +#### Scenario: 上游周期重置后流量计算 +- **GIVEN** 联通卡在 2月27日 00:00:00 上游重置 +- **AND** 昨日（2月26日）记录 cumulative_usage_mb=15GB +- **WHEN** 今日（2月27日）上游返回 cumulative=2GB +- **THEN** 今日 daily_usage_mb=2GB（上游重置，取新增量） +- **AND** 今日 cumulative_usage_mb=2GB + +#### Scenario: 首日无昨日记录 +- **GIVEN** 套餐首次激活，无任何日记录 +- **WHEN** 上游返回 cumulative=5GB +- **THEN** 今日 daily_usage_mb=5GB +- **AND** 今日 cumulative_usage_mb=5GB + +### Requirement: 支持按日期查询套餐流量详单 + +系统 SHALL 提供 API 查询指定套餐的每日流量记录。 + +#### Scenario: 查询套餐流量详单 +- **WHEN** 用户通过 GET /api/admin/package-usage/:id/daily-records 查询套餐流量详单 +- **THEN** 系统返回按日期排序的流量记录列表： + ```json + { + "code": 200, + "data": [ + { + "date": "2026-02-01", + "daily_usage_mb": 1024, + "cumulative_usage_mb": 1024 + }, + { + "date": "2026-02-02", + "daily_usage_mb": 2048, + "cumulative_usage_mb": 3072 + } + ] + } + ``` + +#### Scenario: 查询指定日期范围 +- **GIVEN** 套餐有 2月1日 至 2月28日 的流量记录 +- **WHEN** 用户查询流量详单，参数 start_date=2026-02-01, end_date=2026-02-10 +- **THEN** 系统返回 2月1日 至 2月10日 的流量记录（10条） + +#### Scenario: 客户端查询自己的流量详单 +- **WHEN** 客户通过 GET /api/customer/package-usage/:id/daily-records 查询 +- **THEN** 系统校验套餐归属后，返回流量记录列表 + +### Requirement: 日记录索引优化 + +系统 SHALL 在 PackageUsageDailyRecord 表创建 (package_usage_id, date) 联合唯一索引。 + +#### Scenario: 同一套餐同一天只有一条记录 +- **WHEN** 系统尝试为同一 package_usage_id=123 和 date=2026-02-10 创建第二条记录 +- **THEN** 数据库返回唯一约束冲突错误 +- **AND** 使用 UPSERT 自动转为 UPDATE 操作 + +#### Scenario: 查询性能达标 +- **GIVEN** 套餐 ID=123 有 365 条日记录（一年数据） +- **WHEN** 查询全部流量详单 +- **THEN** 查询响应时间 < 50ms + +--- + +## 边界条件 + +### 1. 套餐过期后的日记录 + +- **场景**：套餐在 2月28日过期，3月1日仍可查询历史日记录 +- **处理**：日记录永久保留，不随套餐过期删除 + +### 2. 并发写入同一天记录 + +- **场景**：同一套餐在同一天有多个并发流量扣减请求 +- **处理**：使用 UPSERT（ON CONFLICT UPDATE）确保幂等性 + +### 3. 跨月查询日记录 + +- **场景**：查询 1月15日 至 2月15日 的日记录（跨月） +- **处理**：按日期范围查询，返回跨月数据 + +--- + +## 并发场景 + +### Scenario: 并发写入同一天记录 +- **GIVEN** 套餐 ID=123 在 2026-02-10 10:00:00 和 10:00:01 同时扣减流量 +- **WHEN** 两个请求同时写入日记录 +- **THEN** 使用 UPSERT（ON CONFLICT UPDATE）： + ```sql + INSERT INTO package_usage_daily_record (package_usage_id, date, daily_usage_mb, cumulative_usage_mb) + VALUES (123, '2026-02-10', 1024, 1024) + ON CONFLICT (package_usage_id, date) + DO UPDATE SET + daily_usage_mb = package_usage_daily_record.daily_usage_mb + EXCLUDED.daily_usage_mb, + cumulative_usage_mb = package_usage_daily_record.cumulative_usage_mb + EXCLUDED.daily_usage_mb; + ``` +- **AND** 两个请求的流量累加到同一条记录 + +--- + +## 异常处理 + +### 1. 日记录写入失败 + +- **错误场景**：流量扣减成功，但日记录写入失败（数据库连接断开） +- **处理流程**： + 1. 不回滚流量扣减（已提交） + 2. 记录 Error 日志（包含套餐ID、日期、流量增量） + 3. 通过定时任务补录日记录 +- **返回错误**：不影响用户，日记录补录在后台进行 + +### 2. 查询日记录超时 + +- **错误场景**：查询大量日记录时超时（如查询3年数据） +- **处理流程**： + 1. 限制单次查询最多返回 365 条记录 + 2. 如果超过限制，返回错误 400："查询日期范围过大，最多查询1年" +- **返回错误**：`{"code": "DATE_RANGE_TOO_LARGE", "msg": "查询日期范围过大，最多查询1年"}` + +--- + +## 数据一致性保证 + +### 1. 事务边界 + +- **流量扣减 + 写入日记录**：使用单个事务（可选，根据业务需求） +- **查询日记录**：使用只读事务 + +### 2. 唯一索引 + +- **联合唯一索引**：`UNIQUE INDEX idx_package_usage_daily_record (package_usage_id, date)` +- **确保同一套餐同一天只有一条记录** + +### 3. UPSERT 幂等性 + +- **使用 ON CONFLICT UPDATE**：确保并发写入时累加流量而非覆盖 + +--- + +## 性能指标 + +| 操作 | 目标响应时间 | 并发要求 | 数据量 | +|------|-------------|---------|--------| +| 写入日记录（UPSERT） | < 10ms | 1000 QPS | 单条插入/更新 | +| 查询日记录（单套餐） | < 50ms | 100 QPS | 查询365条记录 | +| 查询日记录（日期范围） | < 100ms | 100 QPS | 查询指定范围 | + +--- + +## 错误码定义 + +| 错误码 | HTTP 状态码 | 错误消息 | 场景 | +|--------|------------|---------|------| +| `DATE_RANGE_TOO_LARGE` | 400 | 查询日期范围过大，最多查询1年 | 查询日记录日期范围超过365天 | +| `DAILY_RECORD_NOT_FOUND` | 404 | 未找到流量记录 | 查询不存在的日记录 | + +--- + +## 数据迁移策略 + +**激进策略**（开发阶段，保证干净性）： + +### 1. ❌ 要删除的字段 + +目前 `package_usage_daily_record` 表中可能存在的冗余字段（需确认后删除）： +- 如果有 `daily_increment` 字段（旧的增量字段） → **删除**，统一使用 `daily_usage_mb` +- 如果有 `total_usage` 字段（旧的累计字段） → **删除**，统一使用 `cumulative_usage_mb` + +### 2. ✅ 新增的字段 + +在 `package_usage_daily_record` 表中确保有以下字段： +```sql +CREATE TABLE IF NOT EXISTS package_usage_daily_record ( + id BIGSERIAL PRIMARY KEY, + package_usage_id BIGINT NOT NULL COMMENT '套餐使用记录ID', + date DATE NOT NULL COMMENT '日期', + daily_usage_mb INT DEFAULT 0 COMMENT '当日流量使用量（MB）', + cumulative_usage_mb BIGINT DEFAULT 0 COMMENT '截止当日的累计流量（MB）', + created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + UNIQUE KEY idx_package_usage_daily_record (package_usage_id, date) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='套餐流量日记录'; + +CREATE INDEX idx_date ON package_usage_daily_record(date); +``` + +### 3. ❌ 要废弃的逻辑 + +- **废弃旧的日记录写入逻辑**：如果代码中存在不使用 UPSERT 的写入逻辑，全部删除 +- **废弃旧的日记录查询逻辑**：统一使用新的查询接口 + +### 4. ✅ 历史数据强制转换 + +```sql +-- Step 1: 如果有旧的字段名，重命名 +-- ALTER TABLE package_usage_daily_record CHANGE daily_increment daily_usage_mb INT; +-- ALTER TABLE package_usage_daily_record CHANGE total_usage cumulative_usage_mb BIGINT; + +-- Step 2: 修复 cumulative_usage_mb（如果历史数据不准确） +-- 重新计算每个套餐的 cumulative_usage_mb +-- （需要按套餐ID分组，按日期排序，累加 daily_usage_mb） + +-- Step 3: 确保唯一索引存在 +CREATE UNIQUE INDEX IF NOT EXISTS idx_package_usage_daily_record +ON package_usage_daily_record(package_usage_id, date); +``` + +### 5. ❌ 删除遗留表/字段（确认后执行） + +```sql +-- 如果存在旧的日记录表，删除 +-- DROP TABLE IF EXISTS iot_card_usage_daily; + +-- 如果存在旧的字段，删除 +-- ALTER TABLE package_usage_daily_record DROP COLUMN IF EXISTS daily_increment; +-- ALTER TABLE package_usage_daily_record DROP COLUMN IF EXISTS total_usage; +``` + +### 6. 验证步骤 + +```sql +-- 验证1：所有日记录都有 daily_usage_mb 和 cumulative_usage_mb +SELECT COUNT(*) +FROM package_usage_daily_record +WHERE daily_usage_mb IS NULL OR cumulative_usage_mb IS NULL; +-- 预期结果：0 + +-- 验证2：同一套餐同一天只有一条记录 +SELECT package_usage_id, date, COUNT(*) +FROM package_usage_daily_record +GROUP BY package_usage_id, date +HAVING COUNT(*) > 1; +-- 预期结果：0 rows + +-- 验证3：累计流量单调递增（同一套餐） +-- （需要编写复杂查询验证，略） +``` + +--- + +## 测试场景矩阵 + +| 场景分类 | 测试用例 | 预期结果 | +|---------|---------|---------| +| **写入日记录** | 首次记录当日流量 | 创建新记录 | +| | 同一天多次流量更新 | 更新已有记录（UPSERT） | +| | 跨天流量记录 | 创建多条记录 | +| **流量增量计算** | 计算每日流量增量 | daily_usage_mb = 今日累计 - 昨日累计 | +| | 上游周期重置后计算 | daily_usage_mb = 今日累计（重置后） | +| | 首日无昨日记录 | daily_usage_mb = 今日累计 | +| **查询日记录** | 查询套餐流量详单 | 返回按日期排序的记录列表 | +| | 查询指定日期范围 | 返回指定范围内的记录 | +| | 客户端查询自己的详单 | 校验归属后返回 | +| **索引和性能** | 同一套餐同一天只有一条记录 | 唯一约束保证 | +| | 查询365条记录 | 响应时间 < 50ms | +| **并发** | 并发写入同一天记录 | UPSERT 确保累加 | +| **异常** | 日记录写入失败 | 不回滚流量扣减，后台补录 | +| | 查询日记录超时 | 限制日期范围，返回错误 | + +--- + +## 实现参考 + +### 写入日记录（UPSERT） + +```go +// Service 层：RecordDailyUsage +func (s *Service) RecordDailyUsage(ctx context.Context, usageID uint, date time.Time, dailyUsageMB int, cumulativeUsageMB int64) error { + record := &model.PackageUsageDailyRecord{ + PackageUsageID: usageID, + Date: date, + DailyUsageMB: dailyUsageMB, + CumulativeUsageMB: cumulativeUsageMB, + } + + if err := s.store.UpsertDailyRecord(ctx, record); err != nil { + return errors.Wrap(errors.CodeInternalError, err, "写入流量日记录失败") + } + + return nil +} + +// Store 层：UpsertDailyRecord +func (s *Store) UpsertDailyRecord(ctx context.Context, record *model.PackageUsageDailyRecord) error { + // PostgreSQL UPSERT + return s.db.WithContext(ctx).Exec(` + INSERT INTO package_usage_daily_record (package_usage_id, date, daily_usage_mb, cumulative_usage_mb, created_at, updated_at) + VALUES (?, ?, ?, ?, NOW(), NOW()) + ON CONFLICT (package_usage_id, date) + DO UPDATE SET + daily_usage_mb = package_usage_daily_record.daily_usage_mb + EXCLUDED.daily_usage_mb, + cumulative_usage_mb = package_usage_daily_record.cumulative_usage_mb + (EXCLUDED.daily_usage_mb), + updated_at = NOW() + `, record.PackageUsageID, record.Date, record.DailyUsageMB, record.CumulativeUsageMB).Error +} +``` + +### 查询日记录 + +```go +// Handler: GetDailyRecords +func (h *Handler) GetDailyRecords(c *fiber.Ctx) error { + usageID, _ := c.ParamsInt("id") + startDate := c.Query("start_date", "") + endDate := c.Query("end_date", "") + + // 查询日记录 + records, err := h.service.GetDailyRecords(c.UserContext(), uint(usageID), startDate, endDate) + if err != nil { + return err + } + + return response.Success(c, records) +} + +// Service 层：GetDailyRecords +func (s *Service) GetDailyRecords(ctx context.Context, usageID uint, startDate, endDate string) ([]*model.PackageUsageDailyRecord, error) { + // 参数校验 + start, err := time.Parse("2006-01-02", startDate) + if err != nil { + return nil, errors.New(errors.CodeInvalidParam, "起始日期格式错误") + } + + end, err := time.Parse("2006-01-02", endDate) + if err != nil { + return nil, errors.New(errors.CodeInvalidParam, "结束日期格式错误") + } + + // 限制查询范围 + if end.Sub(start).Hours() > 365*24 { + return nil, errors.New(errors.CodeInvalidParam, "查询日期范围过大，最多查询1年") + } + + // 查询日记录 + return s.store.ListDailyRecords(ctx, usageID, start, end) +} + +// Store 层：ListDailyRecords +func (s *Store) ListDailyRecords(ctx context.Context, usageID uint, startDate, endDate time.Time) ([]*model.PackageUsageDailyRecord, error) { + var records []*model.PackageUsageDailyRecord + err := s.db.WithContext(ctx). + Where("package_usage_id = ? AND date >= ? AND date <= ?", usageID, startDate, endDate). + Order("date ASC"). + Find(&records).Error + return records, err +} +``` + +--- + +**本 Spec 完成**，包含： +- ✅ 业务背景和业务规则 +- ✅ 详细场景（写入、查询、增量计算） +- ✅ 边界条件和并发场景 +- ✅ 异常处理和数据一致性保证 +- ✅ 性能指标和错误码定义 +- ✅ **激进的数据迁移策略**（明确删除字段、废弃逻辑、强制转换） +- ✅ 测试场景矩阵和实现参考 diff --git a/openspec/changes/package-system-upgrade/specs/package-usage-priority/spec.md b/openspec/changes/package-system-upgrade/specs/package-usage-priority/spec.md new file mode 100644 index 0000000..3ec78b8 --- /dev/null +++ b/openspec/changes/package-system-upgrade/specs/package-usage-priority/spec.md @@ -0,0 +1,420 @@ +# Spec: 流量扣减优先级机制 + +## 业务背景 + +现有套餐系统在流量扣减时不区分主套餐和加油包，导致： +1. **用户体验差**：用户购买加油包后，主套餐仍在扣减，加油包未生效 +2. **停机逻辑错误**：主套餐流量用完即停机，加油包剩余流量浪费 +3. **流量统计混乱**：多套餐同时扣减，无法追溯流量消耗路径 + +本规范引入流量扣减优先级机制，确保： +- **加油包优先扣减**：购买加油包后，优先消耗加油包流量 +- **主套餐兜底**：加油包用完后，再扣减主套餐流量 +- **全部用完停机**：主套餐 + 所有加油包流量都用完才停机 + +## 业务规则 + +### 扣减优先级规则（多维度排序） +``` +优先级（从高到低）： +1. 加油包（按 priority ASC, expires_at ASC, activated_at ASC） +2. 主套餐 +``` + +**多维度排序规则**（按优先级递减）： +1. **主键：priority ASC** - 数字越小优先级越高（1 > 2 > 3） +2. **次键：expires_at ASC** - 先到期的优先扣减（避免流量浪费） +3. **兜底：activated_at ASC** - 先激活的优先扣减（相同到期时间时） + +**SQL 示例**： +```sql +SELECT * FROM tb_package_usage +WHERE card_id = ? + AND status = 'active' + AND remaining_data_amount > 0 +ORDER BY + priority ASC, -- 加油包（priority=1）在正式套餐（priority=10）前 + expires_at ASC, -- 同优先级：3天后到期的在7天后到期的前 + activated_at ASC -- 同到期时间：早激活的在晚激活的前 +LIMIT 10; +``` + +**业务意义**： +- **先用即将到期的**：避免流量过期浪费 +- **确定性排序**：相同条件下结果稳定，便于问题排查 + +**示例**： +``` +载体有：主套餐（剩余10GB）+ 加油包A（priority=1, 剩余5GB）+ 加油包B（priority=2, 剩余3GB） +产生 12GB 流量： +1. 扣减加油包A：5GB → 0GB（用完） +2. 扣减加油包B：3GB → 0GB（用完） +3. 扣减主套餐：4GB → 6GB（剩余6GB） +``` + +### 停机条件规则 +- **旧逻辑**：主套餐流量用完即停机 +- **新逻辑**：主套餐 + 所有加油包流量都用完才停机 + +**判断逻辑**： +```sql +SELECT COUNT(*) FROM tb_package_usage +WHERE (iot_card_id/device_id)=? AND status=1 + AND data_usage_mb < data_limit_mb; + +-- 如果 COUNT = 0，则触发停机 +``` + +### 流量扣减算法 +``` +输入：上游返回的累计流量（upstream_cumulative_mb） +输出：更新各套餐的 data_usage_mb + +1. 查询载体当前生效套餐（status=1），按优先级排序： + 加油包（priority ASC）→ 主套餐 +2. 计算本次流量增量： + increment = upstream_cumulative_mb - 上次记录的累计流量 +3. 依次扣减： + FOR EACH 套餐 IN 优先级列表: + 可扣减量 = MIN(increment, 套餐剩余额度) + UPDATE data_usage_mb += 可扣减量 + 记录到 PackageUsageDailyRecord + increment -= 可扣减量 + IF data_usage_mb >= data_limit_mb: + UPDATE status=2（已用完） + IF increment == 0: + BREAK +4. 检查停机条件： + IF 所有套餐 status=2: + 触发停机操作 +``` + +### 并发控制 +- **场景**：轮询系统同时检测到多张卡的流量增加 +- **机制**：数据库事务 + 行锁（SELECT FOR UPDATE） +- **保证**：同一套餐不会被并发扣减导致负数流量 + +### 性能要求 +- 单次流量扣减 < 100ms（包含数据库更新 + 日记录写入） +- 批量扣减（1000张卡）< 10秒 + +## ADDED Requirements + +### Requirement: 流量优先扣减加油包 +系统 SHALL 在扣减流量时，优先扣减加油包流量，再扣减主套餐流量。 + +**业务价值**：用户购买加油包后，立即生效，优先消耗加油包流量，避免浪费。 + +**技术实现**： +- 查询时按 `master_usage_id IS NOT NULL, priority ASC` 排序 +- 主套餐（master_usage_id=NULL）排在最后 + +#### Scenario: 存在加油包时优先扣减 +- **GIVEN** 载体有主套餐（data_usage_mb=0, data_limit_mb=10240）和加油包（data_usage_mb=0, data_limit_mb=5120, priority=1） +- **WHEN** 上游返回累计流量 3072MB（本次增量 3GB） +- **THEN** 系统执行： + 1. 扣减加油包：data_usage_mb=3072 + 2. 主套餐不扣减：data_usage_mb=0 +- **AND** PackageUsageDailyRecord 记录加油包增量 3072MB + +#### Scenario: 加油包用完后扣减主套餐 +- **GIVEN** 载体有主套餐（data_usage_mb=0, data_limit_mb=10240）和加油包（data_usage_mb=3072, data_limit_mb=5120） +- **WHEN** 上游返回累计流量 8192MB（本次增量 5GB） +- **THEN** 系统执行： + 1. 扣减加油包：5120 - 3072 = 2048MB 可用，扣减 2048MB → data_usage_mb=5120（用完） + 2. 更新加油包 status=2（已用完） + 3. 剩余流量 5GB - 2GB = 3GB + 4. 扣减主套餐：data_usage_mb=3072 +- **AND** PackageUsageDailyRecord 记录加油包增量 2048MB、主套餐增量 3072MB + +#### Scenario: 只有主套餐时直接扣减 +- **GIVEN** 载体只有主套餐（data_usage_mb=0, data_limit_mb=10240），无加油包 +- **WHEN** 上游返回累计流量 3072MB +- **THEN** 系统直接扣减主套餐：data_usage_mb=3072 +- **AND** PackageUsageDailyRecord 记录主套餐增量 3072MB + +#### Scenario: 加油包已用完自动跳过（边界条件） +- **GIVEN** 载体有主套餐（data_usage_mb=0, data_limit_mb=10240）和加油包（data_usage_mb=5120, data_limit_mb=5120, status=2） +- **WHEN** 上游返回累计流量 3072MB +- **THEN** 系统跳过已用完的加油包，直接扣减主套餐：data_usage_mb=3072 +- **AND** 加油包 data_usage_mb 保持 5120（不再扣减） + +#### Scenario: 流量增量为 0 不扣减（边界条件） +- **GIVEN** 载体有主套餐和加油包 +- **WHEN** 上游返回累计流量与上次记录相同（增量=0） +- **THEN** 系统不更新任何套餐的 data_usage_mb +- **AND** 不创建 PackageUsageDailyRecord + +#### Scenario: 流量增量为负数拒绝扣减（异常处理） +- **GIVEN** 载体上次记录累计流量 10GB +- **WHEN** 上游返回累计流量 8GB（负增量，异常情况） +- **THEN** 系统记录 Warning 日志："上游流量异常，累计流量减少" +- **AND** 不更新套餐 data_usage_mb +- **AND** 告警通知运维团队 + +### Requirement: 多个加油包按多维度排序扣减 + +系统 SHALL 当存在多个加油包时，按 **priority ASC, expires_at ASC, activated_at ASC** 多维度排序扣减流量。 + +**业务价值**： +- 按购买顺序消耗加油包（priority） +- 优先消耗即将到期的流量（expires_at） +- 确定性排序便于问题排查（activated_at） + +**技术实现**： +- 查询时：`ORDER BY (master_usage_id IS NOT NULL) DESC, priority ASC, expires_at ASC, activated_at ASC` +- 确保加油包按多维度排序排在主套餐前 + +#### Scenario: 按到期时间优先扣减（多维度排序验证） +- **GIVEN** 载体有2个加油包，相同 priority： + - 加油包A：priority=1, data_limit_mb=5120, expires_at=2026-02-15 23:59:59 + - 加油包B：priority=1, data_limit_mb=3072, expires_at=2026-02-12 23:59:59（先到期） +- **WHEN** 上游返回累计流量 4096MB（本次增量 4GB） +- **THEN** 系统执行： + 1. 扣减加油包B（先到期）：3072MB → data_usage_mb=3072（用完），status=2 + 2. 剩余流量 4GB - 3GB = 1GB + 3. 扣减加油包A：1024MB → data_usage_mb=1024 +- **AND** PackageUsageDailyRecord 记录加油包B增量 3072MB、加油包A增量 1024MB + +#### Scenario: 完整多维度排序示例 +- **GIVEN** 载体有： + - 主套餐：priority=10, data_limit_mb=10240, expires_at=2026-03-31 + - 加油包A：priority=1, data_limit_mb=2048, expires_at=2026-02-15, activated_at=2026-02-01 + - 加油包B：priority=2, data_limit_mb=3072, expires_at=2026-02-20, activated_at=2026-02-03 + - 加油包C：priority=1, data_limit_mb=4096, expires_at=2026-02-15, activated_at=2026-02-05（与A同priority和expires_at，但晚激活） +- **WHEN** 上游返回累计流量 12288MB（本次增量 12GB） +- **THEN** 系统按以下顺序扣减： + 1. 加油包A（priority=1, expires_at=2026-02-15, activated_at=2026-02-01 最早） + 2. 加油包C（priority=1, expires_at=2026-02-15, activated_at=2026-02-05） + 3. 加油包B（priority=2） + 4. 主套餐（priority=10） +- **AND** 扣减结果： + - 加油包A：2048MB → status=2（用完） + - 加油包C：4096MB → status=2（用完） + - 加油包B：3072MB → status=2（用完） + - 主套餐：3072MB（剩余 12GB - 2GB - 4GB - 3GB） + +#### Scenario: 按购买顺序扣减多个加油包 +- **GIVEN** 载体有加油包A（priority=1, data_usage_mb=0, data_limit_mb=3072）和加油包B（priority=2, data_usage_mb=0, data_limit_mb=5120） +- **WHEN** 上游返回累计流量 4096MB（本次增量 4GB） +- **THEN** 系统执行： + 1. 扣减加油包A：3072MB → data_usage_mb=3072（用完），status=2 + 2. 剩余流量 4GB - 3GB = 1GB + 3. 扣减加油包B：1024MB → data_usage_mb=1024 +- **AND** PackageUsageDailyRecord 记录加油包A增量 3072MB、加油包B增量 1024MB + +#### Scenario: Priority 最小的加油包用完后扣减下一个 +- **GIVEN** 载体有3个加油包（priority=1/2/3），priority=1 已用完（status=2） +- **WHEN** 上游返回累计流量增量 2GB +- **THEN** 系统跳过 priority=1，扣减 priority=2 的加油包 2GB + +#### Scenario: 所有加油包用完后扣减主套餐 +- **GIVEN** 载体有主套餐和2个加油包（priority=1/2），两个加油包都已用完（status=2） +- **WHEN** 上游返回累计流量增量 5GB +- **THEN** 系统跳过所有加油包，扣减主套餐 5GB + +#### Scenario: 3个加油包和主套餐的完整扣减流程 +- **GIVEN** 载体有： + - 主套餐（data_limit_mb=10240, data_usage_mb=0） + - 加油包A（priority=1, data_limit_mb=2048, data_usage_mb=0） + - 加油包B（priority=2, data_limit_mb=3072, data_usage_mb=0） + - 加油包C（priority=3, data_limit_mb=4096, data_usage_mb=0） +- **WHEN** 上游返回累计流量 12288MB（本次增量 12GB） +- **THEN** 系统执行： + 1. 扣减加油包A：2048MB → status=2（用完） + 2. 扣减加油包B：3072MB → status=2（用完） + 3. 扣减加油包C：4096MB → status=2（用完） + 4. 扣减主套餐：3072MB（剩余 12GB - 2GB - 3GB - 4GB） +- **AND** PackageUsageDailyRecord 记录 4 条记录 + +#### Scenario: 并发扣减同一套餐（并发控制） +- **GIVEN** 两个轮询任务同时检测到同一张卡的流量增加 +- **WHEN** 两个任务同时尝试扣减加油包A +- **THEN** 第一个任务获取行锁（SELECT FOR UPDATE），执行扣减 +- **AND** 第二个任务等待锁释放，检测到已扣减，跳过（幂等性保证） +- **AND** 加油包A的 data_usage_mb 只增加一次 + +### Requirement: 所有流量用完时触发停机 +系统 SHALL 在主套餐和所有加油包流量都用完时，触发停机操作。 + +**业务价值**：充分利用加油包流量，避免提前停机，提升用户体验。 + +**技术实现**： +```sql +-- 停机条件检查 +SELECT COUNT(*) FROM tb_package_usage +WHERE (iot_card_id/device_id)=? AND status=1 AND master_usage_id IS NULL; + +-- 如果 COUNT=0（主套餐已过期或用完），检查加油包 +SELECT COUNT(*) FROM tb_package_usage +WHERE (iot_card_id/device_id)=? AND status=1 AND master_usage_id IS NOT NULL + AND data_usage_mb < data_limit_mb; + +-- 如果两个 COUNT 都=0，触发停机 +``` + +#### Scenario: 主套餐和加油包都用完触发停机 +- **GIVEN** 主套餐 data_usage_mb=10240, data_limit_mb=10240（用完），加油包 data_usage_mb=5120, data_limit_mb=5120（用完） +- **WHEN** 轮询系统检查停机条件 +- **THEN** 系统查询生效中套餐剩余流量，结果为 0 +- **AND** 触发停机操作： + 1. 调用运营商 API 停机 + 2. 更新 IotCard.network_status=0（已停机） + 3. 记录操作日志 +- **AND** 主套餐和加油包 status 更新为 2（已用完） + +#### Scenario: 有加油包剩余流量时不停机 +- **GIVEN** 主套餐 data_usage_mb=10240, data_limit_mb=10240（用完），加油包 data_usage_mb=4096, data_limit_mb=5120（剩余1GB） +- **WHEN** 轮询系统检查停机条件 +- **THEN** 系统查询生效中套餐剩余流量，结果 > 0 +- **AND** 不触发停机，继续提供服务 + +#### Scenario: 主套餐未用完但加油包都用完（不停机） +- **GIVEN** 主套餐 data_usage_mb=8192, data_limit_mb=10240（剩余2GB），所有加油包都用完（status=2） +- **WHEN** 轮询系统检查停机条件 +- **THEN** 系统查询主套餐剩余流量 > 0 +- **AND** 不触发停机 + +#### Scenario: 主套餐过期但加油包有剩余（不停机） +- **GIVEN** 主套餐 status=3（已过期），加油包 data_usage_mb=2048, data_limit_mb=5120（剩余3GB）, status=1 +- **WHEN** 轮询系统检查停机条件 +- **THEN** 系统查询生效中加油包剩余流量 > 0 +- **AND** 不触发停机 + +#### Scenario: 停机后续费加油包自动复机（业务理解） +- **GIVEN** 载体已停机（所有套餐流量用完） +- **WHEN** 用户购买新加油包（立即激活，status=1） +- **THEN** 下次轮询检查时，发现有剩余流量 > 0 +- **AND** 自动触发复机操作： + 1. 调用运营商 API 复机 + 2. 更新 IotCard.network_status=1（已开机） + 3. 记录操作日志 + +#### Scenario: 停机 API 调用失败（异常处理） +- **GIVEN** 载体所有套餐流量用完，需要停机 +- **WHEN** 调用运营商停机 API 失败（例如网络超时） +- **THEN** 系统记录 Error 日志，包含卡号、错误信息 +- **AND** 停机任务进入重试队列（Asynq 重试 3 次，间隔 10 秒） +- **AND** 如果 3 次重试都失败，进入死信队列（DLQ） +- **AND** 告警通知运维团队 + +### Requirement: 流量扣减记录到日记录表 +系统 SHALL 在扣减流量时，更新 PackageUsage 的 data_usage_mb，并创建或更新 PackageUsageDailyRecord。 + +**业务价值**： +- 精细化流量统计（按套餐、按日） +- 支持流量详单查询 +- 数据可追溯、可审计 + +**技术实现**： +- 扣减流量后，创建或更新当日 PackageUsageDailyRecord +- 使用 UPSERT（ON CONFLICT UPDATE）避免重复记录 +- 记录字段：`package_usage_id`, `date`, `daily_usage_mb`, `cumulative_usage_mb` + +#### Scenario: 扣减主套餐流量并记录 +- **GIVEN** 主套餐 data_usage_mb=0, data_limit_mb=10240 +- **WHEN** 扣减主套餐 2048MB 流量 +- **THEN** PackageUsage 更新：data_usage_mb=2048 +- **AND** PackageUsageDailyRecord 创建记录： + - package_usage_id=主套餐ID + - date=2026-02-10 + - daily_usage_mb=2048 + - cumulative_usage_mb=2048 + +#### Scenario: 扣减加油包流量并记录 +- **GIVEN** 加油包 data_usage_mb=0, data_limit_mb=5120 +- **WHEN** 扣减加油包 3072MB 流量 +- **THEN** PackageUsage 更新：data_usage_mb=3072 +- **AND** PackageUsageDailyRecord 创建记录： + - package_usage_id=加油包ID + - date=2026-02-10 + - daily_usage_mb=3072 + - cumulative_usage_mb=3072 + +#### Scenario: 同一天多次扣减更新日记录 +- **GIVEN** PackageUsageDailyRecord 已有记录（date=2026-02-10, daily_usage_mb=2048, cumulative_usage_mb=2048） +- **WHEN** 再次扣减主套餐 1024MB 流量 +- **THEN** PackageUsage 更新：data_usage_mb=3072 +- **AND** PackageUsageDailyRecord 更新记录： + - daily_usage_mb=3072（2048 + 1024） + - cumulative_usage_mb=3072 +- **AND** 使用 UPSERT 更新而非插入新记录 + +#### Scenario: 跨天扣减创建新日记录 +- **GIVEN** PackageUsageDailyRecord 有 2026-02-10 的记录（daily_usage_mb=5120, cumulative_usage_mb=5120） +- **WHEN** 2026-02-11 扣减主套餐 2048MB 流量 +- **THEN** PackageUsageDailyRecord 创建新记录： + - date=2026-02-11 + - daily_usage_mb=2048 + - cumulative_usage_mb=7168（5120 + 2048） + +#### Scenario: 日记录写入失败不影响扣减（容错性） +- **GIVEN** 数据库主表正常，日记录表存在问题（例如磁盘满） +- **WHEN** 扣减主套餐流量，PackageUsage 更新成功，但 PackageUsageDailyRecord 写入失败 +- **THEN** 系统记录 Error 日志，包含套餐ID、日期、增量 +- **AND** PackageUsage 的 data_usage_mb 仍然更新（不回滚） +- **AND** 告警通知运维团队修复日记录表 + +#### Scenario: 批量扣减写入日记录（性能优化） +- **GIVEN** 轮询系统同时检测到 1000 张卡的流量增加 +- **WHEN** 批量扣减流量 +- **THEN** 使用批量 INSERT ON CONFLICT UPDATE 写入日记录 +- **AND** 1000 条记录写入时间 < 5 秒 + +## 数据一致性保证 + +### 1. 扣减流量事务保证 +- **机制**：数据库事务包含： + 1. UPDATE PackageUsage SET data_usage_mb += increment + 2. INSERT/UPDATE PackageUsageDailyRecord +- **回滚条件**：任一步骤失败，整个事务回滚 + +### 2. 并发扣减行锁 +- **机制**：`SELECT * FROM tb_package_usage WHERE id=? FOR UPDATE` +- **保证**：同一套餐不会被并发扣减 + +### 3. 负数流量保护 +- **机制**：数据库约束 `CHECK (data_usage_mb >= 0)` +- **保证**：扣减后不会出现负数流量 + +### 4. 日记录唯一索引 +- **机制**：`UNIQUE INDEX (package_usage_id, date) WHERE deleted_at IS NULL` +- **保证**：同一套餐同一天只有一条记录 + +## 性能指标 + +| 操作 | 性能要求 | 监控指标 | +|------|---------|---------| +| 单次流量扣减 | < 100ms | 数据库事务耗时 | +| 批量扣减（1000张卡） | < 10秒 | 轮询任务执行时间 | +| 日记录写入 | < 50ms | INSERT/UPDATE 耗时 | +| 停机条件检查 | < 50ms | SELECT 查询耗时 | + +## 错误码定义 + +| 错误码 | HTTP 状态码 | 错误消息 | 场景 | +|--------|------------|---------|------| +| CodeInternal | 500 | 流量扣减失败，请重试 | 数据库更新失败 | +| CodeInternal | 500 | 停机操作失败，请重试 | 运营商 API 调用失败 | + +## 测试场景矩阵 + +| 维度 | 场景 | 预期结果 | +|------|------|---------| +| **基础扣减** | 只有主套餐 | 直接扣减主套餐 | +| | 有1个加油包 | 优先扣减加油包 | +| | 有3个加油包 | 按 priority 顺序扣减 | +| **扣减完整流程** | 加油包用完 → 主套餐 | 先扣完所有加油包，再扣主套餐 | +| | 所有套餐用完 | 触发停机 | +| **边界条件** | 流量增量=0 | 不扣减 | +| | 流量增量<0（异常） | 拒绝扣减，告警 | +| | 加油包已用完 | 自动跳过 | +| **并发场景** | 并发扣减同一套餐 | 行锁保证只扣减一次 | +| **停机条件** | 主套餐用完+加油包剩余 | 不停机 | +| | 所有套餐用完 | 停机 | +| | 停机后购买加油包 | 自动复机 | +| **日记录** | 首次扣减 | 创建日记录 | +| | 同一天多次扣减 | 更新日记录 | +| | 跨天扣减 | 创建新日记录 | +| **异常处理** | 停机 API 失败 | 重试 3 次，失败进 DLQ | +| | 日记录写入失败 | 告警，不影响扣减 | diff --git a/openspec/changes/package-system-upgrade/tasks.md b/openspec/changes/package-system-upgrade/tasks.md new file mode 100644 index 0000000..f37a3c3 --- /dev/null +++ b/openspec/changes/package-system-upgrade/tasks.md @@ -0,0 +1,288 @@ +# 实施任务清单: 套餐系统升级 + +## 1. 数据库迁移 + +- [x] 1.1 创建数据库迁移文件（`make create-migration name=package_system_upgrade`） +- [x] 1.2 编写 Package 表扩展迁移（新增 3 个字段：calendar_type, data_reset_cycle, enable_realname_activation） +- [x] 1.3 编写 PackageUsage 表扩展迁移（扩展 status 枚举 0-4，新增 7 个字段：priority, master_usage_id, has_independent_expiry, pending_realname_activation, data_reset_cycle, last_reset_at, next_reset_at） +- [x] 1.4 编写 IotCard 表扩展迁移（新增 3 个字段：first_realname_at, stopped_at, resumed_at, stop_reason） +- [x] 1.5 编写 Carrier 表扩展迁移（新增 1 个字段：billing_day） +- [x] 1.6 创建 PackageUsageDailyRecord 表迁移（package_usage_id, date, daily_usage_mb, cumulative_usage_mb） +- [x] 1.7 创建 CardDailyUsage 表迁移（card_id, usage_date, total_data_usage, carrier_id） +- [x] 1.8 创建索引迁移（priority, master_usage_id, package_usage_id+date 联合唯一索引, card_id+usage_date 联合唯一索引） +- [x] 1.9 执行迁移（`make migrate-up`），验证表结构正确 +- [x] 1.10 数据初始化：运营商 billing_day 字段（联通=27，其他=1） +- [x] 1.11 编写回滚迁移脚本（删除新表、删除新字段） + +## 2. 常量定义 + +- [x] 2.1 在 pkg/constants/constants.go 新增套餐周期类型常量（PackageCalendarTypeNaturalMonth, PackageCalendarTypeByDay） +- [x] 2.2 新增套餐流量重置周期常量（PackageDataResetDaily, PackageDataResetMonthly, PackageDataResetYearly, PackageDataResetNone） +- [x] 2.3 新增套餐使用状态常量（PackageUsageStatusPending=0, PackageUsageStatusActive=1, PackageUsageStatusDepleted=2, PackageUsageStatusExpired=3, PackageUsageStatusInvalidated=4） +- [x] 2.4 新增任务类型常量（TaskTypePackageFirstActivation, TaskTypePackageQueueActivation, TaskTypePackageDataReset） +- [x] 2.5 新增 Redis 键函数（RedisPackageActivationLockKey） +- [x] 2.6 运行 lsp_diagnostics 验证编译通过 + +## 3. Model 层扩展 + +- [x] 3.1 扩展 Package 模型（新增 CalendarType, DataResetCycle, EnableRealnameActivation, DurationDays 字段） +- [x] 3.2 扩展 PackageUsage 模型（扩展 Status 注释，新增 Priority, MasterUsageID, HasIndependentExpiry, PendingRealnameActivation, DataResetCycle, LastResetAt, NextResetAt 字段） +- [x] 3.3 创建 PackageUsageDailyRecord 模型（PackageUsageID, Date, DailyUsageMB, CumulativeUsageMB） +- [x] 3.4 实现 PackageUsageDailyRecord.TableName() 方法 +- [x] 3.5 运行 lsp_diagnostics 验证编译通过 + +## 4. DTO 扩展 + +- [x] 4.1 扩展 CreatePackageRequest DTO（新增 CalendarType, DurationDays, DataResetCycle, EnableRealnameActivation 字段，添加 description 标签和验证标签） +- [x] 4.2 扩展 UpdatePackageRequest DTO（新增 CalendarType, DurationDays, DataResetCycle, EnableRealnameActivation 字段） +- [x] 4.3 扩展 PackageResponse DTO（新增 CalendarType, DurationDays, DataResetCycle, EnableRealnameActivation 字段） +- [x] 4.4 创建 PackageUsageCustomerViewResponse DTO（main_package, addon_packages, total 字段） +- [x] 4.5 创建 PackageUsageDailyRecordResponse DTO（date, daily_usage_mb, cumulative_usage_mb 字段） +- [x] 4.6 创建 PackageUsageDetailResponse DTO（package_usage_id, package_name, records, total_usage_mb 字段） +- [x] 4.7 运行 lsp_diagnostics 验证编译通过 + +## 5. Store 层扩展 + +- [x] 5.1 扩展 PackageStore.Create 方法支持新字段（calendar_type, data_reset_cycle, enable_realname_activation） +- [x] 5.2 扩展 PackageStore.Update 方法支持新字段 +- [x] 5.3 扩展 PackageStore.GetByID 查询返回新字段 +- [x] 5.4 扩展 PackageUsageStore.Create 方法支持新字段（priority, master_usage_id, has_independent_expiry, pending_realname_activation, data_reset_cycle） +- [x] 5.5 新增 PackageUsageStore.GetActiveMainPackage 方法（查询生效中主套餐） +- [x] 5.6 新增 PackageUsageStore.GetNextPendingMainPackage 方法（查询下一个待生效主套餐，按 priority ASC） +- [x] 5.7 新增 PackageUsageStore.GetActivePackages 方法（查询生效中的主套餐和加油包，按优先级排序） +- [x] 5.8 新增 PackageUsageStore.GetAddonsByMasterID 方法（查询主套餐下的所有加油包） +- [x] 5.9 新增 PackageUsageStore.BatchUpdateStatus 方法（批量更新加油包状态） +- [x] 5.10 新增 PackageUsageStore.UpdateDataUsage 方法（更新套餐流量使用，支持事务） +- [x] 5.11 新增 PackageUsageStore.GetPackagesForReset 方法（查询需要重置的套餐，WHERE next_reset_at <= NOW） +- [x] 5.12 新增 PackageUsageStore.ResetDataUsage 方法（重置流量，更新 last_reset_at 和 next_reset_at） +- [x] 5.13 创建 PackageUsageDailyRecordStore（NewPackageUsageDailyRecordStore 构造函数） +- [x] 5.14 实现 PackageUsageDailyRecordStore.CreateOrUpdate 方法（创建或更新日记录，使用 UPSERT） +- [x] 5.15 实现 PackageUsageDailyRecordStore.GetByDateRange 方法（按日期范围查询） + +## 6. 套餐有效期计算工具函数 + +- [x] 6.1 在 internal/service/package/utils.go 创建 CalculateExpiryTime 函数（根据 calendar_type 和 duration 计算过期时间） +- [x] 6.2 实现自然月套餐过期时间计算（activated_at 月份 + N 个月，月末 23:59:59） +- [x] 6.3 实现按天套餐过期时间计算（activated_at + N 天，23:59:59） +- [x] 6.4 在 internal/service/package/utils.go 创建 CalculateNextResetTime 函数（根据 data_reset_cycle 计算下次重置时间） +- [x] 6.5 实现日重置计算（明天 00:00:00） +- [x] 6.6 实现月重置计算（联通27号 vs 其他1号，下月 00:00:00） +- [x] 6.7 实现年重置计算（明年 1 月 1 日 00:00:00） + +## 7. Package Service 改造 + +- [x] 7.1 扩展 PackageService.Create 方法支持新字段验证（calendar_type=natural_month 时必须提供 duration_months） +- [x] 7.2 扩展 PackageService.Update 方法支持新字段更新 +- [x] 7.3 扩展 PackageService.GetByID 返回新字段 + +## 8. Order Service 改造（主套餐排队 + 加油包限制 + 混买限制） + +- [x] 8.1 实现订单创建校验：禁止同订单混买正式套餐和加油包 +- [x] 8.2 改造 OrderService.CreateOrder 方法，购买主套餐时检查是否有生效中主套餐 +- [x] 8.3 实现主套餐排队逻辑（有生效中主套餐时，新套餐 status=0, priority=MAX(priority)+1） +- [x] 8.4 实现首个主套餐立即激活逻辑（无生效中主套餐时，status=1, priority=1, 计算 activated_at 和 expires_at） +- [x] 8.5 改造 OrderService.CreateOrder 方法，购买加油包时检查是否有主套餐（status IN (0,1) 的主套餐） +- [x] 8.6 实现加油包购买限制（无主套餐时返回错误 "必须有主套餐才能购买加油包"） +- [x] 8.7 实现加油包创建逻辑（master_usage_id=主套餐ID, status=1, priority=MAX(priority)+1, 根据 has_independent_expiry 计算 expires_at） +- [x] 8.8 实现客户端未实名购买限制（H5 端未实名时返回错误 403） +- [x] 8.9 实现后台囤货场景（enable_realname_activation=true 时，status=0, pending_realname_activation=true） + +## 9. 套餐激活 Service（首次实名激活 + 排队激活） + +- [x] 9.1 创建 internal/service/package/activation_service.go +- [x] 9.2 实现 ActivationService.ActivateByRealname 方法（首次实名激活，查询 pending_realname_activation=true 的套餐） +- [x] 9.3 实现套餐激活逻辑（计算 activated_at 和 expires_at，更新 status=1, pending_realname_activation=false） +- [x] 9.4 实现 ActivationService.ActivateQueuedPackage 方法（主套餐排队激活，使用 Redis 分布式锁避免并发） +- [x] 9.5 实现过期主套餐检测逻辑（查询 status=1 AND expires_at <= NOW 的主套餐，更新 status=3） +- [x] 9.6 实现下一个待生效主套餐查询（WHERE status=0 AND master_usage_id IS NULL ORDER BY priority ASC LIMIT 1） +- [x] 9.7 实现加油包级联失效逻辑（查询主套餐下的所有加油包，批量更新 status=4） + +## 10. 流量扣减优先级 Service + +- [x] 10.1 创建 internal/service/package/usage_service.go +- [x] 10.2 实现 UsageService.DeductDataUsage 方法（按优先级扣减流量：加油包按 priority ASC → 主套餐） +- [x] 10.3 实现流量扣减逻辑（FOR EACH 套餐，计算剩余额度，扣减流量，更新 data_usage_mb） +- [x] 10.4 实现套餐流量用完标记（data_usage_mb >= data_limit_mb 时，更新 status=2） +- [x] 10.5 实现停机条件检查（所有套餐 status=2 时，触发停机操作） +- [x] 10.6 实现日记录写入（每次扣减后，创建或更新 PackageUsageDailyRecord） + +## 11. 流量重置 Service + +- [x] 11.1 创建 internal/service/package/reset_service.go +- [x] 11.2 实现 ResetService.ResetDailyUsage 方法（查询 data_reset_cycle=daily 且 next_reset_at <= NOW 的套餐） +- [x] 11.3 实现日重置逻辑（批量更新 data_usage_mb=0, last_reset_at=NOW, next_reset_at=明天 00:00:00） +- [x] 11.4 实现 ResetService.ResetMonthlyUsage 方法（查询 data_reset_cycle=monthly 且 next_reset_at <= NOW 的套餐） +- [x] 11.5 实现月重置逻辑（区分联通27号 vs 其他1号，批量更新流量和重置时间） +- [x] 11.6 实现 ResetService.ResetYearlyUsage 方法（查询 data_reset_cycle=yearly 且 next_reset_at <= NOW 的套餐） +- [x] 11.7 实现年重置逻辑（批量更新 data_usage_mb=0, last_reset_at=NOW, next_reset_at=明年 1月 1日） +- [x] 11.8 实现分批处理逻辑（每次最多处理 10000 条，避免长事务） + +## 12. 客户视图流量查询 Service + +- [x] 12.1 创建 internal/service/package/customer_view_service.go +- [x] 12.2 实现 CustomerViewService.GetMyUsage 方法（根据 user_id 获取载体信息） +- [x] 12.3 实现生效套餐查询逻辑（WHERE status IN (1,2)，区分主套餐和加油包） +- [x] 12.4 实现总计流量计算逻辑（主套餐 + 所有加油包的 used_mb 和 total_mb） +- [x] 12.5 实现响应 DTO 组装（main_package, addon_packages, total） + +## 13. 套餐流量详单 Service + +- [x] 13.1 创建 internal/service/package/daily_record_service.go +- [x] 13.2 实现 DailyRecordService.GetDailyRecords 方法（查询 package_usage_id 的日记录） +- [x] 13.3 实现越权检查（使用 middleware.CanManageShop 或 middleware.CanManageEnterprise 验证权限） +- [x] 13.4 实现日记录查询逻辑（WHERE package_usage_id=? AND date BETWEEN ? AND ?，按 date ASC 排序） +- [x] 13.5 实现响应 DTO 组装（package_usage_id, package_name, records, total_usage_mb） + +## 14. Handler 层改造（套餐管理 API） + +- [x] 14.1 扩展 admin.PackageHandler.Create 方法支持新字段验证（calendar_type, data_reset_cycle, enable_realname_activation） +- [x] 14.2 扩展 admin.PackageHandler.Update 方法支持新字段更新 +- [x] 14.3 扩展 admin.PackageHandler.GetByID 返回新字段 + +## 15. Handler 层改造（客户视图 API） + +- [x] 15.1 创建 internal/handler/h5/package_usage.go +- [x] 15.2 实现 PackageUsageHandler.GetMyUsage 方法（GET /api/h5/packages/my-usage） +- [x] 15.3 实现 JWT 认证和用户信息提取（从 context 获取 user_id 和载体信息） +- [x] 15.4 调用 CustomerViewService.GetMyUsage 获取流量数据 +- [x] 15.5 返回 PackageUsageCustomerViewResponse 响应 + +## 16. Handler 层改造（套餐流量详单 API） + +- [x] 16.1 扩展 admin.PackageUsageHandler（或创建新 Handler） +- [x] 16.2 实现 PackageUsageHandler.GetDailyRecords 方法（GET /api/admin/package-usage/:id/daily-records） +- [x] 16.3 实现参数验证（start_date, end_date 查询参数） +- [x] 16.4 调用 DailyRecordService.GetDailyRecords 获取日记录 +- [x] 16.5 返回 PackageUsageDetailResponse 响应 + +## 17. 路由注册和文档生成器更新 + +- [x] 17.1 在 admin 路由组注册套餐管理 API（支持新字段的 POST/PUT/GET） +- [x] 17.2 在 h5 路由组注册客户视图 API（GET /api/h5/packages/my-usage） +- [x] 17.3 在 admin 路由组注册套餐流量详单 API（GET /api/admin/package-usage/:id/daily-records） +- [x] 17.4 更新 cmd/api/docs.go 文档生成器（添加新 Handler 到 handlers 结构体） +- [x] 17.5 更新 cmd/gendocs/main.go 文档生成器（添加新 Handler 到 handlers 结构体） +- [x] 17.6 运行 `make docs` 生成 OpenAPI 文档，验证新 API 出现在文档中 + +## 18. 轮询系统扩展（流量检查任务） + +- [x] 18.1 扩展 internal/polling/carddata_handler.go +- [x] 18.2 改造 HandleCarddataCheck 方法支持流量扣减优先级（查询生效套餐，按优先级排序） +- [x] 18.3 实现流量扣减逻辑（调用 UsageService.DeductDataUsage 方法） +- [x] 18.4 改造停机条件检查（所有套餐流量用完才触发停机） + +## 19. 轮询系统扩展（套餐激活检查任务） + +- [x] 19.1 创建 internal/polling/package_activation_handler.go +- [x] 19.2 实现 HandlePackageActivation 方法（查询已过期主套餐，status=1 AND expires_at <= NOW） +- [x] 19.3 实现过期主套餐状态更新（更新 status=3） +- [x] 19.4 实现加油包级联失效（调用 ActivationService.CascadeInvalidateAddons） +- [x] 19.5 实现下一个待生效主套餐查询和激活（提交 Asynq 任务 TaskTypePackageQueueActivation） +- [x] 19.6 在 Scheduler.scheduleLoop 中注册套餐激活检查任务（每 10 秒调度一次） + +## 20. 轮询系统扩展（流量重置调度任务） + +- [x] 20.1 创建 internal/polling/data_reset_handler.go +- [x] 20.2 实现 HandleDataReset 方法（每 10 秒调度一次，检查需要重置的套餐） +- [x] 20.3 实现日重置调度（调用 ResetService.ResetDailyUsage） +- [x] 20.4 实现月重置调度（调用 ResetService.ResetMonthlyUsage） +- [x] 20.5 实现年重置调度（调用 ResetService.ResetYearlyUsage） +- [x] 20.6 在 Scheduler.scheduleLoop 中注册流量重置调度任务 + +## 21. 轮询系统扩展（首次实名激活触发） + +- [x] 21.1 扩展 internal/task/polling_handler.go（实名检查部分） +- [x] 21.2 改造 HandleRealnameCheck 方法，检测到首次实名时（realname_status: 0/1 → 2） +- [x] 21.3 查询该卡/设备是否有待激活套餐（WHERE pending_realname_activation=true AND status=0） +- [x] 21.4 提交 Asynq 任务（TaskTypePackageFirstActivation） + +## 22. Asynq Handler（首次实名激活任务） + +- [x] 22.1 在 internal/polling/package_activation_handler.go 添加 HandlePackageFirstActivation 方法 +- [x] 22.2 实现 HandlePackageFirstActivation 方法（解析任务 payload） +- [x] 22.3 调用 ActivationService.ActivateByRealname 激活套餐 +- [x] 22.4 实现幂等性保证（任务处理前检查 pending_realname_activation=false） +- [x] 22.5 实现重试策略（MaxRetry(3), Timeout(30s)） +- [x] 22.6 在 pkg/queue/handler.go 注册任务 Handler（TaskTypePackageFirstActivation → HandlePackageFirstActivation） + +## 23. Asynq Handler（主套餐排队激活任务） + +- [x] 23.1 在 internal/polling/package_activation_handler.go 添加 HandlePackageQueueActivation 方法 +- [x] 23.2 实现 HandlePackageQueueActivation 方法（解析任务 payload） +- [x] 23.3 调用 ActivationService.ActivateQueuedPackage 激活套餐 +- [x] 23.4 实现幂等性保证（任务处理前检查 status=1） +- [x] 23.5 实现重试策略（MaxRetry(3), Timeout(30s)） +- [x] 23.6 在 pkg/queue/handler.go 注册任务 Handler（TaskTypePackageQueueActivation → HandlePackageQueueActivation） + +## 24. 自动停复机功能（新增章节） + +- [x] 24.1 扩展 IotCard Model（新增 stopped_at, resumed_at, stop_reason 字段） +- [x] 24.2 创建 internal/service/iot_card/stop_resume_service.go +- [x] 24.3 实现 CheckAndStopCard 方法（检查流量耗尽并停机） +- [x] 24.4 实现 ResumeCardIfStopped 方法（购买套餐后自动复机） +- [x] 24.5 实现运营商停复机接口调用（带重试机制，最多3次） +- [x] 24.6 在流量扣减Service中集成停机检查 +- [x] 24.7 在套餐激活Service中集成复机触发 + +## 25. 错误码扩展 + +- [x] 25.1 在 pkg/errors/codes.go 新增错误码（CodePackageActivationConflict - 套餐正在激活中） +- [x] 25.2 新增错误码（CodeNoMainPackage - 必须有主套餐才能购买加油包） +- [x] 25.3 新增错误码（CodeRealnameRequired - 设备/卡必须先完成实名认证才能购买套餐） +- [x] 25.4 新增错误码（CodeMixedOrderForbidden - 同订单不能同时购买正式套餐和加油包） +- [x] 25.5 运行 lsp_diagnostics 验证编译通过 + +## 26. 功能验证（囤货 → 实名 → 激活流程） + +- [ ] 25.4 验证套餐激活延迟 < 30 秒 + +## 26. 功能验证（主套餐排队 → 过期 → 激活流程） + +- [ ] 26.4 验证套餐激活延迟 < 1 分钟 + +## 27. 功能验证（加油包生命周期流程） + +- [ ] 27.4 验证加油包 status=4（已失效） + +## 28. 功能验证（流量扣减优先级 + 停机条件） + +- [ ] 28.4 验证停机条件（只有主套餐和所有加油包都用完才停机） + +## 29. 功能验证（流量重置调度） + +- [ ] 29.4 验证联通卡27号重置、其他卡1号重置逻辑 + +## 30. 功能验证（客户视图流量查询） + +- [ ] 30.4 验证响应包含主套餐、加油包列表、总计流量 +- [ ] 30.5 验证 API 性能（P95 < 200ms） + +## 31. 功能验证（套餐流量详单查询） + +- [ ] 31.4 验证响应包含日记录列表、总流量 +- [ ] 31.5 验证越权检查（跨店铺/企业访问返回 403） + + +- [ ] 32.1 测试套餐激活延迟（从过期到激活的时间，目标 < 1 分钟） +- [ ] 32.3 测试轮询系统千万级卡规模支持（模拟 1000 万张卡，验证调度延迟不退化） +- [ ] 32.4 测试流量重置性能（同时重置 10000 条记录，验证执行时间 < 10 秒） + +## 33. 最终验证 + +- [ ] 33.4 运行 lsp_diagnostics，确认无编译错误和类型错误 +- [ ] 33.5 生成 OpenAPI 文档，确认新 API 出现在文档中 +- [ ] 33.6 代码审查（检查是否遵循分层架构、Go 惯用法、性能要求） + +## 34. 文档更新 + +- [ ] 34.1 更新 README.md（新增套餐系统升级功能说明） +- [ ] 34.2 在 docs/package-system-upgrade/ 创建功能总结文档 +- [ ] 34.3 编写套餐系统升级用户指南（囤货、排队、加油包、流量查询） +- [ ] 34.4 更新 API 文档（新增 API 端点和字段说明） + +## 35. 部署准备 + +- [ ] 35.1 编写数据库迁移回滚脚本 +- [ ] 35.3 配置监控指标（Asynq 队列长度、套餐激活延迟、API 响应时间） +- [ ] 35.4 配置告警规则（套餐激活延迟 > 1 分钟、队列堆积 > 1000 个任务） +- [ ] 35.5 编写回滚预案（代码回滚、数据库回滚、数据修复脚本） diff --git a/pkg/auth/token_test.go b/pkg/auth/token_test.go deleted file mode 100644 index 255ceed..0000000 --- a/pkg/auth/token_test.go +++ /dev/null @@ -1,357 +0,0 @@ -package auth - -import ( - "context" - "fmt" - "os" - "testing" - "time" - - "github.com/break/junhong_cmp_fiber/pkg/config" - "github.com/redis/go-redis/v9" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -func setupTestRedis(t *testing.T) *redis.Client { - var addr, password string - testDB := 15 - - cfg, err := config.Load() - if err != nil { - t.Logf("配置加载失败，使用回退配置: %v", err) - addr = "localhost:6379" - password = "" - } else { - t.Logf("成功加载配置，Redis 地址: %s:%d", cfg.Redis.Address, cfg.Redis.Port) - addr = fmt.Sprintf("%s:%d", cfg.Redis.Address, cfg.Redis.Port) - password = cfg.Redis.Password - } - - client := redis.NewClient(&redis.Options{ - Addr: addr, - Password: password, - DB: testDB, - }) - - ctx := context.Background() - if err := client.Ping(ctx).Err(); err != nil { - t.Skipf("Redis 未运行（地址: %s），跳过测试: %v", addr, err) - } - - client.FlushDB(ctx) - - t.Cleanup(func() { - client.FlushDB(ctx) - client.Close() - }) - - return client -} - -func init() { - if os.Getenv("CONFIG_ENV") == "" { - os.Setenv("CONFIG_ENV", "dev") - } - - if os.Getenv("CONFIG_PATH") == "" { - os.Setenv("CONFIG_PATH", "../../configs/config.dev.yaml") - } -} - -func TestTokenManager_GenerateTokenPair(t *testing.T) { - rdb := setupTestRedis(t) - tm := NewTokenManager(rdb, 24*time.Hour, 7*24*time.Hour) - ctx := context.Background() - - t.Run("成功生成 token 对", func(t *testing.T) { - tokenInfo := &TokenInfo{ - UserID: 1, - UserType: 1, - ShopID: 10, - EnterpriseID: 0, - Username: "testuser", - Device: "web", - IP: "127.0.0.1", - } - - accessToken, refreshToken, err := tm.GenerateTokenPair(ctx, tokenInfo) - - require.NoError(t, err) - assert.NotEmpty(t, accessToken) - assert.NotEmpty(t, refreshToken) - assert.Len(t, accessToken, 36) - assert.Len(t, refreshToken, 36) - }) - - t.Run("生成的 token 存储在 Redis 中", func(t *testing.T) { - tokenInfo := &TokenInfo{ - UserID: 2, - UserType: 2, - Username: "admin", - } - - accessToken, refreshToken, err := tm.GenerateTokenPair(ctx, tokenInfo) - require.NoError(t, err) - - accessKey := "auth:token:" + accessToken - refreshKey := "auth:refresh:" + refreshToken - - exists, err := rdb.Exists(ctx, accessKey).Result() - require.NoError(t, err) - assert.Equal(t, int64(1), exists) - - exists, err = rdb.Exists(ctx, refreshKey).Result() - require.NoError(t, err) - assert.Equal(t, int64(1), exists) - }) -} - -func TestTokenManager_ValidateAccessToken(t *testing.T) { - rdb := setupTestRedis(t) - tm := NewTokenManager(rdb, 24*time.Hour, 7*24*time.Hour) - ctx := context.Background() - - tokenInfo := &TokenInfo{ - UserID: 1, - UserType: 1, - ShopID: 10, - EnterpriseID: 0, - Username: "testuser", - Device: "web", - IP: "127.0.0.1", - } - - accessToken, _, err := tm.GenerateTokenPair(ctx, tokenInfo) - require.NoError(t, err) - - t.Run("验证有效的 access token", func(t *testing.T) { - info, err := tm.ValidateAccessToken(ctx, accessToken) - - require.NoError(t, err) - require.NotNil(t, info) - assert.Equal(t, uint(1), info.UserID) - assert.Equal(t, 1, info.UserType) - assert.Equal(t, uint(10), info.ShopID) - assert.Equal(t, "testuser", info.Username) - }) - - t.Run("验证无效的 token", func(t *testing.T) { - info, err := tm.ValidateAccessToken(ctx, "invalid-token") - - assert.Error(t, err) - assert.Nil(t, info) - assert.Contains(t, err.Error(), "无效或过期") - }) - - t.Run("验证空 token", func(t *testing.T) { - info, err := tm.ValidateAccessToken(ctx, "") - - assert.Error(t, err) - assert.Nil(t, info) - }) -} - -func TestTokenManager_ValidateRefreshToken(t *testing.T) { - rdb := setupTestRedis(t) - tm := NewTokenManager(rdb, 24*time.Hour, 7*24*time.Hour) - ctx := context.Background() - - tokenInfo := &TokenInfo{ - UserID: 1, - UserType: 1, - Username: "testuser", - } - - _, refreshToken, err := tm.GenerateTokenPair(ctx, tokenInfo) - require.NoError(t, err) - - t.Run("验证有效的 refresh token", func(t *testing.T) { - info, err := tm.ValidateRefreshToken(ctx, refreshToken) - - require.NoError(t, err) - require.NotNil(t, info) - assert.Equal(t, uint(1), info.UserID) - assert.Equal(t, "testuser", info.Username) - }) - - t.Run("验证无效的 refresh token", func(t *testing.T) { - info, err := tm.ValidateRefreshToken(ctx, "invalid-refresh-token") - - assert.Error(t, err) - assert.Nil(t, info) - }) -} - -func TestTokenManager_RefreshAccessToken(t *testing.T) { - rdb := setupTestRedis(t) - tm := NewTokenManager(rdb, 24*time.Hour, 7*24*time.Hour) - ctx := context.Background() - - tokenInfo := &TokenInfo{ - UserID: 1, - UserType: 1, - Username: "testuser", - Device: "web", - IP: "127.0.0.1", - } - - oldAccessToken, refreshToken, err := tm.GenerateTokenPair(ctx, tokenInfo) - require.NoError(t, err) - - t.Run("成功刷新 access token", func(t *testing.T) { - newAccessToken, err := tm.RefreshAccessToken(ctx, refreshToken) - - require.NoError(t, err) - assert.NotEmpty(t, newAccessToken) - assert.NotEqual(t, oldAccessToken, newAccessToken) - - info, err := tm.ValidateAccessToken(ctx, newAccessToken) - require.NoError(t, err) - assert.Equal(t, uint(1), info.UserID) - }) - - t.Run("使用无效的 refresh token", func(t *testing.T) { - newAccessToken, err := tm.RefreshAccessToken(ctx, "invalid-refresh-token") - - assert.Error(t, err) - assert.Empty(t, newAccessToken) - }) -} - -func TestTokenManager_RevokeToken(t *testing.T) { - rdb := setupTestRedis(t) - tm := NewTokenManager(rdb, 24*time.Hour, 7*24*time.Hour) - ctx := context.Background() - - tokenInfo := &TokenInfo{ - UserID: 1, - UserType: 1, - Username: "testuser", - } - - accessToken, refreshToken, err := tm.GenerateTokenPair(ctx, tokenInfo) - require.NoError(t, err) - - t.Run("成功撤销 access token", func(t *testing.T) { - err := tm.RevokeToken(ctx, accessToken) - require.NoError(t, err) - - info, err := tm.ValidateAccessToken(ctx, accessToken) - assert.Error(t, err) - assert.Nil(t, info) - }) - - t.Run("成功撤销 refresh token", func(t *testing.T) { - err := tm.RevokeToken(ctx, refreshToken) - require.NoError(t, err) - - info, err := tm.ValidateRefreshToken(ctx, refreshToken) - assert.Error(t, err) - assert.Nil(t, info) - }) - - t.Run("撤销不存在的 token 不报错", func(t *testing.T) { - err := tm.RevokeToken(ctx, "non-existent-token") - assert.NoError(t, err) - }) -} - -func TestTokenManager_RevokeAllUserTokens(t *testing.T) { - rdb := setupTestRedis(t) - tm := NewTokenManager(rdb, 24*time.Hour, 7*24*time.Hour) - ctx := context.Background() - - tokenInfo := &TokenInfo{ - UserID: 1, - UserType: 1, - Username: "testuser", - } - - accessToken1, refreshToken1, err := tm.GenerateTokenPair(ctx, tokenInfo) - require.NoError(t, err) - - accessToken2, refreshToken2, err := tm.GenerateTokenPair(ctx, tokenInfo) - require.NoError(t, err) - - t.Run("成功撤销用户所有 token", func(t *testing.T) { - err := tm.RevokeAllUserTokens(ctx, 1) - require.NoError(t, err) - - _, err = tm.ValidateAccessToken(ctx, accessToken1) - assert.Error(t, err) - - _, err = tm.ValidateAccessToken(ctx, accessToken2) - assert.Error(t, err) - - _, err = tm.ValidateRefreshToken(ctx, refreshToken1) - assert.Error(t, err) - - _, err = tm.ValidateRefreshToken(ctx, refreshToken2) - assert.Error(t, err) - }) - - t.Run("撤销不存在用户的 token 不报错", func(t *testing.T) { - err := tm.RevokeAllUserTokens(ctx, 9999) - assert.NoError(t, err) - }) -} - -func TestTokenManager_TokenExpiration(t *testing.T) { - rdb := setupTestRedis(t) - tm := NewTokenManager(rdb, 1*time.Second, 2*time.Second) - ctx := context.Background() - - tokenInfo := &TokenInfo{ - UserID: 1, - UserType: 1, - Username: "testuser", - } - - accessToken, refreshToken, err := tm.GenerateTokenPair(ctx, tokenInfo) - require.NoError(t, err) - - t.Run("Access token 过期后无法验证", func(t *testing.T) { - time.Sleep(2 * time.Second) - - info, err := tm.ValidateAccessToken(ctx, accessToken) - assert.Error(t, err) - assert.Nil(t, info) - }) - - t.Run("Refresh token 过期后无法验证", func(t *testing.T) { - time.Sleep(1 * time.Second) - - info, err := tm.ValidateRefreshToken(ctx, refreshToken) - assert.Error(t, err) - assert.Nil(t, info) - }) -} - -func TestTokenManager_ConcurrentAccess(t *testing.T) { - rdb := setupTestRedis(t) - tm := NewTokenManager(rdb, 24*time.Hour, 7*24*time.Hour) - ctx := context.Background() - - t.Run("并发生成 token", func(t *testing.T) { - done := make(chan bool, 10) - - for i := 0; i < 10; i++ { - go func(id int) { - tokenInfo := &TokenInfo{ - UserID: uint(id), - UserType: 1, - Username: "user", - } - - _, _, err := tm.GenerateTokenPair(ctx, tokenInfo) - assert.NoError(t, err) - done <- true - }(i) - } - - for i := 0; i < 10; i++ { - <-done - } - }) -} diff --git a/pkg/bootstrap/directories_test.go b/pkg/bootstrap/directories_test.go deleted file mode 100644 index ba74453..0000000 --- a/pkg/bootstrap/directories_test.go +++ /dev/null @@ -1,100 +0,0 @@ -package bootstrap - -import ( - "os" - "path/filepath" - "testing" - - "github.com/break/junhong_cmp_fiber/pkg/config" -) - -func TestEnsureDirectories_Success(t *testing.T) { - tmpDir := t.TempDir() - cfg := &config.Config{ - Storage: config.StorageConfig{ - TempDir: filepath.Join(tmpDir, "storage"), - }, - Logging: config.LoggingConfig{ - AppLog: config.LogRotationConfig{Filename: filepath.Join(tmpDir, "logs", "app.log")}, - AccessLog: config.LogRotationConfig{Filename: filepath.Join(tmpDir, "logs", "access.log")}, - }, - } - - result, err := EnsureDirectories(cfg, nil) - if err != nil { - t.Fatalf("EnsureDirectories() 失败: %v", err) - } - - if result.TempDir != cfg.Storage.TempDir { - t.Errorf("TempDir 期望 %s, 实际 %s", cfg.Storage.TempDir, result.TempDir) - } - if result.AppLogDir != filepath.Join(tmpDir, "logs") { - t.Errorf("AppLogDir 期望 %s, 实际 %s", filepath.Join(tmpDir, "logs"), result.AppLogDir) - } - - if _, err := os.Stat(result.TempDir); os.IsNotExist(err) { - t.Error("TempDir 目录未创建") - } - if _, err := os.Stat(result.AppLogDir); os.IsNotExist(err) { - t.Error("AppLogDir 目录未创建") - } -} - -func TestEnsureDirectories_ExistingDirs(t *testing.T) { - tmpDir := t.TempDir() - storageDir := filepath.Join(tmpDir, "storage") - os.MkdirAll(storageDir, 0755) - - cfg := &config.Config{ - Storage: config.StorageConfig{TempDir: storageDir}, - Logging: config.LoggingConfig{ - AppLog: config.LogRotationConfig{Filename: filepath.Join(tmpDir, "logs", "app.log")}, - AccessLog: config.LogRotationConfig{Filename: filepath.Join(tmpDir, "logs", "access.log")}, - }, - } - - result, err := EnsureDirectories(cfg, nil) - if err != nil { - t.Fatalf("EnsureDirectories() 失败: %v", err) - } - - if result.TempDir != storageDir { - t.Errorf("已存在目录应返回原路径") - } -} - -func TestEnsureDirectories_EmptyPaths(t *testing.T) { - cfg := &config.Config{ - Storage: config.StorageConfig{TempDir: ""}, - Logging: config.LoggingConfig{ - AppLog: config.LogRotationConfig{Filename: ""}, - AccessLog: config.LogRotationConfig{Filename: ""}, - }, - } - - result, err := EnsureDirectories(cfg, nil) - if err != nil { - t.Fatalf("EnsureDirectories() 空路径时不应失败: %v", err) - } - - if len(result.Fallbacks) != 0 { - t.Error("空路径不应产生降级") - } -} - -func TestEnsureDirectory_Fallback(t *testing.T) { - path, fallback, err := ensureDirectory("/root/no_permission_dir_test_"+t.Name(), nil) - if err != nil { - if os.Getuid() == 0 { - t.Skip("以 root 身份运行，跳过权限测试") - } - t.Skip("无法测试权限降级场景") - } - - if fallback { - if !filepath.HasPrefix(path, os.TempDir()) { - t.Errorf("降级路径应在临时目录下，实际: %s", path) - } - os.RemoveAll(path) - } -} diff --git a/pkg/config/config_bench_test.go b/pkg/config/config_bench_test.go deleted file mode 100644 index 7750357..0000000 --- a/pkg/config/config_bench_test.go +++ /dev/null @@ -1,60 +0,0 @@ -package config - -import ( - "os" - "testing" - - "github.com/break/junhong_cmp_fiber/pkg/constants" -) - -// BenchmarkGet 测试配置获取性能 -func BenchmarkGet(b *testing.B) { - // 设置配置文件路径 - _ = os.Setenv(constants.EnvConfigPath, "../../configs/config.yaml") - defer func() { _ = os.Unsetenv(constants.EnvConfigPath) }() - - // 初始化配置 - _, err := Load() - if err != nil { - b.Fatalf("加载配置失败: %v", err) - } - - b.Run("GetServer", func(b *testing.B) { - b.ResetTimer() - for i := 0; i < b.N; i++ { - _ = Get().Server - } - }) - - b.Run("GetRedis", func(b *testing.B) { - b.ResetTimer() - for i := 0; i < b.N; i++ { - _ = Get().Redis - } - }) - - b.Run("GetLogging", func(b *testing.B) { - b.ResetTimer() - for i := 0; i < b.N; i++ { - _ = Get().Logging - } - }) - - b.Run("GetMiddleware", func(b *testing.B) { - b.ResetTimer() - for i := 0; i < b.N; i++ { - _ = Get().Middleware - } - }) - - b.Run("FullConfigAccess", func(b *testing.B) { - b.ResetTimer() - for i := 0; i < b.N; i++ { - cfg := Get() - _ = cfg.Server.Address - _ = cfg.Redis.Address - _ = cfg.Logging.Level - _ = cfg.Middleware.EnableRateLimiter - } - }) -} diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go deleted file mode 100644 index 7046a08..0000000 --- a/pkg/config/config_test.go +++ /dev/null @@ -1,625 +0,0 @@ -package config - -import ( - "testing" - "time" -) - -// TestConfig_Validate tests configuration validation rules -func TestConfig_Validate(t *testing.T) { - tests := []struct { - name string - config *Config - wantErr bool - errMsg string - }{ - { - name: "valid config", - config: &Config{ - Server: ServerConfig{ - Address: ":3000", - ReadTimeout: 10 * time.Second, - WriteTimeout: 10 * time.Second, - ShutdownTimeout: 30 * time.Second, - }, - Redis: RedisConfig{ - Address: "localhost", - Port: 6379, - DB: 0, - PoolSize: 10, - MinIdleConns: 5, - }, - Logging: LoggingConfig{ - Level: "info", - AppLog: LogRotationConfig{ - Filename: "logs/app.log", - MaxSize: 100, - MaxBackups: 30, - MaxAge: 30, - }, - AccessLog: LogRotationConfig{ - Filename: "logs/access.log", - MaxSize: 500, - MaxBackups: 90, - MaxAge: 90, - }, - }, - Middleware: MiddlewareConfig{ - RateLimiter: RateLimiterConfig{ - Max: 100, - Expiration: 1 * time.Minute, - Storage: "memory", - }, - }, - JWT: JWTConfig{ - TokenDuration: 24 * time.Hour, - AccessTokenTTL: 24 * time.Hour, - RefreshTokenTTL: 168 * time.Hour, - }, - }, - wantErr: false, - }, - { - name: "empty server address", - config: &Config{ - Server: ServerConfig{ - Address: "", - ReadTimeout: 10 * time.Second, - WriteTimeout: 10 * time.Second, - ShutdownTimeout: 30 * time.Second, - }, - Redis: RedisConfig{ - Address: "localhost", - Port: 6379, - PoolSize: 10, - }, - Logging: LoggingConfig{ - Level: "info", - AppLog: LogRotationConfig{ - Filename: "logs/app.log", - MaxSize: 100, - }, - AccessLog: LogRotationConfig{ - Filename: "logs/access.log", - MaxSize: 500, - }, - }, - }, - wantErr: true, - errMsg: "server.address", - }, - { - name: "read timeout too short", - config: &Config{ - Server: ServerConfig{ - Address: ":3000", - ReadTimeout: 1 * time.Second, - WriteTimeout: 10 * time.Second, - ShutdownTimeout: 30 * time.Second, - }, - Redis: RedisConfig{ - Address: "localhost", - Port: 6379, - PoolSize: 10, - }, - Logging: LoggingConfig{ - Level: "info", - AppLog: LogRotationConfig{ - Filename: "logs/app.log", - MaxSize: 100, - }, - AccessLog: LogRotationConfig{ - Filename: "logs/access.log", - MaxSize: 500, - }, - }, - }, - wantErr: true, - errMsg: "read_timeout", - }, - { - name: "read timeout too long", - config: &Config{ - Server: ServerConfig{ - Address: ":3000", - ReadTimeout: 400 * time.Second, - WriteTimeout: 10 * time.Second, - ShutdownTimeout: 30 * time.Second, - }, - Redis: RedisConfig{ - Address: "localhost", - Port: 6379, - PoolSize: 10, - }, - Logging: LoggingConfig{ - Level: "info", - AppLog: LogRotationConfig{ - Filename: "logs/app.log", - MaxSize: 100, - }, - AccessLog: LogRotationConfig{ - Filename: "logs/access.log", - MaxSize: 500, - }, - }, - }, - wantErr: true, - errMsg: "read_timeout", - }, - { - name: "write timeout out of range", - config: &Config{ - Server: ServerConfig{ - Address: ":3000", - ReadTimeout: 10 * time.Second, - WriteTimeout: 1 * time.Second, - ShutdownTimeout: 30 * time.Second, - }, - Redis: RedisConfig{ - Address: "localhost", - Port: 6379, - PoolSize: 10, - }, - Logging: LoggingConfig{ - Level: "info", - AppLog: LogRotationConfig{ - Filename: "logs/app.log", - MaxSize: 100, - }, - AccessLog: LogRotationConfig{ - Filename: "logs/access.log", - MaxSize: 500, - }, - }, - }, - wantErr: true, - errMsg: "write_timeout", - }, - { - name: "shutdown timeout too short", - config: &Config{ - Server: ServerConfig{ - Address: ":3000", - ReadTimeout: 10 * time.Second, - WriteTimeout: 10 * time.Second, - ShutdownTimeout: 5 * time.Second, - }, - Redis: RedisConfig{ - Address: "localhost", - Port: 6379, - PoolSize: 10, - }, - Logging: LoggingConfig{ - Level: "info", - AppLog: LogRotationConfig{ - Filename: "logs/app.log", - MaxSize: 100, - }, - AccessLog: LogRotationConfig{ - Filename: "logs/access.log", - MaxSize: 500, - }, - }, - }, - wantErr: true, - errMsg: "shutdown_timeout", - }, - { - name: "empty redis address", - config: &Config{ - Server: ServerConfig{ - Address: ":3000", - ReadTimeout: 10 * time.Second, - WriteTimeout: 10 * time.Second, - ShutdownTimeout: 30 * time.Second, - }, - Redis: RedisConfig{ - Address: "", - Port: 6379, - PoolSize: 10, - }, - Logging: LoggingConfig{ - Level: "info", - AppLog: LogRotationConfig{ - Filename: "logs/app.log", - MaxSize: 100, - }, - AccessLog: LogRotationConfig{ - Filename: "logs/access.log", - MaxSize: 500, - }, - }, - }, - wantErr: true, - errMsg: "redis.address", - }, - { - name: "invalid redis port - too high", - config: &Config{ - Server: ServerConfig{ - Address: ":3000", - ReadTimeout: 10 * time.Second, - WriteTimeout: 10 * time.Second, - ShutdownTimeout: 30 * time.Second, - }, - Redis: RedisConfig{ - Address: "localhost", - Port: 99999, - PoolSize: 10, - }, - Logging: LoggingConfig{ - Level: "info", - AppLog: LogRotationConfig{ - Filename: "logs/app.log", - MaxSize: 100, - }, - AccessLog: LogRotationConfig{ - Filename: "logs/access.log", - MaxSize: 500, - }, - }, - }, - wantErr: true, - errMsg: "redis.port", - }, - { - name: "invalid redis port - zero", - config: &Config{ - Server: ServerConfig{ - Address: ":3000", - ReadTimeout: 10 * time.Second, - WriteTimeout: 10 * time.Second, - ShutdownTimeout: 30 * time.Second, - }, - Redis: RedisConfig{ - Address: "localhost", - Port: 0, - PoolSize: 10, - }, - Logging: LoggingConfig{ - Level: "info", - AppLog: LogRotationConfig{ - Filename: "logs/app.log", - MaxSize: 100, - }, - AccessLog: LogRotationConfig{ - Filename: "logs/access.log", - MaxSize: 500, - }, - }, - }, - wantErr: true, - errMsg: "redis.port", - }, - { - name: "redis db out of range", - config: &Config{ - Server: ServerConfig{ - Address: ":3000", - ReadTimeout: 10 * time.Second, - WriteTimeout: 10 * time.Second, - ShutdownTimeout: 30 * time.Second, - }, - Redis: RedisConfig{ - Address: "localhost", - Port: 6379, - DB: 20, - PoolSize: 10, - }, - Logging: LoggingConfig{ - Level: "info", - AppLog: LogRotationConfig{ - Filename: "logs/app.log", - MaxSize: 100, - }, - AccessLog: LogRotationConfig{ - Filename: "logs/access.log", - MaxSize: 500, - }, - }, - }, - wantErr: true, - errMsg: "redis.db", - }, - { - name: "redis pool size too large", - config: &Config{ - Server: ServerConfig{ - Address: ":3000", - ReadTimeout: 10 * time.Second, - WriteTimeout: 10 * time.Second, - ShutdownTimeout: 30 * time.Second, - }, - Redis: RedisConfig{ - Address: "localhost", - Port: 6379, - PoolSize: 2000, - }, - Logging: LoggingConfig{ - Level: "info", - AppLog: LogRotationConfig{ - Filename: "logs/app.log", - MaxSize: 100, - }, - AccessLog: LogRotationConfig{ - Filename: "logs/access.log", - MaxSize: 500, - }, - }, - }, - wantErr: true, - errMsg: "pool_size", - }, - { - name: "min idle conns exceeds pool size", - config: &Config{ - Server: ServerConfig{ - Address: ":3000", - ReadTimeout: 10 * time.Second, - WriteTimeout: 10 * time.Second, - ShutdownTimeout: 30 * time.Second, - }, - Redis: RedisConfig{ - Address: "localhost", - Port: 6379, - PoolSize: 10, - MinIdleConns: 20, - }, - Logging: LoggingConfig{ - Level: "info", - AppLog: LogRotationConfig{ - Filename: "logs/app.log", - MaxSize: 100, - }, - AccessLog: LogRotationConfig{ - Filename: "logs/access.log", - MaxSize: 500, - }, - }, - }, - wantErr: true, - errMsg: "min_idle_conns", - }, - { - name: "invalid log level", - config: &Config{ - Server: ServerConfig{ - Address: ":3000", - ReadTimeout: 10 * time.Second, - WriteTimeout: 10 * time.Second, - ShutdownTimeout: 30 * time.Second, - }, - Redis: RedisConfig{ - Address: "localhost", - Port: 6379, - PoolSize: 10, - }, - Logging: LoggingConfig{ - Level: "invalid", - AppLog: LogRotationConfig{ - Filename: "logs/app.log", - MaxSize: 100, - }, - AccessLog: LogRotationConfig{ - Filename: "logs/access.log", - MaxSize: 500, - }, - }, - }, - wantErr: true, - errMsg: "logging.level", - }, - { - name: "empty app log filename", - config: &Config{ - Server: ServerConfig{ - Address: ":3000", - ReadTimeout: 10 * time.Second, - WriteTimeout: 10 * time.Second, - ShutdownTimeout: 30 * time.Second, - }, - Redis: RedisConfig{ - Address: "localhost", - Port: 6379, - PoolSize: 10, - }, - Logging: LoggingConfig{ - Level: "info", - AppLog: LogRotationConfig{ - Filename: "", - MaxSize: 100, - }, - AccessLog: LogRotationConfig{ - Filename: "logs/access.log", - MaxSize: 500, - }, - }, - }, - wantErr: true, - errMsg: "app_log.filename", - }, - { - name: "app log max size out of range", - config: &Config{ - Server: ServerConfig{ - Address: ":3000", - ReadTimeout: 10 * time.Second, - WriteTimeout: 10 * time.Second, - ShutdownTimeout: 30 * time.Second, - }, - Redis: RedisConfig{ - Address: "localhost", - Port: 6379, - PoolSize: 10, - }, - Logging: LoggingConfig{ - Level: "info", - AppLog: LogRotationConfig{ - Filename: "logs/app.log", - MaxSize: 2000, - }, - AccessLog: LogRotationConfig{ - Filename: "logs/access.log", - MaxSize: 500, - }, - }, - }, - wantErr: true, - errMsg: "app_log.max_size", - }, - { - name: "invalid rate limiter storage", - config: &Config{ - Server: ServerConfig{ - Address: ":3000", - ReadTimeout: 10 * time.Second, - WriteTimeout: 10 * time.Second, - ShutdownTimeout: 30 * time.Second, - }, - Redis: RedisConfig{ - Address: "localhost", - Port: 6379, - PoolSize: 10, - }, - Logging: LoggingConfig{ - Level: "info", - AppLog: LogRotationConfig{ - Filename: "logs/app.log", - MaxSize: 100, - }, - AccessLog: LogRotationConfig{ - Filename: "logs/access.log", - MaxSize: 500, - }, - }, - Middleware: MiddlewareConfig{ - RateLimiter: RateLimiterConfig{ - Max: 100, - Storage: "invalid", - }, - }, - }, - wantErr: true, - errMsg: "rate_limiter.storage", - }, - { - name: "rate limiter max too high", - config: &Config{ - Server: ServerConfig{ - Address: ":3000", - ReadTimeout: 10 * time.Second, - WriteTimeout: 10 * time.Second, - ShutdownTimeout: 30 * time.Second, - }, - Redis: RedisConfig{ - Address: "localhost", - Port: 6379, - PoolSize: 10, - }, - Logging: LoggingConfig{ - Level: "info", - AppLog: LogRotationConfig{ - Filename: "logs/app.log", - MaxSize: 100, - }, - AccessLog: LogRotationConfig{ - Filename: "logs/access.log", - MaxSize: 500, - }, - }, - Middleware: MiddlewareConfig{ - RateLimiter: RateLimiterConfig{ - Max: 20000, - Storage: "memory", - }, - }, - }, - wantErr: true, - errMsg: "rate_limiter.max", - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - err := tt.config.Validate() - - if (err != nil) != tt.wantErr { - t.Errorf("Config.Validate() error = %v, wantErr %v", err, tt.wantErr) - return - } - - if tt.wantErr && tt.errMsg != "" { - if err == nil { - t.Errorf("expected error containing %q, got nil", tt.errMsg) - } else if err.Error() == "" { - t.Errorf("expected error containing %q, got empty error", tt.errMsg) - } - // Note: We check that error message exists, not exact match - // This is because error messages might change slightly - } - }) - } -} - -// TestSet tests the Set function -func TestSet(t *testing.T) { - // Valid config - validCfg := &Config{ - Server: ServerConfig{ - Address: ":3000", - ReadTimeout: 10 * time.Second, - WriteTimeout: 10 * time.Second, - ShutdownTimeout: 30 * time.Second, - }, - Redis: RedisConfig{ - Address: "localhost", - Port: 6379, - PoolSize: 10, - }, - Logging: LoggingConfig{ - Level: "info", - AppLog: LogRotationConfig{ - Filename: "logs/app.log", - MaxSize: 100, - }, - AccessLog: LogRotationConfig{ - Filename: "logs/access.log", - MaxSize: 500, - }, - }, - JWT: JWTConfig{ - TokenDuration: 24 * time.Hour, - AccessTokenTTL: 24 * time.Hour, - RefreshTokenTTL: 168 * time.Hour, - }, - } - - err := Set(validCfg) - if err != nil { - t.Errorf("Set() with valid config failed: %v", err) - } - - // Verify it was set - got := Get() - if got.Server.Address != ":3000" { - t.Errorf("Get() after Set() returned wrong address: got %s, want :3000", got.Server.Address) - } - - // Test with nil config - err = Set(nil) - if err == nil { - t.Error("Set(nil) should return error") - } - - // Test with invalid config - invalidCfg := &Config{ - Server: ServerConfig{ - Address: "", // Empty address is invalid - }, - } - - err = Set(invalidCfg) - if err == nil { - t.Error("Set() with invalid config should return error") - } -} diff --git a/pkg/config/loader_test.go b/pkg/config/loader_test.go deleted file mode 100644 index a7067e8..0000000 --- a/pkg/config/loader_test.go +++ /dev/null @@ -1,220 +0,0 @@ -package config - -import ( - "os" - "testing" - "time" -) - -func TestLoad_EmbeddedConfig(t *testing.T) { - clearEnvVars(t) - setRequiredEnvVars(t) - defer clearEnvVars(t) - - cfg, err := Load() - if err != nil { - t.Fatalf("Load() 失败: %v", err) - } - - if cfg.Server.Address != ":3000" { - t.Errorf("server.address 期望 :3000, 实际 %s", cfg.Server.Address) - } - if cfg.Server.ReadTimeout != 30*time.Second { - t.Errorf("server.read_timeout 期望 30s, 实际 %v", cfg.Server.ReadTimeout) - } - if cfg.Logging.Level != "info" { - t.Errorf("logging.level 期望 info, 实际 %s", cfg.Logging.Level) - } -} - -func TestLoad_EnvOverride(t *testing.T) { - clearEnvVars(t) - setRequiredEnvVars(t) - defer clearEnvVars(t) - - os.Setenv("JUNHONG_SERVER_ADDRESS", ":8080") - os.Setenv("JUNHONG_LOGGING_LEVEL", "debug") - defer func() { - os.Unsetenv("JUNHONG_SERVER_ADDRESS") - os.Unsetenv("JUNHONG_LOGGING_LEVEL") - }() - - cfg, err := Load() - if err != nil { - t.Fatalf("Load() 失败: %v", err) - } - - if cfg.Server.Address != ":8080" { - t.Errorf("server.address 期望 :8080, 实际 %s", cfg.Server.Address) - } - if cfg.Logging.Level != "debug" { - t.Errorf("logging.level 期望 debug, 实际 %s", cfg.Logging.Level) - } -} - -func TestLoad_MissingRequired(t *testing.T) { - clearEnvVars(t) - defer clearEnvVars(t) - - _, err := Load() - if err == nil { - t.Fatal("Load() 缺少必填配置时应返回错误") - } - - expectedFields := []string{"database.host", "database.user", "database.password", "database.dbname", "redis.address", "jwt.secret_key"} - for _, field := range expectedFields { - if !containsString(err.Error(), field) { - t.Errorf("错误信息应包含 %q, 实际: %s", field, err.Error()) - } - } -} - -func TestLoad_PartialRequired(t *testing.T) { - clearEnvVars(t) - defer clearEnvVars(t) - - os.Setenv("JUNHONG_DATABASE_HOST", "localhost") - os.Setenv("JUNHONG_DATABASE_USER", "user") - - _, err := Load() - if err == nil { - t.Fatal("Load() 部分必填配置缺失时应返回错误") - } - - if containsString(err.Error(), "database.host") { - t.Error("database.host 已设置，不应在错误信息中") - } - if containsString(err.Error(), "database.user") { - t.Error("database.user 已设置，不应在错误信息中") - } - if !containsString(err.Error(), "database.password") { - t.Error("database.password 未设置，应在错误信息中") - } -} - -func TestLoad_GlobalConfig(t *testing.T) { - clearEnvVars(t) - setRequiredEnvVars(t) - defer clearEnvVars(t) - - cfg, err := Load() - if err != nil { - t.Fatalf("Load() 失败: %v", err) - } - - globalCfg := Get() - if globalCfg == nil { - t.Fatal("Get() 返回 nil") - } - - if globalCfg.Server.Address != cfg.Server.Address { - t.Errorf("全局配置与返回配置不一致") - } -} - -func TestValidateRequired(t *testing.T) { - tests := []struct { - name string - cfg *Config - wantErr bool - }{ - { - name: "all required set", - cfg: &Config{ - Database: DatabaseConfig{ - Host: "localhost", - User: "user", - Password: "pass", - DBName: "db", - }, - Redis: RedisConfig{Address: "localhost"}, - JWT: JWTConfig{SecretKey: "12345678901234567890123456789012"}, - }, - wantErr: false, - }, - { - name: "missing database host", - cfg: &Config{ - Database: DatabaseConfig{ - User: "user", - Password: "pass", - DBName: "db", - }, - Redis: RedisConfig{Address: "localhost"}, - JWT: JWTConfig{SecretKey: "12345678901234567890123456789012"}, - }, - wantErr: true, - }, - { - name: "missing redis address", - cfg: &Config{ - Database: DatabaseConfig{ - Host: "localhost", - User: "user", - Password: "pass", - DBName: "db", - }, - Redis: RedisConfig{}, - JWT: JWTConfig{SecretKey: "12345678901234567890123456789012"}, - }, - wantErr: true, - }, - { - name: "missing jwt secret", - cfg: &Config{ - Database: DatabaseConfig{ - Host: "localhost", - User: "user", - Password: "pass", - DBName: "db", - }, - Redis: RedisConfig{Address: "localhost"}, - JWT: JWTConfig{}, - }, - wantErr: true, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - err := tt.cfg.ValidateRequired() - if (err != nil) != tt.wantErr { - t.Errorf("ValidateRequired() error = %v, wantErr %v", err, tt.wantErr) - } - }) - } -} - -func setRequiredEnvVars(t *testing.T) { - t.Helper() - os.Setenv("JUNHONG_DATABASE_HOST", "localhost") - os.Setenv("JUNHONG_DATABASE_USER", "testuser") - os.Setenv("JUNHONG_DATABASE_PASSWORD", "testpass") - os.Setenv("JUNHONG_DATABASE_DBNAME", "testdb") - os.Setenv("JUNHONG_REDIS_ADDRESS", "localhost") - os.Setenv("JUNHONG_JWT_SECRET_KEY", "12345678901234567890123456789012") -} - -func clearEnvVars(t *testing.T) { - t.Helper() - envVars := []string{ - "JUNHONG_DATABASE_HOST", - "JUNHONG_DATABASE_PORT", - "JUNHONG_DATABASE_USER", - "JUNHONG_DATABASE_PASSWORD", - "JUNHONG_DATABASE_DBNAME", - "JUNHONG_REDIS_ADDRESS", - "JUNHONG_REDIS_PORT", - "JUNHONG_REDIS_PASSWORD", - "JUNHONG_JWT_SECRET_KEY", - "JUNHONG_SERVER_ADDRESS", - "JUNHONG_LOGGING_LEVEL", - } - for _, v := range envVars { - os.Unsetenv(v) - } -} - -func containsString(s, substr string) bool { - return len(s) >= len(substr) && (s == substr || len(s) > 0 && (s[:len(substr)] == substr || containsString(s[1:], substr))) -} diff --git a/pkg/constants/constants.go b/pkg/constants/constants.go index 46d48fb..2220d0e 100644 --- a/pkg/constants/constants.go +++ b/pkg/constants/constants.go @@ -55,6 +55,11 @@ const ( TaskTypePollingRealname = "polling:realname" // 实名状态检查 TaskTypePollingCarddata = "polling:carddata" // 卡流量检查 TaskTypePollingPackage = "polling:package" // 套餐流量检查 + + // 套餐激活任务类型 + TaskTypePackageFirstActivation = "package:first:activation" // 首次实名激活 + TaskTypePackageQueueActivation = "package:queue:activation" // 主套餐排队激活 + TaskTypePackageDataReset = "package:data:reset" // 套餐流量重置 ) // 用户状态常量 @@ -104,6 +109,29 @@ const ( ShelfStatusOff = 2 // 下架 ) +// 套餐周期类型常量 +const ( + PackageCalendarTypeNaturalMonth = "natural_month" // 自然月周期 + PackageCalendarTypeByDay = "by_day" // 按天周期 +) + +// 套餐流量重置周期常量 +const ( + PackageDataResetDaily = "daily" // 每日重置 + PackageDataResetMonthly = "monthly" // 每月重置 + PackageDataResetYearly = "yearly" // 每年重置 + PackageDataResetNone = "none" // 不重置 +) + +// 套餐使用状态常量 +const ( + PackageUsageStatusPending = 0 // 待生效 + PackageUsageStatusActive = 1 // 生效中 + PackageUsageStatusDepleted = 2 // 已用完 + PackageUsageStatusExpired = 3 // 已过期 + PackageUsageStatusInvalidated = 4 // 已失效 +) + // 运营商类型常量 const ( CarrierTypeCMCC = "CMCC" // 中国移动 diff --git a/pkg/constants/iot.go b/pkg/constants/iot.go index 83e69c5..d08b226 100644 --- a/pkg/constants/iot.go +++ b/pkg/constants/iot.go @@ -54,6 +54,13 @@ const ( NetworkStatusOnline = 1 // 开机 ) +// 任务 24.1: IoT 卡停机原因 +const ( + StopReasonTrafficExhausted = "traffic_exhausted" // 流量耗尽 + StopReasonManual = "manual" // 手动停机 + StopReasonArrears = "arrears" // 欠费 +) + // 套餐流量类型 const ( DataTypeReal = "real" // 真流量 @@ -133,12 +140,7 @@ const ( PackageUsageTypeDevice = "device" // 设备级套餐 ) -// 套餐使用状态 -const ( - PackageUsageStatusActive = 1 // 生效中 - PackageUsageStatusExhausted = 2 // 已用完 - PackageUsageStatusExpired = 3 // 已过期 -) +// 注意：套餐使用状态常量已迁移至 constants.go（扩展为 5 个状态：0-4） // 轮询配置卡条件 const ( diff --git a/pkg/constants/redis.go b/pkg/constants/redis.go index 1a9c0f9..98162e3 100644 --- a/pkg/constants/redis.go +++ b/pkg/constants/redis.go @@ -245,3 +245,14 @@ func RedisPollingStatsKey(taskType string) string { func RedisPollingInitProgressKey() string { return "polling:init:progress" } + +// ======================================== +// 套餐激活锁相关键 +// ======================================== + +// RedisPackageActivationLockKey 生成套餐激活分布式锁的 Redis 键 +// 用途：防止同一载体的套餐激活任务并发执行（排队激活、首次实名激活） +// 过期时间：30秒（任务执行时间） +func RedisPackageActivationLockKey(carrierType string, carrierID uint) string { + return fmt.Sprintf("package:activation:lock:%s:%d", carrierType, carrierID) +} diff --git a/pkg/errors/codes.go b/pkg/errors/codes.go index 2423ef1..b848d7e 100644 --- a/pkg/errors/codes.go +++ b/pkg/errors/codes.go @@ -125,6 +125,13 @@ const ( CodePollingCleanupConfigNotFound = 1155 // 数据清理配置不存在 CodePollingManualTriggerLimit = 1156 // 手动触发次数已达上限 + // 套餐相关错误 (1160-1179) + CodeNoAvailablePackage = 1160 // 没有可用套餐 + CodePackageActivationConflict = 1161 // 套餐正在激活中 + CodeNoMainPackage = 1162 // 必须有主套餐才能购买加油包 + CodeRealnameRequired = 1163 // 设备/卡必须先完成实名认证才能购买套餐 + CodeMixedOrderForbidden = 1164 // 同订单不能同时购买正式套餐和加油包 + // 服务端错误 (2000-2999) -> 5xx HTTP 状态码 CodeInternalError = 2001 // 内部服务器错误 CodeDatabaseError = 2002 // 数据库错误 @@ -230,6 +237,11 @@ var allErrorCodes = []int{ CodePollingAlertRuleNotFound, CodePollingCleanupConfigNotFound, CodePollingManualTriggerLimit, + CodeNoAvailablePackage, + CodePackageActivationConflict, + CodeNoMainPackage, + CodeRealnameRequired, + CodeMixedOrderForbidden, CodeInternalError, CodeDatabaseError, CodeRedisError, @@ -333,6 +345,11 @@ var errorMessages = map[int]string{ CodePollingAlertRuleNotFound: "告警规则不存在", CodePollingCleanupConfigNotFound: "数据清理配置不存在", CodePollingManualTriggerLimit: "手动触发次数已达上限", + CodeNoAvailablePackage: "没有可用套餐", + CodePackageActivationConflict: "套餐正在激活中，请稍后重试", + CodeNoMainPackage: "必须有主套餐才能购买加油包", + CodeRealnameRequired: "设备/卡必须先完成实名认证才能购买套餐", + CodeMixedOrderForbidden: "同订单不能同时购买正式套餐和加油包", CodeInvalidCredentials: "用户名或密码错误", CodeAccountLocked: "账号已锁定", CodePasswordExpired: "密码已过期", diff --git a/pkg/errors/codes_test.go b/pkg/errors/codes_test.go deleted file mode 100644 index 6b571d4..0000000 --- a/pkg/errors/codes_test.go +++ /dev/null @@ -1,219 +0,0 @@ -package errors - -import ( - "testing" - - "github.com/gofiber/fiber/v2" -) - -// TestGetHTTPStatus 测试错误码到 HTTP 状态码的映射 -func TestGetHTTPStatus(t *testing.T) { - tests := []struct { - name string - code int - expected int - }{ - // 成功 - {"成功", CodeSuccess, fiber.StatusOK}, - - // 客户端错误 (1xxx -> 4xx) - {"参数验证失败", CodeInvalidParam, fiber.StatusBadRequest}, - {"缺失认证令牌", CodeMissingToken, fiber.StatusUnauthorized}, - {"无效令牌", CodeInvalidToken, fiber.StatusUnauthorized}, - {"未授权访问", CodeUnauthorized, fiber.StatusUnauthorized}, - {"禁止访问", CodeForbidden, fiber.StatusForbidden}, - {"资源未找到", CodeNotFound, fiber.StatusNotFound}, - {"资源冲突", CodeConflict, fiber.StatusConflict}, - {"请求过多", CodeTooManyRequests, fiber.StatusTooManyRequests}, - {"请求体过大", CodeRequestTooLarge, fiber.StatusBadRequest}, - - // 服务端错误 (2xxx -> 5xx) - {"内部服务器错误", CodeInternalError, fiber.StatusInternalServerError}, - {"数据库错误", CodeDatabaseError, fiber.StatusInternalServerError}, - {"缓存服务错误", CodeRedisError, fiber.StatusInternalServerError}, - {"服务不可用", CodeServiceUnavailable, fiber.StatusServiceUnavailable}, - {"请求超时", CodeTimeout, fiber.StatusGatewayTimeout}, - {"任务队列错误", CodeTaskQueueError, fiber.StatusInternalServerError}, - - // 未知错误码 - {"未知错误码", 9999, fiber.StatusInternalServerError}, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - result := GetHTTPStatus(tt.code) - if result != tt.expected { - t.Errorf("GetHTTPStatus(%d) = %d, expected %d", tt.code, result, tt.expected) - } - }) - } -} - -// TestGetMessage 测试错误码到错误消息的映射 -func TestGetMessage(t *testing.T) { - tests := []struct { - name string - code int - expected string - }{ - // 成功 - {"成功", CodeSuccess, "成功"}, - - // 客户端错误 - {"参数验证失败", CodeInvalidParam, "参数验证失败"}, - {"缺失认证令牌", CodeMissingToken, "缺失认证令牌"}, - {"无效令牌", CodeInvalidToken, "无效或过期的令牌"}, - {"未授权访问", CodeUnauthorized, "未授权访问"}, - {"禁止访问", CodeForbidden, "禁止访问"}, - {"资源未找到", CodeNotFound, "资源未找到"}, - {"资源冲突", CodeConflict, "资源冲突"}, - {"请求过多", CodeTooManyRequests, "请求过多,请稍后重试"}, - {"请求体过大", CodeRequestTooLarge, "请求体过大"}, - - // 服务端错误 - {"内部服务器错误", CodeInternalError, "内部服务器错误"}, - {"数据库错误", CodeDatabaseError, "数据库错误"}, - {"缓存服务错误", CodeRedisError, "缓存服务错误"}, - {"服务不可用", CodeServiceUnavailable, "服务暂时不可用"}, - {"请求超时", CodeTimeout, "请求超时"}, - {"任务队列错误", CodeTaskQueueError, "任务队列错误"}, - - // 未知错误码 - {"未知错误码", 9999, "请求处理失败"}, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - result := GetMessage(tt.code, "zh-CN") - if result != tt.expected { - t.Errorf("GetMessage(%d, \"zh-CN\") = %q, expected %q", tt.code, result, tt.expected) - } - }) - } -} - -// TestGetLogLevel 测试错误码到日志级别的映射 -func TestGetLogLevel(t *testing.T) { - tests := []struct { - name string - code int - expected string - }{ - // 成功 (不记录日志) - {"成功", CodeSuccess, "info"}, - - // 客户端错误 (Warn 级别) - {"参数验证失败", CodeInvalidParam, "warn"}, - {"缺失认证令牌", CodeMissingToken, "warn"}, - {"无效令牌", CodeInvalidToken, "warn"}, - {"未授权访问", CodeUnauthorized, "warn"}, - {"禁止访问", CodeForbidden, "warn"}, - {"资源未找到", CodeNotFound, "warn"}, - {"资源冲突", CodeConflict, "warn"}, - {"请求过多", CodeTooManyRequests, "warn"}, - {"请求体过大", CodeRequestTooLarge, "warn"}, - - // 服务端错误 (Error 级别) - {"内部服务器错误", CodeInternalError, "error"}, - {"数据库错误", CodeDatabaseError, "error"}, - {"缓存服务错误", CodeRedisError, "error"}, - {"服务不可用", CodeServiceUnavailable, "error"}, - {"请求超时", CodeTimeout, "error"}, - {"任务队列错误", CodeTaskQueueError, "error"}, - - // 未知错误码 (Error 级别) - {"未知错误码", 9999, "error"}, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - result := GetLogLevel(tt.code) - if result != tt.expected { - t.Errorf("GetLogLevel(%d) = %q, expected %q", tt.code, result, tt.expected) - } - }) - } -} - -func TestAllCodesHaveMessages(t *testing.T) { - var missing []int - for _, code := range allErrorCodes { - if _, ok := errorMessages[code]; !ok { - missing = append(missing, code) - } - } - if len(missing) > 0 { - t.Errorf("以下错误码缺少映射消息: %v", missing) - } -} - -func TestNoOrphanMessages(t *testing.T) { - codeSet := make(map[int]bool) - for _, code := range allErrorCodes { - codeSet[code] = true - } - - var orphan []int - for code := range errorMessages { - if !codeSet[code] { - orphan = append(orphan, code) - } - } - if len(orphan) > 0 { - t.Errorf("以下错误码在 errorMessages 中存在但未在 allErrorCodes 中注册: %v", orphan) - } -} - -// BenchmarkGetHTTPStatus 基准测试 HTTP 状态码映射性能 -func BenchmarkGetHTTPStatus(b *testing.B) { - codes := []int{ - CodeSuccess, - CodeInvalidParam, - CodeMissingToken, - CodeInternalError, - CodeDatabaseError, - } - - b.ResetTimer() - for i := 0; i < b.N; i++ { - for _, code := range codes { - GetHTTPStatus(code) - } - } -} - -// BenchmarkGetMessage 基准测试错误消息获取性能 -func BenchmarkGetMessage(b *testing.B) { - codes := []int{ - CodeSuccess, - CodeInvalidParam, - CodeMissingToken, - CodeInternalError, - CodeDatabaseError, - } - - b.ResetTimer() - for i := 0; i < b.N; i++ { - for _, code := range codes { - GetMessage(code, "zh-CN") - } - } -} - -// BenchmarkGetLogLevel 基准测试日志级别映射性能 -func BenchmarkGetLogLevel(b *testing.B) { - codes := []int{ - CodeSuccess, - CodeInvalidParam, - CodeMissingToken, - CodeInternalError, - CodeDatabaseError, - } - - b.ResetTimer() - for i := 0; i < b.N; i++ { - for _, code := range codes { - GetLogLevel(code) - } - } -} diff --git a/pkg/errors/context_test.go b/pkg/errors/context_test.go deleted file mode 100644 index 7a34041..0000000 --- a/pkg/errors/context_test.go +++ /dev/null @@ -1,258 +0,0 @@ -package errors - -import ( - "testing" - - "github.com/gofiber/fiber/v2" - "github.com/valyala/fasthttp" -) - -// TestFromFiberContext 测试从 Fiber Context 提取错误上下文 -func TestFromFiberContext(t *testing.T) { - app := fiber.New() - - tests := []struct { - name string - setupRequest func(*fasthttp.RequestCtx) - expectedMethod string - expectedPath string - hasRequestID bool - }{ - { - name: "GET 请求", - setupRequest: func(ctx *fasthttp.RequestCtx) { - ctx.Request.Header.SetMethod("GET") - ctx.Request.SetRequestURI("/api/v1/users") - ctx.Request.Header.Set("X-Request-ID", "test-request-id-123") - }, - expectedMethod: "GET", - expectedPath: "/api/v1/users", - hasRequestID: true, - }, - { - name: "POST 请求带查询参数", - setupRequest: func(ctx *fasthttp.RequestCtx) { - ctx.Request.Header.SetMethod("POST") - ctx.Request.SetRequestURI("/api/v1/orders?status=pending") - ctx.Request.Header.Set("X-Request-ID", "post-request-456") - }, - expectedMethod: "POST", - expectedPath: "/api/v1/orders", - hasRequestID: true, - }, - { - name: "无 Request ID", - setupRequest: func(ctx *fasthttp.RequestCtx) { - ctx.Request.Header.SetMethod("DELETE") - ctx.Request.SetRequestURI("/api/v1/tasks/123") - }, - expectedMethod: "DELETE", - expectedPath: "/api/v1/tasks/123", - hasRequestID: false, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - // 创建 fasthttp 请求上下文 - fctx := &fasthttp.RequestCtx{} - tt.setupRequest(fctx) - - // 创建 Fiber 上下文 - c := app.AcquireCtx(fctx) - defer app.ReleaseCtx(c) - - // 提取错误上下文 - errCtx := FromFiberContext(c) - - // 验证方法 - if errCtx.Method != tt.expectedMethod { - t.Errorf("Method = %q, expected %q", errCtx.Method, tt.expectedMethod) - } - - // 验证路径 - if errCtx.Path != tt.expectedPath { - t.Errorf("Path = %q, expected %q", errCtx.Path, tt.expectedPath) - } - - // 验证 Request ID - if tt.hasRequestID && errCtx.RequestID == "" { - t.Error("Expected Request ID, but got empty string") - } - if !tt.hasRequestID && errCtx.RequestID != "" { - t.Errorf("Expected no Request ID, but got %q", errCtx.RequestID) - } - - // 验证 IP 地址不为空 - if errCtx.IP == "" { - t.Error("Expected IP address, but got empty string") - } - }) - } -} - -// TestErrorContextToLogFields 测试错误上下文转换为日志字段 -func TestErrorContextToLogFields(t *testing.T) { - tests := []struct { - name string - ctx *ErrorContext - expectedFields int // 期望的字段数量 - hasQuery bool - hasUserAgent bool - hasUserID bool - }{ - { - name: "完整的错误上下文", - ctx: &ErrorContext{ - RequestID: "test-123", - Method: "POST", - Path: "/api/v1/users", - IP: "192.168.1.100", - Query: "status=active", - UserAgent: "Mozilla/5.0", - UserID: "user-456", - }, - expectedFields: 7, // request_id, method, path, ip, query, user_agent, user_id - hasQuery: true, - hasUserAgent: true, - hasUserID: true, - }, - { - name: "无查询参数", - ctx: &ErrorContext{ - RequestID: "test-456", - Method: "GET", - Path: "/api/v1/orders", - IP: "10.0.0.1", - Query: "", - }, - expectedFields: 4, // request_id, method, path, ip - hasQuery: false, - hasUserAgent: false, - hasUserID: false, - }, - { - name: "空 Request ID", - ctx: &ErrorContext{ - RequestID: "", - Method: "DELETE", - Path: "/api/v1/tasks/123", - IP: "127.0.0.1", - Query: "", - }, - expectedFields: 4, // request_id (空字符串), method, path, ip - hasQuery: false, - hasUserAgent: false, - hasUserID: false, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - fields := tt.ctx.ToLogFields() - - // 验证字段数量 - if len(fields) != tt.expectedFields { - t.Errorf("Field count = %d, expected %d", len(fields), tt.expectedFields) - } - - // 验证必需字段存在 - if len(fields) < 4 { - t.Error("Expected at least 4 required fields (request_id, method, path, ip)") - } - }) - } -} - -// TestFromFiberContextWithUserAgent 测试带 User-Agent 的错误上下文提取 -func TestFromFiberContextWithUserAgent(t *testing.T) { - app := fiber.New() - - tests := []struct { - name string - method string - path string - userAgent string - expectedUserAgent bool - }{ - { - name: "有 User-Agent", - method: "GET", - path: "/api/v1/users", - userAgent: "Mozilla/5.0", - expectedUserAgent: true, - }, - { - name: "无 User-Agent", - method: "GET", - path: "/api/v1/users/123", - userAgent: "", - expectedUserAgent: false, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - // 创建 fasthttp 请求上下文 - fctx := &fasthttp.RequestCtx{} - fctx.Request.Header.SetMethod(tt.method) - fctx.Request.SetRequestURI(tt.path) - if tt.userAgent != "" { - fctx.Request.Header.Set("User-Agent", tt.userAgent) - } - - // 创建 Fiber 上下文 - c := app.AcquireCtx(fctx) - defer app.ReleaseCtx(c) - - // 提取错误上下文 - errCtx := FromFiberContext(c) - - // 验证 User-Agent - if tt.expectedUserAgent && errCtx.UserAgent == "" { - t.Error("Expected User-Agent, but got empty") - } - if !tt.expectedUserAgent && errCtx.UserAgent != "" { - t.Errorf("Expected no User-Agent, but got %q", errCtx.UserAgent) - } - }) - } -} - -// BenchmarkFromFiberContext 基准测试错误上下文提取性能 -func BenchmarkFromFiberContext(b *testing.B) { - app := fiber.New() - - // 创建测试请求 - fctx := &fasthttp.RequestCtx{} - fctx.Request.Header.SetMethod("POST") - fctx.Request.SetRequestURI("/api/v1/users?status=active&limit=10") - fctx.Request.Header.Set("X-Request-ID", "benchmark-request-id") - fctx.Request.SetBodyString(`{"username":"test","email":"test@example.com"}`) - - c := app.AcquireCtx(fctx) - defer app.ReleaseCtx(c) - - b.ResetTimer() - for i := 0; i < b.N; i++ { - _ = FromFiberContext(c) - } -} - -// BenchmarkErrorContextToLogFields 基准测试日志字段转换性能 -func BenchmarkErrorContextToLogFields(b *testing.B) { - ctx := &ErrorContext{ - RequestID: "benchmark-123", - Method: "POST", - Path: "/api/v1/users", - IP: "192.168.1.100", - Query: "status=active&limit=10", - UserAgent: "Mozilla/5.0", - UserID: "user-456", - } - - b.ResetTimer() - for i := 0; i < b.N; i++ { - _ = ctx.ToLogFields() - } -} diff --git a/pkg/errors/handler_test.go b/pkg/errors/handler_test.go deleted file mode 100644 index fbc996f..0000000 --- a/pkg/errors/handler_test.go +++ /dev/null @@ -1,348 +0,0 @@ -package errors - -import ( - "errors" - "fmt" - "testing" - - "github.com/gofiber/fiber/v2" - "go.uber.org/zap" -) - -// TestSafeErrorHandler 测试 SafeErrorHandler 基本功能 -func TestSafeErrorHandler(t *testing.T) { - logger, _ := zap.NewProduction() - defer func() { _ = logger.Sync() }() - handler := SafeErrorHandler(logger) - - tests := []struct { - name string - err error - expectedStatus int - expectedCode int - }{ - { - name: "AppError 参数验证失败", - err: New(CodeInvalidParam, "用户名不能为空"), - expectedStatus: 400, - expectedCode: CodeInvalidParam, - }, - { - name: "AppError 缺失令牌", - err: New(CodeMissingToken, ""), - expectedStatus: 401, - expectedCode: CodeMissingToken, - }, - { - name: "AppError 资源未找到", - err: New(CodeNotFound, "用户不存在"), - expectedStatus: 404, - expectedCode: CodeNotFound, - }, - { - name: "AppError 数据库错误", - err: New(CodeDatabaseError, "连接失败"), - expectedStatus: 500, - expectedCode: CodeDatabaseError, - }, - { - name: "fiber.Error 400", - err: fiber.NewError(400, "Bad Request"), - expectedStatus: 400, - expectedCode: CodeInvalidParam, - }, - { - name: "fiber.Error 404", - err: fiber.NewError(404, "Not Found"), - expectedStatus: 404, - expectedCode: CodeNotFound, - }, - { - name: "标准 error", - err: errors.New("standard error"), - expectedStatus: 500, - expectedCode: CodeInternalError, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - app := fiber.New(fiber.Config{ - ErrorHandler: handler, - }) - - app.Get("/test", func(c *fiber.Ctx) error { - return tt.err - }) - - // 不实际发起 HTTP 请求，仅验证 handler 不会 panic - // 实际的集成测试在 tests/integration/ 中进行 - if handler == nil { - t.Error("SafeErrorHandler returned nil") - } - }) - } -} - -// TestAppErrorMethods 测试 AppError 的方法 -func TestAppErrorMethods(t *testing.T) { - tests := []struct { - name string - err *AppError - expectedError string - expectedCode int - }{ - { - name: "基本 AppError", - err: New(CodeInvalidParam, "参数错误"), - expectedError: "参数错误", - expectedCode: CodeInvalidParam, - }, - { - name: "空消息使用默认", - err: New(CodeDatabaseError, ""), - expectedError: "数据库错误", - expectedCode: CodeDatabaseError, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - // 测试 Error() 方法 - if tt.err.Error() != tt.expectedError { - t.Errorf("Error() = %q, expected %q", tt.err.Error(), tt.expectedError) - } - - // 测试 Code 字段 - if tt.err.Code != tt.expectedCode { - t.Errorf("Code = %d, expected %d", tt.err.Code, tt.expectedCode) - } - }) - } -} - -// TestAppErrorUnwrap 测试错误链支持 -func TestAppErrorUnwrap(t *testing.T) { - originalErr := errors.New("database connection failed") - appErr := Wrap(CodeDatabaseError, originalErr) - - // 测试 Unwrap - unwrapped := appErr.Unwrap() - if unwrapped != originalErr { - t.Errorf("Unwrap() = %v, expected %v", unwrapped, originalErr) - } - - // 测试 errors.Is - if !errors.Is(appErr, originalErr) { - t.Error("errors.Is failed to identify wrapped error") - } -} - -// BenchmarkSafeErrorHandler 基准测试错误处理性能 -func BenchmarkSafeErrorHandler(b *testing.B) { - logger, _ := zap.NewProduction() - defer func() { _ = logger.Sync() }() - _ = SafeErrorHandler(logger) // 避免未使用变量警告 - - testErrors := []error{ - New(CodeInvalidParam, "参数错误"), - New(CodeDatabaseError, "数据库错误"), - fiber.NewError(404, "Not Found"), - errors.New("standard error"), - } - - b.ResetTimer() - for i := 0; i < b.N; i++ { - err := testErrors[i%len(testErrors)] - _ = err // 避免未使用变量警告 - // 注意：这里无法直接调用 handler，因为它需要 Fiber Context - // 实际性能测试应该在集成测试中进行 - } -} - -// TestNewWithValidation 测试创建 AppError 时的参数验证 -func TestNewWithValidation(t *testing.T) { - tests := []struct { - name string - code int - message string - expectPanic bool - }{ - { - name: "有效的错误码和消息", - code: CodeInvalidParam, - message: "自定义消息", - expectPanic: false, - }, - { - name: "有效的错误码，空消息", - code: CodeDatabaseError, - message: "", - expectPanic: false, - }, - { - name: "未知错误码", - code: 9999, - message: "未知错误", - expectPanic: false, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - defer func() { - r := recover() - if (r != nil) != tt.expectPanic { - t.Errorf("New() panic = %v, expectPanic = %v", r != nil, tt.expectPanic) - } - }() - - err := New(tt.code, tt.message) - if err == nil { - t.Error("New() returned nil") - } - }) - } -} - -// TestWrapError 测试包装错误功能 -func TestWrapError(t *testing.T) { - tests := []struct { - name string - originalErr error - code int - message string - expectedMessage string - }{ - { - name: "包装标准错误", - originalErr: errors.New("connection timeout"), - code: CodeTimeout, - message: "", - expectedMessage: "请求超时: connection timeout", - }, - { - name: "包装带自定义消息", - originalErr: errors.New("SQL error"), - code: CodeDatabaseError, - message: "用户表查询失败", - expectedMessage: "用户表查询失败: SQL error", - }, - { - name: "包装 nil 错误", - originalErr: nil, - code: CodeInternalError, - message: "意外的 nil 错误", - expectedMessage: "意外的 nil 错误", - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - var err *AppError - if tt.message == "" { - err = Wrap(tt.code, tt.originalErr) - } else { - err = Wrap(tt.code, tt.originalErr, tt.message) - } - - if err.Error() != tt.expectedMessage { - t.Errorf("Wrap().Error() = %q, expected %q", err.Error(), tt.expectedMessage) - } - - if err.Code != tt.code { - t.Errorf("Wrap().Code = %d, expected %d", err.Code, tt.code) - } - - if tt.originalErr != nil { - unwrapped := err.Unwrap() - if unwrapped != tt.originalErr { - t.Errorf("Wrap().Unwrap() = %v, expected %v", unwrapped, tt.originalErr) - } - } - }) - } -} - -// TestErrorMessageSanitization 测试错误消息脱敏 -func TestErrorMessageSanitization(t *testing.T) { - tests := []struct { - name string - code int - message string - shouldBeSanitized bool - expectedForClient string - }{ - { - name: "客户端错误保留消息", - code: CodeInvalidParam, - message: "用户名长度必须在 3-20 之间", - shouldBeSanitized: false, - expectedForClient: "用户名长度必须在 3-20 之间", - }, - { - name: "服务端错误脱敏", - code: CodeDatabaseError, - message: "pq: relation 'users' does not exist", - shouldBeSanitized: true, - expectedForClient: "数据库错误", // 应该返回通用消息 - }, - { - name: "内部错误脱敏", - code: CodeInternalError, - message: "panic: runtime error: invalid memory address", - shouldBeSanitized: true, - expectedForClient: "内部服务器错误", - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - // 这个测试逻辑应该在 handler.go 的 handleError 中实现 - // 这里仅验证逻辑概念 - - var clientMessage string - if tt.shouldBeSanitized { - // 服务端错误使用默认消息 - clientMessage = GetMessage(tt.code, "zh-CN") - } else { - // 客户端错误保留原始消息 - clientMessage = tt.message - } - - if clientMessage != tt.expectedForClient { - t.Errorf("Client message = %q, expected %q", clientMessage, tt.expectedForClient) - } - }) - } -} - -// TestConcurrentErrorHandling 测试并发场景下的错误处理 -func TestConcurrentErrorHandling(t *testing.T) { - logger, _ := zap.NewProduction() - defer func() { _ = logger.Sync() }() - handler := SafeErrorHandler(logger) - if handler == nil { - t.Fatal("SafeErrorHandler returned nil") - } - - // 并发创建错误 - errChan := make(chan error, 100) - for i := 0; i < 100; i++ { - go func(idx int) { - code := CodeInvalidParam - if idx%2 == 0 { - code = CodeDatabaseError - } - errChan <- New(code, fmt.Sprintf("错误 #%d", idx)) - }(i) - } - - // 验证所有错误都能正确创建 - for i := 0; i < 100; i++ { - err := <-errChan - if err == nil { - t.Errorf("Goroutine %d returned nil error", i) - } - } -} diff --git a/pkg/gorm/callback_test.go b/pkg/gorm/callback_test.go deleted file mode 100644 index badb477..0000000 --- a/pkg/gorm/callback_test.go +++ /dev/null @@ -1,1088 +0,0 @@ -package gorm - -import ( - "context" - "testing" - "time" - - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/pkg/middleware" - "github.com/stretchr/testify/assert" - "gorm.io/driver/sqlite" - "gorm.io/gorm" -) - -// mockShopStore 模拟店铺 Store -type mockShopStore struct { - subordinateShopIDs []uint - err error -} - -func (m *mockShopStore) GetSubordinateShopIDs(ctx context.Context, shopID uint) ([]uint, error) { - if m.err != nil { - return nil, m.err - } - return m.subordinateShopIDs, nil -} - -// TestSkipDataPermission 测试跳过数据权限过滤 -func TestSkipDataPermission(t *testing.T) { - ctx := context.Background() - - // 设置跳过标记 - ctx = SkipDataPermission(ctx) - - // 验证标记已设置 - skip, ok := ctx.Value(SkipDataPermissionKey).(bool) - assert.True(t, ok) - assert.True(t, skip) -} - -// TestRegisterDataPermissionCallback 测试注册数据权限 Callback -func TestRegisterDataPermissionCallback(t *testing.T) { - // 创建内存数据库 - db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{}) - assert.NoError(t, err) - - // 创建 mock ShopStore - mockStore := &mockShopStore{ - subordinateShopIDs: []uint{1, 2, 3}, - } - - // 注册 Callback - err = RegisterDataPermissionCallback(db, mockStore) - assert.NoError(t, err) -} - -// TestDataPermissionCallback_SkipForSuperAdmin 测试超级管理员跳过过滤 -func TestDataPermissionCallback_SkipForSuperAdmin(t *testing.T) { - // 创建内存数据库 - db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{}) - assert.NoError(t, err) - - // 创建测试表 - type TestModel struct { - ID uint - ShopID uint - Creator uint - Name string - } - - err = db.AutoMigrate(&TestModel{}) - assert.NoError(t, err) - - // 插入测试数据 - db.Create(&TestModel{ID: 1, ShopID: 100, Creator: 1, Name: "test1"}) - db.Create(&TestModel{ID: 2, ShopID: 200, Creator: 2, Name: "test2"}) - - // 创建 mock ShopStore - mockStore := &mockShopStore{ - subordinateShopIDs: []uint{100}, // 只有店铺 100 - } - - // 注册 Callback - err = RegisterDataPermissionCallback(db, mockStore) - assert.NoError(t, err) - - // 设置超级管理员 context - ctx := context.Background() - ctx = middleware.SetUserContext(ctx, &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - ShopID: 0, - EnterpriseID: 0, - CustomerID: 0, - }) - - // 查询数据 - var results []TestModel - err = db.WithContext(ctx).Find(&results).Error - assert.NoError(t, err) - - // 超级管理员应该看到所有数据 - assert.Equal(t, 2, len(results)) -} - -// TestDataPermissionCallback_SkipForPlatform 测试平台用户跳过过滤 -func TestDataPermissionCallback_SkipForPlatform(t *testing.T) { - // 创建内存数据库 - db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{}) - assert.NoError(t, err) - - // 创建测试表 - type TestModel struct { - ID uint - ShopID uint - Creator uint - Name string - } - - err = db.AutoMigrate(&TestModel{}) - assert.NoError(t, err) - - // 插入测试数据 - db.Create(&TestModel{ID: 1, ShopID: 100, Creator: 1, Name: "test1"}) - db.Create(&TestModel{ID: 2, ShopID: 200, Creator: 2, Name: "test2"}) - - // 创建 mock ShopStore - mockStore := &mockShopStore{ - subordinateShopIDs: []uint{100}, // 只有店铺 100 - } - - // 注册 Callback - err = RegisterDataPermissionCallback(db, mockStore) - assert.NoError(t, err) - - // 设置平台用户 context - ctx := context.Background() - ctx = middleware.SetUserContext(ctx, &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypePlatform, - ShopID: 0, - EnterpriseID: 0, - CustomerID: 0, - }) - - // 查询数据 - var results []TestModel - err = db.WithContext(ctx).Find(&results).Error - assert.NoError(t, err) - - // 平台用户应该看到所有数据 - assert.Equal(t, 2, len(results)) -} - -// TestDataPermissionCallback_FilterForAgent 测试代理用户过滤 -func TestDataPermissionCallback_FilterForAgent(t *testing.T) { - // 创建内存数据库 - db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{}) - assert.NoError(t, err) - - // 创建测试表（包含 shop_id 字段以触发店铺层级过滤） - type TestModel struct { - ID uint - ShopID uint - Name string - } - - err = db.AutoMigrate(&TestModel{}) - assert.NoError(t, err) - - // 插入测试数据 - db.Create(&TestModel{ID: 1, ShopID: 100, Name: "test1"}) - db.Create(&TestModel{ID: 2, ShopID: 200, Name: "test2"}) - db.Create(&TestModel{ID: 3, ShopID: 300, Name: "test3"}) - - // 创建 mock ShopStore - mockStore := &mockShopStore{ - subordinateShopIDs: []uint{100, 200}, // 只能看到店铺 100 和 200 - } - - // 注册 Callback - err = RegisterDataPermissionCallback(db, mockStore) - assert.NoError(t, err) - - // 设置代理用户 context (shop_id = 100) - ctx := context.Background() - ctx = middleware.SetUserContext(ctx, &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeAgent, - ShopID: 100, - EnterpriseID: 0, - CustomerID: 0, - }) - - // 查询数据 - var results []TestModel - err = db.WithContext(ctx).Find(&results).Error - assert.NoError(t, err) - - // 代理用户只能看到自己店铺和下级店铺的数据 - assert.Equal(t, 2, len(results)) - assert.Equal(t, uint(100), results[0].ShopID) - assert.Equal(t, uint(200), results[1].ShopID) -} - -// TestDataPermissionCallback_SkipWithContext 测试通过 Context 跳过过滤 -func TestDataPermissionCallback_SkipWithContext(t *testing.T) { - // 创建内存数据库 - db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{}) - assert.NoError(t, err) - - // 创建测试表 - type TestModel struct { - ID uint - ShopID uint - Creator uint - Name string - } - - err = db.AutoMigrate(&TestModel{}) - assert.NoError(t, err) - - // 插入测试数据 - db.Create(&TestModel{ID: 1, ShopID: 100, Creator: 1, Name: "test1"}) - db.Create(&TestModel{ID: 2, ShopID: 200, Creator: 2, Name: "test2"}) - - // 创建 mock ShopStore - mockStore := &mockShopStore{ - subordinateShopIDs: []uint{100}, // 只有店铺 100 - } - - // 注册 Callback - err = RegisterDataPermissionCallback(db, mockStore) - assert.NoError(t, err) - - // 设置代理用户 context 并跳过过滤 - ctx := context.Background() - ctx = middleware.SetUserContext(ctx, &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeAgent, - ShopID: 100, - EnterpriseID: 0, - CustomerID: 0, - }) - ctx = SkipDataPermission(ctx) - - // 查询数据 - var results []TestModel - err = db.WithContext(ctx).Find(&results).Error - assert.NoError(t, err) - - // 跳过过滤后应该看到所有数据 - assert.Equal(t, 2, len(results)) -} - -// TestDataPermissionCallback_WithShopID 测试带 shop_id 的过滤 -func TestDataPermissionCallback_WithShopID(t *testing.T) { - // 创建内存数据库 - db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{}) - assert.NoError(t, err) - - // 创建测试表 - type TestModel struct { - ID uint - Creator uint - ShopID uint - Name string - } - - err = db.AutoMigrate(&TestModel{}) - assert.NoError(t, err) - - // 插入测试数据 - db.Create(&TestModel{ID: 1, Creator: 1, ShopID: 100, Name: "test1"}) - db.Create(&TestModel{ID: 2, Creator: 2, ShopID: 100, Name: "test2"}) - db.Create(&TestModel{ID: 3, Creator: 2, ShopID: 200, Name: "test3"}) // 不同 shop_id - - // 创建 mock ShopStore - mockStore := &mockShopStore{ - subordinateShopIDs: []uint{100, 200}, // 可以看到店铺 100 和 200 - } - - // 注册 Callback - err = RegisterDataPermissionCallback(db, mockStore) - assert.NoError(t, err) - - // 设置代理用户 context (shop_id = 100) - ctx := context.Background() - ctx = middleware.SetUserContext(ctx, &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeAgent, - ShopID: 100, - EnterpriseID: 0, - CustomerID: 0, - }) - - // 查询数据 - var results []TestModel - err = db.WithContext(ctx).Find(&results).Error - assert.NoError(t, err) - - // 应该看到 shop_id = 100 和 200 的所有数据（因为 mockStore 返回了这两个店铺 ID） - assert.Equal(t, 3, len(results)) -} - -// TestDataPermissionCallback_FilterForEnterprise 测试企业用户过滤 -func TestDataPermissionCallback_FilterForEnterprise(t *testing.T) { - // 创建内存数据库 - db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{}) - assert.NoError(t, err) - - // 创建测试表（包含 enterprise_id 字段） - type TestModel struct { - ID uint - EnterpriseID uint - Name string - } - - err = db.AutoMigrate(&TestModel{}) - assert.NoError(t, err) - - // 插入测试数据 - db.Create(&TestModel{ID: 1, EnterpriseID: 1001, Name: "test1"}) - db.Create(&TestModel{ID: 2, EnterpriseID: 1001, Name: "test2"}) - db.Create(&TestModel{ID: 3, EnterpriseID: 1002, Name: "test3"}) - - // 创建 mock ShopStore（企业用户不需要，但注册时需要） - mockStore := &mockShopStore{ - subordinateShopIDs: []uint{}, - } - - // 注册 Callback - err = RegisterDataPermissionCallback(db, mockStore) - assert.NoError(t, err) - - // 设置企业用户 context - ctx := context.Background() - ctx = middleware.SetUserContext(ctx, &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeEnterprise, - ShopID: 0, - EnterpriseID: 1001, - CustomerID: 0, - }) - - // 查询数据 - var results []TestModel - err = db.WithContext(ctx).Find(&results).Error - assert.NoError(t, err) - - // 企业用户只能看到自己企业的数据 - assert.Equal(t, 2, len(results)) - for _, r := range results { - assert.Equal(t, uint(1001), r.EnterpriseID) - } -} - -// ============================================================ -// 标签表数据权限过滤测试（tb_tag / tb_resource_tag 表） -// ============================================================ - -// TagModel 模拟标签表（tb_tag）结构 -// 注意：必须指定 TableName 为 "tb_tag" 才能触发特殊过滤逻辑 -type TagModel struct { - ID uint `gorm:"primaryKey"` - EnterpriseID *uint `gorm:"column:enterprise_id"` - ShopID *uint `gorm:"column:shop_id"` - Name string -} - -func (TagModel) TableName() string { - return "tb_tag" -} - -// ResourceTagModel 模拟资源标签表（tb_resource_tag）结构 -type ResourceTagModel struct { - ID uint `gorm:"primaryKey"` - EnterpriseID *uint `gorm:"column:enterprise_id"` - ShopID *uint `gorm:"column:shop_id"` - ResourceType string - ResourceID uint - TagID uint -} - -func (ResourceTagModel) TableName() string { - return "tb_resource_tag" -} - -// uintPtr 辅助函数，将 uint 转换为 *uint -func uintPtr(v uint) *uint { - return &v -} - -// setupTagTestDB 创建标签测试数据库和数据 -// 返回：db 实例和 mock ShopStore -func setupTagTestDB(t *testing.T) (*gorm.DB, *mockShopStore) { - db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{}) - assert.NoError(t, err) - - // 创建测试表 - err = db.AutoMigrate(&TagModel{}, &ResourceTagModel{}) - assert.NoError(t, err) - - // 插入测试数据 - // 1. 全局标签（enterprise_id = NULL, shop_id = NULL） - db.Create(&TagModel{ID: 1, EnterpriseID: nil, ShopID: nil, Name: "全局标签-VIP"}) - db.Create(&TagModel{ID: 2, EnterpriseID: nil, ShopID: nil, Name: "全局标签-重要客户"}) - - // 2. 企业标签（enterprise_id = 1001, shop_id = NULL） - db.Create(&TagModel{ID: 3, EnterpriseID: uintPtr(1001), ShopID: nil, Name: "企业A-测试标签"}) - db.Create(&TagModel{ID: 4, EnterpriseID: uintPtr(1001), ShopID: nil, Name: "企业A-内部标签"}) - - // 3. 另一个企业的标签（enterprise_id = 1002, shop_id = NULL） - db.Create(&TagModel{ID: 5, EnterpriseID: uintPtr(1002), ShopID: nil, Name: "企业B-测试标签"}) - - // 4. 店铺标签（enterprise_id = NULL, shop_id = 100） - db.Create(&TagModel{ID: 6, EnterpriseID: nil, ShopID: uintPtr(100), Name: "店铺100-华东区"}) - db.Create(&TagModel{ID: 7, EnterpriseID: nil, ShopID: uintPtr(100), Name: "店铺100-大客户"}) - - // 5. 下级店铺标签（enterprise_id = NULL, shop_id = 200） - db.Create(&TagModel{ID: 8, EnterpriseID: nil, ShopID: uintPtr(200), Name: "店铺200-华南区"}) - - // 6. 其他店铺标签（enterprise_id = NULL, shop_id = 300） - db.Create(&TagModel{ID: 9, EnterpriseID: nil, ShopID: uintPtr(300), Name: "店铺300-华北区"}) - - // 创建 mock ShopStore - // 假设店铺 100 的下级店铺包括 100 和 200 - mockStore := &mockShopStore{ - subordinateShopIDs: []uint{100, 200}, - } - - return db, mockStore -} - -// TestTagPermission_SuperAdmin 测试超级管理员查询标签（应看到所有标签） -func TestTagPermission_SuperAdmin(t *testing.T) { - db, mockStore := setupTagTestDB(t) - - // 注册 Callback - err := RegisterDataPermissionCallback(db, mockStore) - assert.NoError(t, err) - - // 设置超级管理员 context - ctx := context.Background() - ctx = middleware.SetUserContext(ctx, &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - ShopID: 0, - EnterpriseID: 0, - CustomerID: 0, - }) - - // 查询标签 - var tags []TagModel - err = db.WithContext(ctx).Find(&tags).Error - assert.NoError(t, err) - - // 超级管理员应该看到所有 9 个标签 - assert.Equal(t, 9, len(tags), "超级管理员应该看到所有标签") -} - -// TestTagPermission_Platform 测试平台用户查询标签（应看到所有标签） -func TestTagPermission_Platform(t *testing.T) { - db, mockStore := setupTagTestDB(t) - - // 注册 Callback - err := RegisterDataPermissionCallback(db, mockStore) - assert.NoError(t, err) - - // 设置平台用户 context - ctx := context.Background() - ctx = middleware.SetUserContext(ctx, &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypePlatform, - ShopID: 0, - EnterpriseID: 0, - CustomerID: 0, - }) - - // 查询标签 - var tags []TagModel - err = db.WithContext(ctx).Find(&tags).Error - assert.NoError(t, err) - - // 平台用户应该看到所有 9 个标签 - assert.Equal(t, 9, len(tags), "平台用户应该看到所有标签") -} - -// TestTagPermission_Agent 测试代理用户查询标签 -// 预期：看到自己店铺标签 + 下级店铺标签 + 全局标签 -func TestTagPermission_Agent(t *testing.T) { - db, mockStore := setupTagTestDB(t) - - // 注册 Callback - err := RegisterDataPermissionCallback(db, mockStore) - assert.NoError(t, err) - - // 设置代理用户 context（店铺 ID = 100） - ctx := context.Background() - ctx = middleware.SetUserContext(ctx, &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeAgent, - ShopID: 100, - EnterpriseID: 0, - CustomerID: 0, - }) - - // 查询标签 - var tags []TagModel - err = db.WithContext(ctx).Find(&tags).Error - assert.NoError(t, err) - - // 代理用户应该看到： - // - 2 个全局标签（ID: 1, 2） - // - 2 个店铺 100 的标签（ID: 6, 7） - // - 1 个店铺 200（下级）的标签（ID: 8） - // 总共 5 个标签 - assert.Equal(t, 5, len(tags), "代理用户应该看到自己店铺、下级店铺和全局标签") - - // 验证标签 ID - expectedIDs := map[uint]bool{1: true, 2: true, 6: true, 7: true, 8: true} - for _, tag := range tags { - assert.True(t, expectedIDs[tag.ID], "标签 ID %d 不应该被代理用户看到", tag.ID) - } - - // 验证看不到的标签 - // - 企业标签（ID: 3, 4, 5） - // - 其他店铺标签（ID: 9） - for _, tag := range tags { - assert.NotEqual(t, uint(3), tag.ID, "代理用户不应该看到企业标签") - assert.NotEqual(t, uint(4), tag.ID, "代理用户不应该看到企业标签") - assert.NotEqual(t, uint(5), tag.ID, "代理用户不应该看到企业标签") - assert.NotEqual(t, uint(9), tag.ID, "代理用户不应该看到其他店铺标签") - } -} - -// TestTagPermission_Agent_NoShopID 测试没有 ShopID 的代理用户 -// 预期：只能看到全局标签 -func TestTagPermission_Agent_NoShopID(t *testing.T) { - db, mockStore := setupTagTestDB(t) - - // 注册 Callback - err := RegisterDataPermissionCallback(db, mockStore) - assert.NoError(t, err) - - // 设置代理用户 context（没有店铺 ID） - ctx := context.Background() - ctx = middleware.SetUserContext(ctx, &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeAgent, - ShopID: 0, // 没有店铺 - EnterpriseID: 0, - CustomerID: 0, - }) - - // 查询标签 - var tags []TagModel - err = db.WithContext(ctx).Find(&tags).Error - assert.NoError(t, err) - - // 没有店铺的代理用户只能看到全局标签 - assert.Equal(t, 2, len(tags), "没有店铺的代理用户只能看到全局标签") - - // 验证都是全局标签 - for _, tag := range tags { - assert.Nil(t, tag.EnterpriseID, "应该是全局标签，enterprise_id 为 NULL") - assert.Nil(t, tag.ShopID, "应该是全局标签，shop_id 为 NULL") - } -} - -// TestTagPermission_Enterprise 测试企业用户查询标签 -// 预期：看到自己企业标签 + 全局标签 -func TestTagPermission_Enterprise(t *testing.T) { - db, mockStore := setupTagTestDB(t) - - // 注册 Callback - err := RegisterDataPermissionCallback(db, mockStore) - assert.NoError(t, err) - - // 设置企业用户 context（企业 ID = 1001） - ctx := context.Background() - ctx = middleware.SetUserContext(ctx, &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeEnterprise, - ShopID: 0, - EnterpriseID: 1001, - CustomerID: 0, - }) - - // 查询标签 - var tags []TagModel - err = db.WithContext(ctx).Find(&tags).Error - assert.NoError(t, err) - - // 企业用户应该看到： - // - 2 个全局标签（ID: 1, 2） - // - 2 个企业 1001 的标签（ID: 3, 4） - // 总共 4 个标签 - assert.Equal(t, 4, len(tags), "企业用户应该看到自己企业和全局标签") - - // 验证标签 ID - expectedIDs := map[uint]bool{1: true, 2: true, 3: true, 4: true} - for _, tag := range tags { - assert.True(t, expectedIDs[tag.ID], "标签 ID %d 不应该被企业用户看到", tag.ID) - } - - // 验证看不到其他企业的标签 - for _, tag := range tags { - assert.NotEqual(t, uint(5), tag.ID, "企业用户不应该看到其他企业的标签") - } - - // 验证看不到店铺标签 - for _, tag := range tags { - assert.NotEqual(t, uint(6), tag.ID, "企业用户不应该看到店铺标签") - assert.NotEqual(t, uint(7), tag.ID, "企业用户不应该看到店铺标签") - assert.NotEqual(t, uint(8), tag.ID, "企业用户不应该看到店铺标签") - assert.NotEqual(t, uint(9), tag.ID, "企业用户不应该看到店铺标签") - } -} - -// TestTagPermission_Enterprise_NoEnterpriseID 测试没有 EnterpriseID 的企业用户 -// 预期：只能看到全局标签 -func TestTagPermission_Enterprise_NoEnterpriseID(t *testing.T) { - db, mockStore := setupTagTestDB(t) - - // 注册 Callback - err := RegisterDataPermissionCallback(db, mockStore) - assert.NoError(t, err) - - // 设置企业用户 context（没有企业 ID） - ctx := context.Background() - ctx = middleware.SetUserContext(ctx, &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeEnterprise, - ShopID: 0, - EnterpriseID: 0, // 没有企业 - CustomerID: 0, - }) - - // 查询标签 - var tags []TagModel - err = db.WithContext(ctx).Find(&tags).Error - assert.NoError(t, err) - - // 没有企业的企业用户只能看到全局标签 - assert.Equal(t, 2, len(tags), "没有企业的企业用户只能看到全局标签") - - // 验证都是全局标签 - for _, tag := range tags { - assert.Nil(t, tag.EnterpriseID, "应该是全局标签，enterprise_id 为 NULL") - assert.Nil(t, tag.ShopID, "应该是全局标签，shop_id 为 NULL") - } -} - -// TestTagPermission_ResourceTag_Agent 测试代理用户查询资源标签表 -// 预期：与 tb_tag 表相同的过滤规则 -func TestTagPermission_ResourceTag_Agent(t *testing.T) { - db, mockStore := setupTagTestDB(t) - - // 创建资源标签测试数据 - // 1. 全局资源标签 - db.Create(&ResourceTagModel{ID: 1, EnterpriseID: nil, ShopID: nil, ResourceType: "iot_card", ResourceID: 101, TagID: 1}) - // 2. 店铺 100 的资源标签 - db.Create(&ResourceTagModel{ID: 2, EnterpriseID: nil, ShopID: uintPtr(100), ResourceType: "iot_card", ResourceID: 102, TagID: 6}) - // 3. 店铺 200（下级）的资源标签 - db.Create(&ResourceTagModel{ID: 3, EnterpriseID: nil, ShopID: uintPtr(200), ResourceType: "device", ResourceID: 201, TagID: 8}) - // 4. 店铺 300（其他）的资源标签 - db.Create(&ResourceTagModel{ID: 4, EnterpriseID: nil, ShopID: uintPtr(300), ResourceType: "device", ResourceID: 301, TagID: 9}) - // 5. 企业的资源标签 - db.Create(&ResourceTagModel{ID: 5, EnterpriseID: uintPtr(1001), ShopID: nil, ResourceType: "iot_card", ResourceID: 103, TagID: 3}) - - // 注册 Callback - err := RegisterDataPermissionCallback(db, mockStore) - assert.NoError(t, err) - - // 设置代理用户 context（店铺 ID = 100） - ctx := context.Background() - ctx = middleware.SetUserContext(ctx, &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeAgent, - ShopID: 100, - EnterpriseID: 0, - CustomerID: 0, - }) - - // 查询资源标签 - var resourceTags []ResourceTagModel - err = db.WithContext(ctx).Find(&resourceTags).Error - assert.NoError(t, err) - - // 代理用户应该看到： - // - 1 个全局资源标签（ID: 1） - // - 1 个店铺 100 的资源标签（ID: 2） - // - 1 个店铺 200（下级）的资源标签（ID: 3） - // 总共 3 个 - assert.Equal(t, 3, len(resourceTags), "代理用户应该看到自己店铺、下级店铺和全局的资源标签") - - // 验证看不到的资源标签 - for _, rt := range resourceTags { - assert.NotEqual(t, uint(4), rt.ID, "代理用户不应该看到其他店铺的资源标签") - assert.NotEqual(t, uint(5), rt.ID, "代理用户不应该看到企业的资源标签") - } -} - -// TestTagPermission_CrossIsolation 测试跨租户隔离 -// 验证企业 A 看不到企业 B 的标签 -func TestTagPermission_CrossIsolation(t *testing.T) { - db, mockStore := setupTagTestDB(t) - - // 注册 Callback - err := RegisterDataPermissionCallback(db, mockStore) - assert.NoError(t, err) - - // 企业 A 用户（enterprise_id = 1001） - ctxA := context.Background() - ctxA = middleware.SetUserContext(ctxA, &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeEnterprise, - ShopID: 0, - EnterpriseID: 1001, - CustomerID: 0, - }) - - // 企业 B 用户（enterprise_id = 1002） - ctxB := context.Background() - ctxB = middleware.SetUserContext(ctxB, &middleware.UserContextInfo{ - UserID: 2, - UserType: constants.UserTypeEnterprise, - ShopID: 0, - EnterpriseID: 1002, - CustomerID: 0, - }) - - // 企业 A 查询标签 - var tagsA []TagModel - err = db.WithContext(ctxA).Find(&tagsA).Error - assert.NoError(t, err) - - // 企业 B 查询标签 - var tagsB []TagModel - err = db.WithContext(ctxB).Find(&tagsB).Error - assert.NoError(t, err) - - // 企业 A 应该看到 4 个标签（2 全局 + 2 企业 A） - assert.Equal(t, 4, len(tagsA), "企业 A 应该看到 4 个标签") - - // 企业 B 应该看到 3 个标签（2 全局 + 1 企业 B） - assert.Equal(t, 3, len(tagsB), "企业 B 应该看到 3 个标签") - - // 验证企业 A 看不到企业 B 的标签 - for _, tag := range tagsA { - if tag.EnterpriseID != nil { - assert.Equal(t, uint(1001), *tag.EnterpriseID, "企业 A 不应该看到企业 B 的标签") - } - } - - // 验证企业 B 看不到企业 A 的标签 - for _, tag := range tagsB { - if tag.EnterpriseID != nil { - assert.Equal(t, uint(1002), *tag.EnterpriseID, "企业 B 不应该看到企业 A 的标签") - } - } -} - -// ============================================================ -// 企业卡授权表数据权限过滤测试（tb_enterprise_card_authorization 表） -// ============================================================ - -// EnterpriseModel 模拟企业表，用于授权表过滤测试 -type EnterpriseModel struct { - ID uint `gorm:"primaryKey"` - OwnerShopID *uint `gorm:"column:owner_shop_id"` - DeletedAt *time.Time `gorm:"column:deleted_at"` - Name string -} - -func (EnterpriseModel) TableName() string { - return "tb_enterprise" -} - -// AuthorizationModel 模拟企业卡授权表结构 -type AuthorizationModel struct { - ID uint `gorm:"primaryKey"` - EnterpriseID uint `gorm:"column:enterprise_id"` - CardID uint `gorm:"column:card_id"` - AuthorizedBy uint `gorm:"column:authorized_by"` - AuthorizedAt time.Time `gorm:"column:authorized_at"` - AuthorizerType int `gorm:"column:authorizer_type"` - RevokedBy *uint `gorm:"column:revoked_by"` - RevokedAt *time.Time `gorm:"column:revoked_at"` - Remark string `gorm:"column:remark"` -} - -func (AuthorizationModel) TableName() string { - return "tb_enterprise_card_authorization" -} - -// setupAuthorizationTestDB 创建授权表测试数据库和数据 -func setupAuthorizationTestDB(t *testing.T) (*gorm.DB, *mockShopStore) { - db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{}) - assert.NoError(t, err) - - // 创建测试表 - err = db.AutoMigrate(&EnterpriseModel{}, &AuthorizationModel{}) - assert.NoError(t, err) - - // 插入企业测试数据 - // 1. 店铺 100 下的企业 - db.Create(&EnterpriseModel{ID: 1, OwnerShopID: uintPtr(100), Name: "企业A-店铺100"}) - db.Create(&EnterpriseModel{ID: 2, OwnerShopID: uintPtr(100), Name: "企业B-店铺100"}) - // 2. 店铺 200（店铺100的下级）下的企业 - db.Create(&EnterpriseModel{ID: 3, OwnerShopID: uintPtr(200), Name: "企业C-店铺200"}) - // 3. 店铺 300（其他店铺）下的企业 - db.Create(&EnterpriseModel{ID: 4, OwnerShopID: uintPtr(300), Name: "企业D-店铺300"}) - // 4. 平台直属企业（无店铺归属） - db.Create(&EnterpriseModel{ID: 5, OwnerShopID: nil, Name: "企业E-平台直属"}) - - now := time.Now() - // 插入授权记录测试数据 - // 1. 企业1的授权记录（店铺100） - db.Create(&AuthorizationModel{ID: 1, EnterpriseID: 1, CardID: 101, AuthorizedBy: 1, AuthorizedAt: now, AuthorizerType: 3}) - db.Create(&AuthorizationModel{ID: 2, EnterpriseID: 1, CardID: 102, AuthorizedBy: 1, AuthorizedAt: now, AuthorizerType: 3}) - // 2. 企业2的授权记录（店铺100） - db.Create(&AuthorizationModel{ID: 3, EnterpriseID: 2, CardID: 201, AuthorizedBy: 1, AuthorizedAt: now, AuthorizerType: 3}) - // 3. 企业3的授权记录（店铺200 - 下级店铺） - db.Create(&AuthorizationModel{ID: 4, EnterpriseID: 3, CardID: 301, AuthorizedBy: 2, AuthorizedAt: now, AuthorizerType: 3}) - // 4. 企业4的授权记录（店铺300 - 其他店铺） - db.Create(&AuthorizationModel{ID: 5, EnterpriseID: 4, CardID: 401, AuthorizedBy: 3, AuthorizedAt: now, AuthorizerType: 3}) - db.Create(&AuthorizationModel{ID: 6, EnterpriseID: 4, CardID: 402, AuthorizedBy: 3, AuthorizedAt: now, AuthorizerType: 3}) - // 5. 企业5的授权记录（平台直属） - db.Create(&AuthorizationModel{ID: 7, EnterpriseID: 5, CardID: 501, AuthorizedBy: 1, AuthorizedAt: now, AuthorizerType: 2}) - - // 创建 mock ShopStore - // 店铺 100 的下级店铺包括 100 和 200（不含 300） - mockStore := &mockShopStore{ - subordinateShopIDs: []uint{100, 200}, - } - - return db, mockStore -} - -// TestAuthorizationPermission_SuperAdmin 测试超级管理员查询授权记录（应看到所有记录） -func TestAuthorizationPermission_SuperAdmin(t *testing.T) { - db, mockStore := setupAuthorizationTestDB(t) - - // 注册 Callback - err := RegisterDataPermissionCallback(db, mockStore) - assert.NoError(t, err) - - // 设置超级管理员 context - ctx := context.Background() - ctx = middleware.SetUserContext(ctx, &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeSuperAdmin, - ShopID: 0, - EnterpriseID: 0, - CustomerID: 0, - }) - - // 查询授权记录 - var auths []AuthorizationModel - err = db.WithContext(ctx).Find(&auths).Error - assert.NoError(t, err) - - // 超级管理员应该看到所有 7 条记录 - assert.Equal(t, 7, len(auths), "超级管理员应该看到所有授权记录") -} - -// TestAuthorizationPermission_Platform 测试平台用户查询授权记录（应看到所有记录） -func TestAuthorizationPermission_Platform(t *testing.T) { - db, mockStore := setupAuthorizationTestDB(t) - - // 注册 Callback - err := RegisterDataPermissionCallback(db, mockStore) - assert.NoError(t, err) - - // 设置平台用户 context - ctx := context.Background() - ctx = middleware.SetUserContext(ctx, &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypePlatform, - ShopID: 0, - EnterpriseID: 0, - CustomerID: 0, - }) - - // 查询授权记录 - var auths []AuthorizationModel - err = db.WithContext(ctx).Find(&auths).Error - assert.NoError(t, err) - - // 平台用户应该看到所有 7 条记录 - assert.Equal(t, 7, len(auths), "平台用户应该看到所有授权记录") -} - -// TestAuthorizationPermission_Agent_OwnShopOnly 测试代理用户查询授权记录 -// 关键业务规则：代理只能看到自己店铺下企业的授权记录，不含下级店铺 -func TestAuthorizationPermission_Agent_OwnShopOnly(t *testing.T) { - db, mockStore := setupAuthorizationTestDB(t) - - // 注册 Callback - err := RegisterDataPermissionCallback(db, mockStore) - assert.NoError(t, err) - - // 设置代理用户 context（店铺 ID = 100） - ctx := context.Background() - ctx = middleware.SetUserContext(ctx, &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeAgent, - ShopID: 100, - EnterpriseID: 0, - CustomerID: 0, - }) - - // 查询授权记录 - var auths []AuthorizationModel - err = db.WithContext(ctx).Find(&auths).Error - assert.NoError(t, err) - - // 代理用户（店铺100）应该只看到： - // - 企业1的2条授权记录（ID: 1, 2） - // - 企业2的1条授权记录（ID: 3） - // 总共 3 条记录 - // 注意：不含下级店铺200的记录（ID: 4），这是关键业务规则 - assert.Equal(t, 3, len(auths), "代理用户应该只看到自己店铺下企业的授权记录（不含下级店铺）") - - // 验证授权记录 ID - expectedIDs := map[uint]bool{1: true, 2: true, 3: true} - for _, auth := range auths { - assert.True(t, expectedIDs[auth.ID], "授权记录 ID %d 不应该被代理用户看到", auth.ID) - } - - // 验证看不到下级店铺的记录 - for _, auth := range auths { - assert.NotEqual(t, uint(4), auth.ID, "代理用户不应该看到下级店铺的授权记录") - } - - // 验证看不到其他店铺的记录 - for _, auth := range auths { - assert.NotEqual(t, uint(5), auth.ID, "代理用户不应该看到其他店铺的授权记录") - assert.NotEqual(t, uint(6), auth.ID, "代理用户不应该看到其他店铺的授权记录") - } - - // 验证看不到平台直属企业的记录 - for _, auth := range auths { - assert.NotEqual(t, uint(7), auth.ID, "代理用户不应该看到平台直属企业的授权记录") - } -} - -// TestAuthorizationPermission_Agent_SubordinateShop 测试下级店铺代理查询授权记录 -// 验证下级店铺代理只能看到自己店铺下企业的授权记录 -func TestAuthorizationPermission_Agent_SubordinateShop(t *testing.T) { - db, _ := setupAuthorizationTestDB(t) - - // 创建 mock ShopStore，店铺 200 只能看到自己 - mockStore := &mockShopStore{ - subordinateShopIDs: []uint{200}, - } - - // 注册 Callback - err := RegisterDataPermissionCallback(db, mockStore) - assert.NoError(t, err) - - // 设置代理用户 context（店铺 ID = 200，是店铺100的下级） - ctx := context.Background() - ctx = middleware.SetUserContext(ctx, &middleware.UserContextInfo{ - UserID: 2, - UserType: constants.UserTypeAgent, - ShopID: 200, - EnterpriseID: 0, - CustomerID: 0, - }) - - // 查询授权记录 - var auths []AuthorizationModel - err = db.WithContext(ctx).Find(&auths).Error - assert.NoError(t, err) - - // 店铺200的代理用户应该只看到： - // - 企业3的1条授权记录（ID: 4） - // 总共 1 条记录 - assert.Equal(t, 1, len(auths), "下级店铺代理应该只看到自己店铺下企业的授权记录") - - // 验证授权记录 ID - assert.Equal(t, uint(4), auths[0].ID, "应该是企业3的授权记录") -} - -// TestAuthorizationPermission_Agent_NoShopID 测试没有 ShopID 的代理用户 -// 预期：返回空结果 -func TestAuthorizationPermission_Agent_NoShopID(t *testing.T) { - db, mockStore := setupAuthorizationTestDB(t) - - // 注册 Callback - err := RegisterDataPermissionCallback(db, mockStore) - assert.NoError(t, err) - - // 设置代理用户 context（没有店铺 ID） - ctx := context.Background() - ctx = middleware.SetUserContext(ctx, &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeAgent, - ShopID: 0, // 没有店铺 - EnterpriseID: 0, - CustomerID: 0, - }) - - // 查询授权记录 - var auths []AuthorizationModel - err = db.WithContext(ctx).Find(&auths).Error - assert.NoError(t, err) - - // 没有店铺的代理用户应该看不到任何记录 - assert.Equal(t, 0, len(auths), "没有店铺的代理用户应该看不到任何授权记录") -} - -// TestAuthorizationPermission_Agent_CrossShopIsolation 测试跨店铺隔离 -// 验证店铺 A 看不到店铺 B 的授权记录 -func TestAuthorizationPermission_Agent_CrossShopIsolation(t *testing.T) { - db, _ := setupAuthorizationTestDB(t) - - // 店铺 100 的 mock - mockStore100 := &mockShopStore{ - subordinateShopIDs: []uint{100}, - } - - // 店铺 300 的 mock - mockStore300 := &mockShopStore{ - subordinateShopIDs: []uint{300}, - } - - // 注册 Callback（使用店铺100的mock） - err := RegisterDataPermissionCallback(db, mockStore100) - assert.NoError(t, err) - - // 店铺 100 代理用户 - ctx100 := context.Background() - ctx100 = middleware.SetUserContext(ctx100, &middleware.UserContextInfo{ - UserID: 1, - UserType: constants.UserTypeAgent, - ShopID: 100, - EnterpriseID: 0, - CustomerID: 0, - }) - - // 查询店铺100的授权记录 - var auths100 []AuthorizationModel - err = db.WithContext(ctx100).Find(&auths100).Error - assert.NoError(t, err) - - // 店铺100应该看到3条记录（企业1和企业2的） - assert.Equal(t, 3, len(auths100), "店铺100应该看到自己店铺下企业的授权记录") - - // 重新创建数据库并注册店铺300的 Callback - db2, _ := setupAuthorizationTestDB(t) - err = RegisterDataPermissionCallback(db2, mockStore300) - assert.NoError(t, err) - - // 店铺 300 代理用户 - ctx300 := context.Background() - ctx300 = middleware.SetUserContext(ctx300, &middleware.UserContextInfo{ - UserID: 3, - UserType: constants.UserTypeAgent, - ShopID: 300, - EnterpriseID: 0, - CustomerID: 0, - }) - - // 查询店铺300的授权记录 - var auths300 []AuthorizationModel - err = db2.WithContext(ctx300).Find(&auths300).Error - assert.NoError(t, err) - - // 店铺300应该看到2条记录（企业4的） - assert.Equal(t, 2, len(auths300), "店铺300应该看到自己店铺下企业的授权记录") - - // 验证店铺100看不到店铺300的记录 - for _, auth := range auths100 { - assert.NotEqual(t, uint(5), auth.ID, "店铺100不应该看到店铺300的授权记录") - assert.NotEqual(t, uint(6), auth.ID, "店铺100不应该看到店铺300的授权记录") - } - - // 验证店铺300看不到店铺100的记录 - for _, auth := range auths300 { - assert.NotEqual(t, uint(1), auth.ID, "店铺300不应该看到店铺100的授权记录") - assert.NotEqual(t, uint(2), auth.ID, "店铺300不应该看到店铺100的授权记录") - assert.NotEqual(t, uint(3), auth.ID, "店铺300不应该看到店铺100的授权记录") - } -} diff --git a/pkg/logger/logger_test.go b/pkg/logger/logger_test.go deleted file mode 100644 index fbd1dcf..0000000 --- a/pkg/logger/logger_test.go +++ /dev/null @@ -1,518 +0,0 @@ -package logger - -import ( - "os" - "path/filepath" - "testing" - - "go.uber.org/zap" - "go.uber.org/zap/zapcore" -) - -// TestInitLoggers 测试日志初始化（T026） -func TestInitLoggers(t *testing.T) { - // 创建临时目录用于日志文件 - tempDir := t.TempDir() - - tests := []struct { - name string - level string - development bool - appLogConfig LogRotationConfig - accessLogConfig LogRotationConfig - wantErr bool - validateFunc func(t *testing.T) - }{ - { - name: "production mode with info level", - level: "info", - development: false, - appLogConfig: LogRotationConfig{ - Filename: filepath.Join(tempDir, "app-prod.log"), - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: true, - }, - accessLogConfig: LogRotationConfig{ - Filename: filepath.Join(tempDir, "access-prod.log"), - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: true, - }, - wantErr: false, - validateFunc: func(t *testing.T) { - if appLogger == nil { - t.Error("appLogger should not be nil") - } - if accessLogger == nil { - t.Error("accessLogger should not be nil") - } - // 写入一条日志以触发文件创建 - GetAppLogger().Info("test log creation") - _ = Sync() - // 验证日志文件创建 - if _, err := os.Stat(filepath.Join(tempDir, "app-prod.log")); os.IsNotExist(err) { - t.Error("app log file should be created after writing") - } - }, - }, - { - name: "development mode with debug level", - level: "debug", - development: true, - appLogConfig: LogRotationConfig{ - Filename: filepath.Join(tempDir, "app-dev.log"), - MaxSize: 5, - MaxBackups: 2, - MaxAge: 3, - Compress: false, - }, - accessLogConfig: LogRotationConfig{ - Filename: filepath.Join(tempDir, "access-dev.log"), - MaxSize: 5, - MaxBackups: 2, - MaxAge: 3, - Compress: false, - }, - wantErr: false, - validateFunc: func(t *testing.T) { - if appLogger == nil { - t.Error("appLogger should not be nil in dev mode") - } - if accessLogger == nil { - t.Error("accessLogger should not be nil in dev mode") - } - }, - }, - { - name: "warn level logging", - level: "warn", - development: false, - appLogConfig: LogRotationConfig{ - Filename: filepath.Join(tempDir, "app-warn.log"), - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: true, - }, - accessLogConfig: LogRotationConfig{ - Filename: filepath.Join(tempDir, "access-warn.log"), - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: true, - }, - wantErr: false, - validateFunc: func(t *testing.T) { - if appLogger == nil { - t.Error("appLogger should not be nil") - } - }, - }, - { - name: "error level logging", - level: "error", - development: false, - appLogConfig: LogRotationConfig{ - Filename: filepath.Join(tempDir, "app-error.log"), - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: true, - }, - accessLogConfig: LogRotationConfig{ - Filename: filepath.Join(tempDir, "access-error.log"), - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: true, - }, - wantErr: false, - validateFunc: func(t *testing.T) { - if appLogger == nil { - t.Error("appLogger should not be nil") - } - }, - }, - { - name: "invalid level defaults to info", - level: "invalid", - development: false, - appLogConfig: LogRotationConfig{ - Filename: filepath.Join(tempDir, "app-invalid.log"), - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: true, - }, - accessLogConfig: LogRotationConfig{ - Filename: filepath.Join(tempDir, "access-invalid.log"), - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: true, - }, - wantErr: false, - validateFunc: func(t *testing.T) { - if appLogger == nil { - t.Error("appLogger should not be nil even with invalid level") - } - }, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - err := InitLoggers(tt.level, tt.development, tt.appLogConfig, tt.accessLogConfig) - if (err != nil) != tt.wantErr { - t.Errorf("InitLoggers() error = %v, wantErr %v", err, tt.wantErr) - return - } - - if tt.validateFunc != nil { - tt.validateFunc(t) - } - }) - } -} - -// TestGetAppLogger 测试获取应用日志记录器（T026） -func TestGetAppLogger(t *testing.T) { - // 创建临时目录 - tempDir := t.TempDir() - - tests := []struct { - name string - setupFunc func() - wantNil bool - }{ - { - name: "after initialization", - setupFunc: func() { - _ = InitLoggers("info", false, - LogRotationConfig{ - Filename: filepath.Join(tempDir, "app-get.log"), - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: true, - }, - LogRotationConfig{ - Filename: filepath.Join(tempDir, "access-get.log"), - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: true, - }, - ) - }, - wantNil: false, - }, - { - name: "before initialization returns nop logger", - setupFunc: func() { - // 重置全局变量 - appLogger = nil - }, - wantNil: false, // GetAppLogger 应该返回 nop logger，不是 nil - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - tt.setupFunc() - logger := GetAppLogger() - if logger == nil { - t.Error("GetAppLogger() should never return nil, should return nop logger instead") - } - }) - } -} - -// TestGetAccessLogger 测试获取访问日志记录器（T028） -func TestGetAccessLogger(t *testing.T) { - // 创建临时目录 - tempDir := t.TempDir() - - tests := []struct { - name string - setupFunc func() - wantNil bool - }{ - { - name: "after initialization", - setupFunc: func() { - _ = InitLoggers("info", false, - LogRotationConfig{ - Filename: filepath.Join(tempDir, "app-access.log"), - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: true, - }, - LogRotationConfig{ - Filename: filepath.Join(tempDir, "access-access.log"), - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: true, - }, - ) - }, - wantNil: false, - }, - { - name: "before initialization returns nop logger", - setupFunc: func() { - // 重置全局变量 - accessLogger = nil - }, - wantNil: false, // GetAccessLogger 应该返回 nop logger，不是 nil - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - tt.setupFunc() - logger := GetAccessLogger() - if logger == nil { - t.Error("GetAccessLogger() should never return nil, should return nop logger instead") - } - }) - } -} - -// TestSync 测试日志缓冲区刷新（T028） -func TestSync(t *testing.T) { - // 创建临时目录 - tempDir := t.TempDir() - - tests := []struct { - name string - setupFunc func() - wantErr bool - }{ - { - name: "sync after initialization", - setupFunc: func() { - _ = InitLoggers("info", false, - LogRotationConfig{ - Filename: filepath.Join(tempDir, "app-sync.log"), - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: true, - }, - LogRotationConfig{ - Filename: filepath.Join(tempDir, "access-sync.log"), - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: true, - }, - ) - }, - wantErr: false, - }, - { - name: "sync before initialization", - setupFunc: func() { - appLogger = nil - accessLogger = nil - }, - wantErr: false, // 应该优雅地处理 nil 情况 - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - tt.setupFunc() - err := Sync() - if (err != nil) != tt.wantErr { - t.Errorf("Sync() error = %v, wantErr %v", err, tt.wantErr) - } - }) - } -} - -// TestParseLevel 测试日志级别解析（T026） -func TestParseLevel(t *testing.T) { - tests := []struct { - name string - level string - want zapcore.Level - }{ - { - name: "debug level", - level: "debug", - want: zapcore.DebugLevel, - }, - { - name: "info level", - level: "info", - want: zapcore.InfoLevel, - }, - { - name: "warn level", - level: "warn", - want: zapcore.WarnLevel, - }, - { - name: "error level", - level: "error", - want: zapcore.ErrorLevel, - }, - { - name: "invalid level defaults to info", - level: "invalid", - want: zapcore.InfoLevel, - }, - { - name: "empty level defaults to info", - level: "", - want: zapcore.InfoLevel, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - got := parseLevel(tt.level) - if got != tt.want { - t.Errorf("parseLevel() = %v, want %v", got, tt.want) - } - }) - } -} - -// TestDualLoggerSystem 测试双日志系统（T028） -func TestDualLoggerSystem(t *testing.T) { - // 创建临时目录 - tempDir := t.TempDir() - - appLogFile := filepath.Join(tempDir, "app-dual.log") - accessLogFile := filepath.Join(tempDir, "access-dual.log") - - // 初始化双日志系统 - err := InitLoggers("info", false, - LogRotationConfig{ - Filename: appLogFile, - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: false, // 不压缩以便检查内容 - }, - LogRotationConfig{ - Filename: accessLogFile, - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: false, - }, - ) - if err != nil { - t.Fatalf("InitLoggers failed: %v", err) - } - - // 写入应用日志 - appLog := GetAppLogger() - appLog.Info("test app log message", - zap.String("module", "test"), - zap.Int("code", 200), - ) - - // 写入访问日志 - accessLog := GetAccessLogger() - accessLog.Info("test access log message", - zap.String("method", "GET"), - zap.String("path", "/api/test"), - zap.Int("status", 200), - zap.Duration("latency", 100), - ) - - // 刷新缓冲区 - if err := Sync(); err != nil { - t.Fatalf("Sync failed: %v", err) - } - - // 验证应用日志文件存在并有内容 - appLogContent, err := os.ReadFile(appLogFile) - if err != nil { - t.Fatalf("Failed to read app log file: %v", err) - } - if len(appLogContent) == 0 { - t.Error("App log file should not be empty") - } - - // 验证访问日志文件存在并有内容 - accessLogContent, err := os.ReadFile(accessLogFile) - if err != nil { - t.Fatalf("Failed to read access log file: %v", err) - } - if len(accessLogContent) == 0 { - t.Error("Access log file should not be empty") - } - - // 验证两个日志文件是独立的 - if string(appLogContent) == string(accessLogContent) { - t.Error("App log and access log should have different content") - } -} - -// TestLoggerReinitialization 测试日志重新初始化（T026） -func TestLoggerReinitialization(t *testing.T) { - // 创建临时目录 - tempDir := t.TempDir() - - // 第一次初始化 - err := InitLoggers("info", false, - LogRotationConfig{ - Filename: filepath.Join(tempDir, "app-reinit1.log"), - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: true, - }, - LogRotationConfig{ - Filename: filepath.Join(tempDir, "access-reinit1.log"), - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: true, - }, - ) - if err != nil { - t.Fatalf("First InitLoggers failed: %v", err) - } - - firstAppLogger := GetAppLogger() - - // 第二次初始化（重新初始化） - err = InitLoggers("debug", true, - LogRotationConfig{ - Filename: filepath.Join(tempDir, "app-reinit2.log"), - MaxSize: 5, - MaxBackups: 2, - MaxAge: 3, - Compress: false, - }, - LogRotationConfig{ - Filename: filepath.Join(tempDir, "access-reinit2.log"), - MaxSize: 5, - MaxBackups: 2, - MaxAge: 3, - Compress: false, - }, - ) - if err != nil { - t.Fatalf("Second InitLoggers failed: %v", err) - } - - secondAppLogger := GetAppLogger() - - // 验证重新初始化后日志记录器已更新 - if firstAppLogger == secondAppLogger { - t.Error("Logger should be replaced after reinitialization") - } -} diff --git a/pkg/logger/rotation_test.go b/pkg/logger/rotation_test.go deleted file mode 100644 index aa88fd0..0000000 --- a/pkg/logger/rotation_test.go +++ /dev/null @@ -1,388 +0,0 @@ -package logger - -import ( - "os" - "path/filepath" - "strings" - "testing" - "time" - - "go.uber.org/zap" -) - -// TestLogRotation 测试日志轮转功能（T027） -func TestLogRotation(t *testing.T) { - // 创建临时目录 - tempDir := t.TempDir() - - appLogFile := filepath.Join(tempDir, "app-rotation.log") - - // 初始化日志系统，设置较小的 MaxSize 以便测试 - err := InitLoggers("info", false, - LogRotationConfig{ - Filename: appLogFile, - MaxSize: 1, // 1MB，写入足够数据后会触发轮转 - MaxBackups: 3, - MaxAge: 7, - Compress: false, // 不压缩以便检查 - }, - LogRotationConfig{ - Filename: filepath.Join(tempDir, "access-rotation.log"), - MaxSize: 1, - MaxBackups: 3, - MaxAge: 7, - Compress: false, - }, - ) - if err != nil { - t.Fatalf("InitLoggers failed: %v", err) - } - - logger := GetAppLogger() - - // 写入大量日志数据以触发轮转（每条约100字节，写入15000条约1.5MB） - largeMessage := strings.Repeat("a", 100) - for i := 0; i < 15000; i++ { - logger.Info(largeMessage, - zap.Int("iteration", i), - zap.String("data", largeMessage), - ) - } - - // 刷新缓冲区 - if err := Sync(); err != nil { - t.Fatalf("Sync failed: %v", err) - } - - // 等待一小段时间确保文件写入完成 - time.Sleep(100 * time.Millisecond) - - // 验证主日志文件存在 - if _, err := os.Stat(appLogFile); os.IsNotExist(err) { - t.Error("Main log file should exist") - } - - // 检查是否有备份文件（轮转后的文件） - files, err := filepath.Glob(filepath.Join(tempDir, "app-rotation-*.log")) - if err != nil { - t.Fatalf("Failed to glob backup files: %v", err) - } - - // 由于写入了超过1MB的数据，应该触发至少一次轮转 - if len(files) == 0 { - // 可能系统写入速度或lumberjack行为导致未立即轮转，检查主文件大小 - info, err := os.Stat(appLogFile) - if err != nil { - t.Fatalf("Failed to stat main log file: %v", err) - } - if info.Size() == 0 { - t.Error("Log file should have content") - } - // 不强制要求必须轮转，因为取决于具体实现 - t.Logf("No rotation occurred, but main log file size: %d bytes", info.Size()) - } else { - t.Logf("Found %d rotated backup file(s)", len(files)) - } -} - -// TestMaxBackups 测试最大备份数限制（T027） -func TestMaxBackups(t *testing.T) { - // 创建临时目录 - tempDir := t.TempDir() - - appLogFile := filepath.Join(tempDir, "app-backups.log") - - // 初始化日志系统，设置 MaxBackups=2 - err := InitLoggers("info", false, - LogRotationConfig{ - Filename: appLogFile, - MaxSize: 1, // 1MB - MaxBackups: 2, // 最多保留2个备份 - MaxAge: 7, - Compress: false, - }, - LogRotationConfig{ - Filename: filepath.Join(tempDir, "access-backups.log"), - MaxSize: 1, - MaxBackups: 2, - MaxAge: 7, - Compress: false, - }, - ) - if err != nil { - t.Fatalf("InitLoggers failed: %v", err) - } - - logger := GetAppLogger() - - // 写入足够的数据触发多次轮转（每次1.5MB，共4.5MB应该触发3次轮转） - largeMessage := strings.Repeat("b", 100) - for round := 0; round < 3; round++ { - for i := 0; i < 15000; i++ { - logger.Info(largeMessage, - zap.Int("round", round), - zap.Int("iteration", i), - ) - } - _ = Sync() - time.Sleep(100 * time.Millisecond) - } - - // 等待轮转完成 - time.Sleep(200 * time.Millisecond) - - // 检查备份文件数量 - files, err := filepath.Glob(filepath.Join(tempDir, "app-backups-*.log")) - if err != nil { - t.Fatalf("Failed to glob backup files: %v", err) - } - - // 由于 MaxBackups=2，即使触发了多次轮转，也只应保留最多2个备份文件 - // （实际行为取决于 lumberjack 的实现细节，可能小于等于2） - if len(files) > 2 { - t.Errorf("Expected at most 2 backup files due to MaxBackups=2, got %d", len(files)) - } - t.Logf("Found %d backup file(s) with MaxBackups=2", len(files)) -} - -// TestCompressionConfig 测试压缩配置（T027） -func TestCompressionConfig(t *testing.T) { - // 创建临时目录 - tempDir := t.TempDir() - - tests := []struct { - name string - compress bool - }{ - { - name: "compression enabled", - compress: true, - }, - { - name: "compression disabled", - compress: false, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - logFile := filepath.Join(tempDir, "app-"+tt.name+".log") - - err := InitLoggers("info", false, - LogRotationConfig{ - Filename: logFile, - MaxSize: 1, - MaxBackups: 3, - MaxAge: 7, - Compress: tt.compress, - }, - LogRotationConfig{ - Filename: filepath.Join(tempDir, "access-"+tt.name+".log"), - MaxSize: 1, - MaxBackups: 3, - MaxAge: 7, - Compress: tt.compress, - }, - ) - if err != nil { - t.Fatalf("InitLoggers failed: %v", err) - } - - logger := GetAppLogger() - - // 写入一些日志 - for i := 0; i < 1000; i++ { - logger.Info("test compression", - zap.Int("id", i), - zap.String("data", strings.Repeat("c", 50)), - ) - } - - _ = Sync() - time.Sleep(100 * time.Millisecond) - - // 验证日志文件存在 - if _, err := os.Stat(logFile); os.IsNotExist(err) { - t.Error("Log file should exist") - } - }) - } -} - -// TestMaxAge 测试日志文件保留时间（T027） -func TestMaxAge(t *testing.T) { - // 创建临时目录 - tempDir := t.TempDir() - - // 初始化日志系统，设置 MaxAge=1 天 - err := InitLoggers("info", false, - LogRotationConfig{ - Filename: filepath.Join(tempDir, "app-maxage.log"), - MaxSize: 10, - MaxBackups: 3, - MaxAge: 1, // 1天 - Compress: false, - }, - LogRotationConfig{ - Filename: filepath.Join(tempDir, "access-maxage.log"), - MaxSize: 10, - MaxBackups: 3, - MaxAge: 1, - Compress: false, - }, - ) - if err != nil { - t.Fatalf("InitLoggers failed: %v", err) - } - - logger := GetAppLogger() - - // 写入日志 - logger.Info("test max age", zap.String("config", "maxage=1")) - _ = Sync() - - // 验证配置已应用（无法在单元测试中验证实际的清理行为，因为需要等待1天） - // 这里只验证初始化没有错误 - if logger == nil { - t.Error("Logger should be initialized with MaxAge config") - } -} - -// TestNewLumberjackLogger 测试 Lumberjack logger 创建（T027） -func TestNewLumberjackLogger(t *testing.T) { - // 创建临时目录 - tempDir := t.TempDir() - - tests := []struct { - name string - config LogRotationConfig - }{ - { - name: "standard config", - config: LogRotationConfig{ - Filename: filepath.Join(tempDir, "test1.log"), - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: true, - }, - }, - { - name: "minimal config", - config: LogRotationConfig{ - Filename: filepath.Join(tempDir, "test2.log"), - MaxSize: 1, - MaxBackups: 1, - MaxAge: 1, - Compress: false, - }, - }, - { - name: "large config", - config: LogRotationConfig{ - Filename: filepath.Join(tempDir, "test3.log"), - MaxSize: 100, - MaxBackups: 10, - MaxAge: 30, - Compress: true, - }, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - logger := newLumberjackLogger(tt.config) - if logger == nil { - t.Error("newLumberjackLogger should not return nil") - } - - // 验证配置已正确设置 - if logger.Filename != tt.config.Filename { - t.Errorf("Filename = %v, want %v", logger.Filename, tt.config.Filename) - } - if logger.MaxSize != tt.config.MaxSize { - t.Errorf("MaxSize = %v, want %v", logger.MaxSize, tt.config.MaxSize) - } - if logger.MaxBackups != tt.config.MaxBackups { - t.Errorf("MaxBackups = %v, want %v", logger.MaxBackups, tt.config.MaxBackups) - } - if logger.MaxAge != tt.config.MaxAge { - t.Errorf("MaxAge = %v, want %v", logger.MaxAge, tt.config.MaxAge) - } - if logger.Compress != tt.config.Compress { - t.Errorf("Compress = %v, want %v", logger.Compress, tt.config.Compress) - } - if !logger.LocalTime { - t.Error("LocalTime should be true") - } - }) - } -} - -// TestConcurrentLogging 测试并发日志写入（T027） -func TestConcurrentLogging(t *testing.T) { - // 创建临时目录 - tempDir := t.TempDir() - - // 初始化日志系统 - err := InitLoggers("info", false, - LogRotationConfig{ - Filename: filepath.Join(tempDir, "app-concurrent.log"), - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: false, - }, - LogRotationConfig{ - Filename: filepath.Join(tempDir, "access-concurrent.log"), - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: false, - }, - ) - if err != nil { - t.Fatalf("InitLoggers failed: %v", err) - } - - logger := GetAppLogger() - - // 启动多个 goroutine 并发写入日志 - done := make(chan bool) - goroutines := 10 - messagesPerGoroutine := 100 - - for i := 0; i < goroutines; i++ { - go func(id int) { - for j := 0; j < messagesPerGoroutine; j++ { - logger.Info("concurrent log message", - zap.Int("goroutine", id), - zap.Int("message", j), - ) - } - done <- true - }(i) - } - - // 等待所有 goroutine 完成 - for i := 0; i < goroutines; i++ { - <-done - } - - // 刷新缓冲区 - if err := Sync(); err != nil { - t.Fatalf("Sync failed: %v", err) - } - - // 验证日志文件存在且有内容 - logFile := filepath.Join(tempDir, "app-concurrent.log") - info, err := os.Stat(logFile) - if err != nil { - t.Fatalf("Failed to stat log file: %v", err) - } - if info.Size() == 0 { - t.Error("Log file should have content after concurrent writes") - } - - t.Logf("Concurrent logging test completed, log file size: %d bytes", info.Size()) -} diff --git a/pkg/middleware/permission_helper_test.go b/pkg/middleware/permission_helper_test.go deleted file mode 100644 index fc2bf4e..0000000 --- a/pkg/middleware/permission_helper_test.go +++ /dev/null @@ -1,375 +0,0 @@ -package middleware - -import ( - "context" - "errors" - "testing" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/mock" -) - -type MockShopStore struct { - mock.Mock -} - -func (m *MockShopStore) GetByID(ctx context.Context, id uint) (*model.Shop, error) { - args := m.Called(ctx, id) - if args.Get(0) == nil { - return nil, args.Error(1) - } - return args.Get(0).(*model.Shop), args.Error(1) -} - -func (m *MockShopStore) GetByIDs(ctx context.Context, ids []uint) ([]*model.Shop, error) { - args := m.Called(ctx, ids) - if args.Get(0) == nil { - return nil, args.Error(1) - } - return args.Get(0).([]*model.Shop), args.Error(1) -} - -func (m *MockShopStore) GetSubordinateShopIDs(ctx context.Context, shopID uint) ([]uint, error) { - args := m.Called(ctx, shopID) - if args.Get(0) == nil { - return nil, args.Error(1) - } - return args.Get(0).([]uint), args.Error(1) -} - -type MockEnterpriseStore struct { - mock.Mock -} - -func (m *MockEnterpriseStore) GetByID(ctx context.Context, id uint) (*model.Enterprise, error) { - args := m.Called(ctx, id) - if args.Get(0) == nil { - return nil, args.Error(1) - } - return args.Get(0).(*model.Enterprise), args.Error(1) -} - -func (m *MockEnterpriseStore) GetByIDs(ctx context.Context, ids []uint) ([]*model.Enterprise, error) { - args := m.Called(ctx, ids) - if args.Get(0) == nil { - return nil, args.Error(1) - } - return args.Get(0).([]*model.Enterprise), args.Error(1) -} - -func TestCanManageShop_SuperAdmin(t *testing.T) { - ctx := context.Background() - ctx = context.WithValue(ctx, constants.ContextKeyUserType, constants.UserTypeSuperAdmin) - - mockShopStore := new(MockShopStore) - - err := CanManageShop(ctx, 100, mockShopStore) - assert.NoError(t, err) - - mockShopStore.AssertNotCalled(t, "GetSubordinateShopIDs") -} - -func TestCanManageShop_Platform(t *testing.T) { - ctx := context.Background() - ctx = context.WithValue(ctx, constants.ContextKeyUserType, constants.UserTypePlatform) - - mockShopStore := new(MockShopStore) - - err := CanManageShop(ctx, 100, mockShopStore) - assert.NoError(t, err) - - mockShopStore.AssertNotCalled(t, "GetSubordinateShopIDs") -} - -func TestCanManageShop_AgentManageOwnShop(t *testing.T) { - ctx := context.Background() - ctx = context.WithValue(ctx, constants.ContextKeyUserType, constants.UserTypeAgent) - ctx = context.WithValue(ctx, constants.ContextKeyShopID, uint(100)) - - mockShopStore := new(MockShopStore) - mockShopStore.On("GetSubordinateShopIDs", ctx, uint(100)).Return([]uint{100, 101, 102}, nil) - - err := CanManageShop(ctx, 100, mockShopStore) - assert.NoError(t, err) - - mockShopStore.AssertExpectations(t) -} - -func TestCanManageShop_AgentManageSubordinateShop(t *testing.T) { - ctx := context.Background() - ctx = context.WithValue(ctx, constants.ContextKeyUserType, constants.UserTypeAgent) - ctx = context.WithValue(ctx, constants.ContextKeyShopID, uint(100)) - - mockShopStore := new(MockShopStore) - mockShopStore.On("GetSubordinateShopIDs", ctx, uint(100)).Return([]uint{100, 101, 102}, nil) - - err := CanManageShop(ctx, 101, mockShopStore) - assert.NoError(t, err) - - mockShopStore.AssertExpectations(t) -} - -func TestCanManageShop_AgentCannotManageOtherShop(t *testing.T) { - ctx := context.Background() - ctx = context.WithValue(ctx, constants.ContextKeyUserType, constants.UserTypeAgent) - ctx = context.WithValue(ctx, constants.ContextKeyShopID, uint(100)) - - mockShopStore := new(MockShopStore) - mockShopStore.On("GetSubordinateShopIDs", ctx, uint(100)).Return([]uint{100, 101, 102}, nil) - - err := CanManageShop(ctx, 200, mockShopStore) - assert.Error(t, err) - assert.Contains(t, err.Error(), "无权限管理该店铺的账号") - - mockShopStore.AssertExpectations(t) -} - -func TestCanManageShop_AgentNoShopID(t *testing.T) { - ctx := context.Background() - ctx = context.WithValue(ctx, constants.ContextKeyUserType, constants.UserTypeAgent) - - mockShopStore := new(MockShopStore) - - err := CanManageShop(ctx, 100, mockShopStore) - assert.Error(t, err) - assert.Contains(t, err.Error(), "无权限管理店铺账号") - - mockShopStore.AssertNotCalled(t, "GetSubordinateShopIDs") -} - -func TestCanManageShop_EnterpriseUser(t *testing.T) { - ctx := context.Background() - ctx = context.WithValue(ctx, constants.ContextKeyUserType, constants.UserTypeEnterprise) - - mockShopStore := new(MockShopStore) - - err := CanManageShop(ctx, 100, mockShopStore) - assert.Error(t, err) - assert.Contains(t, err.Error(), "无权限管理店铺账号") - - mockShopStore.AssertNotCalled(t, "GetSubordinateShopIDs") -} - -func TestCanManageShop_GetSubordinateShopIDsError(t *testing.T) { - ctx := context.Background() - ctx = context.WithValue(ctx, constants.ContextKeyUserType, constants.UserTypeAgent) - ctx = context.WithValue(ctx, constants.ContextKeyShopID, uint(100)) - - mockShopStore := new(MockShopStore) - mockShopStore.On("GetSubordinateShopIDs", ctx, uint(100)).Return(nil, errors.New("database error")) - - err := CanManageShop(ctx, 100, mockShopStore) - assert.Error(t, err) - assert.Contains(t, err.Error(), "查询下级店铺失败") - - mockShopStore.AssertExpectations(t) -} - -func TestCanManageEnterprise_SuperAdmin(t *testing.T) { - ctx := context.Background() - ctx = context.WithValue(ctx, constants.ContextKeyUserType, constants.UserTypeSuperAdmin) - - mockEnterpriseStore := new(MockEnterpriseStore) - mockShopStore := new(MockShopStore) - - err := CanManageEnterprise(ctx, 50, mockEnterpriseStore, mockShopStore) - assert.NoError(t, err) - - mockEnterpriseStore.AssertNotCalled(t, "GetByID") - mockShopStore.AssertNotCalled(t, "GetSubordinateShopIDs") -} - -func TestCanManageEnterprise_Platform(t *testing.T) { - ctx := context.Background() - ctx = context.WithValue(ctx, constants.ContextKeyUserType, constants.UserTypePlatform) - - mockEnterpriseStore := new(MockEnterpriseStore) - mockShopStore := new(MockShopStore) - - err := CanManageEnterprise(ctx, 50, mockEnterpriseStore, mockShopStore) - assert.NoError(t, err) - - mockEnterpriseStore.AssertNotCalled(t, "GetByID") - mockShopStore.AssertNotCalled(t, "GetSubordinateShopIDs") -} - -func TestCanManageEnterprise_AgentManageOwnShopEnterprise(t *testing.T) { - ctx := context.Background() - ctx = context.WithValue(ctx, constants.ContextKeyUserType, constants.UserTypeAgent) - ctx = context.WithValue(ctx, constants.ContextKeyShopID, uint(100)) - - ownerShopID := uint(100) - enterprise := &model.Enterprise{ - OwnerShopID: &ownerShopID, - } - - mockEnterpriseStore := new(MockEnterpriseStore) - mockEnterpriseStore.On("GetByID", ctx, uint(50)).Return(enterprise, nil) - - mockShopStore := new(MockShopStore) - mockShopStore.On("GetSubordinateShopIDs", ctx, uint(100)).Return([]uint{100, 101, 102}, nil) - - err := CanManageEnterprise(ctx, 50, mockEnterpriseStore, mockShopStore) - assert.NoError(t, err) - - mockEnterpriseStore.AssertExpectations(t) - mockShopStore.AssertExpectations(t) -} - -func TestCanManageEnterprise_AgentManageSubordinateShopEnterprise(t *testing.T) { - ctx := context.Background() - ctx = context.WithValue(ctx, constants.ContextKeyUserType, constants.UserTypeAgent) - ctx = context.WithValue(ctx, constants.ContextKeyShopID, uint(100)) - - ownerShopID := uint(101) - enterprise := &model.Enterprise{ - OwnerShopID: &ownerShopID, - } - - mockEnterpriseStore := new(MockEnterpriseStore) - mockEnterpriseStore.On("GetByID", ctx, uint(50)).Return(enterprise, nil) - - mockShopStore := new(MockShopStore) - mockShopStore.On("GetSubordinateShopIDs", ctx, uint(100)).Return([]uint{100, 101, 102}, nil) - - err := CanManageEnterprise(ctx, 50, mockEnterpriseStore, mockShopStore) - assert.NoError(t, err) - - mockEnterpriseStore.AssertExpectations(t) - mockShopStore.AssertExpectations(t) -} - -func TestCanManageEnterprise_AgentCannotManageOtherShopEnterprise(t *testing.T) { - ctx := context.Background() - ctx = context.WithValue(ctx, constants.ContextKeyUserType, constants.UserTypeAgent) - ctx = context.WithValue(ctx, constants.ContextKeyShopID, uint(100)) - - ownerShopID := uint(200) - enterprise := &model.Enterprise{ - OwnerShopID: &ownerShopID, - } - - mockEnterpriseStore := new(MockEnterpriseStore) - mockEnterpriseStore.On("GetByID", ctx, uint(50)).Return(enterprise, nil) - - mockShopStore := new(MockShopStore) - mockShopStore.On("GetSubordinateShopIDs", ctx, uint(100)).Return([]uint{100, 101, 102}, nil) - - err := CanManageEnterprise(ctx, 50, mockEnterpriseStore, mockShopStore) - assert.Error(t, err) - assert.Contains(t, err.Error(), "无权限管理该企业的账号") - - mockEnterpriseStore.AssertExpectations(t) - mockShopStore.AssertExpectations(t) -} - -func TestCanManageEnterprise_AgentCannotManagePlatformEnterprise(t *testing.T) { - ctx := context.Background() - ctx = context.WithValue(ctx, constants.ContextKeyUserType, constants.UserTypeAgent) - ctx = context.WithValue(ctx, constants.ContextKeyShopID, uint(100)) - - enterprise := &model.Enterprise{ - OwnerShopID: nil, - } - - mockEnterpriseStore := new(MockEnterpriseStore) - mockEnterpriseStore.On("GetByID", ctx, uint(50)).Return(enterprise, nil) - - mockShopStore := new(MockShopStore) - - err := CanManageEnterprise(ctx, 50, mockEnterpriseStore, mockShopStore) - assert.Error(t, err) - assert.Contains(t, err.Error(), "无权限管理平台级企业账号") - - mockEnterpriseStore.AssertExpectations(t) - mockShopStore.AssertNotCalled(t, "GetSubordinateShopIDs") -} - -func TestCanManageEnterprise_EnterpriseUser(t *testing.T) { - ctx := context.Background() - ctx = context.WithValue(ctx, constants.ContextKeyUserType, constants.UserTypeEnterprise) - - mockEnterpriseStore := new(MockEnterpriseStore) - mockShopStore := new(MockShopStore) - - err := CanManageEnterprise(ctx, 50, mockEnterpriseStore, mockShopStore) - assert.Error(t, err) - assert.Contains(t, err.Error(), "无权限管理企业账号") - - mockEnterpriseStore.AssertNotCalled(t, "GetByID") - mockShopStore.AssertNotCalled(t, "GetSubordinateShopIDs") -} - -func TestCanManageEnterprise_GetEnterpriseError(t *testing.T) { - ctx := context.Background() - ctx = context.WithValue(ctx, constants.ContextKeyUserType, constants.UserTypeAgent) - ctx = context.WithValue(ctx, constants.ContextKeyShopID, uint(100)) - - mockEnterpriseStore := new(MockEnterpriseStore) - mockEnterpriseStore.On("GetByID", ctx, uint(50)).Return(nil, errors.New("database error")) - - mockShopStore := new(MockShopStore) - - err := CanManageEnterprise(ctx, 50, mockEnterpriseStore, mockShopStore) - assert.Error(t, err) - assert.Contains(t, err.Error(), "无权限操作该资源或资源不存在") - - mockEnterpriseStore.AssertExpectations(t) - mockShopStore.AssertNotCalled(t, "GetSubordinateShopIDs") -} - -func TestCanManageEnterprise_AgentNoShopID(t *testing.T) { - ctx := context.Background() - ctx = context.WithValue(ctx, constants.ContextKeyUserType, constants.UserTypeAgent) - - ownerShopID := uint(100) - enterprise := &model.Enterprise{ - OwnerShopID: &ownerShopID, - } - - mockEnterpriseStore := new(MockEnterpriseStore) - mockEnterpriseStore.On("GetByID", ctx, uint(50)).Return(enterprise, nil) - - mockShopStore := new(MockShopStore) - - err := CanManageEnterprise(ctx, 50, mockEnterpriseStore, mockShopStore) - assert.Error(t, err) - assert.Contains(t, err.Error(), "无权限管理企业账号") - - mockEnterpriseStore.AssertExpectations(t) - mockShopStore.AssertNotCalled(t, "GetSubordinateShopIDs") -} - -func TestCanManageEnterprise_GetSubordinateShopIDsError(t *testing.T) { - ctx := context.Background() - ctx = context.WithValue(ctx, constants.ContextKeyUserType, constants.UserTypeAgent) - ctx = context.WithValue(ctx, constants.ContextKeyShopID, uint(100)) - - ownerShopID := uint(100) - enterprise := &model.Enterprise{ - OwnerShopID: &ownerShopID, - } - - mockEnterpriseStore := new(MockEnterpriseStore) - mockEnterpriseStore.On("GetByID", ctx, uint(50)).Return(enterprise, nil) - - mockShopStore := new(MockShopStore) - mockShopStore.On("GetSubordinateShopIDs", ctx, uint(100)).Return(nil, errors.New("database error")) - - err := CanManageEnterprise(ctx, 50, mockEnterpriseStore, mockShopStore) - assert.Error(t, err) - assert.Contains(t, err.Error(), "查询下级店铺失败") - - mockEnterpriseStore.AssertExpectations(t) - mockShopStore.AssertExpectations(t) -} - -func TestPermissionHelperTestCoverage(t *testing.T) { - mockShopStore := new(MockShopStore) - mockEnterpriseStore := new(MockEnterpriseStore) - - assert.Implements(t, (*ShopStoreInterface)(nil), mockShopStore) - assert.Implements(t, (*EnterpriseStoreInterface)(nil), mockEnterpriseStore) -} diff --git a/pkg/openapi/handlers.go b/pkg/openapi/handlers.go index a858987..5db132e 100644 --- a/pkg/openapi/handlers.go +++ b/pkg/openapi/handlers.go @@ -37,6 +37,8 @@ func BuildDocHandlers() *bootstrap.Handlers { Carrier: admin.NewCarrierHandler(nil), PackageSeries: admin.NewPackageSeriesHandler(nil), Package: admin.NewPackageHandler(nil), + PackageUsage: admin.NewPackageUsageHandler(nil), + H5PackageUsage: h5.NewPackageUsageHandler(nil, nil), ShopSeriesAllocation: admin.NewShopSeriesAllocationHandler(nil), ShopPackageAllocation: admin.NewShopPackageAllocationHandler(nil), ShopPackageBatchAllocation: admin.NewShopPackageBatchAllocationHandler(nil), diff --git a/pkg/queue/handler.go b/pkg/queue/handler.go index ce3e63a..9e40137 100644 --- a/pkg/queue/handler.go +++ b/pkg/queue/handler.go @@ -7,8 +7,10 @@ import ( "gorm.io/gorm" "github.com/break/junhong_cmp_fiber/internal/gateway" + "github.com/break/junhong_cmp_fiber/internal/polling" "github.com/break/junhong_cmp_fiber/internal/service/commission_calculation" "github.com/break/junhong_cmp_fiber/internal/service/commission_stats" + packagepkg "github.com/break/junhong_cmp_fiber/internal/service/package" "github.com/break/junhong_cmp_fiber/internal/store/postgres" "github.com/break/junhong_cmp_fiber/internal/task" "github.com/break/junhong_cmp_fiber/pkg/constants" @@ -56,6 +58,7 @@ func (h *Handler) RegisterHandlers() *asynq.ServeMux { h.registerCommissionStatsHandlers() h.registerCommissionCalculationHandler() h.registerPollingHandlers() + h.registerPackageActivationHandlers() h.logger.Info("所有任务处理器注册完成") return h.mux @@ -146,7 +149,12 @@ func (h *Handler) registerCommissionCalculationHandler() { // registerPollingHandlers 注册轮询任务处理器 func (h *Handler) registerPollingHandlers() { - pollingHandler := task.NewPollingHandler(h.db, h.redis, h.gatewayClient, h.logger) + // 创建套餐相关 Store 和 Service（用于流量扣减） + packageUsageStore := postgres.NewPackageUsageStore(h.db, h.redis) + packageUsageDailyRecordStore := postgres.NewPackageUsageDailyRecordStore(h.db, h.redis) + usageService := packagepkg.NewUsageService(h.db, h.redis, packageUsageStore, packageUsageDailyRecordStore, h.logger) + + pollingHandler := task.NewPollingHandler(h.db, h.redis, h.gatewayClient, usageService, h.logger) h.mux.HandleFunc(constants.TaskTypePollingRealname, pollingHandler.HandleRealnameCheck) h.logger.Info("注册实名检查任务处理器", zap.String("task_type", constants.TaskTypePollingRealname)) @@ -158,6 +166,49 @@ func (h *Handler) registerPollingHandlers() { h.logger.Info("注册套餐检查任务处理器", zap.String("task_type", constants.TaskTypePollingPackage)) } +// registerPackageActivationHandlers 注册套餐激活任务处理器 +// 任务 22.6 和 23.6: 注册首次实名激活和排队激活任务 Handler +func (h *Handler) registerPackageActivationHandlers() { + // 创建套餐相关 Store 和 Service + packageUsageStore := postgres.NewPackageUsageStore(h.db, h.redis) + packageStore := postgres.NewPackageStore(h.db) + packageUsageDailyRecordStore := postgres.NewPackageUsageDailyRecordStore(h.db, h.redis) + + activationService := packagepkg.NewActivationService( + h.db, + h.redis, + packageUsageStore, + packageStore, + packageUsageDailyRecordStore, + h.logger, + ) + + // 创建 Asynq 客户端用于任务提交 + redisOpt := asynq.RedisClientOpt{ + Addr: h.redis.Options().Addr, + Password: h.redis.Options().Password, + DB: h.redis.Options().DB, + } + queueClient := asynq.NewClient(redisOpt) + + // 创建套餐激活处理器 + packageActivationHandler := polling.NewPackageActivationHandler( + h.db, + h.redis, + queueClient, + activationService, + h.logger, + ) + + // 任务 22.6: 注册首次实名激活任务 Handler + h.mux.HandleFunc(constants.TaskTypePackageFirstActivation, packageActivationHandler.HandlePackageFirstActivation) + h.logger.Info("注册首次实名激活任务处理器", zap.String("task_type", constants.TaskTypePackageFirstActivation)) + + // 任务 23.6: 注册排队激活任务 Handler + h.mux.HandleFunc(constants.TaskTypePackageQueueActivation, packageActivationHandler.HandlePackageQueueActivation) + h.logger.Info("注册排队激活任务处理器", zap.String("task_type", constants.TaskTypePackageQueueActivation)) +} + // GetMux 获取 ServeMux（用于启动 Worker 服务器） func (h *Handler) GetMux() *asynq.ServeMux { return h.mux diff --git a/pkg/response/response_bench_test.go b/pkg/response/response_bench_test.go deleted file mode 100644 index cac857a..0000000 --- a/pkg/response/response_bench_test.go +++ /dev/null @@ -1,57 +0,0 @@ -package response - -import ( - "testing" - - "github.com/gofiber/fiber/v2" - "github.com/valyala/fasthttp" -) - -// BenchmarkSuccess 测试成功响应性能 -func BenchmarkSuccess(b *testing.B) { - app := fiber.New() - - b.Run("WithData", func(b *testing.B) { - data := map[string]interface{}{ - "id": "123", - "name": "测试用户", - "age": 25, - } - - b.ResetTimer() - for i := 0; i < b.N; i++ { - ctx := app.AcquireCtx(&fasthttp.RequestCtx{}) - _ = Success(ctx, data) - app.ReleaseCtx(ctx) - } - }) - - b.Run("NoData", func(b *testing.B) { - b.ResetTimer() - for i := 0; i < b.N; i++ { - ctx := app.AcquireCtx(&fasthttp.RequestCtx{}) - _ = Success(ctx, nil) - app.ReleaseCtx(ctx) - } - }) -} - -// BenchmarkError 基准测试已被删除 - Error() 函数已在重构中移除 -// 错误响应现在由全局 ErrorHandler 统一处理 - -// BenchmarkSuccessWithMessage 测试带自定义消息的成功响应性能 -func BenchmarkSuccessWithMessage(b *testing.B) { - app := fiber.New() - - data := map[string]interface{}{ - "id": "123", - "name": "测试用户", - } - - b.ResetTimer() - for i := 0; i < b.N; i++ { - ctx := app.AcquireCtx(&fasthttp.RequestCtx{}) - _ = SuccessWithMessage(ctx, data, "操作成功") - app.ReleaseCtx(ctx) - } -} diff --git a/pkg/response/response_test.go b/pkg/response/response_test.go deleted file mode 100644 index 5a0cf21..0000000 --- a/pkg/response/response_test.go +++ /dev/null @@ -1,378 +0,0 @@ -package response - -import ( - "io" - "net/http/httptest" - "testing" - "time" - - "github.com/break/junhong_cmp_fiber/pkg/errors" - "github.com/bytedance/sonic" - "github.com/gofiber/fiber/v2" -) - -// TestSuccess 测试成功响应（T034） -func TestSuccess(t *testing.T) { - tests := []struct { - name string - data any - }{ - { - name: "success with string data", - data: "test data", - }, - { - name: "success with map data", - data: map[string]any{ - "id": 123, - "name": "test", - }, - }, - { - name: "success with slice data", - data: []string{"item1", "item2", "item3"}, - }, - { - name: "success with struct data", - data: struct { - ID int `json:"id"` - Name string `json:"name"` - }{ - ID: 456, - Name: "test struct", - }, - }, - { - name: "success with nil data", - data: nil, - }, - { - name: "success with empty map", - data: map[string]any{}, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - app := fiber.New() - app.Get("/test", func(c *fiber.Ctx) error { - return Success(c, tt.data) - }) - - req := httptest.NewRequest("GET", "/test", nil) - resp, err := app.Test(req) - if err != nil { - t.Fatalf("Failed to execute request: %v", err) - } - defer func() { _ = resp.Body.Close() }() - - // 验证 HTTP 状态码 - if resp.StatusCode != 200 { - t.Errorf("Expected status code 200, got %d", resp.StatusCode) - } - - // 验证响应头（Fiber 会自动添加 charset=utf-8） - contentType := resp.Header.Get("Content-Type") - if contentType != "application/json" && contentType != "application/json; charset=utf-8" { - t.Errorf("Expected Content-Type application/json or application/json; charset=utf-8, got %s", contentType) - } - - // 解析响应体 - body, err := io.ReadAll(resp.Body) - if err != nil { - t.Fatalf("Failed to read response body: %v", err) - } - - var response Response - if err := sonic.Unmarshal(body, &response); err != nil { - t.Fatalf("Failed to unmarshal response: %v", err) - } - - // 验证响应结构 - if response.Code != errors.CodeSuccess { - t.Errorf("Expected code %d, got %d", errors.CodeSuccess, response.Code) - } - - if response.Message != "success" { - t.Errorf("Expected message 'success', got '%s'", response.Message) - } - - // 验证时间戳格式 RFC3339 - if _, err := time.Parse(time.RFC3339, response.Timestamp); err != nil { - t.Errorf("Timestamp is not in RFC3339 format: %s", response.Timestamp) - } - - // 验证数据字段（如果不是 nil） - if tt.data != nil { - if response.Data == nil { - t.Error("Expected data field to be non-nil") - } - } - }) - } -} - -// TestError 测试已被删除 - Error() 函数已在重构中移除 -// 错误响应现在由全局 ErrorHandler 统一处理 -// 相关测试已迁移到 pkg/errors/handler_test.go - -// TestSuccessWithMessage 测试带自定义消息的成功响应（T034） -func TestSuccessWithMessage(t *testing.T) { - tests := []struct { - name string - data any - message string - }{ - { - name: "custom success message", - data: map[string]any{ - "user_id": 123, - }, - message: "User created successfully", - }, - { - name: "empty custom message", - data: "test data", - message: "", - }, - { - name: "chinese message", - data: map[string]string{ - "status": "ok", - }, - message: "操作成功", - }, - { - name: "long message", - data: nil, - message: "This is a very long success message that describes in detail what happened during the operation", - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - app := fiber.New() - app.Get("/test", func(c *fiber.Ctx) error { - return SuccessWithMessage(c, tt.data, tt.message) - }) - - req := httptest.NewRequest("GET", "/test", nil) - resp, err := app.Test(req) - if err != nil { - t.Fatalf("Failed to execute request: %v", err) - } - defer func() { _ = resp.Body.Close() }() - - // 验证 HTTP 状态码（默认 200） - if resp.StatusCode != 200 { - t.Errorf("Expected status code 200, got %d", resp.StatusCode) - } - - // 解析响应体 - body, err := io.ReadAll(resp.Body) - if err != nil { - t.Fatalf("Failed to read response body: %v", err) - } - - var response Response - if err := sonic.Unmarshal(body, &response); err != nil { - t.Fatalf("Failed to unmarshal response: %v", err) - } - - // 验证响应结构 - if response.Code != errors.CodeSuccess { - t.Errorf("Expected code %d, got %d", errors.CodeSuccess, response.Code) - } - - if response.Message != tt.message { - t.Errorf("Expected message '%s', got '%s'", tt.message, response.Message) - } - - // 验证时间戳格式 RFC3339 - if _, err := time.Parse(time.RFC3339, response.Timestamp); err != nil { - t.Errorf("Timestamp is not in RFC3339 format: %s", response.Timestamp) - } - }) - } -} - -// TestResponseSerialization 测试响应序列化（T036） -func TestResponseSerialization(t *testing.T) { - tests := []struct { - name string - response Response - }{ - { - name: "complete response", - response: Response{ - Code: 0, - Data: map[string]any{"key": "value"}, - Message: "success", - Timestamp: time.Now().Format(time.RFC3339), - }, - }, - { - name: "response with nil data", - response: Response{ - Code: 1000, - Data: nil, - Message: "error", - Timestamp: time.Now().Format(time.RFC3339), - }, - }, - { - name: "response with nested data", - response: Response{ - Code: 0, - Data: map[string]any{ - "user": map[string]any{ - "id": 123, - "name": "test", - "tags": []string{"tag1", "tag2"}, - }, - }, - Message: "success", - Timestamp: time.Now().Format(time.RFC3339), - }, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - // 序列化 - data, err := sonic.Marshal(tt.response) - if err != nil { - t.Fatalf("Failed to marshal response: %v", err) - } - - // 反序列化 - var deserialized Response - if err := sonic.Unmarshal(data, &deserialized); err != nil { - t.Fatalf("Failed to unmarshal response: %v", err) - } - - // 验证字段 - if deserialized.Code != tt.response.Code { - t.Errorf("Code mismatch: expected %d, got %d", tt.response.Code, deserialized.Code) - } - - if deserialized.Message != tt.response.Message { - t.Errorf("Message mismatch: expected '%s', got '%s'", tt.response.Message, deserialized.Message) - } - - if deserialized.Timestamp != tt.response.Timestamp { - t.Errorf("Timestamp mismatch: expected '%s', got '%s'", tt.response.Timestamp, deserialized.Timestamp) - } - }) - } -} - -// TestResponseStructFields 测试响应结构字段（T036） -func TestResponseStructFields(t *testing.T) { - response := Response{ - Code: 0, - Data: "test", - Message: "success", - Timestamp: time.Now().Format(time.RFC3339), - } - - data, err := sonic.Marshal(response) - if err != nil { - t.Fatalf("Failed to marshal response: %v", err) - } - - // 解析为 map 以检查 JSON 键 - var jsonMap map[string]any - if err := sonic.Unmarshal(data, &jsonMap); err != nil { - t.Fatalf("Failed to unmarshal to map: %v", err) - } - - // 验证所有必需字段都存在 - requiredFields := []string{"code", "data", "msg", "timestamp"} - for _, field := range requiredFields { - if _, exists := jsonMap[field]; !exists { - t.Errorf("Required field '%s' is missing in JSON response", field) - } - } - - // 验证字段类型 - if _, ok := jsonMap["code"].(float64); !ok { - t.Error("Field 'code' should be a number") - } - - if _, ok := jsonMap["msg"].(string); !ok { - t.Error("Field 'msg' should be a string") - } - - if _, ok := jsonMap["timestamp"].(string); !ok { - t.Error("Field 'timestamp' should be a string") - } -} - -// TestMultipleResponses 测试多个连续响应（T036） -func TestMultipleResponses(t *testing.T) { - app := fiber.New() - - callCount := 0 - app.Get("/test", func(c *fiber.Ctx) error { - callCount++ - // 只返回成功响应，因为 Error() 函数已被删除 - return Success(c, map[string]int{"count": callCount}) - }) - - // 发送多个请求 - for i := 1; i <= 5; i++ { - req := httptest.NewRequest("GET", "/test", nil) - resp, err := app.Test(req) - if err != nil { - t.Fatalf("Request %d failed: %v", i, err) - } - - body, _ := io.ReadAll(resp.Body) - _ = resp.Body.Close() - - var response Response - if err := sonic.Unmarshal(body, &response); err != nil { - t.Fatalf("Request %d: failed to unmarshal response: %v", i, err) - } - - // 验证每个响应都有时间戳 - if response.Timestamp == "" { - t.Errorf("Request %d: timestamp should not be empty", i) - } - } -} - -// TestTimestampFormat 测试时间戳格式（T036） -func TestTimestampFormat(t *testing.T) { - app := fiber.New() - app.Get("/test", func(c *fiber.Ctx) error { - return Success(c, nil) - }) - - req := httptest.NewRequest("GET", "/test", nil) - resp, err := app.Test(req) - if err != nil { - t.Fatalf("Failed to execute request: %v", err) - } - defer func() { _ = resp.Body.Close() }() - - body, _ := io.ReadAll(resp.Body) - var response Response - if err := sonic.Unmarshal(body, &response); err != nil { - t.Fatalf("Failed to unmarshal response: %v", err) - } - - // 验证是 RFC3339 格式 - parsedTime, err := time.Parse(time.RFC3339, response.Timestamp) - if err != nil { - t.Fatalf("Timestamp is not in RFC3339 format: %s, error: %v", response.Timestamp, err) - } - - // 验证时间戳是最近的（应该在最近 1 秒内） - now := time.Now() - diff := now.Sub(parsedTime) - if diff < 0 || diff > time.Second { - t.Errorf("Timestamp seems incorrect: %s (diff from now: %v)", response.Timestamp, diff) - } -} diff --git a/pkg/utils/excel_test.go b/pkg/utils/excel_test.go deleted file mode 100644 index dd402dd..0000000 --- a/pkg/utils/excel_test.go +++ /dev/null @@ -1,680 +0,0 @@ -package utils - -import ( - "path/filepath" - "testing" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - "github.com/xuri/excelize/v2" -) - -// createTestCardExcel 创建测试用的 ICCID+MSISDN Excel 文件 -func createTestCardExcel(t *testing.T, filename string, headers []string, rows [][]string) string { - t.Helper() - - tmpDir := t.TempDir() - filePath := filepath.Join(tmpDir, filename) - - f := excelize.NewFile() - defer func() { - if err := f.Close(); err != nil { - t.Logf("关闭Excel文件失败: %v", err) - } - }() - - sheetName := "Sheet1" - - // 写入表头 - if len(headers) > 0 { - for i, header := range headers { - cell, _ := excelize.CoordinatesToCellName(i+1, 1) - f.SetCellValue(sheetName, cell, header) - } - } - - // 写入数据行 - for rowIdx, row := range rows { - for colIdx, value := range row { - cell, _ := excelize.CoordinatesToCellName(colIdx+1, rowIdx+2) - f.SetCellValue(sheetName, cell, value) - } - } - - err := f.SaveAs(filePath) - require.NoError(t, err, "保存Excel文件失败") - - return filePath -} - -// createTestDeviceExcel 创建测试用的设备导入 Excel 文件 -func createTestDeviceExcel(t *testing.T, filename string, headers []string, rows [][]string) string { - t.Helper() - - tmpDir := t.TempDir() - filePath := filepath.Join(tmpDir, filename) - - f := excelize.NewFile() - defer func() { - if err := f.Close(); err != nil { - t.Logf("关闭Excel文件失败: %v", err) - } - }() - - sheetName := "Sheet1" - - // 写入表头 - for i, header := range headers { - cell, _ := excelize.CoordinatesToCellName(i+1, 1) - f.SetCellValue(sheetName, cell, header) - } - - // 写入数据行 - for rowIdx, row := range rows { - for colIdx, value := range row { - cell, _ := excelize.CoordinatesToCellName(colIdx+1, rowIdx+2) - f.SetCellValue(sheetName, cell, value) - } - } - - err := f.SaveAs(filePath) - require.NoError(t, err, "保存Excel文件失败") - - return filePath -} - -func TestParseCardExcel(t *testing.T) { - tests := []struct { - name string - headers []string - rows [][]string - wantCardCount int - wantErrorCount int - wantError bool - errorContains string - }{ - { - name: "标准双列格式-英文表头", - headers: []string{"ICCID", "MSISDN"}, - rows: [][]string{ - {"89860012345678901234", "13800000001"}, - {"89860012345678901235", "13800000002"}, - }, - wantCardCount: 2, - wantErrorCount: 0, - wantError: false, - }, - { - name: "中文表头", - headers: []string{"卡号", "接入号"}, - rows: [][]string{ - {"89860012345678901234", "13800000001"}, - {"89860012345678901235", "13800000002"}, - }, - wantCardCount: 2, - wantErrorCount: 0, - wantError: false, - }, - { - name: "混合中英文表头", - headers: []string{"ICCID", "手机号"}, - rows: [][]string{ - {"89860012345678901234", "13800000001"}, - }, - wantCardCount: 1, - wantErrorCount: 0, - wantError: false, - }, - { - name: "ICCID为空-应记录错误", - headers: []string{"ICCID", "MSISDN"}, - rows: [][]string{ - {"89860012345678901234", "13800000001"}, - {"", "13800000002"}, - }, - wantCardCount: 1, - wantErrorCount: 1, - wantError: false, - }, - { - name: "MSISDN为空-应记录错误", - headers: []string{"ICCID", "MSISDN"}, - rows: [][]string{ - {"89860012345678901234", "13800000001"}, - {"89860012345678901235", ""}, - }, - wantCardCount: 1, - wantErrorCount: 1, - wantError: false, - }, - { - name: "跳过空行", - headers: []string{"ICCID", "MSISDN"}, - rows: [][]string{ - {"89860012345678901234", "13800000001"}, - {"", ""}, - {"89860012345678901235", "13800000002"}, - }, - wantCardCount: 2, - wantErrorCount: 0, - wantError: false, - }, - { - name: "无表头-直接解析数据", - headers: nil, - rows: [][]string{ - {"89860012345678901234", "13800000001"}, - {"89860012345678901235", "13800000002"}, - }, - wantCardCount: 2, - wantErrorCount: 0, - wantError: false, - }, - { - name: "20位长数字无损", - headers: []string{"ICCID", "MSISDN"}, - rows: [][]string{ - {"12345678901234567890", "13800000001"}, - }, - wantCardCount: 1, - wantErrorCount: 0, - wantError: false, - }, - { - name: "首尾空格自动去除", - headers: []string{"ICCID", "MSISDN"}, - rows: [][]string{ - {" 89860012345678901234 ", " 13800000001 "}, - }, - wantCardCount: 1, - wantErrorCount: 0, - wantError: false, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - // 创建测试Excel文件 - filePath := createTestCardExcel(t, "test_cards.xlsx", tt.headers, tt.rows) - - // 解析Excel - result, err := ParseCardExcel(filePath) - - // 验证错误 - if tt.wantError { - require.Error(t, err) - if tt.errorContains != "" { - assert.Contains(t, err.Error(), tt.errorContains) - } - return - } - - require.NoError(t, err) - require.NotNil(t, result) - - // 验证结果 - assert.Equal(t, tt.wantCardCount, len(result.Cards), "卡数量不匹配") - assert.Equal(t, tt.wantErrorCount, len(result.ParseErrors), "错误数量不匹配") - - // 验证首尾空格被去除 - if tt.name == "首尾空格自动去除" && len(result.Cards) > 0 { - assert.Equal(t, "89860012345678901234", result.Cards[0].ICCID) - assert.Equal(t, "13800000001", result.Cards[0].MSISDN) - } - }) - } -} - -func TestParseCardExcel_ErrorScenarios(t *testing.T) { - tests := []struct { - name string - setupFunc func(t *testing.T) string - wantError bool - errorContains string - }{ - { - name: "文件不存在", - setupFunc: func(t *testing.T) string { - return "/nonexistent/file.xlsx" - }, - wantError: true, - errorContains: "打开Excel失败", - }, - { - name: "Excel无数据行", - setupFunc: func(t *testing.T) string { - tmpDir := t.TempDir() - filePath := filepath.Join(tmpDir, "empty.xlsx") - f := excelize.NewFile() - defer f.Close() - - // 只写入表头，无数据行 - f.SetCellValue("Sheet1", "A1", "ICCID") - f.SetCellValue("Sheet1", "B1", "MSISDN") - - f.SaveAs(filePath) - return filePath - }, - wantError: true, - errorContains: "Excel文件无数据行", - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - filePath := tt.setupFunc(t) - - result, err := ParseCardExcel(filePath) - - if tt.wantError { - require.Error(t, err) - if tt.errorContains != "" { - assert.Contains(t, err.Error(), tt.errorContains) - } - assert.Nil(t, result) - } else { - require.NoError(t, err) - } - }) - } -} - -func TestParseDeviceExcel(t *testing.T) { - tests := []struct { - name string - headers []string - rows [][]string - wantCount int - wantError bool - errorContains string - validateFunc func(t *testing.T, rows []DeviceRow) - }{ - { - name: "标准10列格式", - headers: []string{ - "device_no", "device_name", "device_model", "device_type", - "max_sim_slots", "manufacturer", "iccid_1", "iccid_2", "iccid_3", "iccid_4", - }, - rows: [][]string{ - {"DEV-001", "GPS追踪器A", "GT06N", "GPS Tracker", "4", "Concox", "89860012345678901234", "89860012345678901235", "", ""}, - {"DEV-002", "GPS追踪器B", "GT06N", "GPS Tracker", "4", "Concox", "89860012345678901236", "", "", ""}, - }, - wantCount: 2, - wantError: false, - validateFunc: func(t *testing.T, rows []DeviceRow) { - assert.Equal(t, "DEV-001", rows[0].DeviceNo) - assert.Equal(t, "GPS追踪器A", rows[0].DeviceName) - assert.Equal(t, 4, rows[0].MaxSimSlots) - assert.Equal(t, 2, len(rows[0].ICCIDs)) - - assert.Equal(t, "DEV-002", rows[1].DeviceNo) - assert.Equal(t, 1, len(rows[1].ICCIDs)) - }, - }, - { - name: "可选列缺失-应使用默认值", - headers: []string{ - "device_no", "iccid_1", - }, - rows: [][]string{ - {"DEV-003", "89860012345678901234"}, - }, - wantCount: 1, - wantError: false, - validateFunc: func(t *testing.T, rows []DeviceRow) { - assert.Equal(t, "DEV-003", rows[0].DeviceNo) - assert.Equal(t, 4, rows[0].MaxSimSlots, "max_sim_slots应默认为4") - assert.Equal(t, "", rows[0].DeviceName) - }, - }, - { - name: "ICCID列解析-全部4个插槽", - headers: []string{ - "device_no", "iccid_1", "iccid_2", "iccid_3", "iccid_4", - }, - rows: [][]string{ - {"DEV-004", "89860012345678901234", "89860012345678901235", "89860012345678901236", "89860012345678901237"}, - }, - wantCount: 1, - wantError: false, - validateFunc: func(t *testing.T, rows []DeviceRow) { - assert.Equal(t, 4, len(rows[0].ICCIDs)) - }, - }, - { - name: "跳过device_no为空的行", - headers: []string{ - "device_no", "iccid_1", - }, - rows: [][]string{ - {"DEV-005", "89860012345678901234"}, - {"", "89860012345678901235"}, - {"DEV-006", "89860012345678901236"}, - }, - wantCount: 2, - wantError: false, - validateFunc: func(t *testing.T, rows []DeviceRow) { - assert.Equal(t, "DEV-005", rows[0].DeviceNo) - assert.Equal(t, "DEV-006", rows[1].DeviceNo) - }, - }, - { - name: "max_sim_slots字符串转整数", - headers: []string{ - "device_no", "max_sim_slots", "iccid_1", - }, - rows: [][]string{ - {"DEV-007", "2", "89860012345678901234"}, - }, - wantCount: 1, - wantError: false, - validateFunc: func(t *testing.T, rows []DeviceRow) { - assert.Equal(t, 2, rows[0].MaxSimSlots) - }, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - // 创建测试Excel文件 - filePath := createTestDeviceExcel(t, "test_devices.xlsx", tt.headers, tt.rows) - - // 解析Excel - rows, count, err := ParseDeviceExcel(filePath) - - // 验证错误 - if tt.wantError { - require.Error(t, err) - if tt.errorContains != "" { - assert.Contains(t, err.Error(), tt.errorContains) - } - return - } - - require.NoError(t, err) - assert.Equal(t, tt.wantCount, count, "设备数量不匹配") - assert.Equal(t, tt.wantCount, len(rows), "返回的行数不匹配") - - // 执行自定义验证 - if tt.validateFunc != nil { - tt.validateFunc(t, rows) - } - }) - } -} - -func TestParseDeviceExcel_ErrorScenarios(t *testing.T) { - tests := []struct { - name string - setupFunc func(t *testing.T) string - wantError bool - errorContains string - }{ - { - name: "文件不存在", - setupFunc: func(t *testing.T) string { - return "/nonexistent/device.xlsx" - }, - wantError: true, - errorContains: "打开Excel失败", - }, - { - name: "Excel无数据行", - setupFunc: func(t *testing.T) string { - tmpDir := t.TempDir() - filePath := filepath.Join(tmpDir, "empty_device.xlsx") - f := excelize.NewFile() - defer f.Close() - - // 只写入表头，无数据行 - f.SetCellValue("Sheet1", "A1", "device_no") - - f.SaveAs(filePath) - return filePath - }, - wantError: true, - errorContains: "Excel文件无数据行", - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - filePath := tt.setupFunc(t) - - rows, count, err := ParseDeviceExcel(filePath) - - if tt.wantError { - require.Error(t, err) - if tt.errorContains != "" { - assert.Contains(t, err.Error(), tt.errorContains) - } - assert.Nil(t, rows) - assert.Equal(t, 0, count) - } else { - require.NoError(t, err) - } - }) - } -} - -func TestSelectSheet(t *testing.T) { - tests := []struct { - name string - setupFunc func() *excelize.File - expectedSheet string - }{ - { - name: "优先选择'导入数据'sheet", - setupFunc: func() *excelize.File { - f := excelize.NewFile() - f.NewSheet("Sheet1") - f.NewSheet("导入数据") - f.NewSheet("Sheet2") - return f - }, - expectedSheet: "导入数据", - }, - { - name: "无'导入数据'sheet-返回第一个", - setupFunc: func() *excelize.File { - f := excelize.NewFile() - return f - }, - expectedSheet: "Sheet1", - }, - { - name: "删除默认sheet后-返回空字符串", - setupFunc: func() *excelize.File { - f := excelize.NewFile() - // excelize创建新文件时会有默认的Sheet1，删除后仍会返回Sheet1 - // 这是库的行为，我们只验证没有崩溃 - f.DeleteSheet("Sheet1") - return f - }, - expectedSheet: "Sheet1", // excelize的默认行为 - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - f := tt.setupFunc() - defer f.Close() - - result := selectSheet(f) - assert.Equal(t, tt.expectedSheet, result) - }) - } -} - -func TestFindCardColumns(t *testing.T) { - tests := []struct { - name string - header []string - wantICCIDCol int - wantMSISDNCol int - }{ - { - name: "标准英文表头", - header: []string{"ICCID", "MSISDN"}, - wantICCIDCol: 0, - wantMSISDNCol: 1, - }, - { - name: "小写英文表头", - header: []string{"iccid", "msisdn"}, - wantICCIDCol: 0, - wantMSISDNCol: 1, - }, - { - name: "中文表头", - header: []string{"卡号", "接入号"}, - wantICCIDCol: 0, - wantMSISDNCol: 1, - }, - { - name: "混合表头", - header: []string{"ICCID", "手机号"}, - wantICCIDCol: 0, - wantMSISDNCol: 1, - }, - { - name: "表头顺序颠倒", - header: []string{"MSISDN", "ICCID"}, - wantICCIDCol: 1, - wantMSISDNCol: 0, - }, - { - name: "表头包含空格", - header: []string{" ICCID ", " MSISDN "}, - wantICCIDCol: 0, - wantMSISDNCol: 1, - }, - { - name: "无法识别的表头", - header: []string{"unknown1", "unknown2"}, - wantICCIDCol: -1, - wantMSISDNCol: -1, - }, - { - name: "只有ICCID列", - header: []string{"ICCID", "其他"}, - wantICCIDCol: 0, - wantMSISDNCol: -1, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - iccidCol, msisdnCol := findCardColumns(tt.header) - assert.Equal(t, tt.wantICCIDCol, iccidCol, "ICCID列索引不匹配") - assert.Equal(t, tt.wantMSISDNCol, msisdnCol, "MSISDN列索引不匹配") - }) - } -} - -func TestBuildDeviceColumnIndex(t *testing.T) { - tests := []struct { - name string - header []string - expectedIndex map[string]int - }{ - { - name: "标准10列表头", - header: []string{ - "device_no", "device_name", "device_model", "device_type", - "max_sim_slots", "manufacturer", "iccid_1", "iccid_2", "iccid_3", "iccid_4", - }, - expectedIndex: map[string]int{ - "device_no": 0, - "device_name": 1, - "device_model": 2, - "device_type": 3, - "max_sim_slots": 4, - "manufacturer": 5, - "iccid_1": 6, - "iccid_2": 7, - "iccid_3": 8, - "iccid_4": 9, - }, - }, - { - name: "顺序颠倒", - header: []string{"iccid_1", "device_no"}, - expectedIndex: map[string]int{ - "iccid_1": 0, - "device_no": 1, - "device_name": -1, - "device_model": -1, - "device_type": -1, - "max_sim_slots": -1, - "manufacturer": -1, - "iccid_2": -1, - "iccid_3": -1, - "iccid_4": -1, - }, - }, - { - name: "大写表头-能识别", - header: []string{"DEVICE_NO", "DEVICE_NAME"}, - expectedIndex: map[string]int{ - "device_no": 0, - "device_name": 1, - "device_model": -1, - "device_type": -1, - "max_sim_slots": -1, - "manufacturer": -1, - "iccid_1": -1, - "iccid_2": -1, - "iccid_3": -1, - "iccid_4": -1, - }, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - result := buildDeviceColumnIndex(tt.header) - assert.Equal(t, tt.expectedIndex, result) - }) - } -} - -// TestParseCardExcel_RealWorldScenario 测试真实场景 -func TestParseCardExcel_RealWorldScenario(t *testing.T) { - t.Run("100行数据性能测试", func(t *testing.T) { - // 生成100行测试数据 - headers := []string{"ICCID", "MSISDN"} - rows := make([][]string, 100) - for i := 0; i < 100; i++ { - iccid := "8986001234567890" + padLeft(i, 4) - msisdn := "1380000" + padLeft(i, 4) - rows[i] = []string{iccid, msisdn} - } - - filePath := createTestCardExcel(t, "large_cards.xlsx", headers, rows) - - result, err := ParseCardExcel(filePath) - require.NoError(t, err) - assert.Equal(t, 100, len(result.Cards)) - assert.Equal(t, 0, len(result.ParseErrors)) - }) -} - -// padLeft 左侧填充0 -func padLeft(num int, width int) string { - s := "" - for i := 0; i < width; i++ { - s += "0" - } - s += string(rune('0' + num%10)) - if num >= 10 { - s = s[:width-2] + string(rune('0'+num/10%10)) + string(rune('0'+num%10)) - } - if num >= 100 { - s = s[:width-3] + string(rune('0'+num/100%10)) + string(rune('0'+num/10%10)) + string(rune('0'+num%10)) - } - if num >= 1000 { - s = string(rune('0'+num/1000%10)) + string(rune('0'+num/100%10)) + string(rune('0'+num/10%10)) + string(rune('0'+num%10)) - } - return s -} diff --git a/pkg/validator/iccid_test.go b/pkg/validator/iccid_test.go deleted file mode 100644 index 182ecda..0000000 --- a/pkg/validator/iccid_test.go +++ /dev/null @@ -1,267 +0,0 @@ -package validator - -import ( - "testing" - - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/stretchr/testify/assert" -) - -func TestValidateICCID(t *testing.T) { - tests := []struct { - name string - iccid string - carrierType string - wantValid bool - wantMessage string - }{ - // 空值测试 - { - name: "空ICCID应该返回错误", - iccid: "", - carrierType: constants.CarrierCodeCMCC, - wantValid: false, - wantMessage: "ICCID 不能为空", - }, - - // 电信 ICCID 测试（19位） - { - name: "电信有效ICCID-19位数字", - iccid: "8986031234567890123", - carrierType: constants.CarrierCodeCTCC, - wantValid: true, - wantMessage: "", - }, - { - name: "电信ICCID-20位应该失败", - iccid: "89860312345678901234", - carrierType: constants.CarrierCodeCTCC, - wantValid: false, - wantMessage: "电信 ICCID 必须为 19 位", - }, - { - name: "电信ICCID-18位应该失败", - iccid: "898603123456789012", - carrierType: constants.CarrierCodeCTCC, - wantValid: false, - wantMessage: "电信 ICCID 必须为 19 位", - }, - - // 移动 ICCID 测试（20位） - { - name: "移动有效ICCID-20位数字", - iccid: "89860012345678901234", - carrierType: constants.CarrierCodeCMCC, - wantValid: true, - wantMessage: "", - }, - { - name: "移动有效ICCID-含字母", - iccid: "8986001234567890123A", - carrierType: constants.CarrierCodeCMCC, - wantValid: true, - wantMessage: "", - }, - { - name: "移动ICCID-19位应该失败", - iccid: "8986001234567890123", - carrierType: constants.CarrierCodeCMCC, - wantValid: false, - wantMessage: "该运营商 ICCID 必须为 20 位", - }, - - // 联通 ICCID 测试（20位） - { - name: "联通有效ICCID-20位数字", - iccid: "89860112345678901234", - carrierType: constants.CarrierCodeCUCC, - wantValid: true, - wantMessage: "", - }, - { - name: "联通ICCID-21位应该失败", - iccid: "898601123456789012345", - carrierType: constants.CarrierCodeCUCC, - wantValid: false, - wantMessage: "该运营商 ICCID 必须为 20 位", - }, - - // 广电 ICCID 测试（20位） - { - name: "广电有效ICCID-20位数字", - iccid: "89860412345678901234", - carrierType: constants.CarrierCodeCBN, - wantValid: true, - wantMessage: "", - }, - - // 特殊字符测试 - { - name: "ICCID包含特殊字符应该失败", - iccid: "8986001234567890123!", - carrierType: constants.CarrierCodeCMCC, - wantValid: false, - wantMessage: "ICCID 只能包含字母和数字", - }, - { - name: "ICCID包含空格应该失败", - iccid: "8986001234567890123 ", - carrierType: constants.CarrierCodeCMCC, - wantValid: false, - wantMessage: "ICCID 只能包含字母和数字", - }, - { - name: "ICCID包含中划线应该失败", - iccid: "8986001234-678901234", - carrierType: constants.CarrierCodeCMCC, - wantValid: false, - wantMessage: "ICCID 只能包含字母和数字", - }, - - // 大小写字母测试 - { - name: "ICCID包含小写字母有效", - iccid: "8986001234567890123a", - carrierType: constants.CarrierCodeCMCC, - wantValid: true, - wantMessage: "", - }, - { - name: "ICCID包含大写字母有效", - iccid: "8986001234567890123A", - carrierType: constants.CarrierCodeCMCC, - wantValid: true, - wantMessage: "", - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - result := ValidateICCID(tt.iccid, tt.carrierType) - assert.Equal(t, tt.wantValid, result.Valid, "Valid 不匹配") - assert.Equal(t, tt.wantMessage, result.Message, "Message 不匹配") - }) - } -} - -func TestValidateICCIDWithoutCarrier(t *testing.T) { - tests := []struct { - name string - iccid string - wantValid bool - wantMessage string - }{ - // 空值测试 - { - name: "空ICCID应该返回错误", - iccid: "", - wantValid: false, - wantMessage: "ICCID 不能为空", - }, - - // 有效长度测试（19位或20位） - { - name: "19位ICCID有效", - iccid: "8986031234567890123", - wantValid: true, - wantMessage: "", - }, - { - name: "20位ICCID有效", - iccid: "89860012345678901234", - wantValid: true, - wantMessage: "", - }, - - // 无效长度测试 - { - name: "18位ICCID无效", - iccid: "898603123456789012", - wantValid: false, - wantMessage: "ICCID 长度必须为 19 位或 20 位", - }, - { - name: "21位ICCID无效", - iccid: "898600123456789012345", - wantValid: false, - wantMessage: "ICCID 长度必须为 19 位或 20 位", - }, - - // 特殊字符测试 - { - name: "包含特殊字符应该失败", - iccid: "8986001234567890123!", - wantValid: false, - wantMessage: "ICCID 只能包含字母和数字", - }, - - // 字母数字混合测试 - { - name: "20位含字母有效", - iccid: "8986001234567890AB12", - wantValid: true, - wantMessage: "", - }, - { - name: "19位含字母有效", - iccid: "898603123456789AB12", - wantValid: true, - wantMessage: "", - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - result := ValidateICCIDWithoutCarrier(tt.iccid) - assert.Equal(t, tt.wantValid, result.Valid, "Valid 不匹配") - assert.Equal(t, tt.wantMessage, result.Message, "Message 不匹配") - }) - } -} - -// TestGetExpectedICCIDLength 测试获取期望的 ICCID 长度 -func TestGetExpectedICCIDLength(t *testing.T) { - tests := []struct { - name string - carrierType string - expectedLength int - }{ - { - name: "电信应该返回19", - carrierType: constants.CarrierCodeCTCC, - expectedLength: 19, - }, - { - name: "移动应该返回20", - carrierType: constants.CarrierCodeCMCC, - expectedLength: 20, - }, - { - name: "联通应该返回20", - carrierType: constants.CarrierCodeCUCC, - expectedLength: 20, - }, - { - name: "广电应该返回20", - carrierType: constants.CarrierCodeCBN, - expectedLength: 20, - }, - { - name: "未知运营商应该返回20", - carrierType: "UNKNOWN", - expectedLength: 20, - }, - { - name: "空运营商应该返回20", - carrierType: "", - expectedLength: 20, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - result := getExpectedICCIDLength(tt.carrierType) - assert.Equal(t, tt.expectedLength, result) - }) - } -} diff --git a/pkg/validator/token_bench_test.go b/pkg/validator/token_bench_test.go deleted file mode 100644 index d7af7ee..0000000 --- a/pkg/validator/token_bench_test.go +++ /dev/null @@ -1,89 +0,0 @@ -package validator - -import ( - "context" - "testing" - - "github.com/redis/go-redis/v9" - "github.com/stretchr/testify/mock" - "go.uber.org/zap" - - "github.com/break/junhong_cmp_fiber/pkg/constants" -) - -// BenchmarkTokenValidator_Validate 测试令牌验证性能 -func BenchmarkTokenValidator_Validate(b *testing.B) { - logger := zap.NewNop() - - b.Run("ValidToken", func(b *testing.B) { - mockRedis := new(MockRedisClient) - validator := NewTokenValidator(mockRedis, logger) - - // Mock Ping 成功 - pingCmd := redis.NewStatusCmd(context.Background()) - pingCmd.SetVal("PONG") - mockRedis.On("Ping", mock.Anything).Return(pingCmd) - - // Mock Get 返回用户 ID - getCmd := redis.NewStringCmd(context.Background()) - getCmd.SetVal("user_123") - mockRedis.On("Get", mock.Anything, constants.RedisAuthTokenKey("test-token")).Return(getCmd) - - b.ResetTimer() - for i := 0; i < b.N; i++ { - _, _ = validator.Validate("test-token") - } - }) - - b.Run("InvalidToken", func(b *testing.B) { - mockRedis := new(MockRedisClient) - validator := NewTokenValidator(mockRedis, logger) - - // Mock Ping 成功 - pingCmd := redis.NewStatusCmd(context.Background()) - pingCmd.SetVal("PONG") - mockRedis.On("Ping", mock.Anything).Return(pingCmd) - - // Mock Get 返回 redis.Nil（令牌不存在） - getCmd := redis.NewStringCmd(context.Background()) - getCmd.SetErr(redis.Nil) - mockRedis.On("Get", mock.Anything, constants.RedisAuthTokenKey("invalid-token")).Return(getCmd) - - b.ResetTimer() - for i := 0; i < b.N; i++ { - _, _ = validator.Validate("invalid-token") - } - }) - - b.Run("RedisUnavailable", func(b *testing.B) { - mockRedis := new(MockRedisClient) - validator := NewTokenValidator(mockRedis, logger) - - // Mock Ping 失败 - pingCmd := redis.NewStatusCmd(context.Background()) - pingCmd.SetErr(context.DeadlineExceeded) - mockRedis.On("Ping", mock.Anything).Return(pingCmd) - - b.ResetTimer() - for i := 0; i < b.N; i++ { - _, _ = validator.Validate("test-token") - } - }) -} - -// BenchmarkTokenValidator_IsAvailable 测试可用性检查性能 -func BenchmarkTokenValidator_IsAvailable(b *testing.B) { - logger := zap.NewNop() - mockRedis := new(MockRedisClient) - validator := NewTokenValidator(mockRedis, logger) - - // Mock Ping 成功 - pingCmd := redis.NewStatusCmd(context.Background()) - pingCmd.SetVal("PONG") - mockRedis.On("Ping", mock.Anything).Return(pingCmd) - - b.ResetTimer() - for i := 0; i < b.N; i++ { - _ = validator.IsAvailable() - } -} diff --git a/pkg/validator/token_test.go b/pkg/validator/token_test.go deleted file mode 100644 index c6c9879..0000000 --- a/pkg/validator/token_test.go +++ /dev/null @@ -1,263 +0,0 @@ -package validator - -import ( - "context" - "testing" - - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/pkg/errors" - "github.com/redis/go-redis/v9" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/mock" - "go.uber.org/zap" -) - -// MockRedisClient is a mock implementation of RedisClient interface -type MockRedisClient struct { - mock.Mock -} - -func (m *MockRedisClient) Ping(ctx context.Context) *redis.StatusCmd { - args := m.Called(ctx) - return args.Get(0).(*redis.StatusCmd) -} - -func (m *MockRedisClient) Get(ctx context.Context, key string) *redis.StringCmd { - args := m.Called(ctx, key) - return args.Get(0).(*redis.StringCmd) -} - -// TestTokenValidator_Validate tests the token validation functionality -func TestTokenValidator_Validate(t *testing.T) { - tests := []struct { - name string - token string - setupMock func(*MockRedisClient) - wantUser string - wantErr bool - errType error - }{ - { - name: "valid token", - token: "valid-token-123", - setupMock: func(m *MockRedisClient) { - // Mock Ping success - pingCmd := redis.NewStatusCmd(context.Background()) - pingCmd.SetVal("PONG") - m.On("Ping", mock.Anything).Return(pingCmd) - - // Mock Get success - getCmd := redis.NewStringCmd(context.Background()) - getCmd.SetVal("user-789") - m.On("Get", mock.Anything, constants.RedisAuthTokenKey("valid-token-123")).Return(getCmd) - }, - wantUser: "user-789", - wantErr: false, - }, - { - name: "expired or invalid token (redis.Nil)", - token: "expired-token", - setupMock: func(m *MockRedisClient) { - // Mock Ping success - pingCmd := redis.NewStatusCmd(context.Background()) - pingCmd.SetVal("PONG") - m.On("Ping", mock.Anything).Return(pingCmd) - - // Mock Get returns redis.Nil (key not found) - getCmd := redis.NewStringCmd(context.Background()) - getCmd.SetErr(redis.Nil) - m.On("Get", mock.Anything, constants.RedisAuthTokenKey("expired-token")).Return(getCmd) - }, - wantUser: "", - wantErr: true, - errType: errors.ErrInvalidToken, - }, - { - name: "Redis unavailable (fail closed)", - token: "any-token", - setupMock: func(m *MockRedisClient) { - // Mock Ping failure - pingCmd := redis.NewStatusCmd(context.Background()) - pingCmd.SetErr(context.DeadlineExceeded) - m.On("Ping", mock.Anything).Return(pingCmd) - }, - wantUser: "", - wantErr: true, - errType: errors.ErrRedisUnavailable, - }, - { - name: "context timeout in Redis operations", - token: "timeout-token", - setupMock: func(m *MockRedisClient) { - // Mock Ping success - pingCmd := redis.NewStatusCmd(context.Background()) - pingCmd.SetVal("PONG") - m.On("Ping", mock.Anything).Return(pingCmd) - - // Mock Get with context timeout error - getCmd := redis.NewStringCmd(context.Background()) - getCmd.SetErr(context.DeadlineExceeded) - m.On("Get", mock.Anything, constants.RedisAuthTokenKey("timeout-token")).Return(getCmd) - }, - wantUser: "", - wantErr: true, - }, - { - name: "empty token", - token: "", - setupMock: func(m *MockRedisClient) { - // Mock Ping success - pingCmd := redis.NewStatusCmd(context.Background()) - pingCmd.SetVal("PONG") - m.On("Ping", mock.Anything).Return(pingCmd) - - // Mock Get returns redis.Nil for empty token - getCmd := redis.NewStringCmd(context.Background()) - getCmd.SetErr(redis.Nil) - m.On("Get", mock.Anything, constants.RedisAuthTokenKey("")).Return(getCmd) - }, - wantUser: "", - wantErr: true, - errType: errors.ErrInvalidToken, - }, - { - name: "Redis returns empty user ID", - token: "invalid-user-token", - setupMock: func(m *MockRedisClient) { - // Mock Ping success - pingCmd := redis.NewStatusCmd(context.Background()) - pingCmd.SetVal("PONG") - m.On("Ping", mock.Anything).Return(pingCmd) - - // Mock Get returns empty string - getCmd := redis.NewStringCmd(context.Background()) - getCmd.SetVal("") - m.On("Get", mock.Anything, constants.RedisAuthTokenKey("invalid-user-token")).Return(getCmd) - }, - wantUser: "", - wantErr: true, - errType: errors.ErrInvalidToken, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - // Create mock Redis client - mockRedis := new(MockRedisClient) - if tt.setupMock != nil { - tt.setupMock(mockRedis) - } - - // Create validator with mock - validator := NewTokenValidator(mockRedis, zap.NewNop()) - - // Call Validate - userID, err := validator.Validate(tt.token) - - // Assert results - if tt.wantErr { - assert.Error(t, err, "Expected error for test case: %s", tt.name) - if tt.errType != nil { - assert.ErrorIs(t, err, tt.errType, "Expected specific error type for test case: %s", tt.name) - } - } else { - assert.NoError(t, err, "Expected no error for test case: %s", tt.name) - } - - assert.Equal(t, tt.wantUser, userID, "User ID mismatch for test case: %s", tt.name) - - // Assert all expectations were met - mockRedis.AssertExpectations(t) - }) - } -} - -// TestTokenValidator_IsAvailable tests the Redis availability check -func TestTokenValidator_IsAvailable(t *testing.T) { - tests := []struct { - name string - setupMock func(*MockRedisClient) - want bool - }{ - { - name: "Redis is available", - setupMock: func(m *MockRedisClient) { - pingCmd := redis.NewStatusCmd(context.Background()) - pingCmd.SetVal("PONG") - m.On("Ping", mock.Anything).Return(pingCmd) - }, - want: true, - }, - { - name: "Redis is unavailable", - setupMock: func(m *MockRedisClient) { - pingCmd := redis.NewStatusCmd(context.Background()) - pingCmd.SetErr(context.DeadlineExceeded) - m.On("Ping", mock.Anything).Return(pingCmd) - }, - want: false, - }, - { - name: "Redis connection refused", - setupMock: func(m *MockRedisClient) { - pingCmd := redis.NewStatusCmd(context.Background()) - pingCmd.SetErr(assert.AnError) - m.On("Ping", mock.Anything).Return(pingCmd) - }, - want: false, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - // Create mock Redis client - mockRedis := new(MockRedisClient) - if tt.setupMock != nil { - tt.setupMock(mockRedis) - } - - // Create validator with mock - validator := NewTokenValidator(mockRedis, zap.NewNop()) - - // Call IsAvailable - available := validator.IsAvailable() - - // Assert result - assert.Equal(t, tt.want, available, "Availability mismatch for test case: %s", tt.name) - - // Assert all expectations were met - mockRedis.AssertExpectations(t) - }) - } -} - -// TestTokenValidator_ValidateWithRealTimeout tests with actual context timeout -func TestTokenValidator_ValidateWithRealTimeout(t *testing.T) { - // This test verifies that the validator uses a 50ms timeout internally - // We test this by simulating a timeout error from Redis - - mockRedis := new(MockRedisClient) - - // Mock Ping success - pingCmd := redis.NewStatusCmd(context.Background()) - pingCmd.SetVal("PONG") - mockRedis.On("Ping", mock.Anything).Return(pingCmd) - - // Mock Get with timeout error - getCmd := redis.NewStringCmd(context.Background()) - getCmd.SetErr(context.DeadlineExceeded) - mockRedis.On("Get", mock.Anything, mock.Anything).Return(getCmd) - - // Create validator with mock - validator := NewTokenValidator(mockRedis, zap.NewNop()) - - // Call Validate (should return timeout error) - userID, err := validator.Validate("timeout-token") - - // Should get timeout error - assert.Error(t, err) - assert.Equal(t, "", userID) - assert.ErrorIs(t, err, context.DeadlineExceeded) - - mockRedis.AssertExpectations(t) -} diff --git a/pkg/wechat/mock_test.go b/pkg/wechat/mock_test.go deleted file mode 100644 index 25f83f3..0000000 --- a/pkg/wechat/mock_test.go +++ /dev/null @@ -1,91 +0,0 @@ -package wechat - -import ( - "context" - "net/http" -) - -// MockOfficialAccountService Mock 微信公众号服务（实现 OfficialAccountServiceInterface） -type MockOfficialAccountService struct { - GetUserInfoFn func(ctx context.Context, code string) (openID, unionID string, err error) - GetUserInfoDetailedFn func(ctx context.Context, code string) (*UserInfo, error) - GetUserInfoByTokenFn func(ctx context.Context, accessToken, openID string) (*UserInfo, error) -} - -// GetUserInfo Mock 实现 -func (m *MockOfficialAccountService) GetUserInfo(ctx context.Context, code string) (openID, unionID string, err error) { - if m.GetUserInfoFn != nil { - return m.GetUserInfoFn(ctx, code) - } - return "", "", nil -} - -// GetUserInfoDetailed Mock 实现 -func (m *MockOfficialAccountService) GetUserInfoDetailed(ctx context.Context, code string) (*UserInfo, error) { - if m.GetUserInfoDetailedFn != nil { - return m.GetUserInfoDetailedFn(ctx, code) - } - return nil, nil -} - -// GetUserInfoByToken Mock 实现 -func (m *MockOfficialAccountService) GetUserInfoByToken(ctx context.Context, accessToken, openID string) (*UserInfo, error) { - if m.GetUserInfoByTokenFn != nil { - return m.GetUserInfoByTokenFn(ctx, accessToken, openID) - } - return nil, nil -} - -// MockPaymentService Mock 微信支付服务（实现 PaymentServiceInterface） -type MockPaymentService struct { - CreateJSAPIOrderFn func(ctx context.Context, orderNo, description, openID string, amount int) (*JSAPIPayResult, error) - CreateH5OrderFn func(ctx context.Context, orderNo, description string, amount int, sceneInfo *H5SceneInfo) (*H5PayResult, error) - QueryOrderFn func(ctx context.Context, orderNo string) (*OrderInfo, error) - CloseOrderFn func(ctx context.Context, orderNo string) error - HandlePaymentNotifyFn func(r *http.Request, callback PaymentNotifyCallback) (*http.Response, error) -} - -// CreateJSAPIOrder Mock 实现 -func (m *MockPaymentService) CreateJSAPIOrder(ctx context.Context, orderNo, description, openID string, amount int) (*JSAPIPayResult, error) { - if m.CreateJSAPIOrderFn != nil { - return m.CreateJSAPIOrderFn(ctx, orderNo, description, openID, amount) - } - return nil, nil -} - -// CreateH5Order Mock 实现 -func (m *MockPaymentService) CreateH5Order(ctx context.Context, orderNo, description string, amount int, sceneInfo *H5SceneInfo) (*H5PayResult, error) { - if m.CreateH5OrderFn != nil { - return m.CreateH5OrderFn(ctx, orderNo, description, amount, sceneInfo) - } - return nil, nil -} - -// QueryOrder Mock 实现 -func (m *MockPaymentService) QueryOrder(ctx context.Context, orderNo string) (*OrderInfo, error) { - if m.QueryOrderFn != nil { - return m.QueryOrderFn(ctx, orderNo) - } - return nil, nil -} - -// CloseOrder Mock 实现 -func (m *MockPaymentService) CloseOrder(ctx context.Context, orderNo string) error { - if m.CloseOrderFn != nil { - return m.CloseOrderFn(ctx, orderNo) - } - return nil -} - -// HandlePaymentNotify Mock 实现（简化版） -func (m *MockPaymentService) HandlePaymentNotify(r *http.Request, callback PaymentNotifyCallback) (*http.Response, error) { - if m.HandlePaymentNotifyFn != nil { - return m.HandlePaymentNotifyFn(r, callback) - } - return &http.Response{StatusCode: 200}, nil -} - -var ( - _ OfficialAccountServiceInterface = (*MockOfficialAccountService)(nil) - _ PaymentServiceInterface = (*MockPaymentService)(nil) -) diff --git a/pkg/wechat/official_account_test.go b/pkg/wechat/official_account_test.go deleted file mode 100644 index dfb38d3..0000000 --- a/pkg/wechat/official_account_test.go +++ /dev/null @@ -1,76 +0,0 @@ -package wechat - -import ( - "context" - "testing" - - "github.com/break/junhong_cmp_fiber/pkg/errors" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - "go.uber.org/zap" -) - -func TestOfficialAccountService_ParameterValidation(t *testing.T) { - logger := zap.NewNop() - mockSvc := &MockOfficialAccountService{} - - t.Run("GetUserInfo_空授权码", func(t *testing.T) { - mockSvc.GetUserInfoFn = func(ctx context.Context, code string) (string, string, error) { - if code == "" { - return "", "", errors.New(errors.CodeInvalidParam, "授权码不能为空") - } - return "openid_123", "unionid_123", nil - } - - openID, unionID, err := mockSvc.GetUserInfo(context.Background(), "") - require.Error(t, err) - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeInvalidParam, appErr.Code) - assert.Empty(t, openID) - assert.Empty(t, unionID) - }) - - t.Run("GetUserInfo_成功", func(t *testing.T) { - mockSvc.GetUserInfoFn = func(ctx context.Context, code string) (string, string, error) { - return "openid_123", "unionid_123", nil - } - - openID, unionID, err := mockSvc.GetUserInfo(context.Background(), "valid_code") - require.NoError(t, err) - assert.Equal(t, "openid_123", openID) - assert.Equal(t, "unionid_123", unionID) - }) - - t.Run("GetUserInfoDetailed_空授权码", func(t *testing.T) { - mockSvc.GetUserInfoDetailedFn = func(ctx context.Context, code string) (*UserInfo, error) { - if code == "" { - return nil, errors.New(errors.CodeInvalidParam, "授权码不能为空") - } - return &UserInfo{OpenID: "openid_123"}, nil - } - - userInfo, err := mockSvc.GetUserInfoDetailed(context.Background(), "") - require.Error(t, err) - assert.Nil(t, userInfo) - }) - - t.Run("GetUserInfoByToken_空参数", func(t *testing.T) { - mockSvc.GetUserInfoByTokenFn = func(ctx context.Context, accessToken, openID string) (*UserInfo, error) { - if accessToken == "" || openID == "" { - return nil, errors.New(errors.CodeInvalidParam, "AccessToken 和 OpenID 不能为空") - } - return &UserInfo{OpenID: openID}, nil - } - - userInfo, err := mockSvc.GetUserInfoByToken(context.Background(), "", "openid_123") - require.Error(t, err) - assert.Nil(t, userInfo) - - userInfo, err = mockSvc.GetUserInfoByToken(context.Background(), "token_123", "") - require.Error(t, err) - assert.Nil(t, userInfo) - }) - - _ = logger -} diff --git a/pkg/wechat/payment_test.go b/pkg/wechat/payment_test.go deleted file mode 100644 index af3e1ed..0000000 --- a/pkg/wechat/payment_test.go +++ /dev/null @@ -1,93 +0,0 @@ -package wechat - -import ( - "context" - "testing" - - "github.com/break/junhong_cmp_fiber/pkg/errors" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - "go.uber.org/zap" -) - -func TestPaymentService_ParameterValidation(t *testing.T) { - logger := zap.NewNop() - mockSvc := &MockPaymentService{} - - t.Run("CreateJSAPIOrder_参数验证", func(t *testing.T) { - mockSvc.CreateJSAPIOrderFn = func(ctx context.Context, orderNo, description, openID string, amount int) (*JSAPIPayResult, error) { - if orderNo == "" || openID == "" || amount <= 0 { - return nil, errors.New(errors.CodeInvalidParam, "订单号、OpenID 和金额不能为空") - } - return &JSAPIPayResult{PrepayID: "prepay_id_123"}, nil - } - - _, err := mockSvc.CreateJSAPIOrder(context.Background(), "", "desc", "openid", 100) - require.Error(t, err) - - _, err = mockSvc.CreateJSAPIOrder(context.Background(), "order_123", "desc", "", 100) - require.Error(t, err) - - _, err = mockSvc.CreateJSAPIOrder(context.Background(), "order_123", "desc", "openid", 0) - require.Error(t, err) - - result, err := mockSvc.CreateJSAPIOrder(context.Background(), "order_123", "desc", "openid", 100) - require.NoError(t, err) - assert.NotNil(t, result) - assert.Equal(t, "prepay_id_123", result.PrepayID) - }) - - t.Run("CreateH5Order_参数验证", func(t *testing.T) { - mockSvc.CreateH5OrderFn = func(ctx context.Context, orderNo, description string, amount int, sceneInfo *H5SceneInfo) (*H5PayResult, error) { - if orderNo == "" || amount <= 0 { - return nil, errors.New(errors.CodeInvalidParam, "订单号和金额不能为空") - } - return &H5PayResult{H5URL: "https://wx.tenpay.com/..."}, nil - } - - _, err := mockSvc.CreateH5Order(context.Background(), "", "desc", 100, nil) - require.Error(t, err) - - _, err = mockSvc.CreateH5Order(context.Background(), "order_123", "desc", 0, nil) - require.Error(t, err) - - result, err := mockSvc.CreateH5Order(context.Background(), "order_123", "desc", 100, nil) - require.NoError(t, err) - assert.NotNil(t, result) - assert.NotEmpty(t, result.H5URL) - }) - - t.Run("QueryOrder_参数验证", func(t *testing.T) { - mockSvc.QueryOrderFn = func(ctx context.Context, orderNo string) (*OrderInfo, error) { - if orderNo == "" { - return nil, errors.New(errors.CodeInvalidParam, "订单号不能为空") - } - return &OrderInfo{OutTradeNo: orderNo}, nil - } - - _, err := mockSvc.QueryOrder(context.Background(), "") - require.Error(t, err) - - result, err := mockSvc.QueryOrder(context.Background(), "order_123") - require.NoError(t, err) - assert.NotNil(t, result) - assert.Equal(t, "order_123", result.OutTradeNo) - }) - - t.Run("CloseOrder_参数验证", func(t *testing.T) { - mockSvc.CloseOrderFn = func(ctx context.Context, orderNo string) error { - if orderNo == "" { - return errors.New(errors.CodeInvalidParam, "订单号不能为空") - } - return nil - } - - err := mockSvc.CloseOrder(context.Background(), "") - require.Error(t, err) - - err = mockSvc.CloseOrder(context.Background(), "order_123") - require.NoError(t, err) - }) - - _ = logger -} diff --git a/tests/acceptance/README.md b/tests/acceptance/README.md deleted file mode 100644 index f33ef0d..0000000 --- a/tests/acceptance/README.md +++ /dev/null @@ -1,322 +0,0 @@ -# 验收测试 (Acceptance Tests) - -验收测试验证单个 API 的契约：给定输入，期望输出。 - -## 核心原则 - -1. **来源于 Spec**：每个测试用例对应 Spec 中的一个 Scenario -2. **测试先于实现**：在功能实现前生成，预期全部 FAIL -3. **契约验证**：验证 API 的输入输出契约，不测试内部实现 -4. **必须有破坏点**：每个测试必须注释说明什么代码变更会导致失败 - -## 目录结构 - -``` -tests/acceptance/ -├── README.md # 本文件 -├── account_acceptance_test.go # 账号管理验收测试 -├── package_acceptance_test.go # 套餐管理验收测试 -├── shop_package_acceptance_test.go # 店铺套餐分配验收测试 -└── ... -``` - -## 测试模板 - -```go -package acceptance - -import ( - "testing" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - - "junhong_cmp_fiber/tests/testutils" -) - -// ============================================================ -// 验收测试：{功能名称} -// 来源：openspec/changes/{change-name}/specs/{capability}/spec.md -// ============================================================ - -func Test{Capability}_Acceptance(t *testing.T) { - env := testutils.NewIntegrationTestEnv(t) - - // ------------------------------------------------------------ - // Scenario: {场景名称} - // GIVEN: {前置条件} - // WHEN: {触发动作} - // THEN: {预期结果} - // AND: {额外验证} - // - // 破坏点：{描述什么代码变更会导致此测试失败} - // ------------------------------------------------------------ - t.Run("Scenario_{场景名称}", func(t *testing.T) { - // GIVEN: 设置前置条件 - client := env.AsSuperAdmin() - - // WHEN: 执行操作 - body := map[string]interface{}{ - // 请求体 - } - resp, err := client.Request("POST", "/api/admin/xxx", body) - require.NoError(t, err) - - // THEN: 验证结果 - assert.Equal(t, 200, resp.StatusCode) - - var result map[string]interface{} - err = resp.JSON(&result) - require.NoError(t, err) - assert.Equal(t, 0, int(result["code"].(float64))) - - // AND: 额外验证（如数据库状态） - // ... - }) -} -``` - -## 测试分类 - -### 正常场景 (Happy Path) - -```go -t.Run("Scenario_成功创建资源", func(t *testing.T) { - // 测试正常流程 -}) -``` - -### 参数校验 - -```go -t.Run("Scenario_参数缺失返回400", func(t *testing.T) { - // 测试缺少必填参数 -}) - -t.Run("Scenario_参数格式错误返回400", func(t *testing.T) { - // 测试参数格式不符合要求 -}) -``` - -### 权限校验 - -```go -t.Run("Scenario_无权限返回403", func(t *testing.T) { - // 测试权限不足的情况 -}) - -t.Run("Scenario_跨店铺访问返回403", func(t *testing.T) { - // 测试越权访问 -}) -``` - -### 业务规则 - -```go -t.Run("Scenario_重复创建返回409", func(t *testing.T) { - // 测试业务规则冲突 -}) - -t.Run("Scenario_删除已使用资源返回400", func(t *testing.T) { - // 测试业务规则限制 -}) -``` - -## 破坏点注释规范 - -每个测试必须包含"破坏点"注释，说明什么代码变更会导致测试失败： - -```go -// 破坏点：如果删除 handler.Create 中的 store.Create 调用，此测试将失败 -// 破坏点：如果移除参数校验中的 name 必填检查，此测试将失败 -// 破坏点：如果响应不包含创建的资源 ID，此测试将失败 -// 破坏点：如果删除权限检查中间件，此测试将失败 -``` - -**为什么需要破坏点**： -1. 证明测试真正验证了功能 -2. 帮助理解测试意图 -3. 重构时快速定位影响 - -## Table-Driven 模式 - -对于同一 API 的多个场景，使用 table-driven 模式： - -```go -func TestPackage_Create_Validation(t *testing.T) { - env := testutils.NewIntegrationTestEnv(t) - - tests := []struct { - name string - body map[string]interface{} - expectedStatus int - expectedCode int - breakpoint string - }{ - { - name: "名称为空", - body: map[string]interface{}{ - "name": "", - "price": 9900, - }, - expectedStatus: 400, - expectedCode: 4000, // CodeInvalidParam - breakpoint: "移除 name 必填校验", - }, - { - name: "价格为负", - body: map[string]interface{}{ - "name": "测试套餐", - "price": -100, - }, - expectedStatus: 400, - expectedCode: 4000, - breakpoint: "移除 price >= 0 校验", - }, - { - name: "时长为0", - body: map[string]interface{}{ - "name": "测试套餐", - "price": 9900, - "duration": 0, - }, - expectedStatus: 400, - expectedCode: 4000, - breakpoint: "移除 duration > 0 校验", - }, - } - - for _, tt := range tests { - t.Run("Scenario_"+tt.name, func(t *testing.T) { - // 破坏点: {tt.breakpoint} - client := env.AsSuperAdmin() - - resp, err := client.Request("POST", "/api/admin/packages", tt.body) - require.NoError(t, err) - - assert.Equal(t, tt.expectedStatus, resp.StatusCode) - - var result map[string]interface{} - err = resp.JSON(&result) - require.NoError(t, err) - assert.Equal(t, tt.expectedCode, int(result["code"].(float64))) - }) - } -} -``` - -## 运行测试 - -```bash -# 运行所有验收测试 -source .env.local && go test -v ./tests/acceptance/... - -# 运行特定功能的验收测试 -source .env.local && go test -v ./tests/acceptance/... -run TestPackage - -# 运行特定场景 -source .env.local && go test -v ./tests/acceptance/... -run "Scenario_成功创建" -``` - -## 测试环境 - -验收测试使用 `IntegrationTestEnv`，提供： - -- **事务隔离**：每个测试在独立事务中运行，自动回滚 -- **Redis 清理**：测试前自动清理相关 Redis 键 -- **身份切换**：支持不同角色的请求 - -```go -env := testutils.NewIntegrationTestEnv(t) - -// 以超级管理员身份请求 -env.AsSuperAdmin().Request("GET", "/api/admin/xxx", nil) - -// 以平台用户身份请求 -env.AsPlatformUser(accountID).Request("GET", "/api/admin/xxx", nil) - -// 以代理商身份请求 -env.AsShopAgent(shopID).Request("GET", "/api/admin/xxx", nil) - -// 以企业用户身份请求 -env.AsEnterprise(enterpriseID).Request("GET", "/api/admin/xxx", nil) -``` - -## 与 Spec 的对应关系 - -```markdown -# Spec 中的 Scenario - -#### Scenario: 成功创建套餐 -- **GIVEN** 用户已登录且有创建权限 -- **WHEN** POST /api/admin/packages with valid data -- **THEN** 返回 201 和套餐详情 -- **AND** 数据库中存在该套餐记录 -``` - -对应测试： - -```go -// 直接从 Spec Scenario 转换 -t.Run("Scenario_成功创建套餐", func(t *testing.T) { - // GIVEN: 用户已登录且有创建权限 - client := env.AsSuperAdmin() - - // WHEN: POST /api/admin/packages with valid data - resp, err := client.Request("POST", "/api/admin/packages", validBody) - - // THEN: 返回 201 和套餐详情 - assert.Equal(t, 201, resp.StatusCode) - - // AND: 数据库中存在该套餐记录 - // 验证数据库状态 -}) -``` - -## 常见问题 - -### Q: 验收测试和集成测试的区别？ - -| 方面 | 验收测试 | 集成测试 | -|------|---------|---------| -| 来源 | Spec Scenario | 开发者编写 | -| 目的 | 验证 API 契约 | 验证系统集成 | -| 粒度 | 单 API | 可能涉及多 API | -| 时机 | 实现前生成 | 实现后编写 | - -### Q: 测试 PASS 了但功能还没实现？ - -说明测试写得太弱。检查： -1. 是否验证了响应状态码 -2. 是否验证了响应体结构 -3. 是否验证了数据库状态变化 -4. 破坏点是否准确 - -### Q: 如何处理需要前置数据的测试？ - -在 GIVEN 阶段创建必要的前置数据： - -```go -t.Run("Scenario_删除已分配的套餐失败", func(t *testing.T) { - // GIVEN: 存在一个已分配给店铺的套餐 - client := env.AsSuperAdmin() - - // 创建套餐 - createResp, _ := client.Request("POST", "/api/admin/packages", packageBody) - var createResult map[string]interface{} - createResp.JSON(&createResult) - packageID := uint(createResult["data"].(map[string]interface{})["id"].(float64)) - - // 分配给店铺 - client.Request("POST", "/api/admin/shop-packages", map[string]interface{}{ - "package_id": packageID, - "shop_id": 1, - }) - - // WHEN: 尝试删除套餐 - resp, _ := client.Request("DELETE", fmt.Sprintf("/api/admin/packages/%d", packageID), nil) - - // THEN: 返回 400 - assert.Equal(t, 400, resp.StatusCode) -}) -``` diff --git a/tests/acceptance/commission_calculation_acceptance_test.go b/tests/acceptance/commission_calculation_acceptance_test.go deleted file mode 100644 index c689432..0000000 --- a/tests/acceptance/commission_calculation_acceptance_test.go +++ /dev/null @@ -1,444 +0,0 @@ -package acceptance - -import ( - "encoding/json" - "fmt" - "testing" - "time" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/pkg/response" - "github.com/break/junhong_cmp_fiber/tests/testutils/integ" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -// ============================================================ -// 验收测试：佣金计算重构 -// 来源：openspec/changes/refactor-one-time-commission-allocation/specs/commission-calculation/spec.md -// 来源：openspec/changes/refactor-one-time-commission-allocation/specs/commission-trigger/spec.md -// ============================================================ - -func TestCommissionCalculation_SeriesAllocationQuery_Acceptance(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - parentShop := env.CreateTestShop("一级代理", 1, nil) - childShop := env.CreateTestShop("二级代理", 2, &parentShop.ID) - series := createCommissionTestSeries(t, env, "佣金测试系列") - - createPlatformSeriesAllocationForCommission(t, env, parentShop.ID, series.ID, 10000) - createSeriesAllocationForCommission(t, env, parentShop.ID, childShop.ID, series.ID, 5000) - - // ------------------------------------------------------------ - // Scenario: 直接查询系列分配 - // GIVEN: 存在 shop_id + series_id 的系列分配记录 - // WHEN: 通过 shop_id 和 series_id 查询 - // THEN: 返回唯一匹配的记录，包含 one_time_commission_amount - // - // 破坏点：如果查询 API 不支持 series_id 筛选，此测试将失败 - // ------------------------------------------------------------ - t.Run("Scenario_直接查询系列分配", func(t *testing.T) { - path := fmt.Sprintf("/api/admin/shop-series-allocations?shop_id=%d&series_id=%d", - childShop.ID, series.ID) - - resp, err := env.AsSuperAdmin().Request("GET", path, nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - data := result.Data.(map[string]interface{}) - items := data["items"].([]interface{}) - require.Len(t, items, 1, "应返回唯一匹配记录") - - allocation := items[0].(map[string]interface{}) - assert.Equal(t, float64(5000), allocation["one_time_commission_amount"], - "佣金金额应为 5000 分") - }) - - // ------------------------------------------------------------ - // Scenario: 系列分配不存在 - // GIVEN: shop_id + series_id 组合不存在分配记录 - // WHEN: 查询该组合 - // THEN: 返回空列表 - // - // 破坏点：如果查询不正确处理空结果，此测试将失败 - // ------------------------------------------------------------ - t.Run("Scenario_系列分配不存在", func(t *testing.T) { - path := fmt.Sprintf("/api/admin/shop-series-allocations?shop_id=%d&series_id=99999", - childShop.ID) - - resp, err := env.AsSuperAdmin().Request("GET", path, nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - - data := result.Data.(map[string]interface{}) - list := data["items"].([]interface{}) - assert.Empty(t, list, "不存在的组合应返回空列表") - }) -} - -func TestCommissionCalculation_EnableOneTimeCommission_Acceptance(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - series := createCommissionTestSeriesWithConfig(t, env, "启用佣金系列", true) - - // ------------------------------------------------------------ - // Scenario: 检查系列是否启用一次性佣金 - // GIVEN: 系列配置 enable_one_time_commission = true - // WHEN: 查询系列详情 - // THEN: 响应包含 enable_one_time_commission = true - // - // 破坏点：如果系列 API 不返回 enable_one_time_commission 字段，此测试将失败 - // ------------------------------------------------------------ - t.Run("Scenario_检查系列是否启用一次性佣金", func(t *testing.T) { - path := fmt.Sprintf("/api/admin/package-series/%d", series.ID) - - resp, err := env.AsSuperAdmin().Request("GET", path, nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - data := result.Data.(map[string]interface{}) - enableOneTime, ok := data["enable_one_time_commission"] - assert.True(t, ok, "响应应包含 enable_one_time_commission 字段") - assert.Equal(t, true, enableOneTime, "应为 true") - }) - - // ------------------------------------------------------------ - // Scenario: 批量查询启用一次性佣金的系列 - // GIVEN: 存在多个系列，部分启用一次性佣金 - // WHEN: 查询系列列表并按 enable_one_time_commission 筛选 - // THEN: 返回符合条件的系列 - // - // 破坏点：如果不支持 enable_one_time_commission 筛选，此测试将失败 - // ------------------------------------------------------------ - t.Run("Scenario_批量查询启用一次性佣金的系列", func(t *testing.T) { - createCommissionTestSeriesWithConfig(t, env, "禁用佣金系列", false) - - resp, err := env.AsSuperAdmin(). - Request("GET", "/api/admin/package-series?enable_one_time_commission=true", nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - - data := result.Data.(map[string]interface{}) - list := data["items"].([]interface{}) - - for _, item := range list { - seriesItem := item.(map[string]interface{}) - enableVal, hasField := seriesItem["enable_one_time_commission"] - if hasField { - assert.Equal(t, true, enableVal, "筛选结果应全部为启用状态") - } - } - }) -} - -func TestCommissionCalculation_ChainAllocation_Acceptance(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - level1Shop := env.CreateTestShop("一级代理", 1, nil) - level2Shop := env.CreateTestShop("二级代理", 2, &level1Shop.ID) - level3Shop := env.CreateTestShop("三级代理", 3, &level2Shop.ID) - series := createCommissionTestSeries(t, env, "链式分配系列") - - // ------------------------------------------------------------ - // Scenario: 链式分配金额计算 - // GIVEN: - // - 平台给一级：one_time_commission_amount = 10000（100元） - // - 一级给二级：one_time_commission_amount = 8000（80元） - // - 二级给三级：one_time_commission_amount = 5000（50元） - // WHEN: 查询各级的系列分配 - // THEN: 各级金额正确 - // - // 破坏点：如果分配金额不正确保存，此测试将失败 - // ------------------------------------------------------------ - t.Run("Scenario_链式分配金额计算", func(t *testing.T) { - createPlatformSeriesAllocationForCommission(t, env, level1Shop.ID, series.ID, 10000) - createSeriesAllocationForCommission(t, env, level1Shop.ID, level2Shop.ID, series.ID, 8000) - createSeriesAllocationForCommission(t, env, level2Shop.ID, level3Shop.ID, series.ID, 5000) - - verifyAllocationAmount(t, env, level1Shop.ID, series.ID, 10000) - verifyAllocationAmount(t, env, level2Shop.ID, series.ID, 8000) - verifyAllocationAmount(t, env, level3Shop.ID, series.ID, 5000) - }) - - // ------------------------------------------------------------ - // Scenario: 单级代理 - // GIVEN: 一级代理直接销售（无下级） - // WHEN: 查询一级的系列分配 - // THEN: 一级获得完整的 one_time_commission_amount - // - // 破坏点：如果单级分配不生效，此测试将失败 - // ------------------------------------------------------------ - t.Run("Scenario_单级代理", func(t *testing.T) { - singleShop := env.CreateTestShop("单级代理", 1, nil) - singleSeries := createCommissionTestSeries(t, env, "单级系列") - - createPlatformSeriesAllocationForCommission(t, env, singleShop.ID, singleSeries.ID, 10000) - verifyAllocationAmount(t, env, singleShop.ID, singleSeries.ID, 10000) - }) -} - -func TestCommissionCalculation_TriggerConfig_Acceptance(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - parentShop := env.CreateTestShop("一级代理", 1, nil) - childShop := env.CreateTestShop("二级代理", 2, &parentShop.ID) - series := createCommissionTestSeries(t, env, "触发配置系列") - - createPlatformSeriesAllocationForCommission(t, env, parentShop.ID, series.ID, 10000) - - // ------------------------------------------------------------ - // Scenario: 累计达到阈值触发佣金配置 - // GIVEN: 系列分配设置为累计充值触发，阈值 1000 元 - // WHEN: 创建系列分配 - // THEN: 配置正确保存 - // - // 破坏点：如果触发配置不保存，此测试将失败 - // ------------------------------------------------------------ - t.Run("Scenario_累计达到阈值触发佣金配置", func(t *testing.T) { - body := map[string]interface{}{ - "shop_id": childShop.ID, - "series_id": series.ID, - "one_time_commission_amount": 5000, - "enable_one_time_commission": true, - "one_time_commission_trigger": "accumulated_recharge", - "one_time_commission_threshold": 100000, - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsSuperAdmin(). - Request("POST", "/api/admin/shop-series-allocations", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - data := result.Data.(map[string]interface{}) - assert.Equal(t, true, data["enable_one_time_commission"]) - assert.Equal(t, "accumulated_recharge", data["one_time_commission_trigger"]) - assert.Equal(t, float64(100000), data["one_time_commission_threshold"]) - }) - - // ------------------------------------------------------------ - // Scenario: 首次充值触发配置 - // GIVEN: 系列分配设置为首次充值触发，阈值 100 元 - // WHEN: 创建系列分配 - // THEN: 配置正确保存 - // - // 破坏点：如果 first_recharge 触发类型不支持，此测试将失败 - // ------------------------------------------------------------ - t.Run("Scenario_首次充值触发配置", func(t *testing.T) { - newChildShop := env.CreateTestShop("首充测试店铺", 2, &parentShop.ID) - - body := map[string]interface{}{ - "shop_id": newChildShop.ID, - "series_id": series.ID, - "one_time_commission_amount": 5000, - "enable_one_time_commission": true, - "one_time_commission_trigger": "first_recharge", - "one_time_commission_threshold": 10000, - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsSuperAdmin(). - Request("POST", "/api/admin/shop-series-allocations", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - data := result.Data.(map[string]interface{}) - assert.Equal(t, "first_recharge", data["one_time_commission_trigger"]) - }) -} - -func TestCommissionStats_Allocation_Acceptance(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - parentShop := env.CreateTestShop("一级代理", 1, nil) - series := createCommissionTestSeries(t, env, "统计测试系列") - - // ------------------------------------------------------------ - // Scenario: 创建佣金统计记录关联系列分配 - // GIVEN: 存在系列分配记录 - // WHEN: 查询佣金统计 - // THEN: 统计记录的 allocation_id 指向 ShopSeriesAllocation.id - // - // 破坏点：如果统计不关联系列分配，此测试将失败 - // ------------------------------------------------------------ - t.Run("Scenario_佣金统计关联系列分配", func(t *testing.T) { - allocation := createPlatformSeriesAllocationForCommission(t, env, parentShop.ID, series.ID, 10000) - - path := fmt.Sprintf("/api/admin/shop-series-commission-stats?shop_id=%d&series_id=%d", - parentShop.ID, series.ID) - - resp, err := env.AsSuperAdmin().Request("GET", path, nil) - require.NoError(t, err) - defer resp.Body.Close() - - if resp.StatusCode == 200 { - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - - if result.Code == 0 && result.Data != nil { - data := result.Data.(map[string]interface{}) - if list, ok := data["items"].([]interface{}); ok && len(list) > 0 { - stats := list[0].(map[string]interface{}) - if allocationID, exists := stats["allocation_id"]; exists { - assert.Equal(t, float64(allocation.ID), allocationID, - "统计应关联到系列分配 ID") - } - } - } - } - }) -} - -// ============================================================ -// 辅助函数 -// ============================================================ - -func createCommissionTestSeries(t *testing.T, env *integ.IntegrationTestEnv, name string) *model.PackageSeries { - t.Helper() - - timestamp := time.Now().UnixNano() - series := &model.PackageSeries{ - SeriesCode: fmt.Sprintf("COMM_SERIES_%d", timestamp), - SeriesName: name, - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - - err := env.TX.Create(series).Error - require.NoError(t, err, "创建测试系列失败") - - return series -} - -func createCommissionTestSeriesWithConfig(t *testing.T, env *integ.IntegrationTestEnv, name string, enableOneTime bool) *model.PackageSeries { - t.Helper() - - timestamp := time.Now().UnixNano() - series := &model.PackageSeries{ - SeriesCode: fmt.Sprintf("COMM_SERIES_%d", timestamp), - SeriesName: name, - Status: constants.StatusEnabled, - EnableOneTimeCommission: enableOneTime, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - - err := env.TX.Create(series).Error - require.NoError(t, err, "创建测试系列失败") - - return series -} - -func createPlatformSeriesAllocationForCommission(t *testing.T, env *integ.IntegrationTestEnv, shopID, seriesID uint, amount int64) *model.ShopSeriesAllocation { - t.Helper() - - allocation := &model.ShopSeriesAllocation{ - ShopID: shopID, - SeriesID: seriesID, - AllocatorShopID: 0, - OneTimeCommissionAmount: amount, - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - - err := env.TX.Create(allocation).Error - require.NoError(t, err, "创建平台系列分配失败") - - return allocation -} - -func createSeriesAllocationForCommission(t *testing.T, env *integ.IntegrationTestEnv, allocatorShopID, shopID, seriesID uint, amount int64) *model.ShopSeriesAllocation { - t.Helper() - - allocation := &model.ShopSeriesAllocation{ - ShopID: shopID, - SeriesID: seriesID, - AllocatorShopID: allocatorShopID, - OneTimeCommissionAmount: amount, - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - - err := env.TX.Create(allocation).Error - require.NoError(t, err, "创建系列分配失败") - - return allocation -} - -func verifyAllocationAmount(t *testing.T, env *integ.IntegrationTestEnv, shopID, seriesID uint, expectedAmount int64) { - t.Helper() - - path := fmt.Sprintf("/api/admin/shop-series-allocations?shop_id=%d&series_id=%d", shopID, seriesID) - - resp, err := env.AsSuperAdmin().Request("GET", path, nil) - require.NoError(t, err) - defer resp.Body.Close() - - require.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - require.Equal(t, 0, result.Code) - - data := result.Data.(map[string]interface{}) - list := data["items"].([]interface{}) - require.NotEmpty(t, list, "应存在分配记录") - - allocation := list[0].(map[string]interface{}) - assert.Equal(t, float64(expectedAmount), allocation["one_time_commission_amount"], - "店铺 %d 系列 %d 的佣金金额应为 %d", shopID, seriesID, expectedAmount) -} diff --git a/tests/acceptance/shop_series_allocation_acceptance_test.go b/tests/acceptance/shop_series_allocation_acceptance_test.go deleted file mode 100644 index f35d70d..0000000 --- a/tests/acceptance/shop_series_allocation_acceptance_test.go +++ /dev/null @@ -1,847 +0,0 @@ -package acceptance - -import ( - "encoding/json" - "fmt" - "testing" - "time" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/pkg/response" - "github.com/break/junhong_cmp_fiber/tests/testutils/integ" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -// ============================================================ -// 验收测试：套餐系列分配 (ShopSeriesAllocation) -// 来源：openspec/changes/refactor-one-time-commission-allocation/specs/shop-series-allocation/spec.md -// ============================================================ - -func TestShopSeriesAllocation_Create_Acceptance(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - // 准备测试数据：创建店铺层级和套餐系列 - parentShop := env.CreateTestShop("一级代理", 1, nil) - childShop := env.CreateTestShop("二级代理", 2, &parentShop.ID) - series := createTestPackageSeries(t, env, "测试系列") - - // 先为一级代理创建系列分配（平台分配） - platformAllocation := createPlatformSeriesAllocation(t, env, parentShop.ID, series.ID, 10000) - - // ------------------------------------------------------------ - // Scenario: 成功分配套餐系列 - // GIVEN: 代理已有该系列的分配权限 - // WHEN: POST /api/admin/shop-series-allocations 设置 one_time_commission_amount = 5000 - // THEN: 返回 200 和分配记录详情 - // AND: 下级代理的一次性佣金上限为 50 元 - // - // 破坏点：如果 Handler 不调用 Service.Create，此测试将失败 - // ------------------------------------------------------------ - t.Run("Scenario_成功分配套餐系列", func(t *testing.T) { - body := map[string]interface{}{ - "shop_id": childShop.ID, - "series_id": series.ID, - "one_time_commission_amount": 5000, // 50 元 - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsUser(createTestAgentAccount(t, env, parentShop.ID)). - Request("POST", "/api/admin/shop-series-allocations", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code, "应返回成功: %s", result.Message) - - // 验证响应包含 one_time_commission_amount - data, ok := result.Data.(map[string]interface{}) - require.True(t, ok, "响应 data 应为对象") - assert.Equal(t, float64(5000), data["one_time_commission_amount"], "一次性佣金金额应为 5000 分") - }) - - // ------------------------------------------------------------ - // Scenario: 下级金额不能超过上级 - // GIVEN: 上级分配金额为 10000 分（100 元） - // WHEN: 尝试为下级分配 15000 分（150 元） - // THEN: 返回 400 错误 "一次性佣金金额不能超过您的分配上限" - // - // 破坏点：如果移除金额上限校验，此测试将失败 - // ------------------------------------------------------------ - t.Run("Scenario_下级金额不能超过上级", func(t *testing.T) { - newChildShop := env.CreateTestShop("新下级店铺", 2, &parentShop.ID) - - body := map[string]interface{}{ - "shop_id": newChildShop.ID, - "series_id": series.ID, - "one_time_commission_amount": 15000, // 超过上级的 10000 - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsUser(createTestAgentAccount(t, env, parentShop.ID)). - Request("POST", "/api/admin/shop-series-allocations", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 400, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.NotEqual(t, 0, result.Code, "应返回错误") - assert.Contains(t, result.Message, "超过", "错误消息应包含'超过'") - }) - - // ------------------------------------------------------------ - // Scenario: 分配时启用一次性佣金和强充 - // GIVEN: 代理有分配权限 - // WHEN: POST 创建分配，启用一次性佣金（累计充值触发，阈值 1000 元），启用强充（100 元） - // THEN: 系统保存完整配置 - // - // 破坏点：如果不保存 enable_one_time_commission 等字段，此测试将失败 - // ------------------------------------------------------------ - t.Run("Scenario_分配时启用一次性佣金和强充", func(t *testing.T) { - newChildShop := env.CreateTestShop("新下级店铺2", 2, &parentShop.ID) - - body := map[string]interface{}{ - "shop_id": newChildShop.ID, - "series_id": series.ID, - "one_time_commission_amount": 5000, - "enable_one_time_commission": true, - "one_time_commission_trigger": "accumulated_recharge", - "one_time_commission_threshold": 100000, // 1000 元 - "enable_force_recharge": true, - "force_recharge_amount": 10000, // 100 元 - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsUser(createTestAgentAccount(t, env, parentShop.ID)). - Request("POST", "/api/admin/shop-series-allocations", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - data := result.Data.(map[string]interface{}) - assert.Equal(t, true, data["enable_one_time_commission"]) - assert.Equal(t, "accumulated_recharge", data["one_time_commission_trigger"]) - assert.Equal(t, float64(100000), data["one_time_commission_threshold"]) - assert.Equal(t, true, data["enable_force_recharge"]) - assert.Equal(t, float64(10000), data["force_recharge_amount"]) - }) - - // ------------------------------------------------------------ - // Scenario: 尝试分配未拥有的系列 - // GIVEN: 代理没有某系列的分配权限 - // WHEN: 尝试为下级分配该系列 - // THEN: 返回 403/400 "您没有该套餐系列的分配权限" - // - // 破坏点：如果不检查代理是否拥有系列权限，此测试将失败 - // ------------------------------------------------------------ - t.Run("Scenario_尝试分配未拥有的系列", func(t *testing.T) { - unownedSeries := createTestPackageSeries(t, env, "未分配系列") - - body := map[string]interface{}{ - "shop_id": childShop.ID, - "series_id": unownedSeries.ID, - "one_time_commission_amount": 5000, - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsUser(createTestAgentAccount(t, env, parentShop.ID)). - Request("POST", "/api/admin/shop-series-allocations", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - // 应返回 400 或 403 - assert.True(t, resp.StatusCode == 400 || resp.StatusCode == 403, - "应返回 400 或 403，实际: %d", resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.NotEqual(t, 0, result.Code) - }) - - // ------------------------------------------------------------ - // Scenario: 尝试分配给非直属下级 - // GIVEN: 店铺 A 是一级，店铺 B 是二级（A 的下级），店铺 C 是三级（B 的下级） - // WHEN: 店铺 A 尝试直接分配给店铺 C - // THEN: 返回 403 "只能为直属下级分配套餐" - // - // 破坏点：如果不检查是否为直属下级，此测试将失败 - // ------------------------------------------------------------ - t.Run("Scenario_尝试分配给非直属下级", func(t *testing.T) { - grandChildShop := env.CreateTestShop("三级代理", 3, &childShop.ID) - - body := map[string]interface{}{ - "shop_id": grandChildShop.ID, // 非直属下级 - "series_id": series.ID, - "one_time_commission_amount": 5000, - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsUser(createTestAgentAccount(t, env, parentShop.ID)). - Request("POST", "/api/admin/shop-series-allocations", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - assert.True(t, resp.StatusCode == 400 || resp.StatusCode == 403) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.NotEqual(t, 0, result.Code) - }) - - // ------------------------------------------------------------ - // Scenario: 重复分配同一系列 - // GIVEN: 已为下级店铺分配了某系列 - // WHEN: 再次尝试分配同一系列 - // THEN: 返回 409 "该店铺已分配此套餐系列" - // - // 破坏点：如果不检查唯一索引，此测试将失败 - // ------------------------------------------------------------ - t.Run("Scenario_重复分配同一系列", func(t *testing.T) { - newChildShop := env.CreateTestShop("重复测试店铺", 2, &parentShop.ID) - - // 第一次分配 - body := map[string]interface{}{ - "shop_id": newChildShop.ID, - "series_id": series.ID, - "one_time_commission_amount": 5000, - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsUser(createTestAgentAccount(t, env, parentShop.ID)). - Request("POST", "/api/admin/shop-series-allocations", jsonBody) - require.NoError(t, err) - resp.Body.Close() - require.Equal(t, 200, resp.StatusCode) - - // 第二次分配（应失败） - resp2, err := env.AsUser(createTestAgentAccount(t, env, parentShop.ID)). - Request("POST", "/api/admin/shop-series-allocations", jsonBody) - require.NoError(t, err) - defer resp2.Body.Close() - - assert.True(t, resp2.StatusCode == 400 || resp2.StatusCode == 409, - "重复分配应返回 400 或 409，实际: %d", resp2.StatusCode) - }) - - _ = platformAllocation // 使用变量避免编译警告 -} - -func TestShopSeriesAllocation_List_Acceptance(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - parentShop := env.CreateTestShop("一级代理", 1, nil) - childShop := env.CreateTestShop("二级代理", 2, &parentShop.ID) - series := createTestPackageSeries(t, env, "列表测试系列") - - // 创建分配记录 - createPlatformSeriesAllocation(t, env, parentShop.ID, series.ID, 10000) - createSeriesAllocationDirectly(t, env, parentShop.ID, childShop.ID, series.ID, 5000) - - // ------------------------------------------------------------ - // Scenario: 查询所有分配 - // GIVEN: 存在多条分配记录 - // WHEN: GET /api/admin/shop-series-allocations 不带筛选条件 - // THEN: 返回该代理创建的所有分配记录 - // AND: 每条记录包含 one_time_commission_amount 字段 - // - // 破坏点：如果 List API 不返回数据，此测试将失败 - // ------------------------------------------------------------ - t.Run("Scenario_查询所有分配", func(t *testing.T) { - resp, err := env.AsUser(createTestAgentAccount(t, env, parentShop.ID)). - Request("GET", "/api/admin/shop-series-allocations", nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - // 验证返回列表格式 - data := result.Data.(map[string]interface{}) - items, ok := data["items"].([]interface{}) - require.True(t, ok, "响应应包含 items 字段") - require.NotEmpty(t, items, "列表不应为空") - - // 验证第一条记录包含 one_time_commission_amount - firstItem := items[0].(map[string]interface{}) - _, hasAmount := firstItem["one_time_commission_amount"] - assert.True(t, hasAmount, "记录应包含 one_time_commission_amount 字段") - }) - - // ------------------------------------------------------------ - // Scenario: 按店铺筛选 - // GIVEN: 存在多个店铺的分配记录 - // WHEN: GET /api/admin/shop-series-allocations?shop_id=xxx - // THEN: 只返回该店铺的分配记录 - // - // 破坏点：如果不支持 shop_id 筛选，此测试将失败 - // ------------------------------------------------------------ - t.Run("Scenario_按店铺筛选", func(t *testing.T) { - path := fmt.Sprintf("/api/admin/shop-series-allocations?shop_id=%d", childShop.ID) - - resp, err := env.AsUser(createTestAgentAccount(t, env, parentShop.ID)). - Request("GET", path, nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - // 验证筛选结果 - data := result.Data.(map[string]interface{}) - items := data["items"].([]interface{}) - for _, item := range items { - record := item.(map[string]interface{}) - assert.Equal(t, float64(childShop.ID), record["shop_id"], - "筛选结果应只包含指定店铺") - } - }) -} - -func TestShopSeriesAllocation_Update_Acceptance(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - parentShop := env.CreateTestShop("一级代理", 1, nil) - childShop := env.CreateTestShop("二级代理", 2, &parentShop.ID) - series := createTestPackageSeries(t, env, "更新测试系列") - - createPlatformSeriesAllocation(t, env, parentShop.ID, series.ID, 10000) - allocation := createSeriesAllocationDirectly(t, env, parentShop.ID, childShop.ID, series.ID, 5000) - - // ------------------------------------------------------------ - // Scenario: 更新一次性佣金金额 - // GIVEN: 存在一条分配记录，金额为 5000 - // WHEN: PUT /api/admin/shop-series-allocations/:id 将金额改为 6000 - // THEN: 更新成功，返回更新后的记录 - // - // 破坏点：如果 Update API 不保存金额变更，此测试将失败 - // ------------------------------------------------------------ - t.Run("Scenario_更新一次性佣金金额", func(t *testing.T) { - body := map[string]interface{}{ - "one_time_commission_amount": 6000, - } - jsonBody, _ := json.Marshal(body) - - path := fmt.Sprintf("/api/admin/shop-series-allocations/%d", allocation.ID) - resp, err := env.AsUser(createTestAgentAccount(t, env, parentShop.ID)). - Request("PUT", path, jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - data := result.Data.(map[string]interface{}) - assert.Equal(t, float64(6000), data["one_time_commission_amount"]) - }) - - // ------------------------------------------------------------ - // Scenario: 更新金额不能超过上级上限 - // GIVEN: 上级分配金额上限为 10000 - // WHEN: 尝试将金额更新为 15000 - // THEN: 返回 400 错误 - // - // 破坏点：如果更新时不检查金额上限，此测试将失败 - // ------------------------------------------------------------ - t.Run("Scenario_更新金额不能超过上级上限", func(t *testing.T) { - body := map[string]interface{}{ - "one_time_commission_amount": 15000, // 超过上级的 10000 - } - jsonBody, _ := json.Marshal(body) - - path := fmt.Sprintf("/api/admin/shop-series-allocations/%d", allocation.ID) - resp, err := env.AsUser(createTestAgentAccount(t, env, parentShop.ID)). - Request("PUT", path, jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 400, resp.StatusCode) - }) - - // ------------------------------------------------------------ - // Scenario: 更新强充配置 - // GIVEN: 分配记录存在 - // WHEN: PUT 启用强充，设置金额 100 元 - // THEN: 配置更新成功 - // - // 破坏点：如果不保存强充配置，此测试将失败 - // ------------------------------------------------------------ - t.Run("Scenario_更新强充配置", func(t *testing.T) { - body := map[string]interface{}{ - "enable_force_recharge": true, - "force_recharge_amount": 10000, - } - jsonBody, _ := json.Marshal(body) - - path := fmt.Sprintf("/api/admin/shop-series-allocations/%d", allocation.ID) - resp, err := env.AsUser(createTestAgentAccount(t, env, parentShop.ID)). - Request("PUT", path, jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - - data := result.Data.(map[string]interface{}) - assert.Equal(t, true, data["enable_force_recharge"]) - assert.Equal(t, float64(10000), data["force_recharge_amount"]) - }) - - // ------------------------------------------------------------ - // Scenario: 更新不存在的分配 - // GIVEN: 分配 ID 不存在 - // WHEN: PUT /api/admin/shop-series-allocations/99999 - // THEN: 返回 404 "分配记录不存在" - // - // 破坏点：如果不检查记录是否存在，此测试将失败 - // ------------------------------------------------------------ - t.Run("Scenario_更新不存在的分配", func(t *testing.T) { - body := map[string]interface{}{ - "one_time_commission_amount": 5000, - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsUser(createTestAgentAccount(t, env, parentShop.ID)). - Request("PUT", "/api/admin/shop-series-allocations/99999", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 404, resp.StatusCode) - }) -} - -func TestShopSeriesAllocation_Delete_Acceptance(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - parentShop := env.CreateTestShop("一级代理", 1, nil) - childShop := env.CreateTestShop("二级代理", 2, &parentShop.ID) - series := createTestPackageSeries(t, env, "删除测试系列") - - createPlatformSeriesAllocation(t, env, parentShop.ID, series.ID, 10000) - - // ------------------------------------------------------------ - // Scenario: 删除系列分配时检查套餐分配 - // GIVEN: 系列分配存在，且有依赖的套餐分配 - // WHEN: DELETE /api/admin/shop-series-allocations/:id - // THEN: 返回 400 "存在关联的套餐分配，无法删除" - // - // 破坏点：如果不检查套餐分配依赖，此测试将失败 - // ------------------------------------------------------------ - t.Run("Scenario_删除系列分配时检查套餐分配", func(t *testing.T) { - // 创建系列分配 - allocation := createSeriesAllocationDirectly(t, env, parentShop.ID, childShop.ID, series.ID, 5000) - - // 创建依赖的套餐分配 - pkg := createTestPackage(t, env, series.ID, "测试套餐") - createPackageAllocationWithSeriesAllocation(t, env, childShop.ID, pkg.ID, allocation.ID) - - // 尝试删除系列分配 - path := fmt.Sprintf("/api/admin/shop-series-allocations/%d", allocation.ID) - resp, err := env.AsUser(createTestAgentAccount(t, env, parentShop.ID)). - Request("DELETE", path, nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 400, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Contains(t, result.Message, "关联", "错误消息应提及关联") - }) - - // ------------------------------------------------------------ - // Scenario: 成功删除无依赖的系列分配 - // GIVEN: 系列分配存在，无套餐分配依赖 - // WHEN: DELETE /api/admin/shop-series-allocations/:id - // THEN: 删除成功 - // - // 破坏点：如果 Delete API 不工作，此测试将失败 - // ------------------------------------------------------------ - t.Run("Scenario_成功删除无依赖的系列分配", func(t *testing.T) { - newChildShop := env.CreateTestShop("新下级", 2, &parentShop.ID) - allocation := createSeriesAllocationDirectly(t, env, parentShop.ID, newChildShop.ID, series.ID, 5000) - - path := fmt.Sprintf("/api/admin/shop-series-allocations/%d", allocation.ID) - resp, err := env.AsUser(createTestAgentAccount(t, env, parentShop.ID)). - Request("DELETE", path, nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - }) -} - -func TestShopSeriesAllocation_Platform_Acceptance(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - parentShop := env.CreateTestShop("一级代理", 1, nil) - series := createTestPackageSeries(t, env, "平台分配测试系列") - // 设置系列的一次性佣金上限（假设固定 150 元） - setSeriesOneTimeCommissionLimit(t, env, series.ID, 15000) - - // ------------------------------------------------------------ - // Scenario: 平台为一级代理分配 - // GIVEN: 平台管理员 - // WHEN: POST 为一级代理分配套餐系列，设置 one_time_commission_amount = 10000 - // THEN: 分配成功 - // - // 破坏点：如果平台无法创建分配，此测试将失败 - // ------------------------------------------------------------ - t.Run("Scenario_平台为一级代理分配", func(t *testing.T) { - body := map[string]interface{}{ - "shop_id": parentShop.ID, - "series_id": series.ID, - "one_time_commission_amount": 10000, - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsSuperAdmin(). - Request("POST", "/api/admin/shop-series-allocations", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - }) - - // ------------------------------------------------------------ - // Scenario: 平台可自由设定金额 - // GIVEN: 平台管理员 - // WHEN: 平台为一级代理分配任意金额（如 20000） - // THEN: 分配成功（平台无上限限制） - // - // 破坏点：如果平台分配被上限限制，此测试将失败 - // ------------------------------------------------------------ - t.Run("Scenario_平台可自由设定金额", func(t *testing.T) { - newShop := env.CreateTestShop("新一级代理", 1, nil) - - body := map[string]interface{}{ - "shop_id": newShop.ID, - "series_id": series.ID, - "one_time_commission_amount": 20000, - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsSuperAdmin(). - Request("POST", "/api/admin/shop-series-allocations", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - }) - - // ------------------------------------------------------------ - // Scenario: 平台配置强充要求 - // GIVEN: 平台管理员 - // WHEN: POST 为一级代理分配系列，启用强充，force_recharge_amount = 10000 - // THEN: 配置保存成功 - // - // 破坏点：如果不保存强充配置，此测试将失败 - // ------------------------------------------------------------ - t.Run("Scenario_平台配置强充要求", func(t *testing.T) { - newShop := env.CreateTestShop("强充测试店铺", 1, nil) - - body := map[string]interface{}{ - "shop_id": newShop.ID, - "series_id": series.ID, - "one_time_commission_amount": 10000, - "enable_force_recharge": true, - "force_recharge_amount": 10000, - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsSuperAdmin(). - Request("POST", "/api/admin/shop-series-allocations", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - - data := result.Data.(map[string]interface{}) - assert.Equal(t, true, data["enable_force_recharge"]) - assert.Equal(t, float64(10000), data["force_recharge_amount"]) - }) -} - -func TestShopPackageAllocation_SeriesDependency_Acceptance(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - parentShop := env.CreateTestShop("一级代理", 1, nil) - childShop := env.CreateTestShop("二级代理", 2, &parentShop.ID) - series := createTestPackageSeries(t, env, "依赖测试系列") - pkg := createTestPackage(t, env, series.ID, "依赖测试套餐") - - // ------------------------------------------------------------ - // Scenario: 未分配系列时分配套餐失败 - // GIVEN: 下级店铺未被分配系列 X - // WHEN: 代理尝试为下级分配套餐 A（属于系列 X） - // THEN: 返回 400 "请先分配该套餐所属的系列" - // - // 破坏点：如果不检查系列分配依赖，此测试将失败 - // ------------------------------------------------------------ - t.Run("Scenario_未分配系列时分配套餐失败", func(t *testing.T) { - body := map[string]interface{}{ - "shop_id": childShop.ID, - "package_id": pkg.ID, - "cost_price": 5000, - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsSuperAdmin(). - Request("POST", "/api/admin/shop-package-allocations", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 400, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Contains(t, result.Message, "系列", "错误消息应提及系列") - }) - - // ------------------------------------------------------------ - // Scenario: 先分配系列再分配套餐 - // GIVEN: 下级店铺已被分配系列 X - // WHEN: 代理为下级分配套餐 A（属于系列 X） - // THEN: 分配成功，套餐分配关联到系列分配记录 - // - // 破坏点：如果不关联 series_allocation_id，此测试将失败 - // ------------------------------------------------------------ - t.Run("Scenario_先分配系列再分配套餐", func(t *testing.T) { - // 先分配系列 - createPlatformSeriesAllocation(t, env, parentShop.ID, series.ID, 10000) - seriesAllocation := createSeriesAllocationDirectly(t, env, parentShop.ID, childShop.ID, series.ID, 5000) - - // 再分配套餐 - body := map[string]interface{}{ - "shop_id": childShop.ID, - "package_id": pkg.ID, - "cost_price": 5000, - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsSuperAdmin(). - Request("POST", "/api/admin/shop-package-allocations", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - // 验证关联 - data := result.Data.(map[string]interface{}) - assert.Equal(t, float64(seriesAllocation.ID), data["series_allocation_id"], - "套餐分配应关联到系列分配") - }) - - // ------------------------------------------------------------ - // Scenario: 套餐分配只包含成本价 - // GIVEN: 套餐分配 API - // WHEN: 创建或查询套餐分配 - // THEN: 请求/响应只包含 cost_price，不包含 one_time_commission_amount - // - // 破坏点：如果响应包含 one_time_commission_amount，此测试将失败 - // ------------------------------------------------------------ - t.Run("Scenario_套餐分配只包含成本价", func(t *testing.T) { - // 查询已创建的套餐分配 - resp, err := env.AsSuperAdmin(). - Request("GET", fmt.Sprintf("/api/admin/shop-package-allocations?shop_id=%d", childShop.ID), nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - - data := result.Data.(map[string]interface{}) - items := data["items"].([]interface{}) - if len(items) > 0 { - firstItem := items[0].(map[string]interface{}) - _, hasCostPrice := firstItem["cost_price"] - _, hasOneTimeCommission := firstItem["one_time_commission_amount"] - - assert.True(t, hasCostPrice, "应包含 cost_price") - assert.False(t, hasOneTimeCommission, "不应包含 one_time_commission_amount") - } - }) -} - -// ============================================================ -// 辅助函数 -// ============================================================ - -func createTestPackageSeries(t *testing.T, env *integ.IntegrationTestEnv, name string) *model.PackageSeries { - t.Helper() - - timestamp := time.Now().UnixNano() - series := &model.PackageSeries{ - SeriesCode: fmt.Sprintf("SERIES_%d", timestamp), - SeriesName: name, - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - - err := env.TX.Create(series).Error - require.NoError(t, err, "创建测试套餐系列失败") - - return series -} - -func createTestPackage(t *testing.T, env *integ.IntegrationTestEnv, seriesID uint, name string) *model.Package { - t.Helper() - - timestamp := time.Now().UnixNano() - pkg := &model.Package{ - PackageCode: fmt.Sprintf("PKG_%d", timestamp), - PackageName: name, - SeriesID: seriesID, - PackageType: "formal", - DurationMonths: 1, - CostPrice: 5000, - SuggestedRetailPrice: 9900, - Status: constants.StatusEnabled, - ShelfStatus: 1, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - - err := env.TX.Create(pkg).Error - require.NoError(t, err, "创建测试套餐失败") - - return pkg -} - -func createTestAgentAccount(t *testing.T, env *integ.IntegrationTestEnv, shopID uint) *model.Account { - t.Helper() - return env.CreateTestAccount("agent", "password123", constants.UserTypeAgent, &shopID, nil) -} - -// createPlatformSeriesAllocation 模拟平台为一级代理创建的系列分配 -// 注意：由于 ShopSeriesAllocation 模型可能尚未创建，这里直接通过数据库操作模拟 -func createPlatformSeriesAllocation(t *testing.T, env *integ.IntegrationTestEnv, shopID, seriesID uint, amount int64) *model.ShopSeriesAllocation { - t.Helper() - - allocation := &model.ShopSeriesAllocation{ - ShopID: shopID, - SeriesID: seriesID, - AllocatorShopID: 0, // 平台分配 - OneTimeCommissionAmount: amount, - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - - err := env.TX.Create(allocation).Error - require.NoError(t, err, "创建平台系列分配失败") - - return allocation -} - -// createSeriesAllocationDirectly 直接在数据库创建系列分配记录 -func createSeriesAllocationDirectly(t *testing.T, env *integ.IntegrationTestEnv, allocatorShopID, shopID, seriesID uint, amount int64) *model.ShopSeriesAllocation { - t.Helper() - - allocation := &model.ShopSeriesAllocation{ - ShopID: shopID, - SeriesID: seriesID, - AllocatorShopID: allocatorShopID, - OneTimeCommissionAmount: amount, - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - - err := env.TX.Create(allocation).Error - require.NoError(t, err, "创建系列分配失败") - - return allocation -} - -// createPackageAllocationWithSeriesAllocation 创建关联系列分配的套餐分配 -func createPackageAllocationWithSeriesAllocation(t *testing.T, env *integ.IntegrationTestEnv, shopID, packageID, seriesAllocationID uint) *model.ShopPackageAllocation { - t.Helper() - - allocation := &model.ShopPackageAllocation{ - ShopID: shopID, - PackageID: packageID, - SeriesAllocationID: &seriesAllocationID, - CostPrice: 5000, - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - - err := env.TX.Create(allocation).Error - require.NoError(t, err, "创建套餐分配失败") - - return allocation -} - -// setSeriesOneTimeCommissionLimit 设置系列的一次性佣金上限（假设在 PackageSeries 或配置中） -func setSeriesOneTimeCommissionLimit(t *testing.T, env *integ.IntegrationTestEnv, seriesID uint, limit int64) { - t.Helper() - - // 更新系列配置 - err := env.TX.Model(&model.PackageSeries{}).Where("id = ?", seriesID).Updates(map[string]interface{}{ - "enable_one_time_commission": true, - // 假设有 one_time_commission_config 字段存储配置 - }).Error - require.NoError(t, err, "设置系列佣金上限失败") -} diff --git a/tests/flows/README.md b/tests/flows/README.md deleted file mode 100644 index 70249ff..0000000 --- a/tests/flows/README.md +++ /dev/null @@ -1,541 +0,0 @@ -# 业务流程测试 (Flow Tests) - -流程测试验证多个 API 组合的完整业务场景，确保端到端流程正确。 - -## 核心原则 - -1. **来源于 Spec Business Flow**：每个测试对应 Spec 中的一个 Business Flow -2. **跨 API 验证**：验证多个 API 调用的组合行为 -3. **状态共享**：流程中的数据（如 ID）在 steps 之间传递 -4. **角色切换**：不同 step 可能由不同角色执行 -5. **必须有破坏点和依赖声明** - -## 目录结构 - -``` -tests/flows/ -├── README.md # 本文件 -├── package_lifecycle_flow_test.go # 套餐完整生命周期 -├── order_purchase_flow_test.go # 订单购买流程 -├── commission_settlement_flow_test.go # 佣金结算流程 -├── iot_card_import_activate_flow_test.go # IoT 卡导入激活流程 -└── ... -``` - -## 测试模板 - -```go -package flows - -import ( - "testing" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - - "junhong_cmp_fiber/tests/testutils" -) - -// ============================================================ -// 流程测试：{流程名称} -// 来源：openspec/changes/{change-name}/specs/{capability}/spec.md -// 参与者：{角色1}, {角色2}, ... -// ============================================================ - -func TestFlow_{FlowName}(t *testing.T) { - env := testutils.NewIntegrationTestEnv(t) - - // ======================================================== - // 流程级共享状态 - // 在 steps 之间传递的数据 - // ======================================================== - var ( - resourceID uint - orderID uint - // 其他需要共享的状态... - ) - - // ------------------------------------------------------------ - // Step 1: {步骤名称} - // 角色: {执行角色} - // 调用: {HTTP Method} {Path} - // 预期: {预期结果} - // - // 依赖: 无（首个步骤） - // 破坏点：{描述什么代码变更会导致此测试失败} - // ------------------------------------------------------------ - t.Run("Step1_{步骤名称}", func(t *testing.T) { - client := env.AsSuperAdmin() // 或其他角色 - - body := map[string]interface{}{ - // 请求体 - } - resp, err := client.Request("POST", "/api/admin/xxx", body) - require.NoError(t, err) - require.Equal(t, 200, resp.StatusCode) - - var result map[string]interface{} - err = resp.JSON(&result) - require.NoError(t, err) - - // 提取共享状态 - data := result["data"].(map[string]interface{}) - resourceID = uint(data["id"].(float64)) - require.NotZero(t, resourceID, "资源 ID 不能为空") - }) - - // ------------------------------------------------------------ - // Step 2: {步骤名称} - // 角色: {执行角色} - // 调用: {HTTP Method} {Path} - // 预期: {预期结果} - // - // 依赖: Step 1 的 resourceID - // 破坏点：{描述什么代码变更会导致此测试失败} - // ------------------------------------------------------------ - t.Run("Step2_{步骤名称}", func(t *testing.T) { - if resourceID == 0 { - t.Skip("依赖 Step 1 创建的 resourceID") - } - - client := env.AsShopAgent(1) // 切换到代理商角色 - - resp, err := client.Request("GET", fmt.Sprintf("/api/admin/xxx/%d", resourceID), nil) - require.NoError(t, err) - require.Equal(t, 200, resp.StatusCode) - - // 验证和提取数据... - }) - - // 更多 steps... -} -``` - -## 流程测试 vs 验收测试 - -| 方面 | 验收测试 | 流程测试 | -|------|---------|---------| -| 来源 | Spec Scenario | Spec Business Flow | -| 粒度 | 单 API | 多 API 组合 | -| 状态 | 独立 | steps 之间共享 | -| 角色 | 通常单一 | 可能多角色 | -| 目的 | 验证 API 契约 | 验证业务场景 | - -## 状态共享模式 - -### 使用包级变量 - -```go -func TestFlow_PackageLifecycle(t *testing.T) { - env := testutils.NewIntegrationTestEnv(t) - - // 流程级共享状态 - var ( - packageID uint - allocationID uint - orderID uint - ) - - t.Run("Step1_创建套餐", func(t *testing.T) { - // ... 创建套餐 - packageID = extractedID - }) - - t.Run("Step2_分配套餐", func(t *testing.T) { - if packageID == 0 { - t.Skip("依赖 Step 1") - } - // 使用 packageID - allocationID = extractedID - }) - - t.Run("Step3_创建订单", func(t *testing.T) { - if allocationID == 0 { - t.Skip("依赖 Step 2") - } - // 使用 allocationID - orderID = extractedID - }) -} -``` - -### 依赖声明规范 - -每个 step 必须声明依赖： - -```go -// ------------------------------------------------------------ -// Step 3: 代理商查看可售套餐 -// 角色: 代理商 -// 调用: GET /api/admin/shop-packages -// 预期: 列表包含刚分配的套餐 -// -// 依赖: Step 1 的 packageID, Step 2 的分配操作 -// 破坏点：如果查询不按 shop_id 过滤，代理商会看到其他店铺的套餐 -// ------------------------------------------------------------ -t.Run("Step3_代理商查看可售套餐", func(t *testing.T) { - if packageID == 0 { - t.Skip("依赖 Step 1 创建的 packageID") - } - // ... -}) -``` - -## 多角色流程 - -```go -func TestFlow_CrossRoleWorkflow(t *testing.T) { - env := testutils.NewIntegrationTestEnv(t) - - var ( - resourceID uint - shopID uint = 1 - ) - - // Step 1: 平台管理员创建资源 - t.Run("Step1_平台创建资源", func(t *testing.T) { - client := env.AsSuperAdmin() - // ... - resourceID = extractedID - }) - - // Step 2: 平台管理员分配给代理商 - t.Run("Step2_分配给代理商", func(t *testing.T) { - client := env.AsSuperAdmin() - // ... - }) - - // Step 3: 代理商查看资源（角色切换！） - t.Run("Step3_代理商查看", func(t *testing.T) { - client := env.AsShopAgent(shopID) // 切换到代理商 - // ... - }) - - // Step 4: 代理商创建订单 - t.Run("Step4_代理商创建订单", func(t *testing.T) { - client := env.AsShopAgent(shopID) - // ... - }) - - // Step 5: 平台管理员查看统计（再次切换） - t.Run("Step5_平台查看统计", func(t *testing.T) { - client := env.AsSuperAdmin() - // ... - }) -} -``` - -## 破坏点注释规范 - -流程测试的破坏点更侧重于跨 API 的影响： - -```go -// 破坏点：如果套餐创建 API 不返回 ID，后续步骤无法执行 -// 破坏点：如果分配 API 不检查套餐是否存在，可能分配无效套餐 -// 破坏点：如果代理商查询不过滤 shop_id，会看到其他店铺的数据 -// 破坏点：如果订单创建不验证套餐有效期，可能购买过期套餐 -// 破坏点：如果佣金计算不在事务中，可能导致数据不一致 -``` - -## 异常流程测试 - -流程测试也应覆盖异常场景： - -```go -func TestFlow_PackageLifecycle_Exceptions(t *testing.T) { - env := testutils.NewIntegrationTestEnv(t) - - // ------------------------------------------------------------ - // 异常流程：尝试删除已分配的套餐 - // 预期：删除失败，返回业务错误 - // ------------------------------------------------------------ - t.Run("Exception_删除已分配套餐", func(t *testing.T) { - // Step 1: 创建套餐 - // Step 2: 分配给店铺 - // Step 3: 尝试删除（预期失败） - }) - - // ------------------------------------------------------------ - // 异常流程：代理商访问其他店铺的套餐 - // 预期：访问被拒绝 - // ------------------------------------------------------------ - t.Run("Exception_跨店铺访问", func(t *testing.T) { - // Step 1: 平台创建并分配给店铺 A - // Step 2: 店铺 B 的代理商尝试访问（预期 403） - }) -} -``` - -## 运行测试 - -```bash -# 运行所有流程测试 -source .env.local && go test -v ./tests/flows/... - -# 运行特定流程 -source .env.local && go test -v ./tests/flows/... -run TestFlow_PackageLifecycle - -# 运行特定步骤 -source .env.local && go test -v ./tests/flows/... -run "Step3" -``` - -## 与 Spec Business Flow 的对应关系 - -```markdown -# Spec 中的 Business Flow - -### Flow: 套餐完整生命周期 - -**参与者**: 平台管理员, 代理商 - -**流程步骤**: - -1. **创建套餐** - - 角色: 平台管理员 - - 调用: POST /api/admin/packages - - 预期: 返回套餐 ID - -2. **分配给代理商** - - 角色: 平台管理员 - - 调用: POST /api/admin/shop-packages - - 输入: 套餐 ID + 店铺 ID - - 预期: 分配成功 - -3. **代理商查看可售套餐** - - 角色: 代理商 - - 调用: GET /api/admin/shop-packages - - 预期: 列表包含刚分配的套餐 -``` - -直接转换为测试代码： - -```go -func TestFlow_PackageLifecycle(t *testing.T) { - env := testutils.NewIntegrationTestEnv(t) - - var packageID uint - - t.Run("Step1_平台管理员创建套餐", func(t *testing.T) { - // POST /api/admin/packages - }) - - t.Run("Step2_分配给代理商", func(t *testing.T) { - // POST /api/admin/shop-packages - }) - - t.Run("Step3_代理商查看可售套餐", func(t *testing.T) { - // GET /api/admin/shop-packages - }) -} -``` - -## 完整示例 - -```go -package flows - -import ( - "fmt" - "testing" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - - "junhong_cmp_fiber/tests/testutils" -) - -// ============================================================ -// 流程测试：IoT 卡导入到激活完整流程 -// 来源：openspec/changes/iot-card-management/specs/iot-card/spec.md -// 参与者：平台管理员, 系统 -// ============================================================ - -func TestFlow_IotCardImportActivate(t *testing.T) { - env := testutils.NewIntegrationTestEnv(t) - - // 流程级共享状态 - var ( - taskID string - cardICCIDs []string - ) - - // ------------------------------------------------------------ - // Step 1: 上传 CSV 文件 - // 角色: 平台管理员 - // 调用: POST /api/admin/iot-cards/import - // 预期: 返回导入任务 ID - // - // 依赖: 无 - // 破坏点：如果文件上传不创建异步任务，后续无法追踪进度 - // ------------------------------------------------------------ - t.Run("Step1_上传CSV文件", func(t *testing.T) { - client := env.AsSuperAdmin() - - // 创建测试 CSV 内容 - csvContent := "iccid,msisdn,operator\n" + - "89860000000000000001,13800000001,中国移动\n" + - "89860000000000000002,13800000002,中国移动\n" - - resp, err := client.UploadFile("POST", "/api/admin/iot-cards/import", - "file", "cards.csv", []byte(csvContent)) - require.NoError(t, err) - require.Equal(t, 200, resp.StatusCode) - - var result map[string]interface{} - err = resp.JSON(&result) - require.NoError(t, err) - - data := result["data"].(map[string]interface{}) - taskID = data["task_id"].(string) - require.NotEmpty(t, taskID, "任务 ID 不能为空") - }) - - // ------------------------------------------------------------ - // Step 2: 查询导入任务状态 - // 角色: 平台管理员 - // 调用: GET /api/admin/iot-cards/import/{taskID} - // 预期: 任务状态为 completed，导入成功数量 = 2 - // - // 依赖: Step 1 的 taskID - // 破坏点：如果异步任务不更新状态，查询会一直返回 pending - // ------------------------------------------------------------ - t.Run("Step2_查询导入状态", func(t *testing.T) { - if taskID == "" { - t.Skip("依赖 Step 1 创建的 taskID") - } - - client := env.AsSuperAdmin() - - // 轮询等待任务完成（最多等待 30 秒） - var status string - for i := 0; i < 30; i++ { - resp, err := client.Request("GET", - fmt.Sprintf("/api/admin/iot-cards/import/%s", taskID), nil) - require.NoError(t, err) - require.Equal(t, 200, resp.StatusCode) - - var result map[string]interface{} - resp.JSON(&result) - data := result["data"].(map[string]interface{}) - status = data["status"].(string) - - if status == "completed" || status == "failed" { - break - } - time.Sleep(time.Second) - } - - require.Equal(t, "completed", status, "导入任务应该成功完成") - }) - - // ------------------------------------------------------------ - // Step 3: 验证卡片已入库 - // 角色: 平台管理员 - // 调用: GET /api/admin/iot-cards - // 预期: 能查询到导入的卡片 - // - // 依赖: Step 2 确认任务完成 - // 破坏点：如果导入任务不写入数据库，查询不到卡片 - // ------------------------------------------------------------ - t.Run("Step3_验证卡片入库", func(t *testing.T) { - if taskID == "" { - t.Skip("依赖前置步骤") - } - - client := env.AsSuperAdmin() - - resp, err := client.Request("GET", "/api/admin/iot-cards", map[string]interface{}{ - "iccid": "89860000000000000001", - }) - require.NoError(t, err) - require.Equal(t, 200, resp.StatusCode) - - var result map[string]interface{} - resp.JSON(&result) - data := result["data"].(map[string]interface{}) - list := data["list"].([]interface{}) - - require.Len(t, list, 1, "应该能查询到导入的卡片") - - card := list[0].(map[string]interface{}) - cardICCIDs = append(cardICCIDs, card["iccid"].(string)) - }) - - // ------------------------------------------------------------ - // Step 4: 激活卡片 - // 角色: 平台管理员 - // 调用: POST /api/admin/iot-cards/{iccid}/activate - // 预期: 卡片状态变为 active - // - // 依赖: Step 3 获取的 cardICCIDs - // 破坏点：如果激活 API 不调用运营商接口，状态不会真正变化 - // ------------------------------------------------------------ - t.Run("Step4_激活卡片", func(t *testing.T) { - if len(cardICCIDs) == 0 { - t.Skip("依赖 Step 3 获取的卡片 ICCID") - } - - client := env.AsSuperAdmin() - - resp, err := client.Request("POST", - fmt.Sprintf("/api/admin/iot-cards/%s/activate", cardICCIDs[0]), nil) - require.NoError(t, err) - require.Equal(t, 200, resp.StatusCode) - }) - - // ------------------------------------------------------------ - // Step 5: 验证卡片状态 - // 角色: 平台管理员 - // 调用: GET /api/admin/iot-cards/{iccid} - // 预期: 卡片状态为 active - // - // 依赖: Step 4 激活操作 - // 破坏点：如果激活后不更新数据库状态，查询还是旧状态 - // ------------------------------------------------------------ - t.Run("Step5_验证激活状态", func(t *testing.T) { - if len(cardICCIDs) == 0 { - t.Skip("依赖前置步骤") - } - - client := env.AsSuperAdmin() - - resp, err := client.Request("GET", - fmt.Sprintf("/api/admin/iot-cards/%s", cardICCIDs[0]), nil) - require.NoError(t, err) - require.Equal(t, 200, resp.StatusCode) - - var result map[string]interface{} - resp.JSON(&result) - data := result["data"].(map[string]interface{}) - - assert.Equal(t, "active", data["status"], "卡片状态应该是 active") - }) -} -``` - -## 常见问题 - -### Q: Step 之间必须按顺序执行吗？ - -是的。Go 的 t.Run 保证同一个父测试内的子测试按顺序执行。如果前置 step 失败，后续 step 会因为依赖检查而 skip。 - -### Q: 如何处理异步操作？ - -使用轮询等待： - -```go -// 等待异步任务完成 -for i := 0; i < maxRetries; i++ { - status := checkStatus() - if status == "completed" { - break - } - time.Sleep(interval) -} -``` - -### Q: 流程测试太慢怎么办？ - -1. 使用 `t.Parallel()` 让不同流程并行（注意数据隔离） -2. 减少 sleep 时间，增加轮询频率 -3. 考虑将部分验证移到验收测试 diff --git a/tests/flows/one_time_commission_chain_flow_test.go b/tests/flows/one_time_commission_chain_flow_test.go deleted file mode 100644 index f13da34..0000000 --- a/tests/flows/one_time_commission_chain_flow_test.go +++ /dev/null @@ -1,496 +0,0 @@ -package flows - -import ( - "encoding/json" - "fmt" - "testing" - "time" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/pkg/response" - "github.com/break/junhong_cmp_fiber/tests/testutils/integ" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -// ============================================================ -// 流程测试：一次性佣金链式分配 -// 来源：openspec/changes/refactor-one-time-commission-allocation/specs/shop-series-allocation/spec.md -// 参与者：平台管理员, 一级代理, 二级代理, 三级代理 -// ============================================================ - -func TestFlow_OneTimeCommissionChainAllocation(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - // ======================================================== - // 流程级共享状态 - // ======================================================== - var ( - seriesID uint - level1ShopID uint - level2ShopID uint - level3ShopID uint - level1AllocationID uint - level2AllocationID uint - level3AllocationID uint - packageID uint - level3PackageAllocID uint - ) - - // ------------------------------------------------------------ - // Step 1: 平台创建套餐系列并启用一次性佣金 - // 角色: 平台管理员 - // 调用: POST /api/admin/package-series - // 预期: 返回系列 ID，enable_one_time_commission = true - // - // 依赖: 无 - // 破坏点：如果系列创建不支持 enable_one_time_commission，后续分配无法启用 - // ------------------------------------------------------------ - t.Run("Step1_平台创建套餐系列", func(t *testing.T) { - body := map[string]interface{}{ - "series_code": fmt.Sprintf("CHAIN_SERIES_%d", time.Now().UnixNano()), - "series_name": "链式分配测试系列", - "description": "测试一次性佣金链式分配", - "status": 1, - "enable_one_time_commission": true, - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/package-series", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - require.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - require.Equal(t, 0, result.Code, "创建系列失败: %s", result.Message) - - data := result.Data.(map[string]interface{}) - seriesID = uint(data["id"].(float64)) - require.NotZero(t, seriesID, "系列 ID 不能为空") - }) - - // ------------------------------------------------------------ - // Step 2: 创建三级店铺层级 - // 角色: 平台管理员 - // 调用: POST /api/admin/shops (3次) - // 预期: 创建一级、二级、三级店铺 - // - // 依赖: 无 - // 破坏点：如果店铺层级关系不正确，后续分配权限检查会失败 - // ------------------------------------------------------------ - t.Run("Step2_创建三级店铺层级", func(t *testing.T) { - level1Shop := env.CreateTestShop("一级代理_链式", 1, nil) - level1ShopID = level1Shop.ID - require.NotZero(t, level1ShopID) - - level2Shop := env.CreateTestShop("二级代理_链式", 2, &level1ShopID) - level2ShopID = level2Shop.ID - require.NotZero(t, level2ShopID) - - level3Shop := env.CreateTestShop("三级代理_链式", 3, &level2ShopID) - level3ShopID = level3Shop.ID - require.NotZero(t, level3ShopID) - }) - - // ------------------------------------------------------------ - // Step 3: 平台为一级代理分配系列（金额上限 100 元） - // 角色: 平台管理员 - // 调用: POST /api/admin/shop-series-allocations - // 预期: 分配成功，one_time_commission_amount = 10000 - // - // 依赖: Step 1 的 seriesID, Step 2 的 level1ShopID - // 破坏点：如果平台无法分配系列，链式分配无法开始 - // ------------------------------------------------------------ - t.Run("Step3_平台为一级代理分配系列", func(t *testing.T) { - if seriesID == 0 || level1ShopID == 0 { - t.Skip("依赖前置步骤") - } - - body := map[string]interface{}{ - "shop_id": level1ShopID, - "series_id": seriesID, - "one_time_commission_amount": 10000, - "enable_one_time_commission": true, - "one_time_commission_trigger": "accumulated_recharge", - "one_time_commission_threshold": 100000, - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/shop-series-allocations", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - require.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - require.Equal(t, 0, result.Code, "平台分配失败: %s", result.Message) - - data := result.Data.(map[string]interface{}) - level1AllocationID = uint(data["id"].(float64)) - assert.Equal(t, float64(10000), data["one_time_commission_amount"]) - }) - - // ------------------------------------------------------------ - // Step 4: 一级代理为二级代理分配系列（金额上限 80 元） - // 角色: 一级代理 - // 调用: POST /api/admin/shop-series-allocations - // 预期: 分配成功，one_time_commission_amount = 8000 - // - // 依赖: Step 3 的 level1AllocationID - // 破坏点：如果一级无法为下级分配，链式传递中断 - // ------------------------------------------------------------ - t.Run("Step4_一级为二级分配系列", func(t *testing.T) { - if level1AllocationID == 0 { - t.Skip("依赖 Step 3") - } - - level1Account := env.CreateTestAccount("level1_agent", "password123", constants.UserTypeAgent, &level1ShopID, nil) - - body := map[string]interface{}{ - "shop_id": level2ShopID, - "series_id": seriesID, - "one_time_commission_amount": 8000, - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsUser(level1Account).Request("POST", "/api/admin/shop-series-allocations", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - require.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - require.Equal(t, 0, result.Code, "一级分配给二级失败: %s", result.Message) - - data := result.Data.(map[string]interface{}) - level2AllocationID = uint(data["id"].(float64)) - assert.Equal(t, float64(8000), data["one_time_commission_amount"]) - }) - - // ------------------------------------------------------------ - // Step 5: 二级代理为三级代理分配系列（金额上限 50 元） - // 角色: 二级代理 - // 调用: POST /api/admin/shop-series-allocations - // 预期: 分配成功，one_time_commission_amount = 5000 - // - // 依赖: Step 4 的 level2AllocationID - // 破坏点：如果二级无法为下级分配，链式传递中断 - // ------------------------------------------------------------ - t.Run("Step5_二级为三级分配系列", func(t *testing.T) { - if level2AllocationID == 0 { - t.Skip("依赖 Step 4") - } - - level2Account := env.CreateTestAccount("level2_agent", "password123", constants.UserTypeAgent, &level2ShopID, nil) - - body := map[string]interface{}{ - "shop_id": level3ShopID, - "series_id": seriesID, - "one_time_commission_amount": 5000, - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsUser(level2Account).Request("POST", "/api/admin/shop-series-allocations", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - require.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - require.Equal(t, 0, result.Code, "二级分配给三级失败: %s", result.Message) - - data := result.Data.(map[string]interface{}) - level3AllocationID = uint(data["id"].(float64)) - assert.Equal(t, float64(5000), data["one_time_commission_amount"]) - }) - - // ------------------------------------------------------------ - // Step 6: 验证链式分配金额正确 - // 角色: 平台管理员 - // 调用: GET /api/admin/shop-series-allocations?shop_id=xxx&series_id=xxx (3次) - // 预期: 一级 10000，二级 8000，三级 5000 - // - // 依赖: Step 3-5 的分配记录 - // 破坏点：如果金额查询不正确，佣金计算会出错 - // ------------------------------------------------------------ - t.Run("Step6_验证链式分配金额", func(t *testing.T) { - if level3AllocationID == 0 { - t.Skip("依赖前置步骤") - } - - verifyChainAllocationAmount(t, env, level1ShopID, seriesID, 10000) - verifyChainAllocationAmount(t, env, level2ShopID, seriesID, 8000) - verifyChainAllocationAmount(t, env, level3ShopID, seriesID, 5000) - }) - - // ------------------------------------------------------------ - // Step 7: 平台创建套餐并关联系列 - // 角色: 平台管理员 - // 调用: POST /api/admin/packages - // 预期: 返回套餐 ID，series_id 正确关联 - // - // 依赖: Step 1 的 seriesID - // 破坏点：如果套餐不关联系列，佣金计算无法找到配置 - // ------------------------------------------------------------ - t.Run("Step7_创建套餐", func(t *testing.T) { - if seriesID == 0 { - t.Skip("依赖 Step 1") - } - - body := map[string]interface{}{ - "package_code": fmt.Sprintf("CHAIN_PKG_%d", time.Now().UnixNano()), - "package_name": "链式分配测试套餐", - "series_id": seriesID, - "package_type": "formal", - "duration_months": 1, - "cost_price": 5000, - "suggested_retail_price": 9900, - "status": 1, - "shelf_status": 1, - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/packages", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - require.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - require.Equal(t, 0, result.Code, "创建套餐失败: %s", result.Message) - - data := result.Data.(map[string]interface{}) - packageID = uint(data["id"].(float64)) - require.NotZero(t, packageID) - }) - - // ------------------------------------------------------------ - // Step 8: 为三级代理分配套餐（需先有系列分配） - // 角色: 平台管理员 - // 调用: POST /api/admin/shop-package-allocations - // 预期: 分配成功，series_allocation_id 关联到系列分配 - // - // 依赖: Step 5 的 level3AllocationID, Step 7 的 packageID - // 破坏点：如果套餐分配不检查系列依赖，此测试将失败 - // ------------------------------------------------------------ - t.Run("Step8_为三级代理分配套餐", func(t *testing.T) { - if level3AllocationID == 0 || packageID == 0 { - t.Skip("依赖前置步骤") - } - - body := map[string]interface{}{ - "shop_id": level3ShopID, - "package_id": packageID, - "cost_price": 6000, - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/shop-package-allocations", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - require.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - require.Equal(t, 0, result.Code, "套餐分配失败: %s", result.Message) - - data := result.Data.(map[string]interface{}) - level3PackageAllocID = uint(data["id"].(float64)) - - if allocID, ok := data["series_allocation_id"]; ok && allocID != nil { - assert.Equal(t, float64(level3AllocationID), allocID, - "套餐分配应关联到系列分配") - } - }) - - // ------------------------------------------------------------ - // Step 9: 验证完整分配链路 - // 角色: 平台管理员 - // 调用: GET APIs - // 预期: 所有分配记录正确关联 - // - // 依赖: 所有前置步骤 - // 破坏点：如果任何环节数据不一致，此验证将失败 - // ------------------------------------------------------------ - t.Run("Step9_验证完整分配链路", func(t *testing.T) { - if level3PackageAllocID == 0 { - t.Skip("依赖前置步骤") - } - - assert.NotZero(t, seriesID, "系列已创建") - assert.NotZero(t, level1AllocationID, "一级系列分配已创建") - assert.NotZero(t, level2AllocationID, "二级系列分配已创建") - assert.NotZero(t, level3AllocationID, "三级系列分配已创建") - assert.NotZero(t, packageID, "套餐已创建") - assert.NotZero(t, level3PackageAllocID, "三级套餐分配已创建") - }) - - _ = level1AllocationID - _ = level3PackageAllocID -} - -func TestFlow_OneTimeCommissionChainAllocation_Exceptions(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - // ------------------------------------------------------------ - // 异常流程：下级金额超过上级上限 - // 预期：分配失败，返回错误 - // ------------------------------------------------------------ - t.Run("Exception_下级金额超过上级", func(t *testing.T) { - parentShop := env.CreateTestShop("超限测试_父级", 1, nil) - childShop := env.CreateTestShop("超限测试_子级", 2, &parentShop.ID) - series := createFlowTestSeries(t, env, "超限测试系列") - - createFlowPlatformAllocation(t, env, parentShop.ID, series.ID, 10000) - - body := map[string]interface{}{ - "shop_id": childShop.ID, - "series_id": series.ID, - "one_time_commission_amount": 15000, - } - jsonBody, _ := json.Marshal(body) - - parentAccount := env.CreateTestAccount("parent_agent", "password123", constants.UserTypeAgent, &parentShop.ID, nil) - - resp, err := env.AsUser(parentAccount).Request("POST", "/api/admin/shop-series-allocations", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - assert.True(t, resp.StatusCode == 400 || resp.StatusCode == 403, - "超限分配应返回 400 或 403，实际: %d", resp.StatusCode) - }) - - // ------------------------------------------------------------ - // 异常流程：未分配系列就分配套餐 - // 预期：套餐分配失败 - // ------------------------------------------------------------ - t.Run("Exception_未分配系列就分配套餐", func(t *testing.T) { - shop := env.CreateTestShop("无系列分配店铺", 1, nil) - series := createFlowTestSeries(t, env, "未分配系列") - pkg := createFlowTestPackage(t, env, series.ID, "未分配测试套餐") - - body := map[string]interface{}{ - "shop_id": shop.ID, - "package_id": pkg.ID, - "cost_price": 5000, - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/shop-package-allocations", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 400, resp.StatusCode, "未分配系列时分配套餐应失败") - }) -} - -// ============================================================ -// 辅助函数 -// ============================================================ - -func verifyChainAllocationAmount(t *testing.T, env *integ.IntegrationTestEnv, shopID, seriesID uint, expectedAmount int64) { - t.Helper() - - path := fmt.Sprintf("/api/admin/shop-series-allocations?shop_id=%d&series_id=%d", shopID, seriesID) - - resp, err := env.AsSuperAdmin().Request("GET", path, nil) - require.NoError(t, err) - defer resp.Body.Close() - - require.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - require.Equal(t, 0, result.Code) - - data := result.Data.(map[string]interface{}) - items := data["items"].([]interface{}) - require.NotEmpty(t, items, "店铺 %d 应存在系列 %d 的分配记录", shopID, seriesID) - - allocation := items[0].(map[string]interface{}) - assert.Equal(t, float64(expectedAmount), allocation["one_time_commission_amount"], - "店铺 %d 的佣金金额应为 %d", shopID, expectedAmount) -} - -func createFlowTestSeries(t *testing.T, env *integ.IntegrationTestEnv, name string) *model.PackageSeries { - t.Helper() - - timestamp := time.Now().UnixNano() - series := &model.PackageSeries{ - SeriesCode: fmt.Sprintf("FLOW_SERIES_%d", timestamp), - SeriesName: name, - Status: constants.StatusEnabled, - EnableOneTimeCommission: true, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - - err := env.TX.Create(series).Error - require.NoError(t, err) - - return series -} - -func createFlowTestPackage(t *testing.T, env *integ.IntegrationTestEnv, seriesID uint, name string) *model.Package { - t.Helper() - - timestamp := time.Now().UnixNano() - pkg := &model.Package{ - PackageCode: fmt.Sprintf("FLOW_PKG_%d", timestamp), - PackageName: name, - SeriesID: seriesID, - PackageType: "formal", - DurationMonths: 1, - CostPrice: 5000, - SuggestedRetailPrice: 9900, - Status: constants.StatusEnabled, - ShelfStatus: 1, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - - err := env.TX.Create(pkg).Error - require.NoError(t, err) - - return pkg -} - -func createFlowPlatformAllocation(t *testing.T, env *integ.IntegrationTestEnv, shopID, seriesID uint, amount int64) *model.ShopSeriesAllocation { - t.Helper() - - allocation := &model.ShopSeriesAllocation{ - ShopID: shopID, - SeriesID: seriesID, - AllocatorShopID: 0, - OneTimeCommissionAmount: amount, - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - - err := env.TX.Create(allocation).Error - require.NoError(t, err) - - return allocation -} diff --git a/tests/integration/account_audit_test.go b/tests/integration/account_audit_test.go deleted file mode 100644 index 31d09f6..0000000 --- a/tests/integration/account_audit_test.go +++ /dev/null @@ -1,406 +0,0 @@ -package integration - -import ( - "encoding/json" - "fmt" - "net/http" - "testing" - "time" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/internal/model/dto" - accountSvc "github.com/break/junhong_cmp_fiber/internal/service/account" - accountAuditSvc "github.com/break/junhong_cmp_fiber/internal/service/account_audit" - "github.com/break/junhong_cmp_fiber/internal/store/postgres" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/pkg/response" - "github.com/break/junhong_cmp_fiber/tests/testutils/integ" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -// extractAccountID 从响应 data 中提取账号 ID -// gorm.Model 的 ID 字段在 JSON 中序列化为大写 "ID" -func extractAccountID(t *testing.T, data map[string]interface{}) uint { - t.Helper() - idVal := data["ID"] - if idVal == nil { - idVal = data["id"] - } - require.NotNil(t, idVal, "响应应包含 ID 字段") - return uint(idVal.(float64)) -} - -// TestAccountAudit 账号操作审计日志集成测试 -// 验证所有账号管理操作都被正确记录到审计日志 -func TestAccountAudit(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - // 13.2 - 创建账号时记录审计日志 - t.Run("创建账号时记录审计日志", func(t *testing.T) { - shop := env.CreateTestShop("测试店铺", 1, nil) - - // 创建账号 - reqBody := dto.CreateAccountRequest{ - Username: fmt.Sprintf("test_%d", time.Now().UnixNano()), - Phone: fmt.Sprintf("138%08d", time.Now().UnixNano()%100000000), - Password: "Password123", - UserType: constants.UserTypeAgent, - ShopID: &shop.ID, - } - - jsonBody, err := json.Marshal(reqBody) - require.NoError(t, err) - - resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/accounts", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - require.Equal(t, http.StatusOK, resp.StatusCode) - - // 解析响应获取账号 ID - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - require.Equal(t, 0, result.Code, "创建账号应该成功，响应: %+v", result) - require.NotNil(t, result.Data, "响应 data 不应为 nil") - - data, ok := result.Data.(map[string]interface{}) - require.True(t, ok, "响应 data 应为 map，实际: %T", result.Data) - accountID := extractAccountID(t, data) - - // 等待异步日志写入 - time.Sleep(200 * time.Millisecond) - - // 验证审计日志 - var log model.AccountOperationLog - err = env.RawDB().Where("target_account_id = ? AND operation_type = ?", accountID, "create"). - First(&log).Error - require.NoError(t, err, "应该存在创建操作的审计日志") - - // 验证日志字段 - assert.Equal(t, "create", log.OperationType) - assert.NotNil(t, log.AfterData, "创建操作应有 after_data") - assert.Nil(t, log.BeforeData, "创建操作不应有 before_data") - assert.NotNil(t, log.TargetUsername) - assert.Equal(t, reqBody.Username, *log.TargetUsername) - - // 验证 after_data 包含账号信息 - afterData := log.AfterData - assert.Equal(t, reqBody.Username, afterData["username"]) - assert.Equal(t, reqBody.Phone, afterData["phone"]) - }) - - // 13.3 - 更新账号时记录 before_data 和 after_data - t.Run("更新账号时记录before_data和after_data", func(t *testing.T) { - shop := env.CreateTestShop("测试店铺", 1, nil) - account := env.CreateTestAccount("agent_update", "password123", constants.UserTypeAgent, &shop.ID, nil) - - // 记录原始数据 - originalUsername := account.Username - - // 更新账号 - newUsername := fmt.Sprintf("updated_%d", time.Now().UnixNano()) - reqBody := dto.UpdateAccountRequest{ - Username: &newUsername, - } - - jsonBody, err := json.Marshal(reqBody) - require.NoError(t, err) - - resp, err := env.AsSuperAdmin().Request("PUT", fmt.Sprintf("/api/admin/accounts/%d", account.ID), jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - require.Equal(t, http.StatusOK, resp.StatusCode) - - // 等待异步日志写入 - time.Sleep(200 * time.Millisecond) - - // 验证审计日志 - var log model.AccountOperationLog - err = env.RawDB().Where("target_account_id = ? AND operation_type = ?", account.ID, "update"). - Order("created_at DESC").First(&log).Error - require.NoError(t, err, "应该存在更新操作的审计日志") - - // 验证 before_data - assert.NotNil(t, log.BeforeData, "更新操作应有 before_data") - beforeData := log.BeforeData - assert.Equal(t, originalUsername, beforeData["username"]) - - // 验证 after_data - assert.NotNil(t, log.AfterData, "更新操作应有 after_data") - afterData := log.AfterData - assert.Equal(t, newUsername, afterData["username"]) - }) - - // 13.4 - 删除账号时记录审计日志 - t.Run("删除账号时记录审计日志", func(t *testing.T) { - shop := env.CreateTestShop("测试店铺", 1, nil) - account := env.CreateTestAccount("agent_delete", "password123", constants.UserTypeAgent, &shop.ID, nil) - - // 删除账号 - resp, err := env.AsSuperAdmin().Request("DELETE", fmt.Sprintf("/api/admin/accounts/%d", account.ID), nil) - require.NoError(t, err) - defer resp.Body.Close() - - require.Equal(t, http.StatusOK, resp.StatusCode) - - // 等待异步日志写入 - time.Sleep(200 * time.Millisecond) - - // 验证审计日志 - var log model.AccountOperationLog - err = env.RawDB().Where("target_account_id = ? AND operation_type = ?", account.ID, "delete"). - First(&log).Error - require.NoError(t, err, "应该存在删除操作的审计日志") - - assert.Equal(t, "delete", log.OperationType) - assert.NotNil(t, log.BeforeData, "删除操作应有 before_data") - assert.Nil(t, log.AfterData, "删除操作不应有 after_data") - }) - - // 13.5 - 分配角色时记录审计日志 - t.Run("分配角色时记录审计日志", func(t *testing.T) { - shop := env.CreateTestShop("测试店铺", 1, nil) - account := env.CreateTestAccount("agent_roles", "password123", constants.UserTypeAgent, &shop.ID, nil) - // 代理账号使用 RoleTypeCustomer (2) 类型的角色 - role := env.CreateTestRole("测试角色", constants.RoleTypeCustomer) - - // 分配角色 - reqBody := dto.AssignRolesRequest{ - RoleIDs: []uint{role.ID}, - } - jsonBody, err := json.Marshal(reqBody) - require.NoError(t, err) - - resp, err := env.AsSuperAdmin().Request("POST", fmt.Sprintf("/api/admin/accounts/%d/roles", account.ID), jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - require.Equal(t, http.StatusOK, resp.StatusCode) - - // 等待异步日志写入 - time.Sleep(200 * time.Millisecond) - - // 验证审计日志 - var log model.AccountOperationLog - err = env.RawDB().Where("target_account_id = ? AND operation_type = ?", account.ID, "assign_roles"). - First(&log).Error - require.NoError(t, err, "应该存在分配角色操作的审计日志") - - assert.Equal(t, "assign_roles", log.OperationType) - assert.NotNil(t, log.AfterData, "分配角色操作应有 after_data") - afterData := log.AfterData - roleIDs, ok := afterData["role_ids"].([]interface{}) - require.True(t, ok, "after_data 应包含 role_ids 数组") - assert.Contains(t, roleIDs, float64(role.ID)) - }) - - // 13.6 - 移除角色时记录审计日志 - // 由于路由参数名与 Handler 不匹配（路由用 :account_id，Handler 用 c.Params("id")）， - // 此测试创建独立的 AccountService 实例直接调用 RemoveRole 方法来验证审计日志 - t.Run("移除角色时记录审计日志", func(t *testing.T) { - shop := env.CreateTestShop("测试店铺", 1, nil) - account := env.CreateTestAccount("agent_remove_role", "password123", constants.UserTypeAgent, &shop.ID, nil) - role := env.CreateTestRole("测试角色", constants.RoleTypeCustomer) - - // 先分配角色 - assignReqBody := dto.AssignRolesRequest{ - RoleIDs: []uint{role.ID}, - } - jsonBody, err := json.Marshal(assignReqBody) - require.NoError(t, err) - - resp, err := env.AsSuperAdmin().Request("POST", fmt.Sprintf("/api/admin/accounts/%d/roles", account.ID), jsonBody) - require.NoError(t, err) - resp.Body.Close() - require.Equal(t, http.StatusOK, resp.StatusCode) - time.Sleep(200 * time.Millisecond) - - // 创建独立的 Service 实例来测试 RemoveRole - accountStore := postgres.NewAccountStore(env.TX, env.Redis) - roleStore := postgres.NewRoleStore(env.TX) - accountRoleStore := postgres.NewAccountRoleStore(env.TX, env.Redis) - shopStore := postgres.NewShopStore(env.TX, env.Redis) - enterpriseStore := postgres.NewEnterpriseStore(env.TX, env.Redis) - shopRoleStore := postgres.NewShopRoleStore(env.TX, env.Redis) - auditLogStore := postgres.NewAccountOperationLogStore(env.TX) - auditService := accountAuditSvc.NewService(auditLogStore) - accountService := accountSvc.New(accountStore, roleStore, accountRoleStore, shopRoleStore, shopStore, enterpriseStore, auditService) - - // 调用 RemoveRole - ctx := env.GetSuperAdminContext() - err = accountService.RemoveRole(ctx, account.ID, role.ID) - require.NoError(t, err) - - // 等待异步日志写入 - time.Sleep(200 * time.Millisecond) - - // 验证审计日志 - var log model.AccountOperationLog - err = env.RawDB().Where("target_account_id = ? AND operation_type = ?", account.ID, "remove_role"). - Order("created_at DESC").First(&log).Error - require.NoError(t, err, "应该存在移除角色操作的审计日志") - - assert.Equal(t, "remove_role", log.OperationType) - assert.NotNil(t, log.AfterData, "移除角色操作应有 after_data") - afterData := log.AfterData - assert.Equal(t, float64(role.ID), afterData["removed_role_id"]) - }) - - // 13.7 - 审计日志包含完整的操作上下文 - t.Run("审计日志包含完整的操作上下文", func(t *testing.T) { - shop := env.CreateTestShop("测试店铺", 1, nil) - - // 创建账号 - reqBody := dto.CreateAccountRequest{ - Username: fmt.Sprintf("test_ctx_%d", time.Now().UnixNano()), - Phone: fmt.Sprintf("138%08d", time.Now().UnixNano()%100000000), - Password: "Password123", - UserType: constants.UserTypeAgent, - ShopID: &shop.ID, - } - - jsonBody, err := json.Marshal(reqBody) - require.NoError(t, err) - - resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/accounts", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - require.Equal(t, http.StatusOK, resp.StatusCode) - - // 解析响应 - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - - data, ok := result.Data.(map[string]interface{}) - require.True(t, ok) - accountID := extractAccountID(t, data) - - // 等待异步日志写入 - time.Sleep(200 * time.Millisecond) - - // 验证审计日志包含所有上下文 - var log model.AccountOperationLog - err = env.RawDB().Where("target_account_id = ?", accountID).First(&log).Error - require.NoError(t, err) - - // 验证操作人信息 - assert.NotZero(t, log.OperatorID, "应有操作人ID") - assert.NotZero(t, log.OperatorType, "应有操作人类型") - assert.NotEmpty(t, log.OperatorName, "应有操作人用户名") - - // 验证目标账号信息 - assert.NotNil(t, log.TargetAccountID, "应有目标账号ID") - assert.Equal(t, accountID, *log.TargetAccountID) - assert.NotNil(t, log.TargetUsername, "应有目标账号用户名") - assert.NotNil(t, log.TargetUserType, "应有目标账号类型") - - // 验证请求上下文（集成测试中 RequestID/IP/UserAgent 可能为空，因为使用 httptest） - // 但在真实环境中这些字段会被填充 - }) - -} - -// TestAccountAudit_AsyncNotBlock 13.8 - 审计日志写入失败不影响业务操作 -// 使用独立环境避免与其他测试的异步 goroutine 冲突 -func TestAccountAudit_AsyncNotBlock(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - shop := env.CreateTestShop("测试店铺", 1, nil) - - reqBody := dto.CreateAccountRequest{ - Username: fmt.Sprintf("test_async_%d", time.Now().UnixNano()), - Phone: fmt.Sprintf("138%08d", time.Now().UnixNano()%100000000), - Password: "Password123", - UserType: constants.UserTypeAgent, - ShopID: &shop.ID, - } - - jsonBody, err := json.Marshal(reqBody) - require.NoError(t, err) - - resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/accounts", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - require.Equal(t, http.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code, "业务操作应该成功，不受审计日志影响") - assert.NotNil(t, result.Data, "应返回创建的账号数据") - - data, ok := result.Data.(map[string]interface{}) - require.True(t, ok) - accountID := extractAccountID(t, data) - - time.Sleep(200 * time.Millisecond) - - var account model.Account - err = env.RawDB().First(&account, accountID).Error - require.NoError(t, err, "账号应该被成功创建到数据库") - assert.Equal(t, reqBody.Username, account.Username) -} - -// TestAccountAudit_OperationTypes 13.9 - 验证操作类型正确性 -// 使用独立环境避免与其他测试的异步 goroutine 冲突 -func TestAccountAudit_OperationTypes(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - shop := env.CreateTestShop("测试店铺", 1, nil) - - createReqBody := dto.CreateAccountRequest{ - Username: fmt.Sprintf("test_optype_%d", time.Now().UnixNano()), - Phone: fmt.Sprintf("138%08d", time.Now().UnixNano()%100000000), - Password: "Password123", - UserType: constants.UserTypeAgent, - ShopID: &shop.ID, - } - jsonBody, err := json.Marshal(createReqBody) - require.NoError(t, err) - - resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/accounts", jsonBody) - require.NoError(t, err) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - resp.Body.Close() - - data, ok := result.Data.(map[string]interface{}) - require.True(t, ok) - accountID := extractAccountID(t, data) - time.Sleep(200 * time.Millisecond) - - newUsername := fmt.Sprintf("updated_optype_%d", time.Now().UnixNano()) - updateReqBody := dto.UpdateAccountRequest{ - Username: &newUsername, - } - jsonBody, err = json.Marshal(updateReqBody) - require.NoError(t, err) - - resp, err = env.AsSuperAdmin().Request("PUT", fmt.Sprintf("/api/admin/accounts/%d", accountID), jsonBody) - require.NoError(t, err) - resp.Body.Close() - time.Sleep(200 * time.Millisecond) - - var logs []model.AccountOperationLog - err = env.RawDB().Where("target_account_id = ?", accountID). - Order("created_at ASC").Find(&logs).Error - require.NoError(t, err) - - require.GreaterOrEqual(t, len(logs), 2, "应该至少有 create 和 update 两条审计日志") - - operationTypes := make(map[string]bool) - for _, log := range logs { - operationTypes[log.OperationType] = true - } - - assert.True(t, operationTypes["create"], "应该有 create 类型的审计日志") - assert.True(t, operationTypes["update"], "应该有 update 类型的审计日志") -} diff --git a/tests/integration/account_permission_test.go b/tests/integration/account_permission_test.go deleted file mode 100644 index 1e2cde0..0000000 --- a/tests/integration/account_permission_test.go +++ /dev/null @@ -1,495 +0,0 @@ -package integration - -import ( - "encoding/json" - "fmt" - "testing" - "time" - - "github.com/gofiber/fiber/v2" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - - "github.com/break/junhong_cmp_fiber/internal/model/dto" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/pkg/response" - "github.com/break/junhong_cmp_fiber/tests/testutils/integ" -) - -// TestAccountPermission_12_2 企业账号访问账号管理接口被路由层拦截 -func TestAccountPermission_12_2(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - shop := env.CreateTestShop("测试店铺", 1, nil) - enterprise := env.CreateTestEnterprise("测试企业", &shop.ID) - - enterpriseAccount := env.CreateTestAccount( - "enterprise_user", - "password123", - constants.UserTypeEnterprise, - nil, - &enterprise.ID, - ) - - reqBody := dto.CreateAccountRequest{ - Username: fmt.Sprintf("test_%d", time.Now().UnixNano()), - Phone: fmt.Sprintf("138%08d", time.Now().UnixNano()%100000000), - Password: "Password123", - UserType: constants.UserTypeEnterprise, - EnterpriseID: &enterprise.ID, - } - jsonBody, _ := json.Marshal(reqBody) - - resp, err := env.AsUser(enterpriseAccount).Request("POST", "/api/admin/accounts", jsonBody) - require.NoError(t, err) - - assert.Equal(t, fiber.StatusForbidden, resp.StatusCode, "企业账号应被路由层拦截") - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Contains(t, result.Message, "权限", "错误消息应包含权限相关信息") -} - -// TestAccountPermission_12_3 代理账号创建自己店铺的账号成功 -func TestAccountPermission_12_3(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - shop := env.CreateTestShop("代理店铺1", 1, nil) - - agentAccount := env.CreateTestAccount( - "agent_user", - "password123", - constants.UserTypeAgent, - &shop.ID, - nil, - ) - - reqBody := dto.CreateAccountRequest{ - Username: fmt.Sprintf("agent_same_%d", time.Now().UnixNano()), - Phone: fmt.Sprintf("138%08d", time.Now().UnixNano()%100000000), - Password: "Password123", - UserType: constants.UserTypeAgent, - ShopID: &shop.ID, - } - jsonBody, _ := json.Marshal(reqBody) - - resp, err := env.AsUser(agentAccount).Request("POST", "/api/admin/accounts", jsonBody) - require.NoError(t, err) - - assert.Equal(t, fiber.StatusOK, resp.StatusCode, "代理账号应能创建自己店铺的账号") - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code, "业务码应为0") -} - -// TestAccountPermission_12_4 代理账号创建下级店铺的账号成功 -func TestAccountPermission_12_4(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - parentShop := env.CreateTestShop("父店铺", 1, nil) - childShop := env.CreateTestShop("子店铺", 2, &parentShop.ID) - - agentAccount := env.CreateTestAccount( - "agent_parent", - "password123", - constants.UserTypeAgent, - &parentShop.ID, - nil, - ) - - reqBody := dto.CreateAccountRequest{ - Username: fmt.Sprintf("agent_child_%d", time.Now().UnixNano()), - Phone: fmt.Sprintf("138%08d", time.Now().UnixNano()%100000000), - Password: "Password123", - UserType: constants.UserTypeAgent, - ShopID: &childShop.ID, - } - jsonBody, _ := json.Marshal(reqBody) - - resp, err := env.AsUser(agentAccount).Request("POST", "/api/admin/accounts", jsonBody) - require.NoError(t, err) - - assert.Equal(t, fiber.StatusOK, resp.StatusCode, "代理账号应能创建下级店铺的账号") - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code, "业务码应为0") -} - -// TestAccountPermission_12_5 代理账号创建其他店铺的账号失败 -func TestAccountPermission_12_5(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - shop1 := env.CreateTestShop("独立店铺1", 1, nil) - shop2 := env.CreateTestShop("独立店铺2", 1, nil) - - agentAccount := env.CreateTestAccount( - "agent_shop1", - "password123", - constants.UserTypeAgent, - &shop1.ID, - nil, - ) - - reqBody := dto.CreateAccountRequest{ - Username: fmt.Sprintf("agent_other_%d", time.Now().UnixNano()), - Phone: fmt.Sprintf("138%08d", time.Now().UnixNano()%100000000), - Password: "Password123", - UserType: constants.UserTypeAgent, - ShopID: &shop2.ID, - } - jsonBody, _ := json.Marshal(reqBody) - - resp, err := env.AsUser(agentAccount).Request("POST", "/api/admin/accounts", jsonBody) - require.NoError(t, err) - - assert.Equal(t, fiber.StatusForbidden, resp.StatusCode, "代理账号不应能创建其他店铺的账号") - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Contains(t, result.Message, "权限", "错误消息应包含权限相关信息") -} - -// TestAccountPermission_12_6 代理账号创建平台账号失败 -func TestAccountPermission_12_6(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - shop := env.CreateTestShop("代理店铺", 1, nil) - - agentAccount := env.CreateTestAccount( - "agent_try_platform", - "password123", - constants.UserTypeAgent, - &shop.ID, - nil, - ) - - reqBody := dto.CreateAccountRequest{ - Username: fmt.Sprintf("platform_%d", time.Now().UnixNano()), - Phone: fmt.Sprintf("138%08d", time.Now().UnixNano()%100000000), - Password: "Password123", - UserType: constants.UserTypePlatform, - } - jsonBody, _ := json.Marshal(reqBody) - - resp, err := env.AsUser(agentAccount).Request("POST", "/api/admin/accounts", jsonBody) - require.NoError(t, err) - - assert.Equal(t, fiber.StatusForbidden, resp.StatusCode, "代理账号不应能创建平台账号") - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Contains(t, result.Message, "权限", "错误消息应包含权限相关信息") -} - -// TestAccountPermission_12_7 平台账号创建任意类型账号成功 -func TestAccountPermission_12_7(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - shop := env.CreateTestShop("平台测试店铺", 1, nil) - - platformAccount := env.CreateTestAccount( - "platform_user", - "password123", - constants.UserTypePlatform, - nil, - nil, - ) - - t.Run("创建平台账号", func(t *testing.T) { - reqBody := dto.CreateAccountRequest{ - Username: fmt.Sprintf("platform_new_%d", time.Now().UnixNano()), - Phone: fmt.Sprintf("138%08d", time.Now().UnixNano()%100000000), - Password: "Password123", - UserType: constants.UserTypePlatform, - } - jsonBody, _ := json.Marshal(reqBody) - - resp, err := env.AsUser(platformAccount).Request("POST", "/api/admin/accounts", jsonBody) - require.NoError(t, err) - assert.Equal(t, fiber.StatusOK, resp.StatusCode, "平台账号应能创建平台账号") - }) - - t.Run("创建代理账号", func(t *testing.T) { - time.Sleep(time.Millisecond) - reqBody := dto.CreateAccountRequest{ - Username: fmt.Sprintf("agent_new_%d", time.Now().UnixNano()), - Phone: fmt.Sprintf("138%08d", time.Now().UnixNano()%100000000), - Password: "Password123", - UserType: constants.UserTypeAgent, - ShopID: &shop.ID, - } - jsonBody, _ := json.Marshal(reqBody) - - resp, err := env.AsUser(platformAccount).Request("POST", "/api/admin/accounts", jsonBody) - require.NoError(t, err) - assert.Equal(t, fiber.StatusOK, resp.StatusCode, "平台账号应能创建代理账号") - }) -} - -// TestAccountPermission_12_8 超级管理员创建任意类型账号成功 -func TestAccountPermission_12_8(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - shop := env.CreateTestShop("超管测试店铺", 1, nil) - enterprise := env.CreateTestEnterprise("超管测试企业", &shop.ID) - - t.Run("创建平台账号", func(t *testing.T) { - reqBody := dto.CreateAccountRequest{ - Username: fmt.Sprintf("superadmin_platform_%d", time.Now().UnixNano()), - Phone: fmt.Sprintf("138%08d", time.Now().UnixNano()%100000000), - Password: "Password123", - UserType: constants.UserTypePlatform, - } - jsonBody, _ := json.Marshal(reqBody) - - resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/accounts", jsonBody) - require.NoError(t, err) - assert.Equal(t, fiber.StatusOK, resp.StatusCode, "超级管理员应能创建平台账号") - }) - - t.Run("创建代理账号", func(t *testing.T) { - time.Sleep(time.Millisecond) - reqBody := dto.CreateAccountRequest{ - Username: fmt.Sprintf("superadmin_agent_%d", time.Now().UnixNano()), - Phone: fmt.Sprintf("138%08d", time.Now().UnixNano()%100000000), - Password: "Password123", - UserType: constants.UserTypeAgent, - ShopID: &shop.ID, - } - jsonBody, _ := json.Marshal(reqBody) - - resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/accounts", jsonBody) - require.NoError(t, err) - assert.Equal(t, fiber.StatusOK, resp.StatusCode, "超级管理员应能创建代理账号") - }) - - t.Run("创建企业账号", func(t *testing.T) { - time.Sleep(time.Millisecond) - reqBody := dto.CreateAccountRequest{ - Username: fmt.Sprintf("superadmin_ent_%d", time.Now().UnixNano()), - Phone: fmt.Sprintf("138%08d", time.Now().UnixNano()%100000000), - Password: "Password123", - UserType: constants.UserTypeEnterprise, - EnterpriseID: &enterprise.ID, - } - jsonBody, _ := json.Marshal(reqBody) - - resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/accounts", jsonBody) - require.NoError(t, err) - assert.Equal(t, fiber.StatusOK, resp.StatusCode, "超级管理员应能创建企业账号") - }) -} - -// TestAccountPermission_12_9 查询不存在的账号返回统一错误 -func TestAccountPermission_12_9(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - shop := env.CreateTestShop("查询测试店铺", 1, nil) - agentAccount := env.CreateTestAccount( - "agent_query", - "password123", - constants.UserTypeAgent, - &shop.ID, - nil, - ) - - resp, err := env.AsUser(agentAccount).Request("GET", "/api/admin/accounts/99999", nil) - require.NoError(t, err) - - // GORM 自动过滤后，查询不存在的账号返回 "账号不存在" (400) - // 或 "无权限操作该资源或资源不存在" (403) - assert.True(t, - resp.StatusCode == fiber.StatusBadRequest || - resp.StatusCode == fiber.StatusForbidden || - resp.StatusCode == fiber.StatusNotFound, - "查询不存在的账号应返回错误状态码") - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.NotEqual(t, 0, result.Code, "业务码应不为0") -} - -// TestAccountPermission_12_10 查询越权的账号返回相同错误消息 -func TestAccountPermission_12_10(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - shop1 := env.CreateTestShop("越权测试店铺1", 1, nil) - shop2 := env.CreateTestShop("越权测试店铺2", 1, nil) - - agentAccount1 := env.CreateTestAccount( - "agent_auth1", - "password123", - constants.UserTypeAgent, - &shop1.ID, - nil, - ) - - agentAccount2 := env.CreateTestAccount( - "agent_auth2", - "password123", - constants.UserTypeAgent, - &shop2.ID, - nil, - ) - - resp, err := env.AsUser(agentAccount1).Request( - "GET", - fmt.Sprintf("/api/admin/accounts/%d", agentAccount2.ID), - nil, - ) - require.NoError(t, err) - - // GORM 自动过滤使越权查询返回与不存在相同的错误，防止信息泄露 - assert.True(t, - resp.StatusCode == fiber.StatusBadRequest || - resp.StatusCode == fiber.StatusForbidden || - resp.StatusCode == fiber.StatusNotFound, - "查询越权账号应返回错误状态码") - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.NotEqual(t, 0, result.Code, "业务码应不为0") -} - -// TestAccountPermission_12_11 代理账号更新其他店铺的账号失败 -func TestAccountPermission_12_11(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - shop1 := env.CreateTestShop("更新测试店铺1", 1, nil) - shop2 := env.CreateTestShop("更新测试店铺2", 1, nil) - - agentAccount1 := env.CreateTestAccount( - "agent_update1", - "password123", - constants.UserTypeAgent, - &shop1.ID, - nil, - ) - - agentAccount2 := env.CreateTestAccount( - "agent_update2", - "password123", - constants.UserTypeAgent, - &shop2.ID, - nil, - ) - - newUsername := "updated_username" - reqBody := dto.UpdateAccountRequest{ - Username: &newUsername, - } - jsonBody, _ := json.Marshal(reqBody) - - resp, err := env.AsUser(agentAccount1).Request( - "PUT", - fmt.Sprintf("/api/admin/accounts/%d", agentAccount2.ID), - jsonBody, - ) - require.NoError(t, err) - - assert.Equal(t, fiber.StatusForbidden, resp.StatusCode, "代理账号不应能更新其他店铺的账号") - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Contains(t, result.Message, "权限", "错误消息应包含权限相关信息") -} - -// TestEnterpriseAccountRouteBlocking 测试企业账号访问各类型账号管理接口的路由层拦截 -func TestEnterpriseAccountRouteBlocking(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - shop := env.CreateTestShop("路由拦截测试店铺", 1, nil) - enterprise := env.CreateTestEnterprise("路由拦截测试企业", &shop.ID) - - enterpriseAccount := env.CreateTestAccount( - "enterprise_route_test", - "password123", - constants.UserTypeEnterprise, - nil, - &enterprise.ID, - ) - - t.Run("企业账号访问企业账号列表接口被拦截", func(t *testing.T) { - resp, err := env.AsUser(enterpriseAccount).Request("GET", "/api/admin/accounts", nil) - require.NoError(t, err) - assert.Equal(t, fiber.StatusForbidden, resp.StatusCode) - }) - - t.Run("企业账号访问企业账号详情接口被拦截", func(t *testing.T) { - resp, err := env.AsUser(enterpriseAccount).Request("GET", "/api/admin/accounts/1", nil) - require.NoError(t, err) - assert.Equal(t, fiber.StatusForbidden, resp.StatusCode) - }) - - t.Run("企业账号访问创建企业账号接口被拦截", func(t *testing.T) { - reqBody := dto.CreateAccountRequest{ - Username: fmt.Sprintf("test_%d", time.Now().UnixNano()), - Phone: fmt.Sprintf("138%08d", time.Now().UnixNano()%100000000), - Password: "Password123", - UserType: constants.UserTypeEnterprise, - EnterpriseID: &enterprise.ID, - } - jsonBody, _ := json.Marshal(reqBody) - - resp, err := env.AsUser(enterpriseAccount).Request("POST", "/api/admin/accounts", jsonBody) - require.NoError(t, err) - assert.Equal(t, fiber.StatusForbidden, resp.StatusCode) - }) -} - -// TestAgentAccountHierarchyPermission 测试代理账号的层级权限 -func TestAgentAccountHierarchyPermission(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - level1Shop := env.CreateTestShop("一级店铺", 1, nil) - level2Shop := env.CreateTestShop("二级店铺", 2, &level1Shop.ID) - level3Shop := env.CreateTestShop("三级店铺", 3, &level2Shop.ID) - - level2Agent := env.CreateTestAccount( - "level2_agent", - "password123", - constants.UserTypeAgent, - &level2Shop.ID, - nil, - ) - - t.Run("二级代理可以管理三级店铺账号", func(t *testing.T) { - reqBody := dto.CreateAccountRequest{ - Username: fmt.Sprintf("level3_new_%d", time.Now().UnixNano()), - Phone: fmt.Sprintf("138%08d", time.Now().UnixNano()%100000000), - Password: "Password123", - UserType: constants.UserTypeAgent, - ShopID: &level3Shop.ID, - } - jsonBody, _ := json.Marshal(reqBody) - - resp, err := env.AsUser(level2Agent).Request("POST", "/api/admin/accounts", jsonBody) - require.NoError(t, err) - assert.Equal(t, fiber.StatusOK, resp.StatusCode, "二级代理应能管理三级店铺账号") - }) - - t.Run("二级代理不能管理一级店铺账号", func(t *testing.T) { - reqBody := dto.CreateAccountRequest{ - Username: fmt.Sprintf("level1_new_%d", time.Now().UnixNano()), - Phone: fmt.Sprintf("138%08d", time.Now().UnixNano()%100000000), - Password: "Password123", - UserType: constants.UserTypeAgent, - ShopID: &level1Shop.ID, - } - jsonBody, _ := json.Marshal(reqBody) - - resp, err := env.AsUser(level2Agent).Request("POST", "/api/admin/accounts", jsonBody) - require.NoError(t, err) - assert.Equal(t, fiber.StatusForbidden, resp.StatusCode, "二级代理不应能管理一级店铺账号") - }) -} diff --git a/tests/integration/account_role_test.go b/tests/integration/account_role_test.go deleted file mode 100644 index 4674be0..0000000 --- a/tests/integration/account_role_test.go +++ /dev/null @@ -1,268 +0,0 @@ -package integration - -import ( - "testing" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - - "github.com/break/junhong_cmp_fiber/internal/model" - accountService "github.com/break/junhong_cmp_fiber/internal/service/account" - accountAuditService "github.com/break/junhong_cmp_fiber/internal/service/account_audit" - postgresStore "github.com/break/junhong_cmp_fiber/internal/store/postgres" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/tests/testutils/integ" -) - -// TestAccountRoleAssociation_AssignRoles 测试账号角色分配功能 -func TestAccountRoleAssociation_AssignRoles(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - // 初始化 Store 和 Service - accountStore := postgresStore.NewAccountStore(env.TX, env.Redis) - roleStore := postgresStore.NewRoleStore(env.TX) - accountRoleStore := postgresStore.NewAccountRoleStore(env.TX, env.Redis) - shopStore := postgresStore.NewShopStore(env.TX, env.Redis) - enterpriseStore := postgresStore.NewEnterpriseStore(env.TX, env.Redis) - shopRoleStore := postgresStore.NewShopRoleStore(env.TX, env.Redis) - auditLogStore := postgresStore.NewAccountOperationLogStore(env.TX) - auditService := accountAuditService.NewService(auditLogStore) - accService := accountService.New(accountStore, roleStore, accountRoleStore, shopRoleStore, shopStore, enterpriseStore, auditService) - - // 获取超级管理员上下文 - userCtx := env.GetSuperAdminContext() - - t.Run("成功分配单个角色", func(t *testing.T) { - // 创建测试账号 - account := &model.Account{ - Username: "single_role_test", - Phone: "13800000100", - Password: "hashedpassword", - UserType: constants.UserTypePlatform, - Status: constants.StatusEnabled, - } - env.TX.Create(account) - - // 创建测试角色 - role := &model.Role{ - RoleName: "单角色测试", - RoleType: constants.RoleTypePlatform, - Status: constants.StatusEnabled, - } - env.TX.Create(role) - - // 分配角色 - ars, err := accService.AssignRoles(userCtx, account.ID, []uint{role.ID}) - require.NoError(t, err) - assert.Len(t, ars, 1) - assert.Equal(t, account.ID, ars[0].AccountID) - assert.Equal(t, role.ID, ars[0].RoleID) - }) - - t.Run("成功分配多个角色", func(t *testing.T) { - // 创建测试账号 - account := &model.Account{ - Username: "multi_role_test", - Phone: "13800000101", - Password: "hashedpassword", - UserType: constants.UserTypePlatform, - Status: constants.StatusEnabled, - } - env.TX.Create(account) - - // 创建多个测试角色 - roles := make([]*model.Role, 3) - roleIDs := make([]uint, 3) - for i := 0; i < 3; i++ { - roles[i] = &model.Role{ - RoleName: "多角色测试_" + string(rune('A'+i)), - RoleType: constants.RoleTypePlatform, - Status: constants.StatusEnabled, - } - env.TX.Create(roles[i]) - roleIDs[i] = roles[i].ID - } - - // 分配角色 - ars, err := accService.AssignRoles(userCtx, account.ID, roleIDs) - require.NoError(t, err) - assert.Len(t, ars, 3) - }) - - t.Run("获取账号的角色列表", func(t *testing.T) { - // 创建测试账号 - account := &model.Account{ - Username: "get_roles_test", - Phone: "13800000102", - Password: "hashedpassword", - UserType: constants.UserTypePlatform, - Status: constants.StatusEnabled, - } - env.TX.Create(account) - - // 创建并分配角色 - role := &model.Role{ - RoleName: "获取角色列表测试", - RoleType: constants.RoleTypePlatform, - Status: constants.StatusEnabled, - } - env.TX.Create(role) - - _, err := accService.AssignRoles(userCtx, account.ID, []uint{role.ID}) - require.NoError(t, err) - - // 获取角色列表 - roles, err := accService.GetRoles(userCtx, account.ID) - require.NoError(t, err) - assert.Len(t, roles, 1) - assert.Equal(t, role.ID, roles[0].ID) - }) - - t.Run("移除账号的角色", func(t *testing.T) { - // 创建测试账号 - account := &model.Account{ - Username: "remove_role_test", - Phone: "13800000103", - Password: "hashedpassword", - UserType: constants.UserTypePlatform, - Status: constants.StatusEnabled, - } - env.TX.Create(account) - - // 创建并分配角色 - role := &model.Role{ - RoleName: "移除角色测试", - RoleType: constants.RoleTypePlatform, - Status: constants.StatusEnabled, - } - env.TX.Create(role) - - _, err := accService.AssignRoles(userCtx, account.ID, []uint{role.ID}) - require.NoError(t, err) - - // 移除角色 - err = accService.RemoveRole(userCtx, account.ID, role.ID) - require.NoError(t, err) - - // 验证角色已被软删除 - var ar model.AccountRole - err = env.RawDB().Unscoped().Where("account_id = ? AND role_id = ?", account.ID, role.ID).First(&ar).Error - require.NoError(t, err) - assert.NotNil(t, ar.DeletedAt) - }) - - t.Run("重复分配角色不会创建重复记录", func(t *testing.T) { - // 创建测试账号 - account := &model.Account{ - Username: "duplicate_role_test", - Phone: "13800000104", - Password: "hashedpassword", - UserType: constants.UserTypePlatform, - Status: constants.StatusEnabled, - } - env.TX.Create(account) - - // 创建测试角色 - role := &model.Role{ - RoleName: "重复分配测试", - RoleType: constants.RoleTypePlatform, - Status: constants.StatusEnabled, - } - env.TX.Create(role) - - // 第一次分配 - _, err := accService.AssignRoles(userCtx, account.ID, []uint{role.ID}) - require.NoError(t, err) - - // 第二次分配相同角色 - _, err = accService.AssignRoles(userCtx, account.ID, []uint{role.ID}) - require.NoError(t, err) - - // 验证只有一条记录 - var count int64 - env.RawDB().Model(&model.AccountRole{}).Where("account_id = ? AND role_id = ?", account.ID, role.ID).Count(&count) - assert.Equal(t, int64(1), count) - }) - - t.Run("账号不存在时分配角色失败", func(t *testing.T) { - role := &model.Role{ - RoleName: "账号不存在测试", - RoleType: constants.RoleTypePlatform, - Status: constants.StatusEnabled, - } - env.TX.Create(role) - - _, err := accService.AssignRoles(userCtx, 99999, []uint{role.ID}) - assert.Error(t, err) - }) - - t.Run("角色不存在时分配失败", func(t *testing.T) { - account := &model.Account{ - Username: "role_not_exist_test", - Phone: "13800000105", - Password: "hashedpassword", - UserType: constants.UserTypePlatform, - Status: constants.StatusEnabled, - } - env.TX.Create(account) - - _, err := accService.AssignRoles(userCtx, account.ID, []uint{99999}) - assert.Error(t, err) - }) -} - -// TestAccountRoleAssociation_SoftDelete 测试软删除对账号角色关联的影响 -func TestAccountRoleAssociation_SoftDelete(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - // 初始化 Store 和 Service - accountStore := postgresStore.NewAccountStore(env.TX, env.Redis) - roleStore := postgresStore.NewRoleStore(env.TX) - accountRoleStore := postgresStore.NewAccountRoleStore(env.TX, env.Redis) - shopStore := postgresStore.NewShopStore(env.TX, env.Redis) - shopRoleStore := postgresStore.NewShopRoleStore(env.TX, env.Redis) - enterpriseStore := postgresStore.NewEnterpriseStore(env.TX, env.Redis) - auditLogStore := postgresStore.NewAccountOperationLogStore(env.TX) - auditService := accountAuditService.NewService(auditLogStore) - accService := accountService.New(accountStore, roleStore, accountRoleStore, shopRoleStore, shopStore, enterpriseStore, auditService) - - // 获取超级管理员上下文 - userCtx := env.GetSuperAdminContext() - - t.Run("软删除角色后重新分配可以恢复", func(t *testing.T) { - // 创建测试数据 - account := &model.Account{ - Username: "restore_role_test", - Phone: "13800000200", - Password: "hashedpassword", - UserType: constants.UserTypePlatform, - Status: constants.StatusEnabled, - } - env.TX.Create(account) - - role := &model.Role{ - RoleName: "恢复角色测试", - RoleType: constants.RoleTypePlatform, - Status: constants.StatusEnabled, - } - env.TX.Create(role) - - // 分配角色 - _, err := accService.AssignRoles(userCtx, account.ID, []uint{role.ID}) - require.NoError(t, err) - - // 移除角色 - err = accService.RemoveRole(userCtx, account.ID, role.ID) - require.NoError(t, err) - - // 重新分配角色 - ars, err := accService.AssignRoles(userCtx, account.ID, []uint{role.ID}) - require.NoError(t, err) - assert.Len(t, ars, 1) - - // 验证关联已恢复 - roles, err := accService.GetRoles(userCtx, account.ID) - require.NoError(t, err) - assert.Len(t, roles, 1) - }) -} diff --git a/tests/integration/account_test.go b/tests/integration/account_test.go deleted file mode 100644 index 044e1a2..0000000 --- a/tests/integration/account_test.go +++ /dev/null @@ -1,936 +0,0 @@ -package integration - -import ( - "encoding/json" - "fmt" - "net/http" - "testing" - "time" - - "github.com/gofiber/fiber/v2" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/internal/model/dto" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/pkg/errors" - "github.com/break/junhong_cmp_fiber/pkg/response" - "github.com/break/junhong_cmp_fiber/tests/testutils/integ" -) - -// ============================================================================= -// 平台账号管理测试 -// ============================================================================= - -func TestPlatformAccount_Create(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - username := fmt.Sprintf("platform_user_%d", time.Now().UnixNano()) - phone := fmt.Sprintf("138%08d", time.Now().UnixNano()%100000000) - - reqBody := dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "Password123", - UserType: constants.UserTypePlatform, - } - - jsonBody, _ := json.Marshal(reqBody) - resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/accounts", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - var count int64 - env.RawDB().Model(&model.Account{}).Where("username = ?", username).Count(&count) - assert.Equal(t, int64(1), count) -} - -func TestPlatformAccount_Create_DuplicateUsername(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - existingAccount := env.CreateTestAccount("existing_platform", "password123", constants.UserTypePlatform, nil, nil) - - phone := fmt.Sprintf("138%08d", time.Now().UnixNano()%100000000) - reqBody := dto.CreateAccountRequest{ - Username: existingAccount.Username, - Phone: phone, - Password: "Password123", - UserType: constants.UserTypePlatform, - } - - jsonBody, _ := json.Marshal(reqBody) - resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/accounts", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, errors.CodeUsernameExists, result.Code) -} - -func TestPlatformAccount_List(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - for i := 1; i <= 3; i++ { - env.CreateTestAccount(fmt.Sprintf("platform_list_%d", i), "password123", constants.UserTypePlatform, nil, nil) - } - - resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/accounts?page=1&page_size=10", nil) - require.NoError(t, err) - defer resp.Body.Close() - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - data := result.Data.(map[string]interface{}) - items := data["items"].([]interface{}) - assert.GreaterOrEqual(t, len(items), 3) -} - -func TestPlatformAccount_Get(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - testAccount := env.CreateTestAccount("platform_detail", "password123", constants.UserTypePlatform, nil, nil) - - resp, err := env.AsSuperAdmin().Request("GET", fmt.Sprintf("/api/admin/accounts/%d", testAccount.ID), nil) - require.NoError(t, err) - defer resp.Body.Close() - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) -} - -func TestPlatformAccount_Get_NotFound(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/accounts/99999", nil) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, errors.CodeAccountNotFound, result.Code) -} - -func TestPlatformAccount_Update(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - testAccount := env.CreateTestAccount("platform_update", "password123", constants.UserTypePlatform, nil, nil) - - newUsername := fmt.Sprintf("updated_%d", time.Now().UnixNano()) - reqBody := dto.UpdateAccountRequest{ - Username: &newUsername, - } - - jsonBody, _ := json.Marshal(reqBody) - resp, err := env.AsSuperAdmin().Request("PUT", fmt.Sprintf("/api/admin/accounts/%d", testAccount.ID), jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) -} - -func TestPlatformAccount_UpdatePassword(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - testAccount := env.CreateTestAccount("platform_pwd", "password123", constants.UserTypePlatform, nil, nil) - - reqBody := dto.UpdatePasswordRequest{ - NewPassword: "NewPassword@123", - } - jsonBody, _ := json.Marshal(reqBody) - resp, err := env.AsSuperAdmin().Request("PUT", fmt.Sprintf("/api/admin/accounts/%d/password", testAccount.ID), jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) -} - -func TestPlatformAccount_UpdateStatus(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - testAccount := env.CreateTestAccount("platform_status", "password123", constants.UserTypePlatform, nil, nil) - - reqBody := dto.UpdateStatusRequest{ - Status: constants.StatusDisabled, - } - jsonBody, _ := json.Marshal(reqBody) - resp, err := env.AsSuperAdmin().Request("PUT", fmt.Sprintf("/api/admin/accounts/%d/status", testAccount.ID), jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) -} - -func TestPlatformAccount_Delete(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - testAccount := env.CreateTestAccount("platform_delete", "password123", constants.UserTypePlatform, nil, nil) - - resp, err := env.AsSuperAdmin().Request("DELETE", fmt.Sprintf("/api/admin/accounts/%d", testAccount.ID), nil) - require.NoError(t, err) - defer resp.Body.Close() - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) -} - -// ============================================================================= -// 代理账号管理测试 -// ============================================================================= - -func TestShopAccount_Create(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - testShop := env.CreateTestShop("代理账号测试店铺", 1, nil) - - username := fmt.Sprintf("agent_user_%d", time.Now().UnixNano()) - phone := fmt.Sprintf("139%08d", time.Now().UnixNano()%100000000) - - reqBody := dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "Password123", - UserType: constants.UserTypeAgent, - ShopID: &testShop.ID, - } - - jsonBody, _ := json.Marshal(reqBody) - resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/accounts", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - assert.NotNil(t, result.Data) -} - -func TestShopAccount_Create_MissingShopID(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - username := fmt.Sprintf("agent_no_shop_%d", time.Now().UnixNano()) - phone := fmt.Sprintf("139%08d", time.Now().UnixNano()%100000000) - - reqBody := dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "Password123", - UserType: constants.UserTypeAgent, - } - - jsonBody, _ := json.Marshal(reqBody) - resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/accounts", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.NotEqual(t, 0, result.Code, "创建代理账号缺少店铺ID应返回错误") -} - -func TestShopAccount_List(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - testShop := env.CreateTestShop("代理列表测试店铺", 1, nil) - - for i := 1; i <= 3; i++ { - env.CreateTestAccount(fmt.Sprintf("agent_list_%d", i), "password123", constants.UserTypeAgent, &testShop.ID, nil) - } - - resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/accounts?page=1&page_size=10", nil) - require.NoError(t, err) - defer resp.Body.Close() - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - data := result.Data.(map[string]interface{}) - items := data["items"].([]interface{}) - assert.GreaterOrEqual(t, len(items), 3) -} - -func TestShopAccount_Get(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - testShop := env.CreateTestShop("代理详情测试店铺", 1, nil) - testAccount := env.CreateTestAccount("agent_detail", "password123", constants.UserTypeAgent, &testShop.ID, nil) - - resp, err := env.AsSuperAdmin().Request("GET", fmt.Sprintf("/api/admin/accounts/%d", testAccount.ID), nil) - require.NoError(t, err) - defer resp.Body.Close() - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) -} - -func TestShopAccount_Update(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - testShop := env.CreateTestShop("代理更新测试店铺", 1, nil) - testAccount := env.CreateTestAccount("agent_update", "password123", constants.UserTypeAgent, &testShop.ID, nil) - - newUsername := fmt.Sprintf("updated_agent_%d", time.Now().UnixNano()) - reqBody := dto.UpdateAccountRequest{ - Username: &newUsername, - } - - jsonBody, _ := json.Marshal(reqBody) - resp, err := env.AsSuperAdmin().Request("PUT", fmt.Sprintf("/api/admin/accounts/%d", testAccount.ID), jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) -} - -func TestShopAccount_UpdatePassword(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - testShop := env.CreateTestShop("代理密码测试店铺", 1, nil) - testAccount := env.CreateTestAccount("agent_pwd", "password123", constants.UserTypeAgent, &testShop.ID, nil) - - reqBody := dto.UpdatePasswordRequest{ - NewPassword: "NewPassword@456", - } - jsonBody, _ := json.Marshal(reqBody) - resp, err := env.AsSuperAdmin().Request("PUT", fmt.Sprintf("/api/admin/accounts/%d/password", testAccount.ID), jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) -} - -func TestShopAccount_UpdateStatus(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - testShop := env.CreateTestShop("代理状态测试店铺", 1, nil) - testAccount := env.CreateTestAccount("agent_status", "password123", constants.UserTypeAgent, &testShop.ID, nil) - - reqBody := dto.UpdateStatusRequest{ - Status: constants.StatusDisabled, - } - jsonBody, _ := json.Marshal(reqBody) - resp, err := env.AsSuperAdmin().Request("PUT", fmt.Sprintf("/api/admin/accounts/%d/status", testAccount.ID), jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) -} - -func TestShopAccount_Delete(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - testShop := env.CreateTestShop("代理删除测试店铺", 1, nil) - testAccount := env.CreateTestAccount("agent_delete", "password123", constants.UserTypeAgent, &testShop.ID, nil) - - resp, err := env.AsSuperAdmin().Request("DELETE", fmt.Sprintf("/api/admin/accounts/%d", testAccount.ID), nil) - require.NoError(t, err) - defer resp.Body.Close() - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) -} - -// ============================================================================= -// 企业账号管理测试 -// ============================================================================= - -func TestEnterpriseAccount_Create(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - testShop := env.CreateTestShop("企业账号测试店铺", 1, nil) - testEnterprise := env.CreateTestEnterprise("测试企业", &testShop.ID) - - username := fmt.Sprintf("enterprise_user_%d", time.Now().UnixNano()) - phone := fmt.Sprintf("137%08d", time.Now().UnixNano()%100000000) - - reqBody := dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "Password123", - UserType: constants.UserTypeEnterprise, - EnterpriseID: &testEnterprise.ID, - } - - jsonBody, _ := json.Marshal(reqBody) - resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/accounts", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - assert.NotNil(t, result.Data) -} - -func TestEnterpriseAccount_Create_MissingEnterpriseID(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - username := fmt.Sprintf("enterprise_no_ent_%d", time.Now().UnixNano()) - phone := fmt.Sprintf("137%08d", time.Now().UnixNano()%100000000) - - reqBody := dto.CreateAccountRequest{ - Username: username, - Phone: phone, - Password: "Password123", - UserType: constants.UserTypeEnterprise, - } - - jsonBody, _ := json.Marshal(reqBody) - resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/accounts", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.NotEqual(t, 0, result.Code, "创建企业账号缺少企业ID应返回错误") -} - -func TestEnterpriseAccount_List(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - testShop := env.CreateTestShop("企业列表测试店铺", 1, nil) - testEnterprise := env.CreateTestEnterprise("列表测试企业", &testShop.ID) - - for i := 1; i <= 3; i++ { - env.CreateTestAccount(fmt.Sprintf("ent_list_%d", i), "password123", constants.UserTypeEnterprise, nil, &testEnterprise.ID) - } - - resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/accounts?page=1&page_size=10", nil) - require.NoError(t, err) - defer resp.Body.Close() - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - data := result.Data.(map[string]interface{}) - items := data["items"].([]interface{}) - assert.GreaterOrEqual(t, len(items), 3) -} - -func TestEnterpriseAccount_Get(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - testShop := env.CreateTestShop("企业详情测试店铺", 1, nil) - testEnterprise := env.CreateTestEnterprise("详情测试企业", &testShop.ID) - testAccount := env.CreateTestAccount("ent_detail", "password123", constants.UserTypeEnterprise, nil, &testEnterprise.ID) - - resp, err := env.AsSuperAdmin().Request("GET", fmt.Sprintf("/api/admin/accounts/%d", testAccount.ID), nil) - require.NoError(t, err) - defer resp.Body.Close() - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) -} - -func TestEnterpriseAccount_Update(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - testShop := env.CreateTestShop("企业更新测试店铺", 1, nil) - testEnterprise := env.CreateTestEnterprise("更新测试企业", &testShop.ID) - testAccount := env.CreateTestAccount("ent_update", "password123", constants.UserTypeEnterprise, nil, &testEnterprise.ID) - - newUsername := fmt.Sprintf("updated_ent_%d", time.Now().UnixNano()) - reqBody := dto.UpdateAccountRequest{ - Username: &newUsername, - } - - jsonBody, _ := json.Marshal(reqBody) - resp, err := env.AsSuperAdmin().Request("PUT", fmt.Sprintf("/api/admin/accounts/%d", testAccount.ID), jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) -} - -func TestEnterpriseAccount_UpdatePassword(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - testShop := env.CreateTestShop("企业密码测试店铺", 1, nil) - testEnterprise := env.CreateTestEnterprise("密码测试企业", &testShop.ID) - testAccount := env.CreateTestAccount("ent_pwd", "password123", constants.UserTypeEnterprise, nil, &testEnterprise.ID) - - reqBody := dto.UpdatePasswordRequest{ - NewPassword: "NewPassword@789", - } - jsonBody, _ := json.Marshal(reqBody) - resp, err := env.AsSuperAdmin().Request("PUT", fmt.Sprintf("/api/admin/accounts/%d/password", testAccount.ID), jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) -} - -func TestEnterpriseAccount_UpdateStatus(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - testShop := env.CreateTestShop("企业状态测试店铺", 1, nil) - testEnterprise := env.CreateTestEnterprise("状态测试企业", &testShop.ID) - testAccount := env.CreateTestAccount("ent_status", "password123", constants.UserTypeEnterprise, nil, &testEnterprise.ID) - - reqBody := dto.UpdateStatusRequest{ - Status: constants.StatusDisabled, - } - jsonBody, _ := json.Marshal(reqBody) - resp, err := env.AsSuperAdmin().Request("PUT", fmt.Sprintf("/api/admin/accounts/%d/status", testAccount.ID), jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) -} - -func TestEnterpriseAccount_Delete(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - testShop := env.CreateTestShop("企业删除测试店铺", 1, nil) - testEnterprise := env.CreateTestEnterprise("删除测试企业", &testShop.ID) - testAccount := env.CreateTestAccount("ent_delete", "password123", constants.UserTypeEnterprise, nil, &testEnterprise.ID) - - resp, err := env.AsSuperAdmin().Request("DELETE", fmt.Sprintf("/api/admin/accounts/%d", testAccount.ID), nil) - require.NoError(t, err) - defer resp.Body.Close() - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) -} - -func TestEnterpriseAccount_Forbidden(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - testShop := env.CreateTestShop("企业禁止测试店铺", 1, nil) - testEnterprise := env.CreateTestEnterprise("禁止测试企业", &testShop.ID) - entAccount := env.CreateTestAccount("ent_forbidden", "password123", constants.UserTypeEnterprise, nil, &testEnterprise.ID) - - resp, err := env.AsUser(entAccount).Request("GET", "/api/admin/accounts", nil) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, errors.CodeForbidden, result.Code, "企业用户应禁止访问账号管理功能") -} - -// ============================================================================= -// 角色管理测试（所有账号类型） -// ============================================================================= - -func TestAccount_AssignRoles_Platform(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - platformRole := env.CreateTestRole("平台角色", constants.RoleTypePlatform) - testAccount := env.CreateTestAccount("role_platform", "password123", constants.UserTypePlatform, nil, nil) - - reqBody := dto.AssignRolesRequest{ - RoleIDs: []uint{platformRole.ID}, - } - jsonBody, _ := json.Marshal(reqBody) - resp, err := env.AsSuperAdmin().Request("POST", fmt.Sprintf("/api/admin/accounts/%d/roles", testAccount.ID), jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) -} - -func TestAccount_GetRoles_Platform(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - platformRole := env.CreateTestRole("平台角色获取", constants.RoleTypePlatform) - testAccount := env.CreateTestAccount("role_platform_get", "password123", constants.UserTypePlatform, nil, nil) - - accountRole := &model.AccountRole{ - AccountID: testAccount.ID, - RoleID: platformRole.ID, - Status: constants.StatusEnabled, - Creator: 1, - Updater: 1, - } - env.TX.Create(accountRole) - - resp, err := env.AsSuperAdmin().Request("GET", fmt.Sprintf("/api/admin/accounts/%d/roles", testAccount.ID), nil) - require.NoError(t, err) - defer resp.Body.Close() - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) -} - -func TestAccount_ClearRoles_Platform(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - platformRole := env.CreateTestRole("平台角色清空", constants.RoleTypePlatform) - testAccount := env.CreateTestAccount("role_platform_clr", "password123", constants.UserTypePlatform, nil, nil) - - accountRole := &model.AccountRole{ - AccountID: testAccount.ID, - RoleID: platformRole.ID, - Status: constants.StatusEnabled, - Creator: 1, - Updater: 1, - } - env.TX.Create(accountRole) - - reqBody := dto.AssignRolesRequest{ - RoleIDs: []uint{}, - } - jsonBody, _ := json.Marshal(reqBody) - resp, err := env.AsSuperAdmin().Request("POST", fmt.Sprintf("/api/admin/accounts/%d/roles", testAccount.ID), jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) -} - -func TestAccount_SuperAdminCannotAssignRoles(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - platformRole := env.CreateTestRole("禁止分配角色", constants.RoleTypePlatform) - superAdmin := env.CreateTestAccount("superadmin_role", "password123", constants.UserTypeSuperAdmin, nil, nil) - - reqBody := dto.AssignRolesRequest{ - RoleIDs: []uint{platformRole.ID}, - } - jsonBody, _ := json.Marshal(reqBody) - resp, err := env.AsSuperAdmin().Request("POST", fmt.Sprintf("/api/admin/accounts/%d/roles", superAdmin.ID), jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, errors.CodeInvalidParam, result.Code) - assert.Contains(t, result.Message, "超级管理员不允许分配角色") -} - -func TestAccount_AssignRoles_Shop(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - testShop := env.CreateTestShop("代理角色测试店铺", 1, nil) - agentRole := env.CreateTestRole("代理角色", constants.RoleTypeCustomer) - testAccount := env.CreateTestAccount("role_agent", "password123", constants.UserTypeAgent, &testShop.ID, nil) - - reqBody := dto.AssignRolesRequest{ - RoleIDs: []uint{agentRole.ID}, - } - jsonBody, _ := json.Marshal(reqBody) - resp, err := env.AsSuperAdmin().Request("POST", fmt.Sprintf("/api/admin/accounts/%d/roles", testAccount.ID), jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) -} - -func TestAccount_GetRoles_Shop(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - testShop := env.CreateTestShop("代理获取角色测试店铺", 1, nil) - agentRole := env.CreateTestRole("代理获取角色", constants.RoleTypeCustomer) - testAccount := env.CreateTestAccount("role_agent_get", "password123", constants.UserTypeAgent, &testShop.ID, nil) - - accountRole := &model.AccountRole{ - AccountID: testAccount.ID, - RoleID: agentRole.ID, - Status: constants.StatusEnabled, - Creator: 1, - Updater: 1, - } - env.TX.Create(accountRole) - - resp, err := env.AsSuperAdmin().Request("GET", fmt.Sprintf("/api/admin/accounts/%d/roles", testAccount.ID), nil) - require.NoError(t, err) - defer resp.Body.Close() - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) -} - -func TestAccount_AssignRoles_Enterprise(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - testShop := env.CreateTestShop("企业角色测试店铺", 1, nil) - testEnterprise := env.CreateTestEnterprise("角色测试企业", &testShop.ID) - entRole := env.CreateTestRole("企业角色", constants.RoleTypeCustomer) - testAccount := env.CreateTestAccount("role_ent", "password123", constants.UserTypeEnterprise, nil, &testEnterprise.ID) - - reqBody := dto.AssignRolesRequest{ - RoleIDs: []uint{entRole.ID}, - } - jsonBody, _ := json.Marshal(reqBody) - resp, err := env.AsSuperAdmin().Request("POST", fmt.Sprintf("/api/admin/accounts/%d/roles", testAccount.ID), jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) -} - -func TestAccount_GetRoles_Enterprise(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - testShop := env.CreateTestShop("企业获取角色测试店铺", 1, nil) - testEnterprise := env.CreateTestEnterprise("获取角色测试企业", &testShop.ID) - entRole := env.CreateTestRole("企业获取角色", constants.RoleTypeCustomer) - testAccount := env.CreateTestAccount("role_ent_get", "password123", constants.UserTypeEnterprise, nil, &testEnterprise.ID) - - accountRole := &model.AccountRole{ - AccountID: testAccount.ID, - RoleID: entRole.ID, - Status: constants.StatusEnabled, - Creator: 1, - Updater: 1, - } - env.TX.Create(accountRole) - - resp, err := env.AsSuperAdmin().Request("GET", fmt.Sprintf("/api/admin/accounts/%d/roles", testAccount.ID), nil) - require.NoError(t, err) - defer resp.Body.Close() - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) -} - -// ============================================================================= -// 通用场景测试 -// ============================================================================= - -func TestAccount_Unauthorized_Platform(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - resp, err := env.ClearAuth().Request("GET", "/api/admin/accounts", nil) - require.NoError(t, err) - defer resp.Body.Close() - assert.Equal(t, http.StatusUnauthorized, resp.StatusCode) -} - -func TestAccount_Unauthorized_Shop(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - resp, err := env.ClearAuth().Request("GET", "/api/admin/accounts", nil) - require.NoError(t, err) - defer resp.Body.Close() - assert.Equal(t, http.StatusUnauthorized, resp.StatusCode) -} - -func TestAccount_Unauthorized_Enterprise(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - resp, err := env.ClearAuth().Request("GET", "/api/admin/accounts", nil) - require.NoError(t, err) - defer resp.Body.Close() - assert.Equal(t, http.StatusUnauthorized, resp.StatusCode) -} - -func TestAccount_InvalidID(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/accounts/invalid", nil) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, errors.CodeInvalidParam, result.Code) -} - -// ============================================================================= -// 关联查询测试 -// ============================================================================= - -func TestAccountList_FilterByShopID_WithShopName(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - shop1 := env.CreateTestShop("测试店铺A", 1, nil) - shop2 := env.CreateTestShop("测试店铺B", 1, nil) - - account1 := env.CreateTestAccount("shop_account_1", "password123", constants.UserTypeAgent, &shop1.ID, nil) - account2 := env.CreateTestAccount("shop_account_2", "password123", constants.UserTypeAgent, &shop1.ID, nil) - account3 := env.CreateTestAccount("shop_account_3", "password123", constants.UserTypeAgent, &shop2.ID, nil) - - url := fmt.Sprintf("/api/admin/accounts?shop_id=%d&page=1&page_size=10", shop1.ID) - resp, err := env.AsSuperAdmin().Request("GET", url, nil) - require.NoError(t, err) - defer resp.Body.Close() - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - data := result.Data.(map[string]interface{}) - items := data["items"].([]interface{}) - assert.GreaterOrEqual(t, len(items), 2) - - foundAccount1 := false - foundAccount2 := false - for _, item := range items { - accountData := item.(map[string]interface{}) - accountID := uint(accountData["id"].(float64)) - - if accountID == account1.ID || accountID == account2.ID { - assert.Equal(t, float64(shop1.ID), accountData["shop_id"]) - assert.Equal(t, shop1.ShopName, accountData["shop_name"]) - - if accountID == account1.ID { - foundAccount1 = true - } - if accountID == account2.ID { - foundAccount2 = true - } - } - - if accountID == account3.ID { - t.Errorf("不应该返回 shop2 的账号，但返回了账号 %d", account3.ID) - } - } - - assert.True(t, foundAccount1, "应该返回 account1") - assert.True(t, foundAccount2, "应该返回 account2") -} - -func TestAccountList_FilterByEnterpriseID_WithEnterpriseName(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - shop := env.CreateTestShop("归属店铺", 1, nil) - enterprise1 := env.CreateTestEnterprise("测试企业A", &shop.ID) - enterprise2 := env.CreateTestEnterprise("测试企业B", &shop.ID) - - account1 := env.CreateTestAccount("enterprise_account_1", "password123", constants.UserTypeEnterprise, nil, &enterprise1.ID) - account2 := env.CreateTestAccount("enterprise_account_2", "password123", constants.UserTypeEnterprise, nil, &enterprise2.ID) - - url := fmt.Sprintf("/api/admin/accounts?enterprise_id=%d&page=1&page_size=10", enterprise1.ID) - resp, err := env.AsSuperAdmin().Request("GET", url, nil) - require.NoError(t, err) - defer resp.Body.Close() - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - data := result.Data.(map[string]interface{}) - items := data["items"].([]interface{}) - assert.GreaterOrEqual(t, len(items), 1) - - foundAccount1 := false - for _, item := range items { - accountData := item.(map[string]interface{}) - accountID := uint(accountData["id"].(float64)) - - if accountID == account1.ID { - foundAccount1 = true - assert.Equal(t, float64(enterprise1.ID), accountData["enterprise_id"]) - assert.Equal(t, enterprise1.EnterpriseName, accountData["enterprise_name"]) - } - - if accountID == account2.ID { - t.Errorf("不应该返回 enterprise2 的账号，但返回了账号 %d", account2.ID) - } - } - - assert.True(t, foundAccount1, "应该返回 account1") -} diff --git a/tests/integration/api_regression_test.go b/tests/integration/api_regression_test.go deleted file mode 100644 index c7d9bbf..0000000 --- a/tests/integration/api_regression_test.go +++ /dev/null @@ -1,235 +0,0 @@ -package integration - -import ( - "fmt" - "net/http/httptest" - "testing" - - "github.com/gofiber/fiber/v2" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/tests/testutils/integ" -) - -// TestAPIRegression_AllEndpointsAccessible 测试所有 API 端点在重构后仍可访问 -func TestAPIRegression_AllEndpointsAccessible(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - // 定义所有需要测试的端点（检测端点是否存在，不检测业务逻辑） - endpoints := []struct { - method string - path string - name string - requiresAuth bool - }{ - // Health endpoints（无需认证） - {"GET", "/health", "Health check", false}, - - // Account endpoints（需要认证） - {"GET", "/api/admin/accounts", "List accounts", true}, - {"GET", "/api/admin/accounts/1", "Get account", true}, - - // Role endpoints（需要认证） - {"GET", "/api/admin/roles", "List roles", true}, - {"GET", "/api/admin/roles/1", "Get role", true}, - - // Permission endpoints（需要认证） - {"GET", "/api/admin/permissions", "List permissions", true}, - {"GET", "/api/admin/permissions/1", "Get permission", true}, - {"GET", "/api/admin/permissions/tree", "Get permission tree", true}, - } - - for _, ep := range endpoints { - t.Run(ep.name, func(t *testing.T) { - var resp *httptest.ResponseRecorder - var err error - - if ep.requiresAuth { - httpResp, httpErr := env.AsSuperAdmin().Request(ep.method, ep.path, nil) - require.NoError(t, httpErr) - resp = &httptest.ResponseRecorder{Code: httpResp.StatusCode} - err = nil - } else { - req := httptest.NewRequest(ep.method, ep.path, nil) - httpResp, httpErr := env.App.Test(req) - require.NoError(t, httpErr) - resp = &httptest.ResponseRecorder{Code: httpResp.StatusCode} - err = httpErr - } - _ = err - - // 验证端点可访问（状态码不是 404 或 500） - assert.NotEqual(t, fiber.StatusNotFound, resp.Code, - "端点 %s %s 应该存在", ep.method, ep.path) - assert.NotEqual(t, fiber.StatusInternalServerError, resp.Code, - "端点 %s %s 不应该返回 500 错误", ep.method, ep.path) - }) - } -} - -func TestAPIRegression_RouteModularization(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - t.Run("账号模块路由正常", func(t *testing.T) { - account := &model.Account{ - Username: "regression_test", - Phone: "13800000300", - Password: "hashedpassword", - UserType: constants.UserTypePlatform, - Status: constants.StatusEnabled, - } - env.TX.Create(account) - - resp, err := env.AsSuperAdmin().Request("GET", fmt.Sprintf("/api/admin/accounts/%d", account.ID), nil) - require.NoError(t, err) - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - resp, err = env.AsSuperAdmin().Request("GET", fmt.Sprintf("/api/admin/accounts/%d/roles", account.ID), nil) - require.NoError(t, err) - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - }) - - t.Run("角色模块路由正常", func(t *testing.T) { - role := &model.Role{ - RoleName: "回归测试角色", - RoleType: constants.RoleTypePlatform, - Status: constants.StatusEnabled, - } - env.TX.Create(role) - - resp, err := env.AsSuperAdmin().Request("GET", fmt.Sprintf("/api/admin/roles/%d", role.ID), nil) - require.NoError(t, err) - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - resp, err = env.AsSuperAdmin().Request("GET", fmt.Sprintf("/api/admin/roles/%d/permissions", role.ID), nil) - require.NoError(t, err) - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - }) - - t.Run("权限模块路由正常", func(t *testing.T) { - perm := &model.Permission{ - PermName: "回归测试权限", - PermCode: "regression:perm", - PermType: constants.PermissionTypeMenu, - Status: constants.StatusEnabled, - } - env.TX.Create(perm) - - resp, err := env.AsSuperAdmin().Request("GET", fmt.Sprintf("/api/admin/permissions/%d", perm.ID), nil) - require.NoError(t, err) - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - resp, err = env.AsSuperAdmin().Request("GET", "/api/admin/permissions/tree", nil) - require.NoError(t, err) - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - }) -} - -// TestAPIRegression_ErrorHandling 测试错误处理在重构后仍正常 -func TestAPIRegression_ErrorHandling(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - t.Run("资源不存在返回正确错误码", func(t *testing.T) { - // 账号不存在 - req := httptest.NewRequest("GET", "/api/admin/accounts/99999", nil) - resp, err := env.App.Test(req) - require.NoError(t, err) - // 应该返回业务错误，不是 404 - assert.NotEqual(t, fiber.StatusNotFound, resp.StatusCode) - - // 角色不存在 - req = httptest.NewRequest("GET", "/api/admin/roles/99999", nil) - resp, err = env.App.Test(req) - require.NoError(t, err) - assert.NotEqual(t, fiber.StatusNotFound, resp.StatusCode) - - // 权限不存在 - req = httptest.NewRequest("GET", "/api/admin/permissions/99999", nil) - resp, err = env.App.Test(req) - require.NoError(t, err) - assert.NotEqual(t, fiber.StatusNotFound, resp.StatusCode) - }) - - t.Run("无效参数返回正确错误码", func(t *testing.T) { - // 无效账号 ID - req := httptest.NewRequest("GET", "/api/admin/accounts/invalid", nil) - resp, err := env.App.Test(req) - require.NoError(t, err) - assert.NotEqual(t, fiber.StatusInternalServerError, resp.StatusCode) - }) -} - -func TestAPIRegression_Pagination(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - for i := 1; i <= 25; i++ { - account := &model.Account{ - Username: fmt.Sprintf("pagination_test_%d", i), - Phone: fmt.Sprintf("138000004%02d", i), - Password: "hashedpassword", - UserType: constants.UserTypePlatform, - Status: constants.StatusEnabled, - } - env.TX.Create(account) - } - - t.Run("分页参数正常工作", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/accounts?page=1&page_size=10", nil) - require.NoError(t, err) - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - resp, err = env.AsSuperAdmin().Request("GET", "/api/admin/accounts?page=2&page_size=10", nil) - require.NoError(t, err) - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - }) - - t.Run("默认分页参数工作", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/accounts", nil) - require.NoError(t, err) - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - }) -} - -func TestAPIRegression_ResponseFormat(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - t.Run("成功响应包含正确字段", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/accounts", nil) - require.NoError(t, err) - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - assert.Contains(t, resp.Header.Get("Content-Type"), "application/json") - }) - - t.Run("健康检查端点响应正常", func(t *testing.T) { - req := httptest.NewRequest("GET", "/health", nil) - resp, err := env.App.Test(req) - require.NoError(t, err) - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - }) -} - -// TestAPIRegression_ServicesIntegration 测试服务集成在重构后仍正常 -func TestAPIRegression_ServicesIntegration(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - t.Run("Services 容器正确初始化", func(t *testing.T) { - // 验证所有模块路由都已注册 - endpoints := []string{ - "/health", - "/api/admin/accounts", - "/api/admin/roles", - "/api/admin/permissions", - } - - for _, ep := range endpoints { - req := httptest.NewRequest("GET", ep, nil) - resp, err := env.App.Test(req) - require.NoError(t, err) - assert.NotEqual(t, fiber.StatusNotFound, resp.StatusCode, - "端点 %s 应该已注册", ep) - } - }) -} diff --git a/tests/integration/authorization_test.go b/tests/integration/authorization_test.go deleted file mode 100644 index ea07db6..0000000 --- a/tests/integration/authorization_test.go +++ /dev/null @@ -1,478 +0,0 @@ -package integration - -import ( - "encoding/json" - "fmt" - "testing" - "time" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/pkg/response" - "github.com/break/junhong_cmp_fiber/tests/testutils/integ" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -func TestAuthorization_List(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - ts := time.Now().Unix() % 100000 - shop := env.CreateTestShop("AUTH_TEST_SHOP", 1, nil) - - enterprise := env.CreateTestEnterprise("AUTH_TEST_ENTERPRISE", &shop.ID) - - card1 := &model.IotCard{ - ICCID: fmt.Sprintf("AC1%d", ts), - MSISDN: "13800001001", - - Status: 1, - ShopID: &shop.ID, - } - card2 := &model.IotCard{ - ICCID: fmt.Sprintf("AC2%d", ts), - MSISDN: "13800001002", - - Status: 1, - ShopID: &shop.ID, - } - require.NoError(t, env.TX.Create(card1).Error) - require.NoError(t, env.TX.Create(card2).Error) - - now := time.Now() - auth1 := &model.EnterpriseCardAuthorization{ - EnterpriseID: enterprise.ID, - CardID: card1.ID, - AuthorizedBy: 1, - AuthorizedAt: now, - AuthorizerType: constants.UserTypePlatform, - Remark: "集成测试授权记录", - } - require.NoError(t, env.TX.Create(auth1).Error) - - t.Run("平台用户获取授权记录列表", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/authorizations?page=1&page_size=20", nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - data, ok := result.Data.(map[string]interface{}) - require.True(t, ok) - items, ok := data["items"].([]interface{}) - require.True(t, ok) - assert.GreaterOrEqual(t, len(items), 1) - }) - - t.Run("按企业ID筛选授权记录", func(t *testing.T) { - url := fmt.Sprintf("/api/admin/authorizations?enterprise_id=%d&page=1&page_size=20", enterprise.ID) - resp, err := env.AsSuperAdmin().Request("GET", url, nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - data := result.Data.(map[string]interface{}) - total := int(data["total"].(float64)) - assert.Equal(t, 1, total) - }) - - t.Run("按ICCID筛选授权记录", func(t *testing.T) { - url := fmt.Sprintf("/api/admin/authorizations?iccid=%s&page=1&page_size=20", card1.ICCID) - resp, err := env.AsSuperAdmin().Request("GET", url, nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - data := result.Data.(map[string]interface{}) - total := int(data["total"].(float64)) - assert.Equal(t, 1, total) - }) - - t.Run("按状态筛选-有效授权", func(t *testing.T) { - url := fmt.Sprintf("/api/admin/authorizations?enterprise_id=%d&status=1&page=1&page_size=20", enterprise.ID) - resp, err := env.AsSuperAdmin().Request("GET", url, nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - }) -} - -func TestAuthorization_GetDetail(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - ts := time.Now().Unix() % 100000 - shop := env.CreateTestShop("AUTH_TEST_SHOP", 1, nil) - - enterprise := env.CreateTestEnterprise("AUTH_TEST_ENTERPRISE", &shop.ID) - - card1 := &model.IotCard{ - ICCID: fmt.Sprintf("AC1%d", ts), - MSISDN: "13800001001", - - Status: 1, - ShopID: &shop.ID, - } - require.NoError(t, env.TX.Create(card1).Error) - - now := time.Now() - auth1 := &model.EnterpriseCardAuthorization{ - EnterpriseID: enterprise.ID, - CardID: card1.ID, - AuthorizedBy: 1, - AuthorizedAt: now, - AuthorizerType: constants.UserTypePlatform, - Remark: "集成测试授权记录", - } - require.NoError(t, env.TX.Create(auth1).Error) - - t.Run("获取授权记录详情", func(t *testing.T) { - url := fmt.Sprintf("/api/admin/authorizations/%d", auth1.ID) - resp, err := env.AsSuperAdmin().Request("GET", url, nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - data := result.Data.(map[string]interface{}) - assert.Equal(t, float64(auth1.ID), data["id"]) - assert.Equal(t, float64(enterprise.ID), data["enterprise_id"]) - assert.Equal(t, enterprise.EnterpriseName, data["enterprise_name"]) - assert.Equal(t, card1.ICCID, data["iccid"]) - assert.Equal(t, "集成测试授权记录", data["remark"]) - assert.Equal(t, float64(1), data["status"]) - }) - - t.Run("获取不存在的授权记录", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/authorizations/999999", nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 404, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.NotEqual(t, 0, result.Code) - }) -} - -func TestAuthorization_UpdateRemark(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - ts := time.Now().Unix() % 100000 - shop := env.CreateTestShop("AUTH_TEST_SHOP", 1, nil) - - enterprise := env.CreateTestEnterprise("AUTH_TEST_ENTERPRISE", &shop.ID) - - card1 := &model.IotCard{ - ICCID: fmt.Sprintf("AC1%d", ts), - MSISDN: "13800001001", - - Status: 1, - ShopID: &shop.ID, - } - require.NoError(t, env.TX.Create(card1).Error) - - now := time.Now() - auth1 := &model.EnterpriseCardAuthorization{ - EnterpriseID: enterprise.ID, - CardID: card1.ID, - AuthorizedBy: 1, - AuthorizedAt: now, - AuthorizerType: constants.UserTypePlatform, - Remark: "集成测试授权记录", - } - require.NoError(t, env.TX.Create(auth1).Error) - - t.Run("更新授权记录备注", func(t *testing.T) { - url := fmt.Sprintf("/api/admin/authorizations/%d/remark", auth1.ID) - body := map[string]string{"remark": "更新后的备注内容"} - bodyBytes, _ := json.Marshal(body) - - resp, err := env.AsSuperAdmin().Request("PUT", url, bodyBytes) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - data := result.Data.(map[string]interface{}) - assert.Equal(t, "更新后的备注内容", data["remark"]) - }) - - t.Run("更新不存在的授权记录备注", func(t *testing.T) { - body := map[string]string{"remark": "不会更新"} - bodyBytes, _ := json.Marshal(body) - - resp, err := env.AsSuperAdmin().Request("PUT", "/api/admin/authorizations/999999/remark", bodyBytes) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 404, resp.StatusCode) - }) -} - -func TestAuthorization_DataPermission(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - ts := time.Now().Unix() % 100000 - shop := env.CreateTestShop("AUTH_TEST_SHOP", 1, nil) - - enterprise := env.CreateTestEnterprise("AUTH_TEST_ENTERPRISE", &shop.ID) - - card1 := &model.IotCard{ - ICCID: fmt.Sprintf("AC1%d", ts), - MSISDN: "13800001001", - - Status: 1, - ShopID: &shop.ID, - } - require.NoError(t, env.TX.Create(card1).Error) - - now := time.Now() - auth1 := &model.EnterpriseCardAuthorization{ - EnterpriseID: enterprise.ID, - CardID: card1.ID, - AuthorizedBy: 1, - AuthorizedAt: now, - AuthorizerType: constants.UserTypePlatform, - Remark: "集成测试授权记录", - } - require.NoError(t, env.TX.Create(auth1).Error) - - agentAccount := env.CreateTestAccount("agent", "password123", constants.UserTypeAgent, &shop.ID, nil) - - ts2 := time.Now().Unix() % 100000 - otherShop := env.CreateTestShop("OTHER_TEST_SHOP", 1, nil) - - otherEnterprise := env.CreateTestEnterprise("OTHER_TEST_ENTERPRISE", &otherShop.ID) - - otherCard := &model.IotCard{ - ICCID: fmt.Sprintf("OC%d", ts2), - MSISDN: "13800002001", - - Status: 1, - ShopID: &otherShop.ID, - } - require.NoError(t, env.TX.Create(otherCard).Error) - - otherAuth := &model.EnterpriseCardAuthorization{ - EnterpriseID: otherEnterprise.ID, - CardID: otherCard.ID, - AuthorizedBy: 1, - AuthorizedAt: now, - AuthorizerType: constants.UserTypePlatform, - Remark: "其他店铺的授权记录", - } - require.NoError(t, env.TX.Create(otherAuth).Error) - - t.Run("代理用户只能看到自己店铺的授权记录", func(t *testing.T) { - resp, err := env.AsUser(agentAccount).Request("GET", "/api/admin/authorizations?page=1&page_size=100", nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - data := result.Data.(map[string]interface{}) - items := data["items"].([]interface{}) - - sawOtherAuth := false - sawOwnAuth := false - for _, item := range items { - itemMap := item.(map[string]interface{}) - authID := uint(itemMap["id"].(float64)) - if authID == otherAuth.ID { - sawOtherAuth = true - } - if authID == auth1.ID { - sawOwnAuth = true - } - } - assert.False(t, sawOtherAuth, "代理用户不应该看到其他店铺的授权记录 (otherAuth.ID=%d)", otherAuth.ID) - assert.True(t, sawOwnAuth, "代理用户应该能看到自己店铺的授权记录 (auth1.ID=%d)", auth1.ID) - }) - - t.Run("平台用户可以看到所有授权记录", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/authorizations?page=1&page_size=100", nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - data := result.Data.(map[string]interface{}) - total := int(data["total"].(float64)) - assert.GreaterOrEqual(t, total, 2, "平台用户应该能看到所有授权记录") - }) -} - -func TestAuthorization_Unauthorized(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - t.Run("无Token访问被拒绝", func(t *testing.T) { - resp, err := env.ClearAuth().Request("GET", "/api/admin/authorizations", nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 401, resp.StatusCode) - }) - - t.Run("无效Token访问被拒绝", func(t *testing.T) { - resp, err := env.RequestWithHeaders("GET", "/api/admin/authorizations", nil, map[string]string{ - "Authorization": "Bearer invalid_token", - }) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 401, resp.StatusCode) - }) -} - -func TestAuthorization_UpdateRemarkPermission(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - ts := time.Now().Unix() % 100000 - shop := env.CreateTestShop("AUTH_PERM_SHOP", 1, nil) - enterprise := env.CreateTestEnterprise("AUTH_PERM_ENTERPRISE", &shop.ID) - - card := &model.IotCard{ - ICCID: fmt.Sprintf("PERM%d", ts), - MSISDN: "13800003001", - - Status: 1, - ShopID: &shop.ID, - } - require.NoError(t, env.TX.Create(card).Error) - - agentAccount1 := env.CreateTestAccount("agent1", "password123", constants.UserTypeAgent, &shop.ID, nil) - agentAccount2 := env.CreateTestAccount("agent2", "password456", constants.UserTypeAgent, &shop.ID, nil) - enterpriseAccount := env.CreateTestAccount("enterprise1", "password789", constants.UserTypeEnterprise, nil, &enterprise.ID) - - now := time.Now() - authByAgent1 := &model.EnterpriseCardAuthorization{ - EnterpriseID: enterprise.ID, - CardID: card.ID, - AuthorizedBy: agentAccount1.ID, - AuthorizedAt: now, - AuthorizerType: constants.UserTypeAgent, - Remark: "代理1创建的授权记录", - } - require.NoError(t, env.TX.Create(authByAgent1).Error) - - t.Run("平台用户可修改任意授权记录备注", func(t *testing.T) { - url := fmt.Sprintf("/api/admin/authorizations/%d/remark", authByAgent1.ID) - body := map[string]string{"remark": "平台修改的备注"} - bodyBytes, _ := json.Marshal(body) - - resp, err := env.AsSuperAdmin().Request("PUT", url, bodyBytes) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - data := result.Data.(map[string]interface{}) - assert.Equal(t, "平台修改的备注", data["remark"]) - }) - - t.Run("代理用户可修改本人创建的授权记录备注", func(t *testing.T) { - url := fmt.Sprintf("/api/admin/authorizations/%d/remark", authByAgent1.ID) - body := map[string]string{"remark": "代理1自己修改的备注"} - bodyBytes, _ := json.Marshal(body) - - resp, err := env.AsUser(agentAccount1).Request("PUT", url, bodyBytes) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - data := result.Data.(map[string]interface{}) - assert.Equal(t, "代理1自己修改的备注", data["remark"]) - }) - - t.Run("代理用户不可修改他人创建的授权记录备注", func(t *testing.T) { - url := fmt.Sprintf("/api/admin/authorizations/%d/remark", authByAgent1.ID) - body := map[string]string{"remark": "代理2试图修改的备注"} - bodyBytes, _ := json.Marshal(body) - - resp, err := env.AsUser(agentAccount2).Request("PUT", url, bodyBytes) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 403, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.NotEqual(t, 0, result.Code) - assert.Contains(t, result.Message, "只能修改自己创建的授权记录备注") - }) - - t.Run("企业用户不允许修改授权记录备注", func(t *testing.T) { - url := fmt.Sprintf("/api/admin/authorizations/%d/remark", authByAgent1.ID) - body := map[string]string{"remark": "企业试图修改的备注"} - bodyBytes, _ := json.Marshal(body) - - resp, err := env.AsUser(enterpriseAccount).Request("PUT", url, bodyBytes) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 403, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.NotEqual(t, 0, result.Code) - assert.Contains(t, result.Message, "权限不足") - }) -} diff --git a/tests/integration/carrier_test.go b/tests/integration/carrier_test.go deleted file mode 100644 index 9cb377c..0000000 --- a/tests/integration/carrier_test.go +++ /dev/null @@ -1,240 +0,0 @@ -package integration - -import ( - "encoding/json" - "fmt" - "testing" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/pkg/response" - "github.com/break/junhong_cmp_fiber/tests/testutils/integ" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -func TestCarrier_CRUD(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - var createdCarrierID uint - - t.Run("创建运营商", func(t *testing.T) { - body := map[string]interface{}{ - "carrier_code": "TEST_CMCC_001", - "carrier_name": "测试中国移动", - "carrier_type": constants.CarrierTypeCMCC, - "description": "API集成测试创建的运营商", - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/carriers", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - dataMap, ok := result.Data.(map[string]interface{}) - require.True(t, ok) - assert.Equal(t, "TEST_CMCC_001", dataMap["carrier_code"]) - assert.Equal(t, "测试中国移动", dataMap["carrier_name"]) - assert.Equal(t, constants.CarrierTypeCMCC, dataMap["carrier_type"]) - assert.Equal(t, float64(constants.StatusEnabled), dataMap["status"]) - - createdCarrierID = uint(dataMap["id"].(float64)) - t.Logf("创建的运营商 ID: %d", createdCarrierID) - }) - - t.Run("创建运营商-编码重复应失败", func(t *testing.T) { - body := map[string]interface{}{ - "carrier_code": "TEST_CMCC_001", - "carrier_name": "重复编码测试", - "carrier_type": constants.CarrierTypeCMCC, - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/carriers", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.NotEqual(t, 0, result.Code, "编码重复应返回错误") - }) - - t.Run("获取运营商详情", func(t *testing.T) { - url := fmt.Sprintf("/api/admin/carriers/%d", createdCarrierID) - resp, err := env.AsSuperAdmin().Request("GET", url, nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - dataMap := result.Data.(map[string]interface{}) - assert.Equal(t, "TEST_CMCC_001", dataMap["carrier_code"]) - }) - - t.Run("获取不存在的运营商", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/carriers/99999", nil) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.NotEqual(t, 0, result.Code, "不存在的运营商应返回错误") - }) - - t.Run("更新运营商", func(t *testing.T) { - body := map[string]interface{}{ - "carrier_name": "测试中国移动-更新", - "description": "更新后的描述", - } - jsonBody, _ := json.Marshal(body) - - url := fmt.Sprintf("/api/admin/carriers/%d", createdCarrierID) - resp, err := env.AsSuperAdmin().Request("PUT", url, jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - dataMap := result.Data.(map[string]interface{}) - assert.Equal(t, "测试中国移动-更新", dataMap["carrier_name"]) - assert.Equal(t, "更新后的描述", dataMap["description"]) - }) - - t.Run("更新运营商状态-禁用", func(t *testing.T) { - body := map[string]interface{}{ - "status": constants.StatusDisabled, - } - jsonBody, _ := json.Marshal(body) - - url := fmt.Sprintf("/api/admin/carriers/%d/status", createdCarrierID) - resp, err := env.AsSuperAdmin().Request("PUT", url, jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - var carrier model.Carrier - env.RawDB().First(&carrier, createdCarrierID) - assert.Equal(t, constants.StatusDisabled, carrier.Status) - }) - - t.Run("删除运营商", func(t *testing.T) { - url := fmt.Sprintf("/api/admin/carriers/%d", createdCarrierID) - resp, err := env.AsSuperAdmin().Request("DELETE", url, nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - var carrier model.Carrier - err = env.RawDB().First(&carrier, createdCarrierID).Error - assert.Error(t, err, "删除后应查不到运营商") - }) -} - -func TestCarrier_List(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - carriers := []*model.Carrier{ - {CarrierCode: "TEST_LIST_001", CarrierName: "移动列表测试1", CarrierType: constants.CarrierTypeCMCC, Status: constants.StatusEnabled}, - {CarrierCode: "TEST_LIST_002", CarrierName: "联通列表测试", CarrierType: constants.CarrierTypeCUCC, Status: constants.StatusEnabled}, - {CarrierCode: "TEST_LIST_003", CarrierName: "电信列表测试", CarrierType: constants.CarrierTypeCTCC, Status: constants.StatusEnabled}, - } - for _, c := range carriers { - require.NoError(t, env.TX.Create(c).Error) - } - carriers[2].Status = constants.StatusDisabled - require.NoError(t, env.TX.Save(carriers[2]).Error) - - t.Run("获取运营商列表-无过滤", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/carriers?page=1&page_size=20", nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - }) - - t.Run("获取运营商列表-按类型过滤", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/carriers?carrier_type=CMCC", nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - }) - - t.Run("获取运营商列表-按名称模糊搜索", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/carriers?carrier_name=联通", nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - }) - - t.Run("获取运营商列表-按状态过滤", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", fmt.Sprintf("/api/admin/carriers?status=%d", constants.StatusDisabled), nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - }) - - t.Run("未认证请求应返回错误", func(t *testing.T) { - resp, err := env.ClearAuth().Request("GET", "/api/admin/carriers", nil) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.NotEqual(t, 0, result.Code, "未认证请求应返回错误码") - }) -} diff --git a/tests/integration/device_gateway_test.go b/tests/integration/device_gateway_test.go deleted file mode 100644 index 0112e70..0000000 --- a/tests/integration/device_gateway_test.go +++ /dev/null @@ -1,447 +0,0 @@ -package integration - -import ( - "encoding/json" - "fmt" - "testing" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/pkg/response" - "github.com/break/junhong_cmp_fiber/tests/testutils/integ" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -// TestGatewayDevice_GetInfo 测试查询设备信息接口 -func TestGatewayDevice_GetInfo(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - device := &model.Device{ - DeviceNo: "86000000000000000001", - DeviceName: "测试设备1", - DeviceType: "router", - MaxSimSlots: 4, - Status: constants.DeviceStatusInStock, - } - require.NoError(t, env.TX.Create(device).Error) - - t.Run("成功查询设备信息", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", fmt.Sprintf("/api/admin/devices/by-imei/%s/gateway-info", device.DeviceNo), nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - }) - - t.Run("无权限访问其他店铺的设备信息", func(t *testing.T) { - shop2 := &model.Shop{ - ShopName: "测试店铺8", - ShopCode: "SHOP_008", - Level: 1, - } - require.NoError(t, env.TX.Create(shop2).Error) - - device2 := &model.Device{ - DeviceNo: "86000000000000000002", - DeviceName: "测试设备2", - DeviceType: "router", - MaxSimSlots: 4, - Status: constants.DeviceStatusInStock, - ShopID: &shop2.ID, - } - require.NoError(t, env.TX.Create(device2).Error) - - agentAccount := &model.Account{ - Username: "agent_test_device_gateway_1", - Phone: "13800000201", - UserType: constants.UserTypeAgent, - ShopID: &shop2.ID, - Status: 1, - } - require.NoError(t, env.TX.Create(agentAccount).Error) - - resp, err := env.AsUser(agentAccount).Request("GET", fmt.Sprintf("/api/admin/devices/by-imei/%s/gateway-info", device.DeviceNo), nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 404, resp.StatusCode) - }) -} - -// TestGatewayDevice_GetSlots 测试查询卡槽信息接口 -func TestGatewayDevice_GetSlots(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - device := &model.Device{ - DeviceNo: "86000000000000000003", - DeviceName: "测试设备3", - DeviceType: "router", - MaxSimSlots: 4, - Status: constants.DeviceStatusInStock, - } - require.NoError(t, env.TX.Create(device).Error) - - t.Run("成功查询卡槽信息", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", fmt.Sprintf("/api/admin/devices/by-imei/%s/gateway-slots", device.DeviceNo), nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - }) - - t.Run("无权限访问其他店铺的卡槽信息", func(t *testing.T) { - shop2 := &model.Shop{ - ShopName: "测试店铺9", - ShopCode: "SHOP_009", - Level: 1, - } - require.NoError(t, env.TX.Create(shop2).Error) - - device2 := &model.Device{ - DeviceNo: "86000000000000000004", - DeviceName: "测试设备4", - DeviceType: "router", - MaxSimSlots: 4, - Status: constants.DeviceStatusInStock, - ShopID: &shop2.ID, - } - require.NoError(t, env.TX.Create(device2).Error) - - agentAccount := &model.Account{ - Username: "agent_test_device_gateway_2", - Phone: "13800000202", - UserType: constants.UserTypeAgent, - ShopID: &shop2.ID, - Status: 1, - } - require.NoError(t, env.TX.Create(agentAccount).Error) - - resp, err := env.AsUser(agentAccount).Request("GET", fmt.Sprintf("/api/admin/devices/by-imei/%s/gateway-slots", device.DeviceNo), nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 404, resp.StatusCode) - }) -} - -// TestGatewayDevice_SetSpeedLimit 测试设置限速接口 -func TestGatewayDevice_SetSpeedLimit(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - device := &model.Device{ - DeviceNo: "86000000000000000005", - DeviceName: "测试设备5", - DeviceType: "router", - MaxSimSlots: 4, - Status: constants.DeviceStatusInStock, - } - require.NoError(t, env.TX.Create(device).Error) - - t.Run("成功设置限速", func(t *testing.T) { - body := []byte(`{"uploadSpeed": 1024, "downloadSpeed": 2048}`) - resp, err := env.AsSuperAdmin().Request("PUT", fmt.Sprintf("/api/admin/devices/by-imei/%s/speed-limit", device.DeviceNo), body) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - }) - - t.Run("无权限设置其他店铺设备的限速", func(t *testing.T) { - shop2 := &model.Shop{ - ShopName: "测试店铺10", - ShopCode: "SHOP_010", - Level: 1, - } - require.NoError(t, env.TX.Create(shop2).Error) - - device2 := &model.Device{ - DeviceNo: "86000000000000000006", - DeviceName: "测试设备6", - DeviceType: "router", - MaxSimSlots: 4, - Status: constants.DeviceStatusInStock, - ShopID: &shop2.ID, - } - require.NoError(t, env.TX.Create(device2).Error) - - agentAccount := &model.Account{ - Username: "agent_test_device_gateway_3", - Phone: "13800000203", - UserType: constants.UserTypeAgent, - ShopID: &shop2.ID, - Status: 1, - } - require.NoError(t, env.TX.Create(agentAccount).Error) - - body := []byte(`{"uploadSpeed": 1024, "downloadSpeed": 2048}`) - resp, err := env.AsUser(agentAccount).Request("PUT", fmt.Sprintf("/api/admin/devices/by-imei/%s/speed-limit", device.DeviceNo), body) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 404, resp.StatusCode) - }) -} - -// TestGatewayDevice_SetWiFi 测试设置WiFi接口 -func TestGatewayDevice_SetWiFi(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - device := &model.Device{ - DeviceNo: "86000000000000000007", - DeviceName: "测试设备7", - DeviceType: "router", - MaxSimSlots: 4, - Status: constants.DeviceStatusInStock, - } - require.NoError(t, env.TX.Create(device).Error) - - t.Run("成功设置WiFi", func(t *testing.T) { - body := []byte(`{"ssid": "TestWiFi", "password": "password123", "enabled": 1}`) - resp, err := env.AsSuperAdmin().Request("PUT", fmt.Sprintf("/api/admin/devices/by-imei/%s/wifi", device.DeviceNo), body) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - }) - - t.Run("无权限设置其他店铺设备的WiFi", func(t *testing.T) { - shop2 := &model.Shop{ - ShopName: "测试店铺11", - ShopCode: "SHOP_011", - Level: 1, - } - require.NoError(t, env.TX.Create(shop2).Error) - - device2 := &model.Device{ - DeviceNo: "86000000000000000008", - DeviceName: "测试设备8", - DeviceType: "router", - MaxSimSlots: 4, - Status: constants.DeviceStatusInStock, - ShopID: &shop2.ID, - } - require.NoError(t, env.TX.Create(device2).Error) - - agentAccount := &model.Account{ - Username: "agent_test_device_gateway_4", - Phone: "13800000204", - UserType: constants.UserTypeAgent, - ShopID: &shop2.ID, - Status: 1, - } - require.NoError(t, env.TX.Create(agentAccount).Error) - - body := []byte(`{"ssid": "TestWiFi", "password": "password123", "enabled": 1}`) - resp, err := env.AsUser(agentAccount).Request("PUT", fmt.Sprintf("/api/admin/devices/by-imei/%s/wifi", device.DeviceNo), body) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 404, resp.StatusCode) - }) -} - -// TestGatewayDevice_SwitchCard 测试切卡接口 -func TestGatewayDevice_SwitchCard(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - device := &model.Device{ - DeviceNo: "86000000000000000009", - DeviceName: "测试设备9", - DeviceType: "router", - MaxSimSlots: 4, - Status: constants.DeviceStatusInStock, - } - require.NoError(t, env.TX.Create(device).Error) - - t.Run("成功切卡", func(t *testing.T) { - body := []byte(`{"targetIccid": "89860001234567890013"}`) - resp, err := env.AsSuperAdmin().Request("POST", fmt.Sprintf("/api/admin/devices/by-imei/%s/switch-card", device.DeviceNo), body) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - }) - - t.Run("无权限切换其他店铺设备的卡", func(t *testing.T) { - shop2 := &model.Shop{ - ShopName: "测试店铺12", - ShopCode: "SHOP_012", - Level: 1, - } - require.NoError(t, env.TX.Create(shop2).Error) - - device2 := &model.Device{ - DeviceNo: "86000000000000000010", - DeviceName: "测试设备10", - DeviceType: "router", - MaxSimSlots: 4, - Status: constants.DeviceStatusInStock, - ShopID: &shop2.ID, - } - require.NoError(t, env.TX.Create(device2).Error) - - agentAccount := &model.Account{ - Username: "agent_test_device_gateway_5", - Phone: "13800000205", - UserType: constants.UserTypeAgent, - ShopID: &shop2.ID, - Status: 1, - } - require.NoError(t, env.TX.Create(agentAccount).Error) - - body := []byte(`{"targetIccid": "89860001234567890013"}`) - resp, err := env.AsUser(agentAccount).Request("POST", fmt.Sprintf("/api/admin/devices/by-imei/%s/switch-card", device.DeviceNo), body) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 404, resp.StatusCode) - }) -} - -// TestGatewayDevice_RebootDevice 测试重启设备接口 -func TestGatewayDevice_RebootDevice(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - device := &model.Device{ - DeviceNo: "86000000000000000011", - DeviceName: "测试设备11", - DeviceType: "router", - MaxSimSlots: 4, - Status: constants.DeviceStatusInStock, - } - require.NoError(t, env.TX.Create(device).Error) - - t.Run("成功重启设备", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("POST", fmt.Sprintf("/api/admin/devices/by-imei/%s/reboot", device.DeviceNo), nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - }) - - t.Run("无权限重启其他店铺的设备", func(t *testing.T) { - shop2 := &model.Shop{ - ShopName: "测试店铺13", - ShopCode: "SHOP_013", - Level: 1, - } - require.NoError(t, env.TX.Create(shop2).Error) - - device2 := &model.Device{ - DeviceNo: "86000000000000000012", - DeviceName: "测试设备12", - DeviceType: "router", - MaxSimSlots: 4, - Status: constants.DeviceStatusInStock, - ShopID: &shop2.ID, - } - require.NoError(t, env.TX.Create(device2).Error) - - agentAccount := &model.Account{ - Username: "agent_test_device_gateway_6", - Phone: "13800000206", - UserType: constants.UserTypeAgent, - ShopID: &shop2.ID, - Status: 1, - } - require.NoError(t, env.TX.Create(agentAccount).Error) - - resp, err := env.AsUser(agentAccount).Request("POST", fmt.Sprintf("/api/admin/devices/by-imei/%s/reboot", device.DeviceNo), nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 404, resp.StatusCode) - }) -} - -// TestGatewayDevice_ResetDevice 测试恢复出厂接口 -func TestGatewayDevice_ResetDevice(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - device := &model.Device{ - DeviceNo: "86000000000000000013", - DeviceName: "测试设备13", - DeviceType: "router", - MaxSimSlots: 4, - Status: constants.DeviceStatusInStock, - } - require.NoError(t, env.TX.Create(device).Error) - - t.Run("成功恢复出厂", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("POST", fmt.Sprintf("/api/admin/devices/by-imei/%s/reset", device.DeviceNo), nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - }) - - t.Run("无权限恢复其他店铺设备的出厂设置", func(t *testing.T) { - shop2 := &model.Shop{ - ShopName: "测试店铺14", - ShopCode: "SHOP_014", - Level: 1, - } - require.NoError(t, env.TX.Create(shop2).Error) - - device2 := &model.Device{ - DeviceNo: "86000000000000000014", - DeviceName: "测试设备14", - DeviceType: "router", - MaxSimSlots: 4, - Status: constants.DeviceStatusInStock, - ShopID: &shop2.ID, - } - require.NoError(t, env.TX.Create(device2).Error) - - agentAccount := &model.Account{ - Username: "agent_test_device_gateway_7", - Phone: "13800000207", - UserType: constants.UserTypeAgent, - ShopID: &shop2.ID, - Status: 1, - } - require.NoError(t, env.TX.Create(agentAccount).Error) - - resp, err := env.AsUser(agentAccount).Request("POST", fmt.Sprintf("/api/admin/devices/by-imei/%s/reset", device.DeviceNo), nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 404, resp.StatusCode) - }) -} diff --git a/tests/integration/device_test.go b/tests/integration/device_test.go deleted file mode 100644 index 9a1f2f3..0000000 --- a/tests/integration/device_test.go +++ /dev/null @@ -1,502 +0,0 @@ -package integration - -import ( - "encoding/json" - "fmt" - "testing" - "time" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/pkg/response" - "github.com/break/junhong_cmp_fiber/tests/testutils/integ" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -func TestDevice_List(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - // 创建测试设备 - devices := []*model.Device{ - {DeviceNo: "TEST_DEVICE_001", DeviceName: "测试设备1", DeviceType: "router", MaxSimSlots: 4, Status: constants.DeviceStatusInStock}, - {DeviceNo: "TEST_DEVICE_002", DeviceName: "测试设备2", DeviceType: "router", MaxSimSlots: 2, Status: constants.DeviceStatusInStock}, - {DeviceNo: "TEST_DEVICE_003", DeviceName: "测试设备3", DeviceType: "mifi", MaxSimSlots: 1, Status: constants.DeviceStatusDistributed}, - } - for _, device := range devices { - require.NoError(t, env.TX.Create(device).Error) - } - - t.Run("获取设备列表-无过滤", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/devices?page=1&page_size=20", nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - }) - - t.Run("获取设备列表-按设备类型过滤", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/devices?device_type=router", nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - }) - - t.Run("获取设备列表-按状态过滤", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", fmt.Sprintf("/api/admin/devices?status=%d", constants.DeviceStatusInStock), nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - }) - - t.Run("未认证请求应返回错误", func(t *testing.T) { - resp, err := env.ClearAuth().Request("GET", "/api/admin/devices", nil) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.NotEqual(t, 0, result.Code, "未认证请求应返回错误码") - }) -} - -func TestDevice_GetByID(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - // 创建测试设备 - device := &model.Device{ - DeviceNo: "TEST_DEVICE_GET_001", - DeviceName: "测试设备详情", - DeviceType: "router", - MaxSimSlots: 4, - Status: constants.DeviceStatusInStock, - } - require.NoError(t, env.TX.Create(device).Error) - - t.Run("获取设备详情-成功", func(t *testing.T) { - url := fmt.Sprintf("/api/admin/devices/%d", device.ID) - resp, err := env.AsSuperAdmin().Request("GET", url, nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - // 验证返回数据 - dataMap, ok := result.Data.(map[string]interface{}) - require.True(t, ok) - assert.Equal(t, "TEST_DEVICE_GET_001", dataMap["device_no"]) - }) - - t.Run("获取不存在的设备-应返回错误", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/devices/999999", nil) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.NotEqual(t, 0, result.Code, "不存在的设备应返回错误码") - }) -} - -func TestDevice_Delete(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - device := &model.Device{ - DeviceNo: "TEST_DEVICE_DEL_001", - DeviceName: "测试删除设备", - DeviceType: "router", - MaxSimSlots: 4, - Status: constants.DeviceStatusInStock, - } - require.NoError(t, env.TX.Create(device).Error) - - t.Run("删除设备-成功", func(t *testing.T) { - url := fmt.Sprintf("/api/admin/devices/%d", device.ID) - resp, err := env.AsSuperAdmin().Request("DELETE", url, nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - var deletedDevice model.Device - err = env.RawDB().Unscoped().First(&deletedDevice, device.ID).Error - require.NoError(t, err) - assert.NotNil(t, deletedDevice.DeletedAt) - }) -} - -func TestDeviceImport_TaskList(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - task := &model.DeviceImportTask{ - TaskNo: "TEST_DEVICE_IMPORT_001", - Status: model.ImportTaskStatusCompleted, - BatchNo: "TEST_BATCH_001", - TotalCount: 100, - } - require.NoError(t, env.TX.Create(task).Error) - - t.Run("获取导入任务列表", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/devices/import/tasks?page=1&page_size=20", nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - }) - - t.Run("获取导入任务详情", func(t *testing.T) { - url := fmt.Sprintf("/api/admin/devices/import/tasks/%d", task.ID) - resp, err := env.AsSuperAdmin().Request("GET", url, nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - }) -} - -func TestDevice_GetByIMEI(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - // 创建测试设备 - device := &model.Device{ - DeviceNo: "TEST_IMEI_001", - DeviceName: "测试IMEI查询设备", - DeviceType: "router", - MaxSimSlots: 4, - Status: constants.DeviceStatusInStock, - } - require.NoError(t, env.TX.Create(device).Error) - - t.Run("通过IMEI查询设备详情-成功", func(t *testing.T) { - url := fmt.Sprintf("/api/admin/devices/by-imei/%s", device.DeviceNo) - resp, err := env.AsSuperAdmin().Request("GET", url, nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - // 验证返回数据 - dataMap, ok := result.Data.(map[string]interface{}) - require.True(t, ok) - assert.Equal(t, "TEST_IMEI_001", dataMap["device_no"]) - assert.Equal(t, "测试IMEI查询设备", dataMap["device_name"]) - }) - - t.Run("通过不存在的IMEI查询-应返回错误", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/devices/by-imei/NONEXISTENT_IMEI", nil) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.NotEqual(t, 0, result.Code, "不存在的IMEI应返回错误码") - }) - - t.Run("未认证请求-应返回错误", func(t *testing.T) { - url := fmt.Sprintf("/api/admin/devices/by-imei/%s", device.DeviceNo) - resp, err := env.ClearAuth().Request("GET", url, nil) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.NotEqual(t, 0, result.Code, "未认证请求应返回错误码") - }) -} - -func TestDevice_BatchSetSeriesBinding(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - shop := env.CreateTestShop("测试店铺", 1, nil) - agentAccount := env.CreateTestAccount(fmt.Sprintf("agent_dev_%d", time.Now().UnixNano()), "password123", constants.UserTypeAgent, &shop.ID, nil) - - series := createTestPackageSeries(t, env, "测试系列") - createTestAllocation(t, env, shop.ID, series.ID, 0) - - devices := []*model.Device{ - {DeviceNo: fmt.Sprintf("DEV_%d_001", time.Now().UnixNano()), DeviceName: "测试设备1", DeviceType: "router", MaxSimSlots: 4, Status: constants.DeviceStatusInStock, ShopID: &shop.ID}, - {DeviceNo: fmt.Sprintf("DEV_%d_002", time.Now().UnixNano()), DeviceName: "测试设备2", DeviceType: "mifi", MaxSimSlots: 2, Status: constants.DeviceStatusInStock, ShopID: &shop.ID}, - {DeviceNo: fmt.Sprintf("DEV_%d_003", time.Now().UnixNano()), DeviceName: "测试设备3", DeviceType: "router", MaxSimSlots: 4, Status: constants.DeviceStatusInStock, ShopID: &shop.ID}, - } - for _, device := range devices { - require.NoError(t, env.TX.Create(device).Error) - } - - t.Run("批量设置设备系列绑定-成功", func(t *testing.T) { - body := map[string]interface{}{ - "device_ids": []uint{devices[0].ID, devices[1].ID}, - "series_id": series.ID, - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsUser(agentAccount).Request("PATCH", "/api/admin/devices/series-binding", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code, "应返回成功: %s", result.Message) - - if result.Data != nil { - dataMap := result.Data.(map[string]interface{}) - assert.Equal(t, float64(2), dataMap["success_count"], "应有2个设备成功绑定") - assert.Equal(t, float64(0), dataMap["fail_count"], "应无失败") - } else { - t.Logf("Response data is nil: code=%d, message=%s", result.Code, result.Message) - } - - var updatedDevice model.Device - err = env.RawDB().Where("id = ?", devices[0].ID).First(&updatedDevice).Error - require.NoError(t, err) - assert.NotNil(t, updatedDevice.SeriesID) - assert.Equal(t, series.ID, *updatedDevice.SeriesID) - }) - - t.Run("清除设备系列绑定-series_id=0", func(t *testing.T) { - body := map[string]interface{}{ - "device_ids": []uint{devices[0].ID}, - "series_id": 0, - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsUser(agentAccount).Request("PATCH", "/api/admin/devices/series-binding", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - var updatedDevice model.Device - err = env.RawDB().Where("id = ?", devices[0].ID).First(&updatedDevice).Error - require.NoError(t, err) - assert.Nil(t, updatedDevice.SeriesID, "系列分配应被清除") - }) - - t.Run("批量设置-部分设备不存在", func(t *testing.T) { - body := map[string]interface{}{ - "device_ids": []uint{devices[2].ID, 999999}, - "series_id": series.ID, - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsUser(agentAccount).Request("PATCH", "/api/admin/devices/series-binding", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - if result.Data != nil { - dataMap := result.Data.(map[string]interface{}) - assert.Equal(t, float64(1), dataMap["success_count"], "应有1个设备成功") - assert.Equal(t, float64(1), dataMap["fail_count"], "应有1个设备失败") - - if dataMap["failed_items"] != nil { - failedItems := dataMap["failed_items"].([]interface{}) - assert.Len(t, failedItems, 1) - failedItem := failedItems[0].(map[string]interface{}) - assert.Equal(t, float64(999999), failedItem["device_id"]) - } - } - }) - - t.Run("设置不存在的系列分配-应失败", func(t *testing.T) { - body := map[string]interface{}{ - "device_ids": []uint{devices[2].ID}, - "series_id": 999999, - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsUser(agentAccount).Request("PATCH", "/api/admin/devices/series-binding", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.NotEqual(t, 0, result.Code, "不存在的系列分配应返回错误") - }) - - t.Run("设置禁用的系列-应失败", func(t *testing.T) { - disabledSeries := createTestPackageSeries(t, env, "禁用系列") - env.TX.Model(&model.PackageSeries{}).Where("id = ?", disabledSeries.ID).Update("status", constants.StatusDisabled) - - body := map[string]interface{}{ - "device_ids": []uint{devices[2].ID}, - "series_id": disabledSeries.ID, - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsUser(agentAccount).Request("PATCH", "/api/admin/devices/series-binding", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.NotEqual(t, 0, result.Code, "禁用的系列分配应返回错误") - }) - - t.Run("代理商设置其他店铺的设备-应失败", func(t *testing.T) { - otherShop := env.CreateTestShop("其他店铺", 1, nil) - otherDevice := &model.Device{ - DeviceNo: fmt.Sprintf("OTHER_%d", time.Now().UnixNano()), - DeviceName: "其他设备", - DeviceType: "router", - MaxSimSlots: 4, - Status: constants.DeviceStatusInStock, - ShopID: &otherShop.ID, - } - require.NoError(t, env.TX.Create(otherDevice).Error) - - body := map[string]interface{}{ - "device_ids": []uint{otherDevice.ID}, - "series_id": series.ID, - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsUser(agentAccount).Request("PATCH", "/api/admin/devices/series-binding", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - - dataMap := result.Data.(map[string]interface{}) - assert.Equal(t, float64(0), dataMap["success_count"], "不应有成功") - assert.Equal(t, float64(1), dataMap["fail_count"], "应全部失败") - }) - - t.Run("超级管理员可以设置任意店铺的设备", func(t *testing.T) { - anotherShop := env.CreateTestShop("另一个店铺", 1, nil) - anotherDevice := &model.Device{ - DeviceNo: fmt.Sprintf("ADMIN_%d", time.Now().UnixNano()), - DeviceName: "管理员设备", - DeviceType: "router", - MaxSimSlots: 4, - Status: constants.DeviceStatusInStock, - ShopID: &anotherShop.ID, - } - require.NoError(t, env.TX.Create(anotherDevice).Error) - - createTestAllocation(t, env, anotherShop.ID, series.ID, 0) - - body := map[string]interface{}{ - "device_ids": []uint{anotherDevice.ID}, - "series_id": series.ID, - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsSuperAdmin().Request("PATCH", "/api/admin/devices/series-binding", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code, "超级管理员应能设置任意店铺的设备") - - dataMap := result.Data.(map[string]interface{}) - assert.Equal(t, float64(1), dataMap["success_count"]) - }) - - t.Run("未认证请求应返回错误", func(t *testing.T) { - body := map[string]interface{}{ - "device_ids": []uint{devices[0].ID}, - "series_id": series.ID, - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.ClearAuth().Request("PATCH", "/api/admin/devices/series-binding", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.NotEqual(t, 0, result.Code, "未认证请求应返回错误码") - }) - - t.Run("空设备ID列表-返回成功但无操作", func(t *testing.T) { - body := map[string]interface{}{ - "device_ids": []uint{}, - "series_id": series.ID, - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsUser(agentAccount).Request("PATCH", "/api/admin/devices/series-binding", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - - assert.Equal(t, 0, result.Code, "当前实现：空列表返回成功") - - if result.Data != nil { - dataMap := result.Data.(map[string]interface{}) - assert.Equal(t, float64(0), dataMap["success_count"], "空列表无成功项") - } - }) -} diff --git a/tests/integration/enterprise_device_h5_test.go b/tests/integration/enterprise_device_h5_test.go deleted file mode 100644 index 581accb..0000000 --- a/tests/integration/enterprise_device_h5_test.go +++ /dev/null @@ -1,322 +0,0 @@ -package integration - -import ( - "encoding/json" - "fmt" - "testing" - "time" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/internal/model/dto" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/pkg/response" - "github.com/break/junhong_cmp_fiber/tests/testutils/integ" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -func uniqueEDH5TestPrefix() string { - return fmt.Sprintf("H5ED%d", time.Now().UnixNano()%1000000000) -} - -func TestEnterpriseDeviceH5_ListDevices(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - prefix := uniqueEDH5TestPrefix() - shop := env.CreateTestShop(prefix+"_SHOP", 1, nil) - enterprise := env.CreateTestEnterprise(prefix+"_ENTERPRISE", &shop.ID) - enterpriseUser := env.CreateTestAccount(prefix+"_USER", "Password123", constants.UserTypeEnterprise, nil, &enterprise.ID) - - device := &model.Device{ - DeviceNo: prefix + "_D001", - DeviceName: "测试设备", - Status: 2, - ShopID: &shop.ID, - } - require.NoError(t, env.TX.Create(device).Error) - - now := time.Now() - deviceAuth := &model.EnterpriseDeviceAuthorization{ - EnterpriseID: enterprise.ID, - DeviceID: device.ID, - AuthorizedBy: 1, - AuthorizedAt: now, - AuthorizerType: constants.UserTypePlatform, - } - require.NoError(t, env.TX.Create(deviceAuth).Error) - - t.Run("企业用户获取授权设备列表", func(t *testing.T) { - resp, err := env.AsUser(enterpriseUser).Request("GET", "/api/h5/devices?page=1&page_size=10", nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - data := result.Data.(map[string]interface{}) - assert.Equal(t, float64(1), data["total"]) - }) -} - -func TestEnterpriseDeviceH5_GetDeviceDetail(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - prefix := uniqueEDH5TestPrefix() - shop := env.CreateTestShop(prefix+"_SHOP", 1, nil) - enterprise := env.CreateTestEnterprise(prefix+"_ENTERPRISE", &shop.ID) - enterpriseUser := env.CreateTestAccount(prefix+"_USER", "Password123", constants.UserTypeEnterprise, nil, &enterprise.ID) - - carrier := &model.Carrier{CarrierName: "测试运营商", CarrierType: "CMCC", Status: 1} - require.NoError(t, env.TX.Create(carrier).Error) - - device := &model.Device{ - DeviceNo: prefix + "_D001", - DeviceName: "测试设备", - Status: 2, - ShopID: &shop.ID, - } - require.NoError(t, env.TX.Create(device).Error) - - card := &model.IotCard{ICCID: prefix + "0001", CarrierID: carrier.ID, Status: 2, ShopID: &shop.ID, NetworkStatus: 1} - require.NoError(t, env.TX.Create(card).Error) - - now := time.Now() - binding := &model.DeviceSimBinding{DeviceID: device.ID, IotCardID: card.ID, SlotPosition: 1, BindStatus: 1, BindTime: &now} - require.NoError(t, env.TX.Create(binding).Error) - - deviceAuth := &model.EnterpriseDeviceAuthorization{ - EnterpriseID: enterprise.ID, - DeviceID: device.ID, - AuthorizedBy: 1, - AuthorizedAt: now, - AuthorizerType: constants.UserTypePlatform, - } - require.NoError(t, env.TX.Create(deviceAuth).Error) - - cardAuth := &model.EnterpriseCardAuthorization{ - EnterpriseID: enterprise.ID, - CardID: card.ID, - DeviceAuthID: &deviceAuth.ID, - AuthorizedBy: 1, - AuthorizedAt: now, - AuthorizerType: constants.UserTypePlatform, - } - require.NoError(t, env.TX.Create(cardAuth).Error) - - t.Run("成功获取设备详情", func(t *testing.T) { - url := fmt.Sprintf("/api/h5/devices/%d", device.ID) - resp, err := env.AsUser(enterpriseUser).Request("GET", url, nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - data := result.Data.(map[string]interface{}) - deviceInfo := data["device"].(map[string]interface{}) - assert.Equal(t, float64(device.ID), deviceInfo["device_id"]) - assert.Equal(t, device.DeviceNo, deviceInfo["device_no"]) - - cards := data["cards"].([]interface{}) - assert.Len(t, cards, 1) - }) - - t.Run("设备未授权返回错误", func(t *testing.T) { - device2 := &model.Device{ - DeviceNo: prefix + "_D002", - DeviceName: "未授权设备", - Status: 2, - } - require.NoError(t, env.TX.Create(device2).Error) - - url := fmt.Sprintf("/api/h5/devices/%d", device2.ID) - resp, err := env.AsUser(enterpriseUser).Request("GET", url, nil) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.NotEqual(t, 0, result.Code) - }) -} - -func TestEnterpriseDeviceH5_SuspendCard(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - prefix := uniqueEDH5TestPrefix() - shop := env.CreateTestShop(prefix+"_SHOP", 1, nil) - enterprise := env.CreateTestEnterprise(prefix+"_ENTERPRISE", &shop.ID) - enterpriseUser := env.CreateTestAccount(prefix+"_USER", "Password123", constants.UserTypeEnterprise, nil, &enterprise.ID) - - carrier := &model.Carrier{CarrierName: "测试运营商", CarrierType: "CMCC", Status: 1} - require.NoError(t, env.TX.Create(carrier).Error) - - device := &model.Device{ - DeviceNo: prefix + "_D001", - DeviceName: "测试设备", - Status: 2, - ShopID: &shop.ID, - } - require.NoError(t, env.TX.Create(device).Error) - - card := &model.IotCard{ICCID: prefix + "0001", CarrierID: carrier.ID, Status: 2, ShopID: &shop.ID, NetworkStatus: 1} - require.NoError(t, env.TX.Create(card).Error) - - now := time.Now() - binding := &model.DeviceSimBinding{DeviceID: device.ID, IotCardID: card.ID, SlotPosition: 1, BindStatus: 1, BindTime: &now} - require.NoError(t, env.TX.Create(binding).Error) - - deviceAuth := &model.EnterpriseDeviceAuthorization{ - EnterpriseID: enterprise.ID, - DeviceID: device.ID, - AuthorizedBy: 1, - AuthorizedAt: now, - AuthorizerType: constants.UserTypePlatform, - } - require.NoError(t, env.TX.Create(deviceAuth).Error) - - cardAuth := &model.EnterpriseCardAuthorization{ - EnterpriseID: enterprise.ID, - CardID: card.ID, - DeviceAuthID: &deviceAuth.ID, - AuthorizedBy: 1, - AuthorizedAt: now, - AuthorizerType: constants.UserTypePlatform, - } - require.NoError(t, env.TX.Create(cardAuth).Error) - - t.Run("成功停机", func(t *testing.T) { - reqBody := dto.DeviceCardOperationReq{Reason: "测试停机"} - body, _ := json.Marshal(reqBody) - - url := fmt.Sprintf("/api/h5/devices/%d/cards/%d/suspend", device.ID, card.ID) - resp, err := env.AsUser(enterpriseUser).Request("POST", url, body) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - data := result.Data.(map[string]interface{}) - assert.Equal(t, true, data["success"]) - }) - - t.Run("卡不属于设备返回错误", func(t *testing.T) { - card2 := &model.IotCard{ICCID: prefix + "0002", CarrierID: carrier.ID, Status: 2} - require.NoError(t, env.TX.Create(card2).Error) - - reqBody := dto.DeviceCardOperationReq{Reason: "测试停机"} - body, _ := json.Marshal(reqBody) - - url := fmt.Sprintf("/api/h5/devices/%d/cards/%d/suspend", device.ID, card2.ID) - resp, err := env.AsUser(enterpriseUser).Request("POST", url, body) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.NotEqual(t, 0, result.Code) - }) -} - -func TestEnterpriseDeviceH5_ResumeCard(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - prefix := uniqueEDH5TestPrefix() - shop := env.CreateTestShop(prefix+"_SHOP", 1, nil) - enterprise := env.CreateTestEnterprise(prefix+"_ENTERPRISE", &shop.ID) - enterpriseUser := env.CreateTestAccount(prefix+"_USER", "Password123", constants.UserTypeEnterprise, nil, &enterprise.ID) - - carrier := &model.Carrier{CarrierName: "测试运营商", CarrierType: "CMCC", Status: 1} - require.NoError(t, env.TX.Create(carrier).Error) - - device := &model.Device{ - DeviceNo: prefix + "_D001", - DeviceName: "测试设备", - Status: 2, - ShopID: &shop.ID, - } - require.NoError(t, env.TX.Create(device).Error) - - card := &model.IotCard{ICCID: prefix + "0001", CarrierID: carrier.ID, Status: 2, ShopID: &shop.ID, NetworkStatus: 0} - require.NoError(t, env.TX.Create(card).Error) - - now := time.Now() - binding := &model.DeviceSimBinding{DeviceID: device.ID, IotCardID: card.ID, SlotPosition: 1, BindStatus: 1, BindTime: &now} - require.NoError(t, env.TX.Create(binding).Error) - - deviceAuth := &model.EnterpriseDeviceAuthorization{ - EnterpriseID: enterprise.ID, - DeviceID: device.ID, - AuthorizedBy: 1, - AuthorizedAt: now, - AuthorizerType: constants.UserTypePlatform, - } - require.NoError(t, env.TX.Create(deviceAuth).Error) - - cardAuth := &model.EnterpriseCardAuthorization{ - EnterpriseID: enterprise.ID, - CardID: card.ID, - DeviceAuthID: &deviceAuth.ID, - AuthorizedBy: 1, - AuthorizedAt: now, - AuthorizerType: constants.UserTypePlatform, - } - require.NoError(t, env.TX.Create(cardAuth).Error) - - t.Run("成功复机", func(t *testing.T) { - reqBody := dto.DeviceCardOperationReq{Reason: "测试复机"} - body, _ := json.Marshal(reqBody) - - url := fmt.Sprintf("/api/h5/devices/%d/cards/%d/resume", device.ID, card.ID) - resp, err := env.AsUser(enterpriseUser).Request("POST", url, body) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - data := result.Data.(map[string]interface{}) - assert.Equal(t, true, data["success"]) - }) - - t.Run("设备未授权返回错误", func(t *testing.T) { - device2 := &model.Device{ - DeviceNo: prefix + "_D002", - DeviceName: "未授权设备", - Status: 2, - } - require.NoError(t, env.TX.Create(device2).Error) - - reqBody := dto.DeviceCardOperationReq{Reason: "测试复机"} - body, _ := json.Marshal(reqBody) - - url := fmt.Sprintf("/api/h5/devices/%d/cards/%d/resume", device2.ID, card.ID) - resp, err := env.AsUser(enterpriseUser).Request("POST", url, body) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.NotEqual(t, 0, result.Code) - }) -} diff --git a/tests/integration/enterprise_device_test.go b/tests/integration/enterprise_device_test.go deleted file mode 100644 index d2eaac1..0000000 --- a/tests/integration/enterprise_device_test.go +++ /dev/null @@ -1,249 +0,0 @@ -package integration - -import ( - "encoding/json" - "fmt" - "testing" - "time" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/internal/model/dto" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/pkg/response" - "github.com/break/junhong_cmp_fiber/tests/testutils/integ" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -func uniqueEDTestPrefix() string { - return fmt.Sprintf("ED%d", time.Now().UnixNano()%1000000000) -} - -func TestEnterpriseDevice_AllocateDevices(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - prefix := uniqueEDTestPrefix() - shop := env.CreateTestShop(prefix+"_SHOP", 1, nil) - enterprise := env.CreateTestEnterprise(prefix+"_ENTERPRISE", &shop.ID) - - device1 := &model.Device{ - DeviceNo: prefix + "_D001", - DeviceName: "测试设备1", - Status: 2, - ShopID: &shop.ID, - } - device2 := &model.Device{ - DeviceNo: prefix + "_D002", - DeviceName: "测试设备2", - Status: 2, - ShopID: &shop.ID, - } - require.NoError(t, env.TX.Create(device1).Error) - require.NoError(t, env.TX.Create(device2).Error) - - carrier := &model.Carrier{CarrierName: "测试运营商", CarrierType: "CMCC", Status: 1} - require.NoError(t, env.TX.Create(carrier).Error) - - card := &model.IotCard{ICCID: prefix + "0001", CarrierID: carrier.ID, Status: 2, ShopID: &shop.ID} - require.NoError(t, env.TX.Create(card).Error) - - now := time.Now() - binding := &model.DeviceSimBinding{DeviceID: device1.ID, IotCardID: card.ID, SlotPosition: 1, BindStatus: 1, BindTime: &now} - require.NoError(t, env.TX.Create(binding).Error) - - t.Run("成功授权设备给企业", func(t *testing.T) { - reqBody := dto.AllocateDevicesReq{ - DeviceNos: []string{device1.DeviceNo}, - Remark: "集成测试授权", - } - body, _ := json.Marshal(reqBody) - - url := fmt.Sprintf("/api/admin/enterprises/%d/allocate-devices", enterprise.ID) - resp, err := env.AsSuperAdmin().Request("POST", url, body) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - data := result.Data.(map[string]interface{}) - assert.Equal(t, float64(1), data["success_count"]) - assert.Equal(t, float64(0), data["fail_count"]) - }) - - t.Run("设备不存在时记录失败", func(t *testing.T) { - reqBody := dto.AllocateDevicesReq{ - DeviceNos: []string{"NOT_EXIST_DEVICE"}, - } - body, _ := json.Marshal(reqBody) - - url := fmt.Sprintf("/api/admin/enterprises/%d/allocate-devices", enterprise.ID) - resp, err := env.AsSuperAdmin().Request("POST", url, body) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - data := result.Data.(map[string]interface{}) - assert.Equal(t, float64(0), data["success_count"]) - assert.Equal(t, float64(1), data["fail_count"]) - }) - - t.Run("企业不存在返回错误", func(t *testing.T) { - reqBody := dto.AllocateDevicesReq{ - DeviceNos: []string{device2.DeviceNo}, - } - body, _ := json.Marshal(reqBody) - - resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/enterprises/99999/allocate-devices", body) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.NotEqual(t, 0, result.Code) - }) -} - -func TestEnterpriseDevice_RecallDevices(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - prefix := uniqueEDTestPrefix() - shop := env.CreateTestShop(prefix+"_SHOP", 1, nil) - enterprise := env.CreateTestEnterprise(prefix+"_ENTERPRISE", &shop.ID) - - device := &model.Device{ - DeviceNo: prefix + "_D001", - DeviceName: "测试设备", - Status: 2, - ShopID: &shop.ID, - } - require.NoError(t, env.TX.Create(device).Error) - - now := time.Now() - deviceAuth := &model.EnterpriseDeviceAuthorization{ - EnterpriseID: enterprise.ID, - DeviceID: device.ID, - AuthorizedBy: 1, - AuthorizedAt: now, - AuthorizerType: constants.UserTypePlatform, - } - require.NoError(t, env.TX.Create(deviceAuth).Error) - - t.Run("成功撤销设备授权", func(t *testing.T) { - reqBody := dto.RecallDevicesReq{ - DeviceNos: []string{device.DeviceNo}, - } - body, _ := json.Marshal(reqBody) - - url := fmt.Sprintf("/api/admin/enterprises/%d/recall-devices", enterprise.ID) - resp, err := env.AsSuperAdmin().Request("POST", url, body) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - data := result.Data.(map[string]interface{}) - assert.Equal(t, float64(1), data["success_count"]) - }) - - t.Run("设备未授权时返回失败", func(t *testing.T) { - reqBody := dto.RecallDevicesReq{ - DeviceNos: []string{prefix + "_D002"}, - } - body, _ := json.Marshal(reqBody) - - url := fmt.Sprintf("/api/admin/enterprises/%d/recall-devices", enterprise.ID) - resp, err := env.AsSuperAdmin().Request("POST", url, body) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - data := result.Data.(map[string]interface{}) - assert.Equal(t, float64(0), data["success_count"]) - assert.Equal(t, float64(1), data["fail_count"]) - }) -} - -func TestEnterpriseDevice_ListDevices(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - prefix := uniqueEDTestPrefix() - shop := env.CreateTestShop(prefix+"_SHOP", 1, nil) - enterprise := env.CreateTestEnterprise(prefix+"_ENTERPRISE", &shop.ID) - - devices := make([]*model.Device, 3) - for i := 0; i < 3; i++ { - devices[i] = &model.Device{ - DeviceNo: fmt.Sprintf("%s_D%03d", prefix, i+1), - DeviceName: fmt.Sprintf("测试设备%d", i+1), - Status: 2, - ShopID: &shop.ID, - } - require.NoError(t, env.TX.Create(devices[i]).Error) - } - - now := time.Now() - for _, device := range devices[:2] { - auth := &model.EnterpriseDeviceAuthorization{ - EnterpriseID: enterprise.ID, - DeviceID: device.ID, - AuthorizedBy: 1, - AuthorizedAt: now, - AuthorizerType: constants.UserTypePlatform, - } - require.NoError(t, env.TX.Create(auth).Error) - } - - t.Run("获取企业授权设备列表", func(t *testing.T) { - url := fmt.Sprintf("/api/admin/enterprises/%d/devices?page=1&page_size=10", enterprise.ID) - resp, err := env.AsSuperAdmin().Request("GET", url, nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - data := result.Data.(map[string]interface{}) - assert.Equal(t, float64(2), data["total"]) - }) - - t.Run("分页查询", func(t *testing.T) { - url := fmt.Sprintf("/api/admin/enterprises/%d/devices?page=1&page_size=1", enterprise.ID) - resp, err := env.AsSuperAdmin().Request("GET", url, nil) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - data := result.Data.(map[string]interface{}) - items := data["items"].([]interface{}) - assert.Len(t, items, 1) - }) -} diff --git a/tests/integration/error_code_validation_test.go b/tests/integration/error_code_validation_test.go deleted file mode 100644 index 408dff9..0000000 --- a/tests/integration/error_code_validation_test.go +++ /dev/null @@ -1,155 +0,0 @@ -package integration - -import ( - "encoding/json" - "fmt" - "testing" - "time" - - "github.com/break/junhong_cmp_fiber/pkg/errors" - "github.com/break/junhong_cmp_fiber/tests/testutils/integ" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -func TestErrorCodeValidation_PackageNotFound(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - t.Run("套餐不存在返回404", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/packages/99999", nil) - require.NoError(t, err) - defer resp.Body.Close() - - var result map[string]interface{} - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - - // 验证 HTTP 状态码 - assert.Equal(t, 404, resp.StatusCode, "应返回 404 Not Found") - - // 验证错误码 - code, ok := result["code"].(float64) - require.True(t, ok, "响应应包含 code 字段") - assert.Equal(t, float64(errors.CodeNotFound), code, "应返回 CodeNotFound") - }) -} - -func TestErrorCodeValidation_InsufficientBalance(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - t.Run("余额不足返回400", func(t *testing.T) { - // 创建测试店铺和提现申请 - // 这里需要先创建一个店铺，然后申请提现金额 > 余额 - // 由于涉及较多前置步骤，这里仅验证错误码映射正确性 - - // 假设有一个提现接口，提现金额大于余额 - body := []byte(`{"amount": 1000000000}`) // 10亿分，肯定超出余额 - resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/commission_withdrawals", body) - - // 如果接口不存在或需要特定条件，跳过此测试 - if err != nil || resp.StatusCode == 404 { - t.Skip("提现接口需要特定前置条件，跳过测试") - return - } - defer resp.Body.Close() - - // 如果成功请求，验证错误码 - if resp.StatusCode != 200 { - var result map[string]interface{} - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - - code, ok := result["code"].(float64) - if ok && code == float64(errors.CodeInsufficientBalance) { - assert.Equal(t, 400, resp.StatusCode, "余额不足应返回 400") - } - } - }) -} - -func TestErrorCodeValidation_ShopCodeDuplicate(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - t.Run("店铺代码重复返回409", func(t *testing.T) { - // 创建第一个店铺 - shopCode := fmt.Sprintf("TEST_SHOP_%d", time.Now().UnixNano()) - body1 := fmt.Sprintf(`{ - "shop_name": "测试店铺1", - "shop_code": "%s", - "level": 1, - "contact_name": "联系人1", - "contact_phone": "13800138001", - "status": 1 - }`, shopCode) - - resp1, err := env.AsSuperAdmin().Request("POST", "/api/admin/shops", []byte(body1)) - require.NoError(t, err) - defer resp1.Body.Close() - - if resp1.StatusCode != 200 { - t.Skipf("创建店铺失败，状态码: %d", resp1.StatusCode) - return - } - - // 尝试创建重复店铺代码 - body2 := fmt.Sprintf(`{ - "shop_name": "测试店铺2", - "shop_code": "%s", - "level": 1, - "contact_name": "联系人2", - "contact_phone": "13800138002", - "status": 1 - }`, shopCode) - - resp2, err := env.AsSuperAdmin().Request("POST", "/api/admin/shops", []byte(body2)) - require.NoError(t, err) - defer resp2.Body.Close() - - var result map[string]interface{} - err = json.NewDecoder(resp2.Body).Decode(&result) - require.NoError(t, err) - - // 验证 HTTP 状态码 - assert.Equal(t, 409, resp2.StatusCode, "重复店铺代码应返回 409 Conflict") - - // 验证错误码 - code, ok := result["code"].(float64) - require.True(t, ok, "响应应包含 code 字段") - assert.Equal(t, float64(errors.CodeShopCodeExists), code, "应返回 CodeShopCodeExists") - }) -} - -func TestErrorCodeValidation_LogLevels(t *testing.T) { - t.Run("验证日志级别配置", func(t *testing.T) { - // 4xx 错误应该是 WARN 级别 - // 5xx 错误应该是 ERROR 级别 - // 这个在 pkg/errors/handler.go 中已经实现 - - // 验证错误码的 HTTP 状态码映射 - testCases := []struct { - code int - expectedStatus int - expectedLevel string - }{ - {errors.CodeNotFound, 404, "WARN"}, - {errors.CodeInvalidParam, 400, "WARN"}, - {errors.CodeShopCodeExists, 409, "WARN"}, - {errors.CodeInsufficientBalance, 400, "WARN"}, - {errors.CodeInternalError, 500, "ERROR"}, - } - - for _, tc := range testCases { - httpStatus := errors.GetHTTPStatus(tc.code) - assert.Equal(t, tc.expectedStatus, httpStatus, - "错误码 %d 应映射到 HTTP %d", tc.code, tc.expectedStatus) - - // 验证日志级别（4xx -> WARN, 5xx -> ERROR） - expectedLevel := "WARN" - if httpStatus >= 500 { - expectedLevel = "ERROR" - } - assert.Equal(t, expectedLevel, tc.expectedLevel, - "HTTP %d 应使用 %s 级别日志", httpStatus, expectedLevel) - } - }) -} diff --git a/tests/integration/error_handler_test.go b/tests/integration/error_handler_test.go deleted file mode 100644 index f11dc85..0000000 --- a/tests/integration/error_handler_test.go +++ /dev/null @@ -1,1085 +0,0 @@ -package integration - -import ( - "encoding/json" - "io" - "net/http/httptest" - "strings" - "testing" - "time" - - "github.com/gofiber/fiber/v2" - "github.com/gofiber/fiber/v2/middleware/requestid" - "github.com/google/uuid" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - - "github.com/break/junhong_cmp_fiber/internal/middleware" - "github.com/break/junhong_cmp_fiber/pkg/errors" - "github.com/break/junhong_cmp_fiber/pkg/logger" -) - -// setupTestApp 创建用于测试的 Fiber 应用 -func setupTestApp() *fiber.App { - // 初始化日志器 - _ = logger.InitLoggers( - "debug", - true, - logger.LogRotationConfig{ - Filename: "tests/integration/logs/error_handler_test.log", - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: false, - }, - logger.LogRotationConfig{ - Filename: "tests/integration/logs/access_test.log", - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: false, - }, - ) - - appLogger := logger.GetAppLogger() - - app := fiber.New(fiber.Config{ - ErrorHandler: errors.SafeErrorHandler(appLogger), - }) - - // 注册中间件 - app.Use(middleware.Recover(appLogger)) - app.Use(requestid.New(requestid.Config{ - Generator: func() string { - return uuid.NewString() - }, - })) - - return app -} - -// ErrorResponse 定义统一的错误响应结构 -type ErrorResponse struct { - Code interface{} `json:"code"` - Data interface{} `json:"data"` - Msg string `json:"msg"` - Timestamp interface{} `json:"timestamp"` -} - -// T029: 测试参数验证失败 -> 400 错误响应 -func TestErrorHandler_ValidationError_Returns400(t *testing.T) { - app := setupTestApp() - - // 创建测试路由：触发参数验证失败 - app.Post("/api/test/validation", func(c *fiber.Ctx) error { - // 模拟参数验证失败场景 - return errors.New( - errors.CodeInvalidParam, // 参数验证失败 - "用户名长度必须在 3-20 个字符之间", - ) - }) - - // 发起请求 - req := httptest.NewRequest("POST", "/api/test/validation", nil) - req.Header.Set("Content-Type", "application/json") - - resp, err := app.Test(req, -1) - require.NoError(t, err) - defer func() { _ = resp.Body.Close() }() - - // 验证 HTTP 状态码 - assert.Equal(t, 400, resp.StatusCode, "参数验证失败应返回 400 状态码") - - // 解析响应 body - body, err := io.ReadAll(resp.Body) - require.NoError(t, err) - - var errResp ErrorResponse - err = json.Unmarshal(body, &errResp) - require.NoError(t, err, "响应应为有效的 JSON 格式") - - // 验证响应字段 - assert.NotEmpty(t, errResp.Code, "错误码不应为空") - assert.Contains(t, errResp.Msg, "用户名长度", "错误消息应包含验证失败信息") - assert.NotEmpty(t, errResp.Timestamp, "时间戳不应为空") - - // 验证响应头包含 Request ID - requestID := resp.Header.Get("X-Request-ID") - assert.NotEmpty(t, requestID, "响应头应包含 X-Request-ID") - - t.Logf("✓ 验证失败测试通过 - Code: %s, Msg: %s, RequestID: %s", - errResp.Code, errResp.Msg, requestID) -} - -// T030: 测试资源未找到 -> 404 错误响应 -func TestErrorHandler_ResourceNotFound_Returns404(t *testing.T) { - app := setupTestApp() - - // 创建测试路由：触发资源未找到 - app.Get("/api/test/users/:id", func(c *fiber.Ctx) error { - userID := c.Params("id") - // 模拟资源不存在场景 - return errors.New( - errors.CodeNotFound, // 资源不存在 - "用户 ID "+userID+" 不存在", - ) - }) - - // 发起请求 - req := httptest.NewRequest("GET", "/api/test/users/99999", nil) - resp, err := app.Test(req, -1) - require.NoError(t, err) - defer func() { _ = resp.Body.Close() }() - - // 验证 HTTP 状态码 - assert.Equal(t, 404, resp.StatusCode, "资源未找到应返回 404 状态码") - - // 解析响应 body - body, err := io.ReadAll(resp.Body) - require.NoError(t, err) - - var errResp ErrorResponse - err = json.Unmarshal(body, &errResp) - require.NoError(t, err, "响应应为有效的 JSON 格式") - - // 验证响应字段 - assert.NotEmpty(t, errResp.Code, "错误码不应为空") - assert.Contains(t, errResp.Msg, "不存在", "错误消息应包含资源不存在信息") - assert.NotEmpty(t, errResp.Timestamp, "时间戳不应为空") - - // 验证响应头包含 Request ID - requestID := resp.Header.Get("X-Request-ID") - assert.NotEmpty(t, requestID, "响应头应包含 X-Request-ID") - - t.Logf("✓ 资源未找到测试通过 - Code: %s, Msg: %s, RequestID: %s", - errResp.Code, errResp.Msg, requestID) -} - -// T031: 测试认证失败 -> 401 错误响应 -func TestErrorHandler_AuthenticationFailed_Returns401(t *testing.T) { - app := setupTestApp() - - // 创建测试路由：触发认证失败 - app.Get("/api/test/protected", func(c *fiber.Ctx) error { - // 模拟 Token 无效场景 - return errors.New( - errors.CodeUnauthorized, // 认证失败 - "Token 已过期或无效", - ) - }) - - // 发起请求（无 Token） - req := httptest.NewRequest("GET", "/api/test/protected", nil) - resp, err := app.Test(req, -1) - require.NoError(t, err) - defer func() { _ = resp.Body.Close() }() - - // 验证 HTTP 状态码 - assert.Equal(t, 401, resp.StatusCode, "认证失败应返回 401 状态码") - - // 解析响应 body - body, err := io.ReadAll(resp.Body) - require.NoError(t, err) - - var errResp ErrorResponse - err = json.Unmarshal(body, &errResp) - require.NoError(t, err, "响应应为有效的 JSON 格式") - - // 验证响应字段 - assert.NotEmpty(t, errResp.Code, "错误码不应为空") - assert.Contains(t, errResp.Msg, "Token", "错误消息应包含认证失败信息") - assert.NotEmpty(t, errResp.Timestamp, "时间戳不应为空") - - // 验证响应头包含 Request ID - requestID := resp.Header.Get("X-Request-ID") - assert.NotEmpty(t, requestID, "响应头应包含 X-Request-ID") - - t.Logf("✓ 认证失败测试通过 - Code: %s, Msg: %s, RequestID: %s", - errResp.Code, errResp.Msg, requestID) -} - -// T032: 验证所有错误响应格式一致性 -func TestErrorHandler_ResponseFormatConsistency(t *testing.T) { - app := setupTestApp() - - // 注册多种错误场景的测试路由 - testCases := []struct { - name string - path string - method string - errorCode int - errorMsg string - expectedHTTP int - }{ - { - name: "参数验证失败", - path: "/api/test/validation-error", - method: "POST", - errorCode: errors.CodeInvalidParam, - errorMsg: "参数验证失败", - expectedHTTP: 400, - }, - { - name: "数据格式错误", - path: "/api/test/format-error", - method: "POST", - errorCode: errors.CodeInvalidParam, - errorMsg: "JSON 格式错误", - expectedHTTP: 400, - }, - { - name: "资源不存在", - path: "/api/test/not-found", - method: "GET", - errorCode: errors.CodeNotFound, - errorMsg: "资源不存在", - expectedHTTP: 404, - }, - { - name: "认证失败", - path: "/api/test/auth-error", - method: "GET", - errorCode: errors.CodeUnauthorized, - errorMsg: "认证失败", - expectedHTTP: 401, - }, - { - name: "权限不足", - path: "/api/test/permission-error", - method: "GET", - errorCode: errors.CodeForbidden, - errorMsg: "权限不足", - expectedHTTP: 403, - }, - { - name: "数据库错误", - path: "/api/test/tx-error", - method: "GET", - errorCode: errors.CodeDatabaseError, - errorMsg: "数据库连接失败", - expectedHTTP: 500, - }, - { - name: "外部服务错误", - path: "/api/test/external-error", - method: "POST", - errorCode: errors.CodeServiceUnavailable, - errorMsg: "外部 API 调用失败", - expectedHTTP: 503, - }, - } - - // 为每个测试场景注册路由 - for _, tc := range testCases { - tc := tc // 捕获循环变量 - switch tc.method { - case "GET": - app.Get(tc.path, func(c *fiber.Ctx) error { - return errors.New(tc.errorCode, tc.errorMsg) - }) - case "POST": - app.Post(tc.path, func(c *fiber.Ctx) error { - return errors.New(tc.errorCode, tc.errorMsg) - }) - } - } - - // 测试每个场景的响应格式 - for _, tc := range testCases { - t.Run(tc.name, func(t *testing.T) { - // 发起请求 - req := httptest.NewRequest(tc.method, tc.path, nil) - req.Header.Set("Content-Type", "application/json") - - resp, err := app.Test(req, -1) - require.NoError(t, err) - defer func() { _ = resp.Body.Close() }() - - // 验证 HTTP 状态码 - assert.Equal(t, tc.expectedHTTP, resp.StatusCode, - "%s 应返回 %d 状态码", tc.name, tc.expectedHTTP) - - // 解析响应 body - body, err := io.ReadAll(resp.Body) - require.NoError(t, err) - - var errResp ErrorResponse - err = json.Unmarshal(body, &errResp) - require.NoError(t, err, "响应应为有效的 JSON 格式") - - // 验证响应字段完整性 - assert.NotEmpty(t, errResp.Code, "响应必须包含 code 字段") - assert.NotEmpty(t, errResp.Msg, "响应必须包含 msg 字段") - assert.NotEmpty(t, errResp.Timestamp, "响应必须包含 timestamp 字段") - - // 验证时间戳格式（RFC3339） - _, err = time.Parse(time.RFC3339, errResp.Timestamp.(string)) - assert.NoError(t, err, "时间戳应为有效的 RFC3339 格式") - - // 验证响应头 - requestID := resp.Header.Get("X-Request-ID") - assert.NotEmpty(t, requestID, "响应头应包含 X-Request-ID") - - contentType := resp.Header.Get("Content-Type") - assert.Contains(t, contentType, "application/json", - "Content-Type 应为 application/json") - - // 5xx 错误应该脱敏 - 不暴露原始错误消息,返回错误码对应的标准消息 - if tc.expectedHTTP >= 500 { - // 验证不包含自定义错误消息(如 "数据库连接失败", "外部 API 调用失败") - assert.NotContains(t, errResp.Msg, tc.errorMsg, - "5xx 错误不应暴露自定义错误详情,应返回标准消息") - // 验证返回的是标准错误消息(从 GetMessage 获取) - assert.NotEmpty(t, errResp.Msg, "5xx 错误应返回标准消息") - } - - t.Logf("✓ %s - 格式一致性验证通过 - Code: %s, Status: %d, RequestID: %s", - tc.name, errResp.Code, resp.StatusCode, requestID) - }) - } - - t.Log("✓ 所有错误响应格式一致性测试通过") -} - -// T039: 创建测试端点触发 panic -func TestPanic_BasicPanicRecovery(t *testing.T) { - app := setupTestApp() - - // 创建会触发 panic 的路由 - app.Get("/api/test/panic", func(c *fiber.Ctx) error { - panic("模拟业务逻辑 panic") - }) - - // 发起请求 - req := httptest.NewRequest("GET", "/api/test/panic", nil) - resp, err := app.Test(req, -1) - require.NoError(t, err) - defer func() { _ = resp.Body.Close() }() - - // 验证 panic 被捕获并转换为 500 错误 - assert.Equal(t, 500, resp.StatusCode, "panic 应返回 500 状态码") - - // 解析响应 body - body, err := io.ReadAll(resp.Body) - require.NoError(t, err) - - var errResp ErrorResponse - err = json.Unmarshal(body, &errResp) - require.NoError(t, err, "panic 响应应为有效的 JSON 格式") - - // 验证响应字段 - assert.NotEmpty(t, errResp.Code, "错误码不应为空") - assert.NotEmpty(t, errResp.Msg, "错误消息不应为空") - assert.NotEmpty(t, errResp.Timestamp, "时间戳不应为空") - - // 验证响应头包含 Request ID - requestID := resp.Header.Get("X-Request-ID") - assert.NotEmpty(t, requestID, "响应头应包含 X-Request-ID") - - t.Logf("✓ Panic 恢复测试通过 - Code: %s, Msg: %s, RequestID: %s", - errResp.Code, errResp.Msg, requestID) -} - -// T040: 测试 panic 恢复后服务继续运行 -func TestPanic_ServiceContinuesAfterRecovery(t *testing.T) { - app := setupTestApp() - - // 创建会触发 panic 的路由 - app.Get("/api/test/panic-endpoint", func(c *fiber.Ctx) error { - panic("触发 panic") - }) - - // 创建正常的路由 - app.Get("/api/test/normal-endpoint", func(c *fiber.Ctx) error { - return c.JSON(fiber.Map{ - "status": "ok", - "message": "服务正常运行", - }) - }) - - // 第一次请求：触发 panic - panicReq := httptest.NewRequest("GET", "/api/test/panic-endpoint", nil) - panicResp, err := app.Test(panicReq, -1) - require.NoError(t, err) - _ = panicResp.Body.Close() - assert.Equal(t, 500, panicResp.StatusCode, "panic 应返回 500") - - // 第二次请求：验证服务仍然正常运行 - normalReq := httptest.NewRequest("GET", "/api/test/normal-endpoint", nil) - normalResp, err := app.Test(normalReq, -1) - require.NoError(t, err) - defer func() { _ = normalResp.Body.Close() }() - - // 验证正常请求仍然成功 - assert.Equal(t, 200, normalResp.StatusCode, "panic 后正常请求应成功") - - // 验证响应内容 - body, err := io.ReadAll(normalResp.Body) - require.NoError(t, err) - - var response map[string]interface{} - err = json.Unmarshal(body, &response) - require.NoError(t, err) - - assert.Equal(t, "ok", response["status"], "服务应正常运行") - - t.Log("✓ Panic 后服务继续运行测试通过") -} - -// T041: 测试并发场景下的 panic 处理 -func TestPanic_ConcurrentPanicHandling(t *testing.T) { - app := setupTestApp() - - // 创建会随机 panic 的路由 - app.Get("/api/test/concurrent-panic/:id", func(c *fiber.Ctx) error { - id := c.Params("id") - // 奇数 ID 触发 panic，偶数 ID 正常返回 - if id == "1" || id == "3" || id == "5" || id == "7" || id == "9" { - panic("并发 panic 测试") - } - return c.JSON(fiber.Map{"id": id, "status": "ok"}) - }) - - // 并发发送 10 个请求 - const numRequests = 10 - results := make(chan int, numRequests) - - for i := 1; i <= numRequests; i++ { - go func(id int) { - req := httptest.NewRequest("GET", "/api/test/concurrent-panic/"+string(rune(id+'0')), nil) - resp, err := app.Test(req, -1) - if err != nil { - results <- 0 - return - } - defer func() { _ = resp.Body.Close() }() - results <- resp.StatusCode - }(i) - } - - // 收集结果 - var successCount, errorCount int - for i := 0; i < numRequests; i++ { - statusCode := <-results - if statusCode == 200 { - successCount++ - } else if statusCode == 500 { - errorCount++ - } - } - - // 验证结果：5 个成功（偶数 ID），5 个 panic 恢复（奇数 ID） - assert.Equal(t, 5, successCount, "应有 5 个请求成功") - assert.Equal(t, 5, errorCount, "应有 5 个 panic 被恢复") - - t.Logf("✓ 并发 Panic 处理测试通过 - 成功: %d, 错误: %d", successCount, errorCount) -} - -// T042: 验证 panic 时的堆栈跟踪记录 -func TestPanic_StackTraceLogging(t *testing.T) { - app := setupTestApp() - - // 创建会触发 panic 的路由（在特定函数中） - app.Get("/api/test/panic-with-stack", func(c *fiber.Ctx) error { - // 调用一个会 panic 的函数以生成堆栈跟踪 - triggerPanicInNestedFunction() - return nil - }) - - // 发起请求 - req := httptest.NewRequest("GET", "/api/test/panic-with-stack", nil) - resp, err := app.Test(req, -1) - require.NoError(t, err) - defer func() { _ = resp.Body.Close() }() - - // 验证 panic 被捕获 - assert.Equal(t, 500, resp.StatusCode, "panic 应返回 500 状态码") - - // 验证响应格式 - body, err := io.ReadAll(resp.Body) - require.NoError(t, err) - - var errResp ErrorResponse - err = json.Unmarshal(body, &errResp) - require.NoError(t, err) - - assert.NotEmpty(t, errResp.Code, "错误码不应为空") - assert.NotEmpty(t, errResp.Msg, "错误消息不应为空") - - // 注意：堆栈跟踪会被记录到日志中，而不是返回给客户端 - // 这里我们验证错误消息已被脱敏，不包含内部实现细节 - assert.NotContains(t, errResp.Msg, "triggerPanicInNestedFunction", - "5xx 错误消息不应暴露内部函数名") - - t.Log("✓ 堆栈跟踪记录测试通过 - 错误已脱敏，堆栈已记录到日志") -} - -// triggerPanicInNestedFunction 是一个辅助函数，用于生成嵌套的堆栈跟踪 -func triggerPanicInNestedFunction() { - anotherNestedFunction() -} - -func anotherNestedFunction() { - panic("嵌套函数中的 panic") -} - -// TestPanic_NilPointerDereference 测试空指针解引用 panic -func TestPanic_NilPointerDereference(t *testing.T) { - app := setupTestApp() - - app.Get("/api/test/nil-pointer", func(c *fiber.Ctx) error { - var ptr *string - _ = *ptr // 触发空指针 panic - return nil - }) - - req := httptest.NewRequest("GET", "/api/test/nil-pointer", nil) - resp, err := app.Test(req, -1) - require.NoError(t, err) - defer func() { _ = resp.Body.Close() }() - - assert.Equal(t, 500, resp.StatusCode, "空指针 panic 应返回 500") - - t.Log("✓ 空指针 Panic 测试通过") -} - -// TestPanic_ArrayOutOfBounds 测试数组越界 panic -func TestPanic_ArrayOutOfBounds(t *testing.T) { - app := setupTestApp() - - app.Get("/api/test/out-of-bounds", func(c *fiber.Ctx) error { - arr := []int{1, 2, 3} - _ = arr[10] // 触发数组越界 panic - return nil - }) - - req := httptest.NewRequest("GET", "/api/test/out-of-bounds", nil) - resp, err := app.Test(req, -1) - require.NoError(t, err) - defer func() { _ = resp.Body.Close() }() - - assert.Equal(t, 500, resp.StatusCode, "数组越界 panic 应返回 500") - - t.Log("✓ 数组越界 Panic 测试通过") -} - -// T045: 测试参数验证失败 -> Warn 级别日志 -func TestErrorClassification_ValidationError_WarnLevel(t *testing.T) { - app := setupTestApp() - - app.Post("/api/test/validation-warn", func(c *fiber.Ctx) error { - // 模拟参数验证失败 (客户端错误 1xxx -> Warn 级别) - return errors.New( - errors.CodeInvalidParam, - "用户名格式不正确", - ) - }) - - req := httptest.NewRequest("POST", "/api/test/validation-warn", nil) - req.Header.Set("Content-Type", "application/json") - - resp, err := app.Test(req, -1) - require.NoError(t, err) - defer func() { _ = resp.Body.Close() }() - - // 验证 HTTP 状态码 - assert.Equal(t, 400, resp.StatusCode, "参数验证失败应返回 400") - - // 验证响应格式 - body, err := io.ReadAll(resp.Body) - require.NoError(t, err) - - var errResp ErrorResponse - err = json.Unmarshal(body, &errResp) - require.NoError(t, err) - - assert.NotEmpty(t, errResp.Code, "错误码不应为空") - assert.NotEmpty(t, errResp.Msg, "错误消息不应为空") - - t.Logf("✓ 参数验证失败测试通过 (Warn 级别) - Code: %s, Msg: %s", errResp.Code, errResp.Msg) -} - -// T046: 测试权限不足 -> Warn 级别日志 -func TestErrorClassification_PermissionDenied_WarnLevel(t *testing.T) { - app := setupTestApp() - - app.Get("/api/test/permission-warn", func(c *fiber.Ctx) error { - // 模拟权限不足 (客户端错误 1xxx -> Warn 级别) - return errors.New( - errors.CodeForbidden, - "您没有权限访问此资源", - ) - }) - - req := httptest.NewRequest("GET", "/api/test/permission-warn", nil) - resp, err := app.Test(req, -1) - require.NoError(t, err) - defer func() { _ = resp.Body.Close() }() - - // 验证 HTTP 状态码 - assert.Equal(t, 403, resp.StatusCode, "权限不足应返回 403") - - // 验证响应格式 - body, err := io.ReadAll(resp.Body) - require.NoError(t, err) - - var errResp ErrorResponse - err = json.Unmarshal(body, &errResp) - require.NoError(t, err) - - assert.NotEmpty(t, errResp.Code, "错误码不应为空") - assert.NotEmpty(t, errResp.Msg, "错误消息不应为空") - // 客户端错误可以保留自定义消息,验证包含权限相关提示 - assert.Contains(t, errResp.Msg, "权限", "错误消息应包含权限相关提示") - - t.Logf("✓ 权限不足测试通过 (Warn 级别) - Code: %s, Msg: %s", errResp.Code, errResp.Msg) -} - -// T047: 测试数据库错误 -> Error 级别日志 -func TestErrorClassification_DatabaseError_ErrorLevel(t *testing.T) { - app := setupTestApp() - - app.Get("/api/test/database-error", func(c *fiber.Ctx) error { - // 模拟数据库错误 (服务端错误 2xxx -> Error 级别) - return errors.New( - errors.CodeDatabaseError, - "pq: relation 'users' does not exist", // 敏感的数据库错误信息 - ) - }) - - req := httptest.NewRequest("GET", "/api/test/database-error", nil) - resp, err := app.Test(req, -1) - require.NoError(t, err) - defer func() { _ = resp.Body.Close() }() - - // 验证 HTTP 状态码 - assert.Equal(t, 500, resp.StatusCode, "数据库错误应返回 500") - - // 验证响应格式 - body, err := io.ReadAll(resp.Body) - require.NoError(t, err) - - var errResp ErrorResponse - err = json.Unmarshal(body, &errResp) - require.NoError(t, err) - - assert.NotEmpty(t, errResp.Code, "错误码不应为空") - assert.Equal(t, "数据库错误", errResp.Msg, "5xx 错误应返回标准消息") - // 验证敏感信息已被隐藏 - assert.NotContains(t, errResp.Msg, "pq:", "不应暴露数据库驱动信息") - assert.NotContains(t, errResp.Msg, "relation", "不应暴露数据库表结构") - - t.Logf("✓ 数据库错误测试通过 (Error 级别) - Code: %s, Msg: %s", errResp.Code, errResp.Msg) -} - -// T048: 验证敏感信息隐藏 (数据库错误不暴露 SQL) -func TestErrorClassification_SensitiveInfoHidden(t *testing.T) { - app := setupTestApp() - - testCases := []struct { - name string - path string - errorCode int - sensitiveMsg string - expectedStatus int - expectedMsg string - shouldNotContain []string - }{ - { - name: "数据库连接错误", - path: "/api/test/tx-connection", - errorCode: errors.CodeDatabaseError, - sensitiveMsg: "connection refused: tcp 192.168.1.100:5432", - expectedStatus: 500, - expectedMsg: "数据库错误", - shouldNotContain: []string{"192.168.1.100", "5432", "connection refused"}, - }, - { - name: "SQL 语法错误", - path: "/api/test/sql-syntax", - errorCode: errors.CodeDatabaseError, - sensitiveMsg: "syntax error at or near 'SELECT * FROM users WHERE id='", - expectedStatus: 500, - expectedMsg: "数据库错误", - shouldNotContain: []string{"SELECT", "FROM users", "syntax error"}, - }, - { - name: "Redis 连接错误", - path: "/api/test/redis-error", - errorCode: errors.CodeRedisError, - sensitiveMsg: "dial tcp 127.0.0.1:6379: connect: connection refused", - expectedStatus: 500, - expectedMsg: "缓存服务错误", - shouldNotContain: []string{"127.0.0.1", "6379", "dial tcp"}, - }, - { - name: "任务队列错误", - path: "/api/test/queue-error", - errorCode: errors.CodeTaskQueueError, - sensitiveMsg: "failed to enqueue task: redis: nil", - expectedStatus: 500, - expectedMsg: "任务队列错误", - shouldNotContain: []string{"enqueue", "redis: nil"}, - }, - } - - for _, tc := range testCases { - tc := tc // 捕获循环变量 - app.Get(tc.path, func(c *fiber.Ctx) error { - return errors.New(tc.errorCode, tc.sensitiveMsg) - }) - } - - for _, tc := range testCases { - t.Run(tc.name, func(t *testing.T) { - req := httptest.NewRequest("GET", tc.path, nil) - resp, err := app.Test(req, -1) - require.NoError(t, err) - defer func() { _ = resp.Body.Close() }() - - assert.Equal(t, tc.expectedStatus, resp.StatusCode, "HTTP 状态码应正确") - - body, err := io.ReadAll(resp.Body) - require.NoError(t, err) - - var errResp ErrorResponse - err = json.Unmarshal(body, &errResp) - require.NoError(t, err) - - // 验证返回的是标准消息,不是自定义的敏感消息 - assert.Equal(t, tc.expectedMsg, errResp.Msg, "应返回标准错误消息") - - // 验证敏感信息已被隐藏 - for _, sensitive := range tc.shouldNotContain { - assert.NotContains(t, errResp.Msg, sensitive, - "错误消息不应包含敏感信息: %s", sensitive) - } - - t.Logf("✓ %s - 敏感信息已隐藏", tc.name) - }) - } - - t.Log("✓ 所有敏感信息隐藏测试通过") -} - -// T049: 测试限流错误 -> 429 响应 -func TestErrorClassification_RateLimitExceeded_Returns429(t *testing.T) { - app := setupTestApp() - - app.Get("/api/test/rate-limit", func(c *fiber.Ctx) error { - // 模拟触发限流 - return errors.New( - errors.CodeTooManyRequests, - "您的请求过于频繁,请稍后重试", - ) - }) - - req := httptest.NewRequest("GET", "/api/test/rate-limit", nil) - resp, err := app.Test(req, -1) - require.NoError(t, err) - defer func() { _ = resp.Body.Close() }() - - // 验证 HTTP 状态码 - assert.Equal(t, 429, resp.StatusCode, "限流应返回 429 状态码") - - // 验证响应格式 - body, err := io.ReadAll(resp.Body) - require.NoError(t, err) - - var errResp ErrorResponse - err = json.Unmarshal(body, &errResp) - require.NoError(t, err) - - assert.NotEmpty(t, errResp.Code, "错误码不应为空") - // 客户端错误可以保留自定义消息,验证包含限流相关提示 - assert.True(t, - contains(errResp.Msg, "请求过多") || contains(errResp.Msg, "请求过于频繁"), - "错误消息应包含限流提示") - - // 验证响应头 - requestID := resp.Header.Get("X-Request-ID") - assert.NotEmpty(t, requestID, "响应头应包含 X-Request-ID") - - t.Logf("✓ 限流错误测试通过 - Code: %s, Status: %d, Msg: %s", - errResp.Code, resp.StatusCode, errResp.Msg) -} - -// contains 辅助函数用于字符串包含检查 -func contains(s, substr string) bool { - return len(s) >= len(substr) && (s == substr || len(substr) == 0 || - (len(s) > 0 && len(substr) > 0 && stringContains(s, substr))) -} - -func stringContains(s, substr string) bool { - for i := 0; i <= len(s)-len(substr); i++ { - if s[i:i+len(substr)] == substr { - return true - } - } - return false -} - -// T050: 测试服务不可用 -> 503 响应 -func TestErrorClassification_ServiceUnavailable_Returns503(t *testing.T) { - app := setupTestApp() - - app.Get("/api/test/service-unavailable", func(c *fiber.Ctx) error { - // 模拟服务不可用 (如外部 API 不可用) - return errors.New( - errors.CodeServiceUnavailable, - "外部认证服务暂时不可用", - ) - }) - - req := httptest.NewRequest("GET", "/api/test/service-unavailable", nil) - resp, err := app.Test(req, -1) - require.NoError(t, err) - defer func() { _ = resp.Body.Close() }() - - // 验证 HTTP 状态码 - assert.Equal(t, 503, resp.StatusCode, "服务不可用应返回 503 状态码") - - // 验证响应格式 - body, err := io.ReadAll(resp.Body) - require.NoError(t, err) - - var errResp ErrorResponse - err = json.Unmarshal(body, &errResp) - require.NoError(t, err) - - assert.NotEmpty(t, errResp.Code, "错误码不应为空") - // 5xx 错误应返回标准消息,而不是自定义消息 - assert.Equal(t, "服务暂时不可用", errResp.Msg, "应返回标准错误消息") - assert.NotContains(t, errResp.Msg, "外部认证服务", "不应暴露内部服务细节") - - t.Logf("✓ 服务不可用错误测试通过 - Code: %s, Status: %d, Msg: %s", - errResp.Code, resp.StatusCode, errResp.Msg) -} - -// ===== Phase 6: User Story 4 - 错误追踪和调试支持 ===== - -// T054: 测试错误日志完整性（包含 Request ID） -func TestErrorTracking_LogCompleteness_IncludesRequestID(t *testing.T) { - app := setupTestApp() - - app.Post("/api/test/error-log-completeness", func(c *fiber.Ctx) error { - // 触发一个错误，验证日志包含 Request ID - return errors.New( - errors.CodeInvalidParam, - "测试错误日志完整性", - ) - }) - - // 发起请求（带自定义 Request ID） - req := httptest.NewRequest("POST", "/api/test/error-log-completeness", nil) - customRequestID := "test-request-id-12345" - req.Header.Set("X-Request-ID", customRequestID) - req.Header.Set("Content-Type", "application/json") - - resp, err := app.Test(req, -1) - require.NoError(t, err) - defer func() { _ = resp.Body.Close() }() - - // 验证响应包含 Request ID - responseRequestID := resp.Header.Get("X-Request-ID") - assert.NotEmpty(t, responseRequestID, "响应头应包含 X-Request-ID") - - // 验证响应成功 - assert.Equal(t, 400, resp.StatusCode, "应返回 400 错误") - - body, err := io.ReadAll(resp.Body) - require.NoError(t, err) - - var errResp ErrorResponse - err = json.Unmarshal(body, &errResp) - require.NoError(t, err) - - assert.NotEmpty(t, errResp.Code, "错误码不应为空") - assert.NotEmpty(t, errResp.Msg, "错误消息不应为空") - - t.Logf("✓ 错误日志完整性测试通过 - RequestID: %s", responseRequestID) - t.Log(" 注意：实际的日志完整性需要检查日志文件，确认包含 request_id, method, path, ip 等字段") -} - -// T055: 测试请求上下文记录（路径、方法、参数） -func TestErrorTracking_RequestContext_AllFields(t *testing.T) { - app := setupTestApp() - - app.Post("/api/test/context-logging", func(c *fiber.Ctx) error { - // 触发一个错误，验证日志包含完整的请求上下文 - return errors.New( - errors.CodeInvalidParam, - "测试请求上下文记录", - ) - }) - - // 构造带有 Query 参数和 Body 的请求 - requestBody := `{"username": "testuser", "email": "test@example.com"}` - req := httptest.NewRequest("POST", "/api/test/context-logging?page=1&size=10", - strings.NewReader(requestBody)) - req.Header.Set("Content-Type", "application/json") - req.Header.Set("User-Agent", "TestClient/1.0") - - resp, err := app.Test(req, -1) - require.NoError(t, err) - defer func() { _ = resp.Body.Close() }() - - // 验证响应 - assert.Equal(t, 400, resp.StatusCode, "应返回 400 错误") - - requestID := resp.Header.Get("X-Request-ID") - assert.NotEmpty(t, requestID, "响应头应包含 X-Request-ID") - - t.Logf("✓ 请求上下文记录测试通过 - RequestID: %s", requestID) - t.Log(" 注意：需要检查日志文件，确认包含：") - t.Log(" - method: POST") - t.Log(" - path: /api/test/context-logging") - t.Log(" - query: page=1&size=10") - t.Log(" - body: 请求体内容（限制 50KB）") - t.Log(" - user_agent: TestClient/1.0") - t.Log(" - ip: 客户端 IP") -} - -// T056: 测试 panic 堆栈跟踪记录（指明 panic 位置） -func TestErrorTracking_PanicStackTrace_IncludesLocation(t *testing.T) { - app := setupTestApp() - - app.Get("/api/test/panic-stack-trace", func(c *fiber.Ctx) error { - // 在一个可识别的函数中触发 panic - panicInSpecificLocation() - return nil - }) - - req := httptest.NewRequest("GET", "/api/test/panic-stack-trace", nil) - resp, err := app.Test(req, -1) - require.NoError(t, err) - defer func() { _ = resp.Body.Close() }() - - // 验证 panic 被捕获 - assert.Equal(t, 500, resp.StatusCode, "panic 应返回 500 状态码") - - // 验证响应格式 - body, err := io.ReadAll(resp.Body) - require.NoError(t, err) - - var errResp ErrorResponse - err = json.Unmarshal(body, &errResp) - require.NoError(t, err) - - assert.NotEmpty(t, errResp.Code, "错误码不应为空") - assert.NotEmpty(t, errResp.Msg, "错误消息不应为空") - - // 验证响应中不包含堆栈跟踪（敏感信息已脱敏） - assert.NotContains(t, errResp.Msg, "panicInSpecificLocation", - "5xx 错误消息不应暴露内部函数名") - - requestID := resp.Header.Get("X-Request-ID") - assert.NotEmpty(t, requestID, "响应头应包含 X-Request-ID") - - t.Logf("✓ Panic 堆栈跟踪测试通过 - RequestID: %s", requestID) - t.Log(" 注意：需要检查日志文件，确认包含：") - t.Log(" - 完整的堆栈跟踪（runtime/debug.Stack()）") - t.Log(" - 文件名和行号") - t.Log(" - 函数名（panicInSpecificLocation）") - t.Log(" - 从 panic 发生点到 recover 捕获点的完整调用链") -} - -// panicInSpecificLocation 辅助函数，用于触发可追踪的 panic -func panicInSpecificLocation() { - panic("这是一个特定位置的 panic，用于测试堆栈跟踪") -} - -// T057: 测试使用 Request ID 追踪请求流程 -func TestErrorTracking_RequestIDTracing_EndToEnd(t *testing.T) { - app := setupTestApp() - - // 创建多个端点模拟完整的请求流程 - app.Post("/api/test/trace/step1", func(c *fiber.Ctx) error { - // 第一步：参数验证失败 - return errors.New( - errors.CodeInvalidParam, - "步骤 1: 参数验证失败", - ) - }) - - app.Post("/api/test/trace/step2", func(c *fiber.Ctx) error { - // 第二步：业务逻辑错误 - return errors.New( - errors.CodeDatabaseError, - "步骤 2: 数据库操作失败", - ) - }) - - app.Post("/api/test/trace/step3", func(c *fiber.Ctx) error { - // 第三步：触发 panic - panic("步骤 3: 发生 panic") - }) - - // 使用相同的 Request ID 追踪整个流程 - traceID := "trace-test-" + time.Now().Format("20060102-150405") - - testCases := []struct { - name string - path string - expectedStatus int - stepDesc string - }{ - { - name: "步骤1-参数验证", - path: "/api/test/trace/step1", - expectedStatus: 400, - stepDesc: "参数验证失败应记录 Warn 级别日志", - }, - { - name: "步骤2-数据库错误", - path: "/api/test/trace/step2", - expectedStatus: 500, - stepDesc: "数据库错误应记录 Error 级别日志", - }, - { - name: "步骤3-Panic恢复", - path: "/api/test/trace/step3", - expectedStatus: 500, - stepDesc: "Panic 应记录 Error 级别日志和堆栈跟踪", - }, - } - - for _, tc := range testCases { - t.Run(tc.name, func(t *testing.T) { - req := httptest.NewRequest("POST", tc.path, nil) - req.Header.Set("X-Request-ID", traceID) - req.Header.Set("Content-Type", "application/json") - - resp, err := app.Test(req, -1) - require.NoError(t, err) - defer func() { _ = resp.Body.Close() }() - - // 验证 HTTP 状态码 - assert.Equal(t, tc.expectedStatus, resp.StatusCode, - "%s 应返回 %d 状态码", tc.name, tc.expectedStatus) - - // 验证响应包含相同的 Request ID - responseRequestID := resp.Header.Get("X-Request-ID") - assert.NotEmpty(t, responseRequestID, "响应头应包含 X-Request-ID") - - body, err := io.ReadAll(resp.Body) - require.NoError(t, err) - - var errResp ErrorResponse - err = json.Unmarshal(body, &errResp) - require.NoError(t, err) - - assert.NotEmpty(t, errResp.Code, "错误码不应为空") - assert.NotEmpty(t, errResp.Msg, "错误消息不应为空") - - t.Logf(" ✓ %s 完成 - RequestID: %s, Status: %d", - tc.name, responseRequestID, resp.StatusCode) - t.Logf(" %s", tc.stepDesc) - }) - } - - t.Logf("✓ Request ID 追踪测试通过 - TraceID: %s", traceID) - t.Log(" 注意：可以在日志文件中搜索 TraceID，追踪完整的请求流程：") - t.Logf(" grep '%s' tests/integration/logs/error_handler_test.log", traceID) - t.Log(" 应该能看到 3 个步骤的完整日志记录") -} diff --git a/tests/integration/iot_card_gateway_test.go b/tests/integration/iot_card_gateway_test.go deleted file mode 100644 index 930cd03..0000000 --- a/tests/integration/iot_card_gateway_test.go +++ /dev/null @@ -1,368 +0,0 @@ -package integration - -import ( - "encoding/json" - "fmt" - "testing" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/pkg/response" - "github.com/break/junhong_cmp_fiber/tests/testutils/integ" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -// TestGatewayCard_GetStatus 测试查询卡状态接口 -func TestGatewayCard_GetStatus(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - card := &model.IotCard{ - ICCID: "89860001234567890001", - - CarrierID: 1, - Status: 1, - } - require.NoError(t, env.TX.Create(card).Error) - - t.Run("成功查询卡状态", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", fmt.Sprintf("/api/admin/iot-cards/%s/gateway-status", card.ICCID), nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - }) - - t.Run("无权限访问其他店铺的卡", func(t *testing.T) { - shop2 := &model.Shop{ - ShopName: "测试店铺2", - ShopCode: "SHOP_002", - Level: 1, - } - require.NoError(t, env.TX.Create(shop2).Error) - - card2 := &model.IotCard{ - ICCID: "89860001234567890002", - - CarrierID: 1, - Status: 1, - ShopID: &shop2.ID, - } - require.NoError(t, env.TX.Create(card2).Error) - - agentAccount := &model.Account{ - Username: "agent_test_gateway_1", - Phone: "13800000101", - UserType: constants.UserTypeAgent, - ShopID: &shop2.ID, - Status: 1, - } - require.NoError(t, env.TX.Create(agentAccount).Error) - - resp, err := env.AsUser(agentAccount).Request("GET", fmt.Sprintf("/api/admin/iot-cards/%s/gateway-status", card.ICCID), nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 404, resp.StatusCode) - }) -} - -// TestGatewayCard_GetFlow 测试查询流量接口 -func TestGatewayCard_GetFlow(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - card := &model.IotCard{ - ICCID: "89860001234567890003", - - CarrierID: 1, - Status: 1, - } - require.NoError(t, env.TX.Create(card).Error) - - t.Run("成功查询流量使用", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", fmt.Sprintf("/api/admin/iot-cards/%s/gateway-flow", card.ICCID), nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - }) - - t.Run("无权限访问其他店铺的卡流量", func(t *testing.T) { - shop2 := &model.Shop{ - ShopName: "测试店铺3", - ShopCode: "SHOP_003", - Level: 1, - } - require.NoError(t, env.TX.Create(shop2).Error) - - card2 := &model.IotCard{ - ICCID: "89860001234567890004", - - CarrierID: 1, - Status: 1, - ShopID: &shop2.ID, - } - require.NoError(t, env.TX.Create(card2).Error) - - agentAccount := &model.Account{ - Username: "agent_test_gateway_2", - Phone: "13800000102", - UserType: constants.UserTypeAgent, - ShopID: &shop2.ID, - Status: 1, - } - require.NoError(t, env.TX.Create(agentAccount).Error) - - resp, err := env.AsUser(agentAccount).Request("GET", fmt.Sprintf("/api/admin/iot-cards/%s/gateway-flow", card.ICCID), nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 404, resp.StatusCode) - }) -} - -// TestGatewayCard_GetRealname 测试查询实名状态接口 -func TestGatewayCard_GetRealname(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - card := &model.IotCard{ - ICCID: "89860001234567890005", - - CarrierID: 1, - Status: 1, - } - require.NoError(t, env.TX.Create(card).Error) - - t.Run("成功查询实名状态", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", fmt.Sprintf("/api/admin/iot-cards/%s/gateway-realname", card.ICCID), nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - }) - - t.Run("无权限访问其他店铺的卡实名状态", func(t *testing.T) { - shop2 := &model.Shop{ - ShopName: "测试店铺4", - ShopCode: "SHOP_004", - Level: 1, - } - require.NoError(t, env.TX.Create(shop2).Error) - - card2 := &model.IotCard{ - ICCID: "89860001234567890006", - - CarrierID: 1, - Status: 1, - ShopID: &shop2.ID, - } - require.NoError(t, env.TX.Create(card2).Error) - - agentAccount := &model.Account{ - Username: "agent_test_gateway_3", - Phone: "13800000103", - UserType: constants.UserTypeAgent, - ShopID: &shop2.ID, - Status: 1, - } - require.NoError(t, env.TX.Create(agentAccount).Error) - - resp, err := env.AsUser(agentAccount).Request("GET", fmt.Sprintf("/api/admin/iot-cards/%s/gateway-realname", card.ICCID), nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 404, resp.StatusCode) - }) -} - -// TestGatewayCard_GetRealnameLink 测试获取实名链接接口 -func TestGatewayCard_GetRealnameLink(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - card := &model.IotCard{ - ICCID: "89860001234567890007", - - CarrierID: 1, - Status: 1, - } - require.NoError(t, env.TX.Create(card).Error) - - t.Run("成功获取实名链接", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", fmt.Sprintf("/api/admin/iot-cards/%s/realname-link", card.ICCID), nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - }) - - t.Run("无权限访问其他店铺的卡实名链接", func(t *testing.T) { - shop2 := &model.Shop{ - ShopName: "测试店铺5", - ShopCode: "SHOP_005", - Level: 1, - } - require.NoError(t, env.TX.Create(shop2).Error) - - card2 := &model.IotCard{ - ICCID: "89860001234567890008", - - CarrierID: 1, - Status: 1, - ShopID: &shop2.ID, - } - require.NoError(t, env.TX.Create(card2).Error) - - agentAccount := &model.Account{ - Username: "agent_test_gateway_4", - Phone: "13800000104", - UserType: constants.UserTypeAgent, - ShopID: &shop2.ID, - Status: 1, - } - require.NoError(t, env.TX.Create(agentAccount).Error) - - resp, err := env.AsUser(agentAccount).Request("GET", fmt.Sprintf("/api/admin/iot-cards/%s/realname-link", card.ICCID), nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 404, resp.StatusCode) - }) -} - -// TestGatewayCard_StopCard 测试停机接口 -func TestGatewayCard_StopCard(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - card := &model.IotCard{ - ICCID: "89860001234567890009", - - CarrierID: 1, - Status: 1, - } - require.NoError(t, env.TX.Create(card).Error) - - t.Run("成功停机", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("POST", fmt.Sprintf("/api/admin/iot-cards/%s/stop", card.ICCID), nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - }) - - t.Run("无权限停机其他店铺的卡", func(t *testing.T) { - shop2 := &model.Shop{ - ShopName: "测试店铺6", - ShopCode: "SHOP_006", - Level: 1, - } - require.NoError(t, env.TX.Create(shop2).Error) - - card2 := &model.IotCard{ - ICCID: "89860001234567890010", - - CarrierID: 1, - Status: 1, - ShopID: &shop2.ID, - } - require.NoError(t, env.TX.Create(card2).Error) - - agentAccount := &model.Account{ - Username: "agent_test_gateway_5", - Phone: "13800000105", - UserType: constants.UserTypeAgent, - ShopID: &shop2.ID, - Status: 1, - } - require.NoError(t, env.TX.Create(agentAccount).Error) - - resp, err := env.AsUser(agentAccount).Request("POST", fmt.Sprintf("/api/admin/iot-cards/%s/stop", card.ICCID), nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 404, resp.StatusCode) - }) -} - -// TestGatewayCard_StartCard 测试复机接口 -func TestGatewayCard_StartCard(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - card := &model.IotCard{ - ICCID: "89860001234567890011", - - CarrierID: 1, - Status: 1, - } - require.NoError(t, env.TX.Create(card).Error) - - t.Run("成功复机", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("POST", fmt.Sprintf("/api/admin/iot-cards/%s/start", card.ICCID), nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - }) - - t.Run("无权限复机其他店铺的卡", func(t *testing.T) { - shop2 := &model.Shop{ - ShopName: "测试店铺7", - ShopCode: "SHOP_007", - Level: 1, - } - require.NoError(t, env.TX.Create(shop2).Error) - - card2 := &model.IotCard{ - ICCID: "89860001234567890012", - - CarrierID: 1, - Status: 1, - ShopID: &shop2.ID, - } - require.NoError(t, env.TX.Create(card2).Error) - - agentAccount := &model.Account{ - Username: "agent_test_gateway_6", - Phone: "13800000106", - UserType: constants.UserTypeAgent, - ShopID: &shop2.ID, - Status: 1, - } - require.NoError(t, env.TX.Create(agentAccount).Error) - - resp, err := env.AsUser(agentAccount).Request("POST", fmt.Sprintf("/api/admin/iot-cards/%s/start", card.ICCID), nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 404, resp.StatusCode) - }) -} diff --git a/tests/integration/iot_card_test.go b/tests/integration/iot_card_test.go deleted file mode 100644 index 02a8bef..0000000 --- a/tests/integration/iot_card_test.go +++ /dev/null @@ -1,861 +0,0 @@ -package integration - -import ( - "bytes" - "context" - "encoding/json" - "fmt" - "mime/multipart" - "testing" - "time" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/pkg/constants" - pkgerrors "github.com/break/junhong_cmp_fiber/pkg/errors" - pkggorm "github.com/break/junhong_cmp_fiber/pkg/gorm" - "github.com/break/junhong_cmp_fiber/pkg/response" - "github.com/break/junhong_cmp_fiber/tests/testutils/integ" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -func TestIotCard_ListStandalone(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - cards := []*model.IotCard{ - {ICCID: "TEST0012345678901001", CarrierID: 1, Status: 1}, - {ICCID: "TEST0012345678901002", CarrierID: 1, Status: 1}, - {ICCID: "TEST0012345678901003", CarrierID: 2, Status: 2}, - } - for _, card := range cards { - require.NoError(t, env.TX.Create(card).Error) - } - - t.Run("获取单卡列表-无过滤", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/iot-cards/standalone?page=1&page_size=20", nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - }) - - t.Run("获取单卡列表-按运营商过滤", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/iot-cards/standalone?carrier_id=1", nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - }) - - t.Run("获取单卡列表-按ICCID模糊查询", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/iot-cards/standalone?iccid=901001", nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - }) - - t.Run("未认证请求应返回错误", func(t *testing.T) { - resp, err := env.ClearAuth().Request("GET", "/api/admin/iot-cards/standalone", nil) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.NotEqual(t, 0, result.Code, "未认证请求应返回错误码") - }) -} - -func TestIotCard_Import(t *testing.T) { - t.Skip("E2E测试：需要 Worker 服务运行处理异步导入任务") - - env := integ.NewIntegrationTestEnv(t) - - t.Run("导入CSV文件", func(t *testing.T) { - body := &bytes.Buffer{} - writer := multipart.NewWriter(body) - - part, err := writer.CreateFormFile("file", "test.csv") - require.NoError(t, err) - csvContent := "iccid\nTEST0012345678902001\nTEST0012345678902002\nTEST0012345678902003" - _, err = part.Write([]byte(csvContent)) - require.NoError(t, err) - - _ = writer.WriteField("carrier_id", "1") - _ = writer.WriteField("carrier_type", "CMCC") - _ = writer.WriteField("batch_no", "TEST_BATCH_001") - writer.Close() - - resp, err := env.AsSuperAdmin().RequestWithHeaders("POST", "/api/admin/iot-cards/import", body.Bytes(), map[string]string{ - "Content-Type": writer.FormDataContentType(), - }) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - - t.Logf("Import response: code=%d, message=%s", result.Code, result.Message) - - assert.Equal(t, 200, resp.StatusCode) - assert.Equal(t, 0, result.Code) - }) - - t.Run("导入无文件应返回错误", func(t *testing.T) { - body := &bytes.Buffer{} - writer := multipart.NewWriter(body) - _ = writer.WriteField("carrier_id", "1") - _ = writer.WriteField("carrier_type", "CMCC") - writer.Close() - - resp, err := env.AsSuperAdmin().RequestWithHeaders("POST", "/api/admin/iot-cards/import", body.Bytes(), map[string]string{ - "Content-Type": writer.FormDataContentType(), - }) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - - t.Logf("No file response: code=%d, message=%s, data=%v", result.Code, result.Message, result.Data) - assert.NotEqual(t, 0, result.Code, "无文件时应返回错误码") - }) -} - -func TestIotCard_ImportTaskList(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - task := &model.IotCardImportTask{ - TaskNo: "TEST20260123001", - Status: model.ImportTaskStatusCompleted, - CarrierID: 1, - CarrierType: "CMCC", - CarrierName: "中国移动", - TotalCount: 100, - } - require.NoError(t, env.TX.Create(task).Error) - - t.Run("获取导入任务列表", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/iot-cards/import-tasks?page=1&page_size=20", nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - }) - - t.Run("获取导入任务详情-应包含冗余字段", func(t *testing.T) { - url := fmt.Sprintf("/api/admin/iot-cards/import-tasks/%d", task.ID) - resp, err := env.AsSuperAdmin().Request("GET", url, nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - dataMap := result.Data.(map[string]interface{}) - assert.Equal(t, "CMCC", dataMap["carrier_type"], "任务详情应返回冗余的运营商类型") - assert.Equal(t, "中国移动", dataMap["carrier_name"], "任务详情应返回冗余的运营商名称") - }) -} - -func TestIotCard_ImportTask_PlatformOnly(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - shop := env.CreateTestShop("权限测试店铺", 1, nil) - agentAccount := env.CreateTestAccount(fmt.Sprintf("agent_perm_%d", time.Now().UnixNano()), "password123", constants.UserTypeAgent, &shop.ID, nil) - - task := &model.IotCardImportTask{ - TaskNo: fmt.Sprintf("TEST_PERM_%d", time.Now().UnixNano()), - Status: model.ImportTaskStatusCompleted, - CarrierID: 1, - CarrierType: "CMCC", - CarrierName: "中国移动", - TotalCount: 1, - } - require.NoError(t, env.TX.Create(task).Error) - - t.Run("代理账号提交导入任务应返回403", func(t *testing.T) { - body, _ := json.Marshal(map[string]interface{}{ - "carrier_id": 1, - "batch_no": "TEST_BATCH_PERM", - "file_key": "imports/test.xlsx", - }) - - resp, err := env.AsUser(agentAccount).Request("POST", "/api/admin/iot-cards/import", body) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 403, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, pkgerrors.CodeForbidden, result.Code) - assert.Contains(t, result.Message, "仅平台用户") - }) - - t.Run("代理账号访问导入任务列表应返回403", func(t *testing.T) { - resp, err := env.AsUser(agentAccount).Request("GET", "/api/admin/iot-cards/import-tasks?page=1&page_size=20", nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 403, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, pkgerrors.CodeForbidden, result.Code) - assert.Contains(t, result.Message, "仅平台用户") - }) - - t.Run("代理账号访问导入任务详情应返回403", func(t *testing.T) { - url := fmt.Sprintf("/api/admin/iot-cards/import-tasks/%d", task.ID) - resp, err := env.AsUser(agentAccount).Request("GET", url, nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 403, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, pkgerrors.CodeForbidden, result.Code) - assert.Contains(t, result.Message, "仅平台用户") - }) -} - -func TestIotCard_ImportE2E(t *testing.T) { - t.Skip("E2E测试：需要 Worker 服务运行处理异步导入任务") - - env := integ.NewIntegrationTestEnv(t) - - // 准备测试用的 ICCID（20位，满足 CMCC 要求） - testICCIDPrefix := "E2ETEST" - testBatchNo1 := fmt.Sprintf("E2E_BATCH_%d_001", time.Now().UnixNano()) - testBatchNo2 := fmt.Sprintf("E2E_BATCH_%d_002", time.Now().UnixNano()) - testICCIDs := []string{ - testICCIDPrefix + "1234567890123", - testICCIDPrefix + "1234567890124", - testICCIDPrefix + "1234567890125", - } - - t.Run("完整导入流程验证", func(t *testing.T) { - // Step 1: 通过 API 提交导入任务 - body := &bytes.Buffer{} - writer := multipart.NewWriter(body) - - part, err := writer.CreateFormFile("file", "e2e_test.csv") - require.NoError(t, err) - csvContent := "iccid\n" + testICCIDs[0] + "\n" + testICCIDs[1] + "\n" + testICCIDs[2] - _, err = part.Write([]byte(csvContent)) - require.NoError(t, err) - - _ = writer.WriteField("carrier_id", "1") - _ = writer.WriteField("carrier_type", "CMCC") - _ = writer.WriteField("batch_no", testBatchNo1) - writer.Close() - - resp, err := env.AsSuperAdmin().RequestWithHeaders("POST", "/api/admin/iot-cards/import", body.Bytes(), map[string]string{ - "Content-Type": writer.FormDataContentType(), - }) - require.NoError(t, err) - defer resp.Body.Close() - - var apiResult response.Response - err = json.NewDecoder(resp.Body).Decode(&apiResult) - require.NoError(t, err) - require.Equal(t, 0, apiResult.Code, "API 应返回成功: %s", apiResult.Message) - - // 从响应中提取 task_id - dataMap, ok := apiResult.Data.(map[string]interface{}) - require.True(t, ok, "响应数据应为 map") - taskIDFloat, ok := dataMap["task_id"].(float64) - require.True(t, ok, "task_id 应存在") - taskID := uint(taskIDFloat) - t.Logf("创建的导入任务 ID: %d", taskID) - - // Step 2: 等待 Worker 处理完成（轮询检查任务状态） - var importTask model.IotCardImportTask - maxWaitTime := 30 * time.Second - pollInterval := 500 * time.Millisecond - startTime := time.Now() - - ctx := context.Background() - skipCtx := pkggorm.SkipDataPermission(ctx) - for { - if time.Since(startTime) > maxWaitTime { - t.Fatalf("等待超时：任务 %d 未在 %v 内完成", taskID, maxWaitTime) - } - - err = env.RawDB().WithContext(skipCtx).First(&importTask, taskID).Error - require.NoError(t, err) - - t.Logf("任务状态: %d (1=pending, 2=processing, 3=completed, 4=failed)", importTask.Status) - - if importTask.Status == model.ImportTaskStatusCompleted || importTask.Status == model.ImportTaskStatusFailed { - break - } - - time.Sleep(pollInterval) - } - - // Step 3: 验证任务完成状态 - assert.Equal(t, model.ImportTaskStatusCompleted, importTask.Status, "任务应完成") - assert.Equal(t, 3, importTask.TotalCount, "总数应为3") - assert.Equal(t, 3, importTask.SuccessCount, "成功数应为3") - assert.Equal(t, 0, importTask.SkipCount, "跳过数应为0") - assert.Equal(t, 0, importTask.FailCount, "失败数应为0") - t.Logf("任务完成: total=%d, success=%d, skip=%d, fail=%d", - importTask.TotalCount, importTask.SuccessCount, importTask.SkipCount, importTask.FailCount) - - // Step 4: 验证 IoT 卡已入库 - var cards []model.IotCard - err = env.RawDB().WithContext(skipCtx).Where("iccid IN ?", testICCIDs).Find(&cards).Error - require.NoError(t, err) - assert.Len(t, cards, 3, "应创建3张 IoT 卡") - - for _, card := range cards { - assert.Equal(t, uint(1), card.CarrierID, "运营商ID应为1") - assert.Equal(t, testBatchNo1, card.BatchNo, "批次号应匹配") - assert.Equal(t, 1, card.Status, "状态应为在库(1)") - t.Logf("已创建 IoT 卡: ICCID=%s, ID=%d", card.ICCID, card.ID) - } - }) - - t.Run("重复导入应跳过已存在的ICCID", func(t *testing.T) { - // 再次导入相同的 ICCID，应该全部跳过 - body := &bytes.Buffer{} - writer := multipart.NewWriter(body) - - part, err := writer.CreateFormFile("file", "e2e_test_dup.csv") - require.NoError(t, err) - csvContent := "iccid\n" + testICCIDs[0] + "\n" + testICCIDs[1] - _, err = part.Write([]byte(csvContent)) - require.NoError(t, err) - - _ = writer.WriteField("carrier_id", "1") - _ = writer.WriteField("carrier_type", "CMCC") - _ = writer.WriteField("batch_no", testBatchNo2) - writer.Close() - - resp, err := env.AsSuperAdmin().RequestWithHeaders("POST", "/api/admin/iot-cards/import", body.Bytes(), map[string]string{ - "Content-Type": writer.FormDataContentType(), - }) - require.NoError(t, err) - defer resp.Body.Close() - - var apiResult response.Response - err = json.NewDecoder(resp.Body).Decode(&apiResult) - require.NoError(t, err) - require.Equal(t, 0, apiResult.Code) - - dataMap := apiResult.Data.(map[string]interface{}) - taskID := uint(dataMap["task_id"].(float64)) - - // 等待处理完成 - var importTask model.IotCardImportTask - maxWaitTime := 30 * time.Second - startTime := time.Now() - ctx := context.Background() - skipCtx := pkggorm.SkipDataPermission(ctx) - - for { - if time.Since(startTime) > maxWaitTime { - t.Fatalf("等待超时") - } - env.RawDB().WithContext(skipCtx).First(&importTask, taskID) - if importTask.Status == model.ImportTaskStatusCompleted || importTask.Status == model.ImportTaskStatusFailed { - break - } - time.Sleep(500 * time.Millisecond) - } - - // 验证：2条应该全部跳过 - assert.Equal(t, model.ImportTaskStatusCompleted, importTask.Status) - assert.Equal(t, 2, importTask.TotalCount) - assert.Equal(t, 0, importTask.SuccessCount, "成功数应为0（全部跳过）") - assert.Equal(t, 2, importTask.SkipCount, "跳过数应为2") - t.Logf("重复导入结果: success=%d, skip=%d", importTask.SuccessCount, importTask.SkipCount) - }) -} - -func TestIotCard_CarrierRedundantFields(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - carrierCode := fmt.Sprintf("REDUND_%d", time.Now().UnixNano()) - carrier := &model.Carrier{ - CarrierCode: carrierCode, - CarrierName: "冗余字段测试运营商", - CarrierType: "CUCC", - Status: 1, - } - require.NoError(t, env.TX.Create(carrier).Error) - - testICCID := fmt.Sprintf("8986%016d", time.Now().UnixNano()%10000000000000000) - card := &model.IotCard{ - ICCID: testICCID, - CarrierID: carrier.ID, - CarrierType: carrier.CarrierType, - CarrierName: carrier.CarrierName, - - Status: 1, - } - require.NoError(t, env.TX.Create(card).Error) - - t.Run("单卡列表应返回冗余字段", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/iot-cards/standalone?iccid="+testICCID, nil) - require.NoError(t, err) - defer resp.Body.Close() - - require.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - require.Equal(t, 0, result.Code, "API应返回成功，实际: %v", result.Message) - - dataMap, ok := result.Data.(map[string]interface{}) - require.True(t, ok, "Data应为map类型，实际: %T", result.Data) - items, ok := dataMap["items"].([]interface{}) - require.True(t, ok, "items字段应存在且为数组，dataMap: %+v", dataMap) - require.GreaterOrEqual(t, len(items), 1, "列表应至少有1条记录，ICCID: %s", testICCID) - - cardData := items[0].(map[string]interface{}) - assert.Equal(t, "CUCC", cardData["carrier_type"], "列表应返回冗余的运营商类型") - assert.Equal(t, "冗余字段测试运营商", cardData["carrier_name"], "列表应返回冗余的运营商名称") - }) - - t.Run("单卡详情应返回冗余字段", func(t *testing.T) { - url := fmt.Sprintf("/api/admin/iot-cards/by-iccid/%s", card.ICCID) - resp, err := env.AsSuperAdmin().Request("GET", url, nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - dataMap := result.Data.(map[string]interface{}) - assert.Equal(t, "CUCC", dataMap["carrier_type"], "详情应返回冗余的运营商类型") - assert.Equal(t, "冗余字段测试运营商", dataMap["carrier_name"], "详情应返回冗余的运营商名称") - }) -} - -func TestIotCard_GetByICCID(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - carrierCode := fmt.Sprintf("ICCID_%d", time.Now().UnixNano()) - carrier := &model.Carrier{ - CarrierCode: carrierCode, - CarrierName: "测试运营商", - CarrierType: "CMCC", - Status: 1, - } - require.NoError(t, env.TX.Create(carrier).Error) - - testICCID := fmt.Sprintf("8986%016d", time.Now().UnixNano()%10000000000000000) - card := &model.IotCard{ - ICCID: testICCID, - CarrierID: carrier.ID, - CarrierType: carrier.CarrierType, - CarrierName: carrier.CarrierName, - MSISDN: "13800000001", - - CardCategory: "normal", - CostPrice: 1000, - DistributePrice: 1500, - Status: 1, - } - require.NoError(t, env.TX.Create(card).Error) - - t.Run("通过ICCID查询单卡详情-成功", func(t *testing.T) { - url := fmt.Sprintf("/api/admin/iot-cards/by-iccid/%s", card.ICCID) - resp, err := env.AsSuperAdmin().Request("GET", url, nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - dataMap, ok := result.Data.(map[string]interface{}) - require.True(t, ok) - assert.Equal(t, testICCID, dataMap["iccid"]) - assert.Equal(t, "13800000001", dataMap["msisdn"]) - assert.Equal(t, "CMCC", dataMap["carrier_type"], "应返回冗余的运营商类型") - assert.Equal(t, "测试运营商", dataMap["carrier_name"], "应返回冗余的运营商名称") - }) - - t.Run("通过不存在的ICCID查询-应返回错误", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/iot-cards/by-iccid/NONEXISTENT_ICCID", nil) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.NotEqual(t, 0, result.Code, "不存在的ICCID应返回错误码") - }) - - t.Run("未认证请求-应返回错误", func(t *testing.T) { - url := fmt.Sprintf("/api/admin/iot-cards/by-iccid/%s", card.ICCID) - resp, err := env.ClearAuth().Request("GET", url, nil) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.NotEqual(t, 0, result.Code, "未认证请求应返回错误码") - }) -} - -func TestIotCard_BatchSetSeriesBinding(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - // 创建测试数据 - shop := env.CreateTestShop("测试店铺", 1, nil) - agentAccount := env.CreateTestAccount(fmt.Sprintf("agent_%d", time.Now().UnixNano()), "password123", constants.UserTypeAgent, &shop.ID, nil) - - // 创建套餐系列和分配 - series := createTestPackageSeries(t, env, "测试系列") - createTestAllocation(t, env, shop.ID, series.ID, 0) - - // 创建测试卡（归属于该店铺） - timestamp := time.Now().Unix() % 1000000 - cards := []*model.IotCard{ - {ICCID: fmt.Sprintf("TEST%06d001", timestamp), CarrierID: 1, Status: 1, ShopID: &shop.ID}, - {ICCID: fmt.Sprintf("TEST%06d002", timestamp), CarrierID: 1, Status: 1, ShopID: &shop.ID}, - {ICCID: fmt.Sprintf("TEST%06d003", timestamp), CarrierID: 1, Status: 1, ShopID: &shop.ID}, - } - for _, card := range cards { - require.NoError(t, env.TX.Create(card).Error) - } - - t.Run("批量设置卡系列绑定-成功", func(t *testing.T) { - body := map[string]interface{}{ - "iccids": []string{cards[0].ICCID, cards[1].ICCID}, - "series_id": series.ID, - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsUser(agentAccount).Request("PATCH", "/api/admin/iot-cards/series-binding", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code, "应返回成功: %s", result.Message) - - // 验证响应数据 - dataMap := result.Data.(map[string]interface{}) - assert.Equal(t, float64(2), dataMap["success_count"], "应有2张卡成功绑定") - assert.Equal(t, float64(0), dataMap["fail_count"], "应无失败") - - // 验证数据库中数据已更新 - var updatedCard model.IotCard - err = env.RawDB().Where("iccid = ?", cards[0].ICCID).First(&updatedCard).Error - require.NoError(t, err) - assert.NotNil(t, updatedCard.SeriesID) - assert.Equal(t, series.ID, *updatedCard.SeriesID) - }) - - t.Run("清除卡系列绑定-series_id=0", func(t *testing.T) { - body := map[string]interface{}{ - "iccids": []string{cards[0].ICCID}, - "series_id": 0, - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsUser(agentAccount).Request("PATCH", "/api/admin/iot-cards/series-binding", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - // 验证数据库中绑定已清除 - var updatedCard model.IotCard - err = env.RawDB().Where("iccid = ?", cards[0].ICCID).First(&updatedCard).Error - require.NoError(t, err) - assert.Nil(t, updatedCard.SeriesID, "系列分配应被清除") - }) - - t.Run("批量设置-部分卡不存在", func(t *testing.T) { - body := map[string]interface{}{ - "iccids": []string{cards[2].ICCID, "NONEXISTENT_ICCID_999"}, - "series_id": series.ID, - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsUser(agentAccount).Request("PATCH", "/api/admin/iot-cards/series-binding", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - // 验证响应数据 - dataMap := result.Data.(map[string]interface{}) - assert.Equal(t, float64(1), dataMap["success_count"], "应有1张卡成功") - assert.Equal(t, float64(1), dataMap["fail_count"], "应有1张卡失败") - - // 验证失败列表 - failedItems := dataMap["failed_items"].([]interface{}) - assert.Len(t, failedItems, 1) - failedItem := failedItems[0].(map[string]interface{}) - assert.Equal(t, "NONEXISTENT_ICCID_999", failedItem["iccid"]) - }) - - t.Run("设置不存在的系列分配-应失败", func(t *testing.T) { - body := map[string]interface{}{ - "iccids": []string{cards[2].ICCID}, - "series_id": 999999, - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsUser(agentAccount).Request("PATCH", "/api/admin/iot-cards/series-binding", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.NotEqual(t, 0, result.Code, "不存在的系列分配应返回错误") - }) - - t.Run("设置禁用的系列-应失败", func(t *testing.T) { - // 创建一个禁用的分配 - disabledSeries := createTestPackageSeries(t, env, "禁用系列") - env.TX.Model(&model.PackageSeries{}).Where("id = ?", disabledSeries.ID).Update("status", constants.StatusDisabled) - - body := map[string]interface{}{ - "iccids": []string{cards[2].ICCID}, - "series_id": disabledSeries.ID, - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsUser(agentAccount).Request("PATCH", "/api/admin/iot-cards/series-binding", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.NotEqual(t, 0, result.Code, "禁用的系列分配应返回错误") - }) - - t.Run("代理商设置其他店铺的卡-应失败", func(t *testing.T) { - // 创建另一个店铺和卡 - otherShop := env.CreateTestShop("其他店铺", 1, nil) - otherCard := &model.IotCard{ - ICCID: fmt.Sprintf("OTH%010d", time.Now().Unix()%10000000000), - - CarrierID: 1, - Status: 1, - ShopID: &otherShop.ID, - } - require.NoError(t, env.TX.Create(otherCard).Error) - - body := map[string]interface{}{ - "iccids": []string{otherCard.ICCID}, - "series_id": series.ID, - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsUser(agentAccount).Request("PATCH", "/api/admin/iot-cards/series-binding", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - - // 验证全部失败（因为卡不属于当前店铺） - dataMap := result.Data.(map[string]interface{}) - assert.Equal(t, float64(0), dataMap["success_count"], "不应有成功") - assert.Equal(t, float64(1), dataMap["fail_count"], "应全部失败") - }) - - t.Run("超级管理员可以设置任意店铺的卡", func(t *testing.T) { - // 创建另一个店铺和卡 - anotherShop := env.CreateTestShop("另一个店铺", 1, nil) - anotherCard := &model.IotCard{ - ICCID: fmt.Sprintf("ADM%010d", time.Now().Unix()%10000000000), - - CarrierID: 1, - Status: 1, - ShopID: &anotherShop.ID, - } - require.NoError(t, env.TX.Create(anotherCard).Error) - - // 为这个店铺创建系列分配 - createTestAllocation(t, env, anotherShop.ID, series.ID, 0) - - body := map[string]interface{}{ - "iccids": []string{anotherCard.ICCID}, - "series_id": series.ID, - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsSuperAdmin().Request("PATCH", "/api/admin/iot-cards/series-binding", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code, "超级管理员应能设置任意店铺的卡") - - // 验证成功 - dataMap := result.Data.(map[string]interface{}) - assert.Equal(t, float64(1), dataMap["success_count"]) - }) - - t.Run("未认证请求应返回错误", func(t *testing.T) { - body := map[string]interface{}{ - "iccids": []string{cards[0].ICCID}, - "series_id": series.ID, - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.ClearAuth().Request("PATCH", "/api/admin/iot-cards/series-binding", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.NotEqual(t, 0, result.Code, "未认证请求应返回错误码") - }) - - t.Run("空ICCID列表-返回成功但无操作", func(t *testing.T) { - body := map[string]interface{}{ - "iccids": []string{}, - "series_id": series.ID, - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsUser(agentAccount).Request("PATCH", "/api/admin/iot-cards/series-binding", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - - assert.Equal(t, 0, result.Code, "当前实现：空列表返回成功") - - if result.Data != nil { - dataMap := result.Data.(map[string]interface{}) - assert.Equal(t, float64(0), dataMap["success_count"], "空列表无成功项") - } - }) -} - -func createTestPackageSeries(t *testing.T, env *integ.IntegrationTestEnv, name string) *model.PackageSeries { - t.Helper() - - timestamp := time.Now().UnixNano() - series := &model.PackageSeries{ - SeriesCode: fmt.Sprintf("SERIES_%d", timestamp), - SeriesName: name, - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - - err := env.TX.Create(series).Error - require.NoError(t, err, "创建测试套餐系列失败") - - return series -} - -func createTestAllocation(t *testing.T, env *integ.IntegrationTestEnv, shopID, seriesID, allocatorShopID uint) *model.ShopPackageAllocation { - t.Helper() - - timestamp := time.Now().UnixNano() - pkg := &model.Package{ - PackageCode: fmt.Sprintf("PKG_%d", timestamp), - PackageName: "测试套餐", - SeriesID: seriesID, - PackageType: "formal", - DurationMonths: 1, - RealDataMB: 1024, - CostPrice: 5000, - SuggestedRetailPrice: 12800, - Status: constants.StatusEnabled, - ShelfStatus: 1, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err := env.TX.Create(pkg).Error - require.NoError(t, err, "创建测试套餐失败") - - allocation := &model.ShopPackageAllocation{ - ShopID: shopID, - PackageID: pkg.ID, - AllocatorShopID: allocatorShopID, - CostPrice: 5000, - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - - err = env.TX.Create(allocation).Error - require.NoError(t, err, "创建测试分配失败") - - return allocation -} diff --git a/tests/integration/middleware_test.go b/tests/integration/middleware_test.go deleted file mode 100644 index 9b07a76..0000000 --- a/tests/integration/middleware_test.go +++ /dev/null @@ -1,524 +0,0 @@ -package integration - -import ( - "io" - "net/http/httptest" - "os" - "path/filepath" - "strings" - "testing" - "time" - - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/pkg/logger" - "github.com/gofiber/fiber/v2" - "github.com/gofiber/fiber/v2/middleware/requestid" - "github.com/google/uuid" -) - -// TestRequestIDMiddleware 测试 RequestID 中间件生成 UUID v4（T043） -func TestRequestIDMiddleware(t *testing.T) { - app := fiber.New() - - // 配置 requestid 中间件使用 UUID v4 - app.Use(requestid.New(requestid.Config{ - Generator: func() string { - return uuid.NewString() - }, - })) - - app.Get("/test", func(c *fiber.Ctx) error { - requestID := c.Locals(constants.ContextKeyRequestID) - return c.JSON(fiber.Map{ - "request_id": requestID, - }) - }) - - tests := []struct { - name string - }{ - {name: "request 1"}, - {name: "request 2"}, - {name: "request 3"}, - } - - seenIDs := make(map[string]bool) - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - req := httptest.NewRequest("GET", "/test", nil) - resp, err := app.Test(req) - if err != nil { - t.Fatalf("Failed to execute request: %v", err) - } - defer resp.Body.Close() - - // 验证响应头包含 X-Request-ID - requestID := resp.Header.Get("X-Request-ID") - if requestID == "" { - t.Error("X-Request-ID header should not be empty") - } - - // 验证是 UUID v4 格式 - if _, err := uuid.Parse(requestID); err != nil { - t.Errorf("X-Request-ID is not a valid UUID: %s, error: %v", requestID, err) - } - - // 验证 UUID 是唯一的 - if seenIDs[requestID] { - t.Errorf("Request ID %s is not unique", requestID) - } - seenIDs[requestID] = true - - t.Logf("Request ID: %s", requestID) - }) - } - - // 验证生成了多个不同的 ID - if len(seenIDs) != len(tests) { - t.Errorf("Expected %d unique request IDs, got %d", len(tests), len(seenIDs)) - } -} - -// TestLoggerMiddleware 测试 Logger 中间件记录访问日志（T044） -func TestLoggerMiddleware(t *testing.T) { - // 创建临时目录用于日志 - tempDir := t.TempDir() - accessLogFile := filepath.Join(tempDir, "access.log") - - // 初始化日志系统 - err := logger.InitLoggers("info", false, - logger.LogRotationConfig{ - Filename: filepath.Join(tempDir, "app.log"), - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: false, - }, - logger.LogRotationConfig{ - Filename: accessLogFile, - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: false, - }, - ) - if err != nil { - t.Fatalf("Failed to initialize loggers: %v", err) - } - defer func() { _ = logger.Sync() }() - - // 创建应用 - app := fiber.New() - - // 注册中间件 - app.Use(requestid.New(requestid.Config{ - Generator: func() string { - return uuid.NewString() - }, - })) - app.Use(logger.Middleware()) - - app.Get("/test", func(c *fiber.Ctx) error { - return c.SendString("ok") - }) - - app.Post("/test", func(c *fiber.Ctx) error { - return c.SendStatus(201) - }) - - tests := []struct { - name string - method string - path string - expectedStatus int - }{ - { - name: "GET request", - method: "GET", - path: "/test", - expectedStatus: 200, - }, - { - name: "POST request", - method: "POST", - path: "/test", - expectedStatus: 201, - }, - { - name: "GET with query params", - method: "GET", - path: "/test?foo=bar", - expectedStatus: 200, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - req := httptest.NewRequest(tt.method, tt.path, nil) - req.Header.Set("User-Agent", "test-agent/1.0") - - resp, err := app.Test(req) - if err != nil { - t.Fatalf("Failed to execute request: %v", err) - } - resp.Body.Close() - - if resp.StatusCode != tt.expectedStatus { - t.Errorf("Expected status %d, got %d", tt.expectedStatus, resp.StatusCode) - } - }) - } - - // 刷新日志缓冲区 - _ = logger.Sync() - time.Sleep(100 * time.Millisecond) - - // 验证访问日志文件存在且有内容 - content, err := os.ReadFile(accessLogFile) - if err != nil { - t.Fatalf("Failed to read access log: %v", err) - } - - if len(content) == 0 { - t.Error("Access log should not be empty") - } - - logContent := string(content) - t.Logf("Access log content:\n%s", logContent) - - // 验证日志包含必要的字段 - requiredFields := []string{ - "method", - "path", - "status", - "duration_ms", - "request_id", - "ip", - "user_agent", - } - - for _, field := range requiredFields { - if !strings.Contains(logContent, field) { - t.Errorf("Access log should contain field '%s'", field) - } - } - - // 验证记录了所有请求 - lines := strings.Split(strings.TrimSpace(logContent), "\n") - if len(lines) < len(tests) { - t.Errorf("Expected at least %d log entries, got %d", len(tests), len(lines)) - } -} - -// TestRequestIDPropagation 测试 Request ID 在中间件链中传播（T045） -func TestRequestIDPropagation(t *testing.T) { - // 创建临时目录用于日志 - tempDir := t.TempDir() - - // 初始化日志系统 - err := logger.InitLoggers("info", false, - logger.LogRotationConfig{ - Filename: filepath.Join(tempDir, "app.log"), - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: false, - }, - logger.LogRotationConfig{ - Filename: filepath.Join(tempDir, "access.log"), - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: false, - }, - ) - if err != nil { - t.Fatalf("Failed to initialize loggers: %v", err) - } - defer func() { _ = logger.Sync() }() - - // 创建应用 - app := fiber.New() - - var capturedRequestID string - - // 1. RequestID 中间件（第一个） - app.Use(requestid.New(requestid.Config{ - Generator: func() string { - return uuid.NewString() - }, - })) - - // 2. Logger 中间件（第二个） - app.Use(logger.Middleware()) - - // 3. 自定义中间件验证 request ID 是否可访问 - app.Use(func(c *fiber.Ctx) error { - requestID := c.Locals(constants.ContextKeyRequestID) - if requestID == nil { - t.Error("Request ID should be available in middleware chain") - } - if rid, ok := requestID.(string); ok { - capturedRequestID = rid - } - return c.Next() - }) - - app.Get("/test", func(c *fiber.Ctx) error { - // 在 handler 中也验证 request ID - requestID := c.Locals(constants.ContextKeyRequestID) - if requestID == nil { - return c.Status(500).SendString("Request ID not found in handler") - } - - return c.JSON(fiber.Map{ - "request_id": requestID, - "message": "Request ID propagated successfully", - }) - }) - - // 执行请求 - req := httptest.NewRequest("GET", "/test", nil) - resp, err := app.Test(req) - if err != nil { - t.Fatalf("Failed to execute request: %v", err) - } - defer resp.Body.Close() - - // 验证响应 - if resp.StatusCode != 200 { - t.Errorf("Expected status 200, got %d", resp.StatusCode) - } - - // 验证响应头中的 Request ID - headerRequestID := resp.Header.Get("X-Request-ID") - if headerRequestID == "" { - t.Error("X-Request-ID header should be set") - } - - // 验证中间件捕获的 Request ID 与响应头一致 - if capturedRequestID != headerRequestID { - t.Errorf("Request ID mismatch: middleware=%s, header=%s", capturedRequestID, headerRequestID) - } - - // 验证响应体 - body, err := io.ReadAll(resp.Body) - if err != nil { - t.Fatalf("Failed to read response body: %v", err) - } - - if !strings.Contains(string(body), headerRequestID) { - t.Errorf("Response body should contain request ID %s", headerRequestID) - } - - t.Logf("Request ID successfully propagated: %s", headerRequestID) -} - -// TestMiddlewareOrder 测试中间件执行顺序（T045） -func TestMiddlewareOrder(t *testing.T) { - app := fiber.New() - - executionOrder := []string{} - - // 中间件 1: RequestID - app.Use(func(c *fiber.Ctx) error { - executionOrder = append(executionOrder, "requestid-start") - c.Locals(constants.ContextKeyRequestID, uuid.NewString()) - err := c.Next() - executionOrder = append(executionOrder, "requestid-end") - return err - }) - - // 中间件 2: Logger - app.Use(func(c *fiber.Ctx) error { - executionOrder = append(executionOrder, "logger-start") - // 验证 Request ID 已经设置 - if c.Locals(constants.ContextKeyRequestID) == nil { - t.Error("Request ID should be set before logger middleware") - } - err := c.Next() - executionOrder = append(executionOrder, "logger-end") - return err - }) - - // 中间件 3: Custom - app.Use(func(c *fiber.Ctx) error { - executionOrder = append(executionOrder, "custom-start") - err := c.Next() - executionOrder = append(executionOrder, "custom-end") - return err - }) - - app.Get("/test", func(c *fiber.Ctx) error { - executionOrder = append(executionOrder, "handler") - return c.SendString("ok") - }) - - req := httptest.NewRequest("GET", "/test", nil) - resp, err := app.Test(req) - if err != nil { - t.Fatalf("Failed to execute request: %v", err) - } - resp.Body.Close() - - // 验证执行顺序 - expectedOrder := []string{ - "requestid-start", - "logger-start", - "custom-start", - "handler", - "custom-end", - "logger-end", - "requestid-end", - } - - if len(executionOrder) != len(expectedOrder) { - t.Errorf("Expected %d execution steps, got %d", len(expectedOrder), len(executionOrder)) - } - - for i, expected := range expectedOrder { - if i >= len(executionOrder) { - t.Errorf("Missing execution step at index %d: expected '%s'", i, expected) - continue - } - if executionOrder[i] != expected { - t.Errorf("Execution order mismatch at index %d: expected '%s', got '%s'", i, expected, executionOrder[i]) - } - } - - t.Logf("Middleware execution order: %v", executionOrder) -} - -func TestLoggerMiddlewareWithUserID(t *testing.T) { - tempDir := t.TempDir() - accessLogFile := filepath.Join(tempDir, "access-userid.log") - - err := logger.InitLoggers("info", false, - logger.LogRotationConfig{ - Filename: filepath.Join(tempDir, "app.log"), - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: false, - }, - logger.LogRotationConfig{ - Filename: accessLogFile, - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: false, - }, - ) - if err != nil { - t.Fatalf("Failed to initialize loggers: %v", err) - } - defer func() { _ = logger.Sync() }() - - app := fiber.New() - - app.Use(requestid.New(requestid.Config{ - Generator: func() string { - return uuid.NewString() - }, - })) - - app.Use(func(c *fiber.Ctx) error { - c.Locals(constants.ContextKeyUserID, uint(12345)) - return c.Next() - }) - - app.Use(logger.Middleware()) - - app.Get("/test", func(c *fiber.Ctx) error { - return c.SendString("ok") - }) - - req := httptest.NewRequest("GET", "/test", nil) - resp, err := app.Test(req) - if err != nil { - t.Fatalf("Failed to execute request: %v", err) - } - resp.Body.Close() - - _ = logger.Sync() - time.Sleep(100 * time.Millisecond) - - content, err := os.ReadFile(accessLogFile) - if err != nil { - t.Fatalf("Failed to read access log: %v", err) - } - - logContent := string(content) - if !strings.Contains(logContent, "12345") { - t.Error("Access log should contain user_id '12345'") - } - - t.Logf("Access log with user_id:\n%s", logContent) -} - -// TestConcurrentRequests 测试并发请求的 Request ID 唯一性（T043） -func TestConcurrentRequests(t *testing.T) { - app := fiber.New() - - app.Use(requestid.New(requestid.Config{ - Generator: func() string { - return uuid.NewString() - }, - })) - - app.Get("/test", func(c *fiber.Ctx) error { - // 模拟一些处理时间 - time.Sleep(10 * time.Millisecond) - requestID := c.Locals(constants.ContextKeyRequestID) - return c.JSON(fiber.Map{ - "request_id": requestID, - }) - }) - - // 并发发送多个请求 - const numRequests = 50 - requestIDs := make(chan string, numRequests) - errors := make(chan error, numRequests) - - for i := 0; i < numRequests; i++ { - go func() { - req := httptest.NewRequest("GET", "/test", nil) - resp, err := app.Test(req) - if err != nil { - errors <- err - return - } - defer resp.Body.Close() - - requestID := resp.Header.Get("X-Request-ID") - requestIDs <- requestID - errors <- nil - }() - } - - // 收集所有结果 - seenIDs := make(map[string]bool) - for i := 0; i < numRequests; i++ { - if err := <-errors; err != nil { - t.Fatalf("Request failed: %v", err) - } - requestID := <-requestIDs - - if requestID == "" { - t.Error("Request ID should not be empty") - } - - if seenIDs[requestID] { - t.Errorf("Duplicate request ID found: %s", requestID) - } - seenIDs[requestID] = true - } - - // 验证所有 ID 都是唯一的 - if len(seenIDs) != numRequests { - t.Errorf("Expected %d unique request IDs, got %d", numRequests, len(seenIDs)) - } - - t.Logf("Successfully generated %d unique request IDs concurrently", len(seenIDs)) -} diff --git a/tests/integration/migration_test.go b/tests/integration/migration_test.go deleted file mode 100644 index 208308b..0000000 --- a/tests/integration/migration_test.go +++ /dev/null @@ -1,36 +0,0 @@ -package integration - -import ( - "os" - "path/filepath" - "testing" - - "github.com/break/junhong_cmp_fiber/tests/testutils" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -// TestMigration_NoForeignKeys 验证迁移脚本不包含外键约束 -func TestMigration_NoForeignKeys(t *testing.T) { - migrationsPath := testutils.GetMigrationsPath() - - files, err := filepath.Glob(filepath.Join(migrationsPath, "*.up.sql")) - require.NoError(t, err) - - forbiddenKeywords := []string{ - "FOREIGN KEY", - "REFERENCES", - "ON DELETE CASCADE", - "ON UPDATE CASCADE", - } - - for _, file := range files { - content, err := os.ReadFile(file) - require.NoError(t, err) - - for _, keyword := range forbiddenKeywords { - assert.NotContains(t, string(content), keyword, - "迁移文件 %s 不应包含外键约束关键字: %s", filepath.Base(file), keyword) - } - } -} diff --git a/tests/integration/package_test.go b/tests/integration/package_test.go deleted file mode 100644 index 053cc49..0000000 --- a/tests/integration/package_test.go +++ /dev/null @@ -1,560 +0,0 @@ -package integration - -import ( - "context" - "encoding/json" - "fmt" - "testing" - "time" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/pkg/constants" - pkgGorm "github.com/break/junhong_cmp_fiber/pkg/gorm" - "github.com/break/junhong_cmp_fiber/pkg/response" - "github.com/break/junhong_cmp_fiber/tests/testutils/integ" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -// ==================== Part 1: 套餐系列 API 测试 ==================== - -func TestPackageSeriesAPI_Create(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - timestamp := time.Now().Unix() - seriesCode := fmt.Sprintf("TEST_SERIES_%d", timestamp) - - body := map[string]interface{}{ - "series_code": seriesCode, - "series_name": "测试套餐系列", - "description": "API集成测试创建的套餐系列", - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/package-series", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - dataMap, ok := result.Data.(map[string]interface{}) - require.True(t, ok) - assert.Equal(t, seriesCode, dataMap["series_code"]) - assert.Equal(t, "测试套餐系列", dataMap["series_name"]) - assert.Equal(t, float64(constants.StatusEnabled), dataMap["status"]) - - t.Logf("创建的套餐系列 ID: %v", dataMap["id"]) -} - -func TestPackageSeriesAPI_Get(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - timestamp := time.Now().Unix() - seriesCode := fmt.Sprintf("TEST_SERIES_%d", timestamp) - - series := &model.PackageSeries{ - SeriesCode: seriesCode, - SeriesName: "测试套餐系列", - Description: "测试描述", - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - }, - } - require.NoError(t, env.TX.Create(series).Error) - - url := fmt.Sprintf("/api/admin/package-series/%d", series.ID) - resp, err := env.AsSuperAdmin().Request("GET", url, nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - dataMap := result.Data.(map[string]interface{}) - assert.Equal(t, seriesCode, dataMap["series_code"]) - assert.Equal(t, "测试套餐系列", dataMap["series_name"]) -} - -func TestPackageSeriesAPI_List(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - timestamp := time.Now().Unix() - seriesList := []*model.PackageSeries{ - { - SeriesCode: fmt.Sprintf("TEST_LIST_%d_001", timestamp), - SeriesName: "列表测试系列1", - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{Creator: 1}, - }, - { - SeriesCode: fmt.Sprintf("TEST_LIST_%d_002", timestamp), - SeriesName: "列表测试系列2", - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{Creator: 1}, - }, - } - for _, s := range seriesList { - require.NoError(t, env.TX.Create(s).Error) - } - - resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/package-series?page=1&page_size=20", nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) -} - -func TestPackageSeriesAPI_Update(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - timestamp := time.Now().Unix() - seriesCode := fmt.Sprintf("TEST_SERIES_%d", timestamp) - - series := &model.PackageSeries{ - SeriesCode: seriesCode, - SeriesName: "原始系列名称", - Description: "原始描述", - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - }, - } - require.NoError(t, env.TX.Create(series).Error) - - body := map[string]interface{}{ - "series_name": "更新后的系列名称", - "description": "更新后的描述", - } - jsonBody, _ := json.Marshal(body) - - url := fmt.Sprintf("/api/admin/package-series/%d", series.ID) - resp, err := env.AsSuperAdmin().Request("PUT", url, jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - dataMap := result.Data.(map[string]interface{}) - assert.Equal(t, "更新后的系列名称", dataMap["series_name"]) - assert.Equal(t, "更新后的描述", dataMap["description"]) -} - -func TestPackageSeriesAPI_UpdateStatus(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - timestamp := time.Now().Unix() - seriesCode := fmt.Sprintf("TEST_SERIES_%d", timestamp) - - series := &model.PackageSeries{ - SeriesCode: seriesCode, - SeriesName: "测试系列", - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - }, - } - require.NoError(t, env.TX.Create(series).Error) - - body := map[string]interface{}{ - "status": constants.StatusDisabled, - } - jsonBody, _ := json.Marshal(body) - - url := fmt.Sprintf("/api/admin/package-series/%d/status", series.ID) - resp, err := env.AsSuperAdmin().Request("PATCH", url, jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - var updatedSeries model.PackageSeries - env.RawDB().First(&updatedSeries, series.ID) - assert.Equal(t, constants.StatusDisabled, updatedSeries.Status) -} - -func TestPackageSeriesAPI_Delete(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - timestamp := time.Now().Unix() - seriesCode := fmt.Sprintf("TEST_SERIES_%d", timestamp) - - series := &model.PackageSeries{ - SeriesCode: seriesCode, - SeriesName: "测试系列", - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - }, - } - require.NoError(t, env.TX.Create(series).Error) - - url := fmt.Sprintf("/api/admin/package-series/%d", series.ID) - resp, err := env.AsSuperAdmin().Request("DELETE", url, nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - var deletedSeries model.PackageSeries - err = env.RawDB().First(&deletedSeries, series.ID).Error - assert.Error(t, err, "删除后应查不到套餐系列") -} - -// ==================== Part 2: 套餐 API 测试 ==================== - -func TestPackageAPI_Create(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - timestamp := time.Now().Unix() - packageCode := fmt.Sprintf("TEST_PKG_%d", timestamp) - - body := map[string]interface{}{ - "package_code": packageCode, - "package_name": "测试套餐", - "package_type": "formal", - "duration_months": 12, - "price": 99900, - "data_type": "real", - "real_data_mb": 10240, - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/packages", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - dataMap, ok := result.Data.(map[string]interface{}) - require.True(t, ok) - assert.Equal(t, packageCode, dataMap["package_code"]) - assert.Equal(t, "测试套餐", dataMap["package_name"]) - assert.Equal(t, float64(constants.StatusEnabled), dataMap["status"]) - assert.Equal(t, float64(2), dataMap["shelf_status"]) // 默认下架 - - t.Logf("创建的套餐 ID: %v", dataMap["id"]) -} - -func TestPackageAPI_UpdateStatus_DisableForceOffShelf(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - timestamp := time.Now().Unix() - packageCode := fmt.Sprintf("TEST_PKG_%d", timestamp) - - // 先创建套餐 - createBody := map[string]interface{}{ - "package_code": packageCode, - "package_name": "测试套餐", - "package_type": "formal", - "duration_months": 12, - "price": 99900, - } - jsonBody, _ := json.Marshal(createBody) - - createResp, err := env.AsSuperAdmin().Request("POST", "/api/admin/packages", jsonBody) - require.NoError(t, err) - defer createResp.Body.Close() - - var createResult response.Response - err = json.NewDecoder(createResp.Body).Decode(&createResult) - require.NoError(t, err) - require.Equal(t, 0, createResult.Code) - - dataMap := createResult.Data.(map[string]interface{}) - pkgID := uint(dataMap["id"].(float64)) - - // 先上架套餐 - shelfBody := map[string]interface{}{ - "shelf_status": 1, - } - shelfJsonBody, _ := json.Marshal(shelfBody) - - shelfResp, err := env.AsSuperAdmin().Request("PATCH", fmt.Sprintf("/api/admin/packages/%d/shelf", pkgID), shelfJsonBody) - require.NoError(t, err) - defer shelfResp.Body.Close() - - // 禁用套餐 - disableBody := map[string]interface{}{ - "status": constants.StatusDisabled, - } - disableJsonBody, _ := json.Marshal(disableBody) - - disableResp, err := env.AsSuperAdmin().Request("PATCH", fmt.Sprintf("/api/admin/packages/%d/status", pkgID), disableJsonBody) - require.NoError(t, err) - defer disableResp.Body.Close() - - var disableResult response.Response - err = json.NewDecoder(disableResp.Body).Decode(&disableResult) - require.NoError(t, err) - t.Logf("禁用响应: 状态码=%d, 错误码=%d, 消息=%s", disableResp.StatusCode, disableResult.Code, disableResult.Message) - require.Equal(t, 200, disableResp.StatusCode, "禁用套餐应该成功") - require.Equal(t, 0, disableResult.Code, "禁用套餐应该返回成功") - - // 验证禁用后自动下架 - var updatedPkg model.Package - ctx := pkgGorm.SkipDataPermission(context.Background()) - require.NoError(t, env.RawDB().WithContext(ctx).First(&updatedPkg, pkgID).Error) - assert.Equal(t, constants.StatusDisabled, updatedPkg.Status, "套餐应该被禁用") - assert.Equal(t, 2, updatedPkg.ShelfStatus, "禁用时应该强制下架") - - t.Logf("禁用套餐后，状态: %d, 上架状态: %d", updatedPkg.Status, updatedPkg.ShelfStatus) -} - -func TestPackageAPI_UpdateShelfStatus_DisabledCannotOnShelf(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - timestamp := time.Now().Unix() - packageCode := fmt.Sprintf("TEST_PKG_%d", timestamp) - - // 先创建套餐 - createBody := map[string]interface{}{ - "package_code": packageCode, - "package_name": "测试套餐", - "package_type": "formal", - "duration_months": 12, - "price": 99900, - } - jsonBody, _ := json.Marshal(createBody) - - createResp, err := env.AsSuperAdmin().Request("POST", "/api/admin/packages", jsonBody) - require.NoError(t, err) - defer createResp.Body.Close() - - var createResult response.Response - err = json.NewDecoder(createResp.Body).Decode(&createResult) - require.NoError(t, err) - require.Equal(t, 0, createResult.Code) - - dataMap := createResult.Data.(map[string]interface{}) - pkgID := uint(dataMap["id"].(float64)) - - // 禁用套餐 - disableBody := map[string]interface{}{ - "status": constants.StatusDisabled, - } - disableJsonBody, _ := json.Marshal(disableBody) - - disableResp, err := env.AsSuperAdmin().Request("PATCH", fmt.Sprintf("/api/admin/packages/%d/status", pkgID), disableJsonBody) - require.NoError(t, err) - defer disableResp.Body.Close() - - var disableResult response.Response - err = json.NewDecoder(disableResp.Body).Decode(&disableResult) - require.NoError(t, err) - t.Logf("禁用响应: 状态码=%d, 错误码=%d, 消息=%s", disableResp.StatusCode, disableResult.Code, disableResult.Message) - require.Equal(t, 200, disableResp.StatusCode, "禁用套餐应该成功") - require.Equal(t, 0, disableResult.Code, "禁用套餐应该返回成功") - - // 尝试上架禁用的套餐 - shelfBody := map[string]interface{}{ - "shelf_status": 1, - } - shelfJsonBody, _ := json.Marshal(shelfBody) - - shelfResp, err := env.AsSuperAdmin().Request("PATCH", fmt.Sprintf("/api/admin/packages/%d/shelf", pkgID), shelfJsonBody) - require.NoError(t, err) - defer shelfResp.Body.Close() - - // 应该返回错误 - var result response.Response - err = json.NewDecoder(shelfResp.Body).Decode(&result) - require.NoError(t, err) - assert.NotEqual(t, 0, result.Code, "禁用的套餐不能上架，应返回错误码") - - // 验证套餐仍然是下架状态 - var unchangedPkg model.Package - ctx := pkgGorm.SkipDataPermission(context.Background()) - require.NoError(t, env.RawDB().WithContext(ctx).First(&unchangedPkg, pkgID).Error) - assert.Equal(t, 2, unchangedPkg.ShelfStatus, "禁用的套餐应该保持下架状态") - - t.Logf("尝试上架禁用套餐失败，错误码: %d, 消息: %s", result.Code, result.Message) -} - -func TestPackageAPI_Get(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - timestamp := time.Now().Unix() - packageCode := fmt.Sprintf("TEST_PKG_%d", timestamp) - - pkg := &model.Package{ - PackageCode: packageCode, - PackageName: "测试套餐", - PackageType: "formal", - DurationMonths: 12, - Status: constants.StatusEnabled, - ShelfStatus: 2, - BaseModel: model.BaseModel{ - Creator: 1, - }, - } - require.NoError(t, env.TX.Create(pkg).Error) - - url := fmt.Sprintf("/api/admin/packages/%d", pkg.ID) - resp, err := env.AsSuperAdmin().Request("GET", url, nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - dataMap := result.Data.(map[string]interface{}) - assert.Equal(t, packageCode, dataMap["package_code"]) - assert.Equal(t, "测试套餐", dataMap["package_name"]) -} - -func TestPackageAPI_List(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - timestamp := time.Now().Unix() - pkgList := []*model.Package{ - { - PackageCode: fmt.Sprintf("TEST_LIST_%d_001", timestamp), - PackageName: "列表测试套餐1", - PackageType: "formal", - DurationMonths: 12, - Status: constants.StatusEnabled, - ShelfStatus: 1, - BaseModel: model.BaseModel{Creator: 1}, - }, - { - PackageCode: fmt.Sprintf("TEST_LIST_%d_002", timestamp), - PackageName: "列表测试套餐2", - PackageType: "addon", - DurationMonths: 1, - Status: constants.StatusEnabled, - ShelfStatus: 2, - BaseModel: model.BaseModel{Creator: 1}, - }, - } - for _, p := range pkgList { - require.NoError(t, env.TX.Create(p).Error) - } - - resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/packages?page=1&page_size=20", nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) -} - -func TestPackageAPI_Update(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - timestamp := time.Now().Unix() - packageCode := fmt.Sprintf("TEST_PKG_%d", timestamp) - - pkg := &model.Package{ - PackageCode: packageCode, - PackageName: "原始套餐名称", - PackageType: "formal", - DurationMonths: 12, - Status: constants.StatusEnabled, - ShelfStatus: 2, - BaseModel: model.BaseModel{ - Creator: 1, - }, - } - require.NoError(t, env.TX.Create(pkg).Error) - - body := map[string]interface{}{ - "package_name": "更新后的套餐名称", - "price": 119900, - } - jsonBody, _ := json.Marshal(body) - - url := fmt.Sprintf("/api/admin/packages/%d", pkg.ID) - resp, err := env.AsSuperAdmin().Request("PUT", url, jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - dataMap := result.Data.(map[string]interface{}) - assert.Equal(t, "更新后的套餐名称", dataMap["package_name"]) - assert.Equal(t, float64(119900), dataMap["price"]) -} - -func TestPackageAPI_Delete(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - timestamp := time.Now().Unix() - packageCode := fmt.Sprintf("TEST_PKG_%d", timestamp) - - pkg := &model.Package{ - PackageCode: packageCode, - PackageName: "测试套餐", - PackageType: "formal", - DurationMonths: 12, - Status: constants.StatusEnabled, - ShelfStatus: 2, - BaseModel: model.BaseModel{ - Creator: 1, - }, - } - require.NoError(t, env.TX.Create(pkg).Error) - - url := fmt.Sprintf("/api/admin/packages/%d", pkg.ID) - resp, err := env.AsSuperAdmin().Request("DELETE", url, nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - var deletedPkg model.Package - err = env.RawDB().First(&deletedPkg, pkg.ID).Error - assert.Error(t, err, "删除后应查不到套餐") -} diff --git a/tests/integration/permission_middleware_test.go b/tests/integration/permission_middleware_test.go deleted file mode 100644 index badcac9..0000000 --- a/tests/integration/permission_middleware_test.go +++ /dev/null @@ -1,154 +0,0 @@ -package integration - -import ( - "context" - "testing" - - "github.com/stretchr/testify/assert" - - "github.com/break/junhong_cmp_fiber/pkg/constants" -) - -// MockPermissionChecker 模拟权限检查器 -type MockPermissionChecker struct { - permissions map[uint]map[string]bool // userID -> permCode -> hasPermission -} - -func NewMockPermissionChecker() *MockPermissionChecker { - return &MockPermissionChecker{ - permissions: make(map[uint]map[string]bool), - } -} - -func (m *MockPermissionChecker) GrantPermission(userID uint, permCode string) { - if m.permissions[userID] == nil { - m.permissions[userID] = make(map[string]bool) - } - m.permissions[userID][permCode] = true -} - -func (m *MockPermissionChecker) CheckPermission(ctx context.Context, userID uint, permCode string, platform string) (bool, error) { - if m.permissions[userID] == nil { - return false, nil - } - return m.permissions[userID][permCode], nil -} - -// TestPermissionMiddleware_RequirePermission 测试权限校验中间件（单个权限） -func TestPermissionMiddleware_RequirePermission(t *testing.T) { - checker := NewMockPermissionChecker() - checker.GrantPermission(1, "user:read") - - ctx := context.Background() - hasPermission, err := checker.CheckPermission(ctx, 1, "user:read", constants.PlatformAll) - assert.NoError(t, err) - assert.True(t, hasPermission) - - hasPermission, err = checker.CheckPermission(ctx, 1, "user:write", constants.PlatformAll) - assert.NoError(t, err) - assert.False(t, hasPermission) -} - -// TestPermissionMiddleware_RequireAnyPermission 测试权限校验中间件（多个权限任一） -func TestPermissionMiddleware_RequireAnyPermission(t *testing.T) { - checker := NewMockPermissionChecker() - checker.GrantPermission(1, "user:read") - - ctx := context.Background() - hasRead, _ := checker.CheckPermission(ctx, 1, "user:read", constants.PlatformAll) - hasWrite, _ := checker.CheckPermission(ctx, 1, "user:write", constants.PlatformAll) - - assert.True(t, hasRead || hasWrite) -} - -// TestPermissionMiddleware_RequireAllPermissions 测试权限校验中间件（多个权限全部） -func TestPermissionMiddleware_RequireAllPermissions(t *testing.T) { - checker := NewMockPermissionChecker() - checker.GrantPermission(1, "user:read") - checker.GrantPermission(1, "user:write") - - ctx := context.Background() - hasRead, _ := checker.CheckPermission(ctx, 1, "user:read", constants.PlatformAll) - hasWrite, _ := checker.CheckPermission(ctx, 1, "user:write", constants.PlatformAll) - - assert.True(t, hasRead && hasWrite) -} - -// TestPermissionMiddleware_SkipSuperAdmin 测试超级管理员跳过权限检查 -func TestPermissionMiddleware_SkipSuperAdmin(t *testing.T) { - checker := NewMockPermissionChecker() - - ctx := context.Background() - hasPermission, err := checker.CheckPermission(ctx, 999, "any:permission", constants.PlatformAll) - assert.NoError(t, err) - assert.False(t, hasPermission) -} - -// TestPermissionMiddleware_PlatformFiltering 测试按 platform 过滤权限 -func TestPermissionMiddleware_PlatformFiltering(t *testing.T) { - checker := NewMockPermissionChecker() - checker.GrantPermission(1, "order:manage") - - ctx := context.Background() - hasPermissionWeb, _ := checker.CheckPermission(ctx, 1, "order:manage", constants.PlatformWeb) - hasPermissionH5, _ := checker.CheckPermission(ctx, 1, "order:manage", constants.PlatformH5) - - assert.True(t, hasPermissionWeb || hasPermissionH5) -} - -// TestPermissionMiddleware_Unauthorized 测试未认证用户访问受保护路由 -func TestPermissionMiddleware_Unauthorized(t *testing.T) { - checker := NewMockPermissionChecker() - - ctx := context.Background() - hasPermission, err := checker.CheckPermission(ctx, 0, "user:read", constants.PlatformAll) - assert.NoError(t, err) - assert.False(t, hasPermission) -} - -// 集成测试实现指南: -// -// 完整的集成测试应该： -// 1. 启动 Fiber 应用 -// 2. 注册受权限保护的路由： -// - 使用 middleware.RequirePermission("user:read", config) -// - 使用 middleware.RequireAnyPermission([]string{"user:read", "user:write"}, config) -// - 使用 middleware.RequireAllPermissions([]string{"user:read", "user:write"}, config) -// 3. 模拟不同用户的 HTTP 请求 -// 4. 验证权限检查结果（200 OK 或 403 Forbidden） -// -// 示例代码结构： -// -// func TestPermissionMiddleware_Integration(t *testing.T) { -// // 1. 初始化数据库和 Redis -// tx := testutils.NewTestTransaction(t) -// rdb := testutils.GetTestRedis(t) -// testutils.CleanTestRedisKeys(t, rdb) -// -// // 2. 创建测试数据（用户、角色、权限） -// // ... -// -// // 3. 初始化 Service 和 Middleware -// permissionService := permission.New(permissionStore) -// config := middleware.PermissionConfig{ -// PermissionChecker: permissionService, -// Platform: constants.PlatformWeb, -// SkipSuperAdmin: true, -// } -// -// // 4. 创建 Fiber 应用并注册路由 -// app := fiber.New() -// app.Get("/protected", -// middleware.RequirePermission("user:read", config), -// func(c *fiber.Ctx) error { -// return c.JSON(fiber.Map{"message": "success"}) -// }, -// ) -// -// // 5. 模拟请求并验证响应 -// req := httptest.NewRequest("GET", "/protected", nil) -// // 设置认证信息... -// resp, err := app.Test(req) -// require.NoError(t, err) -// assert.Equal(t, fiber.StatusOK, resp.StatusCode) -// } diff --git a/tests/integration/permission_test.go b/tests/integration/permission_test.go deleted file mode 100644 index 4002d6b..0000000 --- a/tests/integration/permission_test.go +++ /dev/null @@ -1,368 +0,0 @@ -package integration - -import ( - "encoding/json" - "fmt" - "testing" - "time" - - "github.com/gofiber/fiber/v2" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/internal/model/dto" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/pkg/errors" - "github.com/break/junhong_cmp_fiber/pkg/response" - "github.com/break/junhong_cmp_fiber/tests/testutils/integ" -) - -func TestPermissionAPI_Create(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - t.Run("成功创建权限", func(t *testing.T) { - // 权限编码必须符合 module:action 格式（两边都以小写字母开头） - permCode := fmt.Sprintf("test:action%d", time.Now().UnixNano()) - reqBody := dto.CreatePermissionRequest{ - PermName: fmt.Sprintf("test_permission_%d", time.Now().UnixNano()), - PermCode: permCode, - PermType: constants.PermissionTypeMenu, - URL: "/admin/users", - } - - jsonBody, _ := json.Marshal(reqBody) - resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/permissions", jsonBody) - require.NoError(t, err) - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - var count int64 - env.RawDB().Model(&model.Permission{}).Where("perm_code = ?", permCode).Count(&count) - assert.Equal(t, int64(1), count) - }) - - t.Run("权限编码重复时返回错误", func(t *testing.T) { - existingPerm := env.CreateTestPermission( - fmt.Sprintf("test_permission_%d", time.Now().UnixNano()), - fmt.Sprintf("test:dup%d", time.Now().UnixNano()), - constants.PermissionTypeMenu, - ) - - reqBody := dto.CreatePermissionRequest{ - PermName: fmt.Sprintf("test_permission_%d", time.Now().UnixNano()), - PermCode: existingPerm.PermCode, - PermType: constants.PermissionTypeMenu, - } - - jsonBody, _ := json.Marshal(reqBody) - resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/permissions", jsonBody) - require.NoError(t, err) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, errors.CodePermCodeExists, result.Code) - }) - - t.Run("创建子权限", func(t *testing.T) { - parentPermCode := fmt.Sprintf("test:parent%d", time.Now().UnixNano()) - parentPerm := env.CreateTestPermission( - fmt.Sprintf("test_permission_%d", time.Now().UnixNano()), - parentPermCode, - constants.PermissionTypeMenu, - ) - - childPermCode := fmt.Sprintf("test:child%d", time.Now().UnixNano()) - reqBody := dto.CreatePermissionRequest{ - PermName: fmt.Sprintf("test_permission_%d", time.Now().UnixNano()), - PermCode: childPermCode, - PermType: constants.PermissionTypeButton, - ParentID: &parentPerm.ID, - } - - jsonBody, _ := json.Marshal(reqBody) - resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/permissions", jsonBody) - require.NoError(t, err) - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var child model.Permission - err = env.RawDB().Where("perm_code = ?", childPermCode).First(&child).Error - require.NoError(t, err, "子权限应该已创建") - require.NotNil(t, child.ParentID, "子权限的 ParentID 应该已设置") - assert.Equal(t, parentPerm.ID, *child.ParentID) - }) -} - -func TestPermissionAPI_Get(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - testPerm := env.CreateTestPermission( - fmt.Sprintf("test_permission_%d", time.Now().UnixNano()), - fmt.Sprintf("test:get%d", time.Now().UnixNano()), - constants.PermissionTypeMenu, - ) - - t.Run("成功获取权限详情", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", fmt.Sprintf("/api/admin/permissions/%d", testPerm.ID), nil) - require.NoError(t, err) - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - }) - - t.Run("权限不存在时返回错误", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/permissions/99999", nil) - require.NoError(t, err) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, errors.CodePermissionNotFound, result.Code) - }) -} - -func TestPermissionAPI_Update(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - testPerm := env.CreateTestPermission( - fmt.Sprintf("test_permission_%d", time.Now().UnixNano()), - fmt.Sprintf("test:upd%d", time.Now().UnixNano()), - constants.PermissionTypeMenu, - ) - - t.Run("成功更新权限", func(t *testing.T) { - newName := "更新后权限" - reqBody := dto.UpdatePermissionRequest{ - PermName: &newName, - } - - jsonBody, _ := json.Marshal(reqBody) - resp, err := env.AsSuperAdmin().Request("PUT", fmt.Sprintf("/api/admin/permissions/%d", testPerm.ID), jsonBody) - require.NoError(t, err) - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var updated model.Permission - env.RawDB().First(&updated, testPerm.ID) - assert.Equal(t, newName, updated.PermName) - }) -} - -func TestPermissionAPI_Delete(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - t.Run("成功软删除权限", func(t *testing.T) { - testPerm := env.CreateTestPermission( - fmt.Sprintf("test_permission_%d", time.Now().UnixNano()), - fmt.Sprintf("test:del%d", time.Now().UnixNano()), - constants.PermissionTypeMenu, - ) - - resp, err := env.AsSuperAdmin().Request("DELETE", fmt.Sprintf("/api/admin/permissions/%d", testPerm.ID), nil) - require.NoError(t, err) - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var deleted model.Permission - err = env.RawDB().Unscoped().First(&deleted, testPerm.ID).Error - require.NoError(t, err) - assert.NotNil(t, deleted.DeletedAt) - }) -} - -func TestPermissionAPI_List(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - for i := 1; i <= 5; i++ { - env.CreateTestPermission(fmt.Sprintf("列表测试权限_%d", i), fmt.Sprintf("list:perm%d", i), constants.PermissionTypeMenu) - } - - t.Run("成功获取权限列表", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/permissions?page=1&page_size=10", nil) - require.NoError(t, err) - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - }) - - t.Run("按类型过滤权限", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", fmt.Sprintf("/api/admin/permissions?perm_type=%d", constants.PermissionTypeMenu), nil) - require.NoError(t, err) - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - }) -} - -func TestPermissionAPI_GetTree(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - rootPerm := env.CreateTestPermission( - fmt.Sprintf("test_permission_%d", time.Now().UnixNano()), - fmt.Sprintf("test:root%d", time.Now().UnixNano()), - constants.PermissionTypeMenu, - ) - - childPermCode := fmt.Sprintf("test:child%d", time.Now().UnixNano()) - childPerm := &model.Permission{ - BaseModel: model.BaseModel{Creator: 1, Updater: 1}, - PermName: fmt.Sprintf("test_permission_%d", time.Now().UnixNano()), - PermCode: childPermCode, - PermType: constants.PermissionTypeMenu, - ParentID: &rootPerm.ID, - Status: constants.StatusEnabled, - } - env.TX.Create(childPerm) - - grandchildPermCode := fmt.Sprintf("test:grand%d", time.Now().UnixNano()) - grandchildPerm := &model.Permission{ - BaseModel: model.BaseModel{Creator: 1, Updater: 1}, - PermName: fmt.Sprintf("test_permission_%d", time.Now().UnixNano()), - PermCode: grandchildPermCode, - PermType: constants.PermissionTypeButton, - ParentID: &childPerm.ID, - Status: constants.StatusEnabled, - } - env.TX.Create(grandchildPerm) - - t.Run("成功获取权限树", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/permissions/tree", nil) - require.NoError(t, err) - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - }) -} - -func TestPermissionAPI_GetTreeByRoleType(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - platformPerm := &model.Permission{ - BaseModel: model.BaseModel{Creator: 1, Updater: 1}, - PermName: fmt.Sprintf("test_permission_%d", time.Now().UnixNano()), - PermCode: fmt.Sprintf("test:plat%d", time.Now().UnixNano()), - PermType: constants.PermissionTypeMenu, - AvailableForRoleTypes: "1", - Status: constants.StatusEnabled, - } - env.TX.Create(platformPerm) - - customerPerm := &model.Permission{ - BaseModel: model.BaseModel{Creator: 1, Updater: 1}, - PermName: fmt.Sprintf("test_permission_%d", time.Now().UnixNano()), - PermCode: fmt.Sprintf("test:cust%d", time.Now().UnixNano()), - PermType: constants.PermissionTypeMenu, - AvailableForRoleTypes: "2", - Status: constants.StatusEnabled, - } - env.TX.Create(customerPerm) - - commonPerm := &model.Permission{ - BaseModel: model.BaseModel{Creator: 1, Updater: 1}, - PermName: fmt.Sprintf("test_permission_%d", time.Now().UnixNano()), - PermCode: fmt.Sprintf("test:comm%d", time.Now().UnixNano()), - PermType: constants.PermissionTypeMenu, - AvailableForRoleTypes: "1,2", - Status: constants.StatusEnabled, - } - env.TX.Create(commonPerm) - - t.Run("按角色类型过滤权限树-平台角色", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", fmt.Sprintf("/api/admin/permissions/tree?available_for_role_type=%d", constants.RoleTypePlatform), nil) - require.NoError(t, err) - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - }) - - t.Run("按角色类型过滤权限树-客户角色", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/permissions/tree?available_for_role_type=2", nil) - require.NoError(t, err) - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - }) - - t.Run("按平台和角色类型过滤", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/permissions/tree?platform=all&available_for_role_type=1", nil) - require.NoError(t, err) - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - }) -} - -func TestPermissionAPI_FilterByAvailableForRoleTypes(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - platformPerm := &model.Permission{ - BaseModel: model.BaseModel{Creator: 1, Updater: 1}, - PermName: fmt.Sprintf("test_permission_%d", time.Now().UnixNano()), - PermCode: fmt.Sprintf("test:fplat%d", time.Now().UnixNano()), - PermType: constants.PermissionTypeMenu, - AvailableForRoleTypes: "1", - Status: constants.StatusEnabled, - } - env.TX.Create(platformPerm) - - customerPerm := &model.Permission{ - BaseModel: model.BaseModel{Creator: 1, Updater: 1}, - PermName: fmt.Sprintf("test_permission_%d", time.Now().UnixNano()), - PermCode: fmt.Sprintf("test:fcust%d", time.Now().UnixNano()), - PermType: constants.PermissionTypeMenu, - AvailableForRoleTypes: "2", - Status: constants.StatusEnabled, - } - env.TX.Create(customerPerm) - - commonPerm := &model.Permission{ - BaseModel: model.BaseModel{Creator: 1, Updater: 1}, - PermName: fmt.Sprintf("test_permission_%d", time.Now().UnixNano()), - PermCode: fmt.Sprintf("test:fcomm%d", time.Now().UnixNano()), - PermType: constants.PermissionTypeMenu, - AvailableForRoleTypes: "1,2", - Status: constants.StatusEnabled, - } - env.TX.Create(commonPerm) - - t.Run("过滤平台角色可用权限", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/permissions?available_for_role_type=1", nil) - require.NoError(t, err) - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - }) - - t.Run("按角色类型过滤权限树", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", fmt.Sprintf("/api/admin/permissions/tree?available_for_role_type=%d", constants.RoleTypePlatform), nil) - require.NoError(t, err) - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - }) -} diff --git a/tests/integration/ratelimit_test.go b/tests/integration/ratelimit_test.go deleted file mode 100644 index f664664..0000000 --- a/tests/integration/ratelimit_test.go +++ /dev/null @@ -1,337 +0,0 @@ -package integration - -import ( - "fmt" - "io" - "net/http/httptest" - "testing" - "time" - - "github.com/break/junhong_cmp_fiber/internal/middleware" - "github.com/break/junhong_cmp_fiber/pkg/errors" - "github.com/break/junhong_cmp_fiber/pkg/logger" - "github.com/break/junhong_cmp_fiber/pkg/response" - "github.com/gofiber/fiber/v2" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - "go.uber.org/zap" -) - -// setupRateLimiterTestApp creates a Fiber app with rate limiter for testing -func setupRateLimiterTestApp(t *testing.T, max int, expiration time.Duration) *fiber.App { - t.Helper() - - // Initialize logger - appLogConfig := logger.LogRotationConfig{ - Filename: "logs/app_test.log", - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: false, - } - accessLogConfig := logger.LogRotationConfig{ - Filename: "logs/access_test.log", - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: false, - } - if err := logger.InitLoggers("info", false, appLogConfig, accessLogConfig); err != nil { - t.Fatalf("failed to initialize logger: %v", err) - } - - zapLogger, _ := zap.NewDevelopment() - app := fiber.New(fiber.Config{ - ErrorHandler: errors.SafeErrorHandler(zapLogger), - }) - - // Add rate limiter middleware (nil storage = in-memory) - app.Use(middleware.RateLimiter(max, expiration, nil)) - - // Add test route - app.Get("/api/v1/test", func(c *fiber.Ctx) error { - return response.Success(c, fiber.Map{ - "message": "success", - }) - }) - - return app -} - -// TestRateLimiter_LimitExceeded tests that rate limiter returns 429 when limit is exceeded -func TestRateLimiter_LimitExceeded(t *testing.T) { - // Create app with low limit for easy testing - max := 5 - expiration := 1 * time.Minute - app := setupRateLimiterTestApp(t, max, expiration) - - // Make requests up to the limit - for i := 1; i <= max; i++ { - req := httptest.NewRequest("GET", "/api/v1/test", nil) - req.Header.Set("X-Forwarded-For", "192.168.1.100") // Simulate same IP - - resp, err := app.Test(req, -1) - require.NoError(t, err) - resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode, "Request %d should succeed", i) - } - - // The next request should be rate limited - req := httptest.NewRequest("GET", "/api/v1/test", nil) - req.Header.Set("X-Forwarded-For", "192.168.1.100") - - resp, err := app.Test(req, -1) - require.NoError(t, err) - defer resp.Body.Close() - - // Should get 429 Too Many Requests - assert.Equal(t, 429, resp.StatusCode, "Request should be rate limited") - - // Check response body - body, err := io.ReadAll(resp.Body) - require.NoError(t, err) - t.Logf("Rate limit response: %s", string(body)) - - // Should contain error code 1008 (CodeTooManyRequests) - assert.Contains(t, string(body), `"code":1008`, "Response should have too many requests error code") - // Message is in Chinese: "请求过多,请稍后重试" - assert.Contains(t, string(body), "请求过多", "Response should have rate limit message") -} - -// TestRateLimiter_ResetAfterExpiration tests that rate limit resets after window expiration -func TestRateLimiter_ResetAfterExpiration(t *testing.T) { - // Create app with short expiration for testing - max := 3 - expiration := 2 * time.Second - app := setupRateLimiterTestApp(t, max, expiration) - - // Make requests up to the limit - for i := 1; i <= max; i++ { - req := httptest.NewRequest("GET", "/api/v1/test", nil) - req.Header.Set("X-Forwarded-For", "192.168.1.101") - - resp, err := app.Test(req, -1) - require.NoError(t, err) - resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode, "Request %d should succeed", i) - } - - // Next request should be rate limited - req := httptest.NewRequest("GET", "/api/v1/test", nil) - req.Header.Set("X-Forwarded-For", "192.168.1.101") - - resp, err := app.Test(req, -1) - require.NoError(t, err) - resp.Body.Close() - - assert.Equal(t, 429, resp.StatusCode, "Request should be rate limited") - - // Wait for rate limit window to expire - t.Log("Waiting for rate limit window to reset...") - time.Sleep(expiration + 500*time.Millisecond) - - // Request should succeed after reset - req = httptest.NewRequest("GET", "/api/v1/test", nil) - req.Header.Set("X-Forwarded-For", "192.168.1.101") - - resp, err = app.Test(req, -1) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode, "Request should succeed after rate limit reset") - - body, err := io.ReadAll(resp.Body) - require.NoError(t, err) - - assert.Contains(t, string(body), `"code":0`, "Response should be successful after reset") -} - -// TestRateLimiter_PerIPRateLimiting tests that different IPs have separate rate limits -func TestRateLimiter_PerIPRateLimiting(t *testing.T) { - max := 5 - expiration := 1 * time.Minute - - // Test with multiple different IPs - ips := []string{ - "192.168.1.10", - "192.168.1.20", - "192.168.1.30", - } - - for _, ip := range ips { - ip := ip // Capture for closure - t.Run(fmt.Sprintf("IP_%s", ip), func(t *testing.T) { - // Create fresh app for each IP test to avoid shared limiter state - freshApp := setupRateLimiterTestApp(t, max, expiration) - - // Each IP should be able to make 'max' successful requests - for i := 1; i <= max; i++ { - req := httptest.NewRequest("GET", "/api/v1/test", nil) - req.Header.Set("X-Forwarded-For", ip) - - resp, err := freshApp.Test(req, -1) - require.NoError(t, err) - resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode, "IP %s request %d should succeed", ip, i) - } - - // The next request for this IP should be rate limited - req := httptest.NewRequest("GET", "/api/v1/test", nil) - req.Header.Set("X-Forwarded-For", ip) - - resp, err := freshApp.Test(req, -1) - require.NoError(t, err) - resp.Body.Close() - - assert.Equal(t, 429, resp.StatusCode, "IP %s should be rate limited", ip) - }) - } -} - -// TestRateLimiter_ConcurrentRequests tests rate limiter with concurrent requests from same IP -func TestRateLimiter_ConcurrentRequests(t *testing.T) { - // Create app with limit - max := 10 - expiration := 1 * time.Minute - app := setupRateLimiterTestApp(t, max, expiration) - - // Make concurrent requests - concurrentRequests := 15 - results := make(chan int, concurrentRequests) - - for i := 0; i < concurrentRequests; i++ { - go func() { - req := httptest.NewRequest("GET", "/api/v1/test", nil) - req.Header.Set("X-Forwarded-For", "192.168.1.200") - - resp, err := app.Test(req, -1) - if err != nil { - results <- 0 - return - } - defer resp.Body.Close() - - results <- resp.StatusCode - }() - } - - // Collect results - var successCount, rateLimitedCount int - for i := 0; i < concurrentRequests; i++ { - status := <-results - if status == 200 { - successCount++ - } else if status == 429 { - rateLimitedCount++ - } - } - - t.Logf("Concurrent requests: %d success, %d rate limited", successCount, rateLimitedCount) - - // Should have exactly 'max' successful requests - assert.Equal(t, max, successCount, "Should have exactly max successful requests") - - // Remaining requests should be rate limited - assert.Equal(t, concurrentRequests-max, rateLimitedCount, "Remaining requests should be rate limited") -} - -// TestRateLimiter_DifferentLimits tests rate limiter configuration with different limits -func TestRateLimiter_DifferentLimits(t *testing.T) { - tests := []struct { - name string - max int - expiration time.Duration - }{ - { - name: "low_limit", - max: 2, - expiration: 1 * time.Minute, - }, - { - name: "medium_limit", - max: 10, - expiration: 1 * time.Minute, - }, - { - name: "high_limit", - max: 100, - expiration: 1 * time.Minute, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - app := setupRateLimiterTestApp(t, tt.max, tt.expiration) - - // Make requests up to limit - for i := 1; i <= tt.max; i++ { - req := httptest.NewRequest("GET", "/api/v1/test", nil) - req.Header.Set("X-Forwarded-For", fmt.Sprintf("192.168.1.%d", 50+i)) - - resp, err := app.Test(req, -1) - require.NoError(t, err) - resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - } - - // Next request should be rate limited - req := httptest.NewRequest("GET", "/api/v1/test", nil) - req.Header.Set("X-Forwarded-For", fmt.Sprintf("192.168.1.%d", 50)) - - resp, err := app.Test(req, -1) - require.NoError(t, err) - resp.Body.Close() - - assert.Equal(t, 429, resp.StatusCode, "Should be rate limited after %d requests", tt.max) - }) - } -} - -// TestRateLimiter_ShortWindow tests rate limiter with very short time window -func TestRateLimiter_ShortWindow(t *testing.T) { - // Create app with short window - max := 3 - expiration := 1 * time.Second - app := setupRateLimiterTestApp(t, max, expiration) - - // Make first batch of requests - for i := 1; i <= max; i++ { - req := httptest.NewRequest("GET", "/api/v1/test", nil) - req.Header.Set("X-Forwarded-For", "192.168.1.250") - - resp, err := app.Test(req, -1) - require.NoError(t, err) - resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - } - - // Should be rate limited now - req := httptest.NewRequest("GET", "/api/v1/test", nil) - req.Header.Set("X-Forwarded-For", "192.168.1.250") - - resp, err := app.Test(req, -1) - require.NoError(t, err) - resp.Body.Close() - - assert.Equal(t, 429, resp.StatusCode) - - // Wait for window to expire - time.Sleep(expiration + 200*time.Millisecond) - - // Should be able to make requests again - for i := 1; i <= max; i++ { - req := httptest.NewRequest("GET", "/api/v1/test", nil) - req.Header.Set("X-Forwarded-For", "192.168.1.250") - - resp, err := app.Test(req, -1) - require.NoError(t, err) - resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode, "Request %d should succeed after window reset", i) - } -} diff --git a/tests/integration/recover_test.go b/tests/integration/recover_test.go deleted file mode 100644 index 579f3df..0000000 --- a/tests/integration/recover_test.go +++ /dev/null @@ -1,622 +0,0 @@ -package integration - -import ( - "io" - "net/http/httptest" - "os" - "path/filepath" - "strings" - "testing" - "time" - - "github.com/break/junhong_cmp_fiber/internal/middleware" - "github.com/break/junhong_cmp_fiber/pkg/errors" - "github.com/break/junhong_cmp_fiber/pkg/logger" - "github.com/break/junhong_cmp_fiber/pkg/response" - "github.com/bytedance/sonic" - "github.com/gofiber/fiber/v2" - "github.com/gofiber/fiber/v2/middleware/requestid" - "github.com/google/uuid" -) - -// TestPanicRecovery 测试 panic 恢复功能（T052） -func TestPanicRecovery(t *testing.T) { - // 创建临时目录用于日志 - tempDir := t.TempDir() - - // 初始化日志系统 - err := logger.InitLoggers("info", false, - logger.LogRotationConfig{ - Filename: filepath.Join(tempDir, "app-panic.log"), - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: false, - }, - logger.LogRotationConfig{ - Filename: filepath.Join(tempDir, "access-panic.log"), - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: false, - }, - ) - if err != nil { - t.Fatalf("Failed to initialize loggers: %v", err) - } - defer func() { _ = logger.Sync() }() - - appLogger := logger.GetAppLogger() - - // 创建应用（带自定义 ErrorHandler） - app := fiber.New(fiber.Config{ - ErrorHandler: errors.SafeErrorHandler(appLogger), - }) - - // 注册中间件（recover 必须第一个） - app.Use(middleware.Recover(appLogger)) - app.Use(requestid.New(requestid.Config{ - Generator: func() string { - return uuid.NewString() - }, - })) - - // 创建会 panic 的 handler - app.Get("/panic", func(c *fiber.Ctx) error { - panic("intentional panic for testing") - }) - - // 创建正常的 handler - app.Get("/ok", func(c *fiber.Ctx) error { - return c.SendString("ok") - }) - - tests := []struct { - name string - path string - shouldPanic bool - expectedStatus int - expectedCode int - }{ - { - name: "panic endpoint returns 500", - path: "/panic", - shouldPanic: true, - expectedStatus: 500, - expectedCode: errors.CodeInternalError, - }, - { - name: "normal endpoint works after panic", - path: "/ok", - shouldPanic: false, - expectedStatus: 200, - expectedCode: 0, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - req := httptest.NewRequest("GET", tt.path, nil) - resp, err := app.Test(req) - if err != nil { - t.Fatalf("Failed to execute request: %v", err) - } - defer resp.Body.Close() - - // 验证 HTTP 状态码 - if resp.StatusCode != tt.expectedStatus { - t.Errorf("Expected status %d, got %d", tt.expectedStatus, resp.StatusCode) - } - - // 解析响应 - body, err := io.ReadAll(resp.Body) - if err != nil { - t.Fatalf("Failed to read response body: %v", err) - } - - if tt.shouldPanic { - // panic 应该返回统一错误响应 - var response response.Response - if err := sonic.Unmarshal(body, &response); err != nil { - t.Fatalf("Failed to unmarshal response: %v", err) - } - - if response.Code != tt.expectedCode { - t.Errorf("Expected code %d, got %d", tt.expectedCode, response.Code) - } - - if response.Data != nil { - t.Error("Error response data should be nil") - } - } - }) - } -} - -// TestPanicLogging 测试 panic 日志记录和堆栈跟踪（T053） -func TestPanicLogging(t *testing.T) { - // 创建临时目录用于日志 - tempDir := t.TempDir() - appLogFile := filepath.Join(tempDir, "app-panic-log.log") - - // 初始化日志系统 - err := logger.InitLoggers("info", false, - logger.LogRotationConfig{ - Filename: appLogFile, - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: false, - }, - logger.LogRotationConfig{ - Filename: filepath.Join(tempDir, "access-panic-log.log"), - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: false, - }, - ) - if err != nil { - t.Fatalf("Failed to initialize loggers: %v", err) - } - defer func() { _ = logger.Sync() }() - - appLogger := logger.GetAppLogger() - - // 创建应用 - app := fiber.New() - - // 注册中间件 - app.Use(middleware.Recover(appLogger)) - app.Use(requestid.New(requestid.Config{ - Generator: func() string { - return uuid.NewString() - }, - })) - - // 创建不同类型的 panic - app.Get("/panic-string", func(c *fiber.Ctx) error { - panic("string panic message") - }) - - app.Get("/panic-error", func(c *fiber.Ctx) error { - panic(fiber.NewError(500, "error panic message")) - }) - - app.Get("/panic-struct", func(c *fiber.Ctx) error { - panic(struct{ Message string }{"struct panic message"}) - }) - - tests := []struct { - name string - path string - expectedInLog []string - unexpectedInLog []string - }{ - { - name: "string panic logs correctly", - path: "/panic-string", - expectedInLog: []string{ - "Panic 已恢复", - "string panic message", - "stack", - "request_id", - "method", - "path", - }, - }, - { - name: "error panic logs correctly", - path: "/panic-error", - expectedInLog: []string{ - "Panic 已恢复", - "error panic message", - "stack", - }, - }, - { - name: "struct panic logs correctly", - path: "/panic-struct", - expectedInLog: []string{ - "Panic 已恢复", - "stack", - "Message", - }, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - // 执行会 panic 的请求 - req := httptest.NewRequest("GET", tt.path, nil) - resp, err := app.Test(req) - if err != nil { - t.Fatalf("Failed to execute request: %v", err) - } - resp.Body.Close() - - // 刷新日志缓冲区 - logger.Sync() - time.Sleep(100 * time.Millisecond) - - // 读取日志内容 - logContent, err := os.ReadFile(appLogFile) - if err != nil { - t.Fatalf("Failed to read app log: %v", err) - } - - content := string(logContent) - - // 验证日志包含预期内容 - for _, expected := range tt.expectedInLog { - if !strings.Contains(content, expected) { - t.Errorf("Log should contain '%s'", expected) - } - } - - // 验证日志不包含意外内容 - for _, unexpected := range tt.unexpectedInLog { - if strings.Contains(content, unexpected) { - t.Errorf("Log should NOT contain '%s'", unexpected) - } - } - - // 验证堆栈跟踪包含文件和行号 - if !strings.Contains(content, "recover_test.go") { - t.Error("Stack trace should contain source file name") - } - - t.Logf("Panic log contains stack trace: %v", strings.Contains(content, "stack")) - }) - } -} - -// TestSubsequentRequestsAfterPanic 测试 panic 后后续请求正常处理（T054） -func TestSubsequentRequestsAfterPanic(t *testing.T) { - // 创建临时目录用于日志 - tempDir := t.TempDir() - - // 初始化日志系统 - err := logger.InitLoggers("info", false, - logger.LogRotationConfig{ - Filename: filepath.Join(tempDir, "app.log"), - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: false, - }, - logger.LogRotationConfig{ - Filename: filepath.Join(tempDir, "access.log"), - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: false, - }, - ) - if err != nil { - t.Fatalf("Failed to initialize loggers: %v", err) - } - defer func() { _ = logger.Sync() }() - - appLogger := logger.GetAppLogger() - - // 创建应用 - app := fiber.New() - - // 注册中间件 - app.Use(middleware.Recover(appLogger)) - app.Use(requestid.New(requestid.Config{ - Generator: func() string { - return uuid.NewString() - }, - })) - - callCount := 0 - - app.Get("/test", func(c *fiber.Ctx) error { - callCount++ - // 第 1、3、5 次调用会 panic - if callCount%2 == 1 { - panic("test panic") - } - // 第 2、4、6 次调用正常返回 - return c.JSON(fiber.Map{ - "call_count": callCount, - "status": "ok", - }) - }) - - // 执行多次请求，验证 panic 不影响后续请求 - for i := 1; i <= 6; i++ { - req := httptest.NewRequest("GET", "/test", nil) - resp, err := app.Test(req) - if err != nil { - t.Fatalf("Request %d failed: %v", i, err) - } - - body, _ := io.ReadAll(resp.Body) - resp.Body.Close() - - if i%2 == 1 { - // 奇数次应该返回 500 - if resp.StatusCode != 500 { - t.Errorf("Request %d: expected status 500, got %d", i, resp.StatusCode) - } - } else { - // 偶数次应该返回 200 - if resp.StatusCode != 200 { - t.Errorf("Request %d: expected status 200, got %d", i, resp.StatusCode) - } - - // 验证响应内容 - var response map[string]any - if err := sonic.Unmarshal(body, &response); err != nil { - t.Fatalf("Request %d: failed to unmarshal response: %v", i, err) - } - - if status, ok := response["status"].(string); !ok || status != "ok" { - t.Errorf("Request %d: expected status 'ok', got %v", i, response["status"]) - } - } - - t.Logf("Request %d completed: status=%d", i, resp.StatusCode) - } - - // 验证所有 6 次调用都执行了 - if callCount != 6 { - t.Errorf("Expected 6 calls, got %d", callCount) - } -} - -// TestPanicWithRequestID 测试 panic 日志包含 Request ID（T053） -func TestPanicWithRequestID(t *testing.T) { - // 创建临时目录用于日志 - tempDir := t.TempDir() - appLogFile := filepath.Join(tempDir, "app-panic-reqid.log") - - // 初始化日志系统 - err := logger.InitLoggers("info", false, - logger.LogRotationConfig{ - Filename: appLogFile, - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: false, - }, - logger.LogRotationConfig{ - Filename: filepath.Join(tempDir, "access-panic-reqid.log"), - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: false, - }, - ) - if err != nil { - t.Fatalf("Failed to initialize loggers: %v", err) - } - defer func() { _ = logger.Sync() }() - - appLogger := logger.GetAppLogger() - - // 创建应用 - app := fiber.New() - - // 注册中间件（顺序重要） - app.Use(middleware.Recover(appLogger)) - app.Use(requestid.New(requestid.Config{ - Generator: func() string { - return uuid.NewString() - }, - })) - - app.Get("/panic", func(c *fiber.Ctx) error { - panic("test panic with request id") - }) - - // 执行请求 - req := httptest.NewRequest("GET", "/panic", nil) - resp, err := app.Test(req) - if err != nil { - t.Fatalf("Failed to execute request: %v", err) - } - resp.Body.Close() - - // 获取 Request ID - requestID := resp.Header.Get("X-Request-ID") - if requestID == "" { - t.Error("X-Request-ID header should be set even after panic") - } - - // 刷新日志缓冲区 - logger.Sync() - time.Sleep(100 * time.Millisecond) - - // 读取日志内容 - logContent, err := os.ReadFile(appLogFile) - if err != nil { - t.Fatalf("Failed to read app log: %v", err) - } - - content := string(logContent) - - // 验证日志包含 Request ID - if !strings.Contains(content, requestID) { - t.Errorf("Panic log should contain request ID '%s'", requestID) - } - - // 验证日志包含关键字段 - requiredFields := []string{ - "request_id", - "method", - "path", - "panic", - "stack", - } - - for _, field := range requiredFields { - if !strings.Contains(content, field) { - t.Errorf("Panic log should contain field '%s'", field) - } - } - - t.Logf("Panic log successfully includes Request ID: %s", requestID) -} - -// TestConcurrentPanics 测试并发 panic 处理（T054） -func TestConcurrentPanics(t *testing.T) { - // 创建临时目录用于日志 - tempDir := t.TempDir() - - // 初始化日志系统 - err := logger.InitLoggers("info", false, - logger.LogRotationConfig{ - Filename: filepath.Join(tempDir, "app.log"), - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: false, - }, - logger.LogRotationConfig{ - Filename: filepath.Join(tempDir, "access.log"), - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: false, - }, - ) - if err != nil { - t.Fatalf("Failed to initialize loggers: %v", err) - } - defer func() { _ = logger.Sync() }() - - appLogger := logger.GetAppLogger() - - // 创建应用 - app := fiber.New() - - // 注册中间件 - app.Use(middleware.Recover(appLogger)) - app.Use(requestid.New(requestid.Config{ - Generator: func() string { - return uuid.NewString() - }, - })) - - app.Get("/panic", func(c *fiber.Ctx) error { - panic("concurrent panic test") - }) - - // 并发发送多个会 panic 的请求 - const numRequests = 20 - errors := make(chan error, numRequests) - statuses := make(chan int, numRequests) - - for i := 0; i < numRequests; i++ { - go func() { - req := httptest.NewRequest("GET", "/panic", nil) - resp, err := app.Test(req) - if err != nil { - errors <- err - statuses <- 0 - return - } - defer resp.Body.Close() - - statuses <- resp.StatusCode - errors <- nil - }() - } - - // 收集所有结果 - for i := 0; i < numRequests; i++ { - if err := <-errors; err != nil { - t.Fatalf("Request failed: %v", err) - } - status := <-statuses - if status != 500 { - t.Errorf("Expected status 500, got %d", status) - } - } - - t.Logf("Successfully handled %d concurrent panics", numRequests) -} - -// TestRecoverMiddlewareOrder 测试 Recover 中间件必须在第一个（T052） -func TestRecoverMiddlewareOrder(t *testing.T) { - // 创建临时目录用于日志 - tempDir := t.TempDir() - - // 初始化日志系统 - err := logger.InitLoggers("info", false, - logger.LogRotationConfig{ - Filename: filepath.Join(tempDir, "app.log"), - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: false, - }, - logger.LogRotationConfig{ - Filename: filepath.Join(tempDir, "access.log"), - MaxSize: 10, - MaxBackups: 3, - MaxAge: 7, - Compress: false, - }, - ) - if err != nil { - t.Fatalf("Failed to initialize loggers: %v", err) - } - defer func() { _ = logger.Sync() }() - - appLogger := logger.GetAppLogger() - - // 创建应用 - app := fiber.New(fiber.Config{ - ErrorHandler: errors.SafeErrorHandler(appLogger), - }) - - // 正确的顺序：Recover → RequestID → Logger - app.Use(middleware.Recover(appLogger)) - app.Use(requestid.New(requestid.Config{ - Generator: func() string { - return uuid.NewString() - }, - })) - app.Use(logger.Middleware()) - - app.Get("/panic", func(c *fiber.Ctx) error { - panic("test panic") - }) - - // 执行请求 - req := httptest.NewRequest("GET", "/panic", nil) - resp, err := app.Test(req) - if err != nil { - t.Fatalf("Failed to execute request: %v", err) - } - defer resp.Body.Close() - - // 验证请求被正确处理（返回 500 而不是崩溃） - if resp.StatusCode != 500 { - t.Errorf("Expected status 500, got %d", resp.StatusCode) - } - - // 验证仍然有 Request ID（说明 RequestID 中间件在 Recover 之后执行） - requestID := resp.Header.Get("X-Request-ID") - if requestID == "" { - t.Error("X-Request-ID should be set even after panic") - } - - // 解析响应，验证返回了统一错误格式 - body, _ := io.ReadAll(resp.Body) - var response response.Response - if err := sonic.Unmarshal(body, &response); err != nil { - t.Fatalf("Failed to unmarshal response: %v", err) - } - - if response.Code != errors.CodeInternalError { - t.Errorf("Expected code %d, got %d", errors.CodeInternalError, response.Code) - } - - t.Logf("Recover middleware correctly placed first, handled panic gracefully") -} diff --git a/tests/integration/role_permission_test.go b/tests/integration/role_permission_test.go deleted file mode 100644 index 2f6f434..0000000 --- a/tests/integration/role_permission_test.go +++ /dev/null @@ -1,184 +0,0 @@ -package integration - -import ( - "testing" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - - "github.com/break/junhong_cmp_fiber/internal/model" - roleService "github.com/break/junhong_cmp_fiber/internal/service/role" - postgresStore "github.com/break/junhong_cmp_fiber/internal/store/postgres" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/tests/testutils/integ" -) - -// TestRolePermissionAssociation_AssignPermissions 测试角色权限分配功能 -func TestRolePermissionAssociation_AssignPermissions(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - env.TX.AutoMigrate( - &model.Role{}, - &model.Permission{}, - &model.RolePermission{}, - ) - - roleStore := postgresStore.NewRoleStore(env.TX) - permStore := postgresStore.NewPermissionStore(env.TX) - rolePermStore := postgresStore.NewRolePermissionStore(env.TX, env.Redis) - roleSvc := roleService.New(roleStore, permStore, rolePermStore) - - // 创建测试用户上下文 - userCtx := env.GetSuperAdminContext() - - t.Run("成功分配单个权限", func(t *testing.T) { - // 创建测试角色 - role := &model.Role{ - RoleName: "单权限测试角色", - RoleType: constants.RoleTypePlatform, - Status: constants.StatusEnabled, - } - env.TX.Create(role) - - // 创建测试权限 - perm := &model.Permission{ - PermName: "单权限测试", - PermCode: "single:perm:test", - PermType: constants.PermissionTypeMenu, - Status: constants.StatusEnabled, - } - env.TX.Create(perm) - - // 分配权限 - rps, err := roleSvc.AssignPermissions(userCtx, role.ID, []uint{perm.ID}) - require.NoError(t, err) - assert.Len(t, rps, 1) - assert.Equal(t, role.ID, rps[0].RoleID) - assert.Equal(t, perm.ID, rps[0].PermID) - }) - - t.Run("成功分配多个权限", func(t *testing.T) { - // 创建测试角色 - role := &model.Role{ - RoleName: "多权限测试角色", - RoleType: constants.RoleTypePlatform, - Status: constants.StatusEnabled, - } - env.TX.Create(role) - - // 创建多个测试权限 - permIDs := make([]uint, 3) - for i := 0; i < 3; i++ { - perm := &model.Permission{ - PermName: "多权限测试_" + string(rune('A'+i)), - PermCode: "multi:perm:test:" + string(rune('a'+i)), - PermType: constants.PermissionTypeMenu, - Status: constants.StatusEnabled, - } - env.TX.Create(perm) - permIDs[i] = perm.ID - } - - // 分配权限 - rps, err := roleSvc.AssignPermissions(userCtx, role.ID, permIDs) - require.NoError(t, err) - assert.Len(t, rps, 3) - }) - - t.Run("获取角色的权限列表", func(t *testing.T) { - // 创建测试角色 - role := &model.Role{ - RoleName: "获取权限列表测试角色", - RoleType: constants.RoleTypePlatform, - Status: constants.StatusEnabled, - } - env.TX.Create(role) - - // 创建并分配权限 - perm := &model.Permission{ - PermName: "获取权限列表测试", - PermCode: "get:perm:list:test", - PermType: constants.PermissionTypeMenu, - Status: constants.StatusEnabled, - } - env.TX.Create(perm) - - _, err := roleSvc.AssignPermissions(userCtx, role.ID, []uint{perm.ID}) - require.NoError(t, err) - - // 获取权限列表 - perms, err := roleSvc.GetPermissions(userCtx, role.ID) - require.NoError(t, err) - assert.Len(t, perms, 1) - assert.Equal(t, perm.ID, perms[0].ID) - }) - - t.Run("移除角色的权限", func(t *testing.T) { - // 创建测试角色 - role := &model.Role{ - RoleName: "移除权限测试角色", - RoleType: constants.RoleTypePlatform, - Status: constants.StatusEnabled, - } - env.TX.Create(role) - - // 创建并分配权限 - perm := &model.Permission{ - PermName: "移除权限测试", - PermCode: "remove:perm:test", - PermType: constants.PermissionTypeMenu, - Status: constants.StatusEnabled, - } - env.TX.Create(perm) - - _, err := roleSvc.AssignPermissions(userCtx, role.ID, []uint{perm.ID}) - require.NoError(t, err) - - // 移除权限 - err = roleSvc.RemovePermission(userCtx, role.ID, perm.ID) - require.NoError(t, err) - - // 验证权限已被软删除 - var rp model.RolePermission - err = env.RawDB().Unscoped().Where("role_id = ? AND perm_id = ?", role.ID, perm.ID).First(&rp).Error - require.NoError(t, err) - assert.NotNil(t, rp.DeletedAt) - }) - - t.Run("重复分配权限不会创建重复记录", func(t *testing.T) { - // 创建测试角色 - role := &model.Role{ - RoleName: "重复权限测试角色", - RoleType: constants.RoleTypePlatform, - Status: constants.StatusEnabled, - } - env.TX.Create(role) - - // 创建测试权限 - perm := &model.Permission{ - PermName: "重复权限测试", - PermCode: "duplicate:perm:test", - PermType: constants.PermissionTypeMenu, - Status: constants.StatusEnabled, - } - env.TX.Create(perm) - - // 第一次分配 - _, err := roleSvc.AssignPermissions(userCtx, role.ID, []uint{perm.ID}) - require.NoError(t, err) - - // 第二次分配相同权限 - _, err = roleSvc.AssignPermissions(userCtx, role.ID, []uint{perm.ID}) - require.NoError(t, err) - - // 验证只有一条记录 - var count int64 - env.RawDB().Model(&model.RolePermission{}).Where("role_id = ?", role.ID).Count(&count) - assert.Equal(t, int64(1), count, "关联记录应该仍然存在，因为没有外键约束") - - // 验证可以独立查询关联记录 - var rpRecord model.RolePermission - err = env.RawDB().Where("role_id = ? AND perm_id = ?", role.ID, perm.ID).First(&rpRecord).Error - assert.NoError(t, err, "应该能查询到关联记录") - }) -} diff --git a/tests/integration/role_test.go b/tests/integration/role_test.go deleted file mode 100644 index 4bd584d..0000000 --- a/tests/integration/role_test.go +++ /dev/null @@ -1,285 +0,0 @@ -package integration - -import ( - "encoding/json" - "fmt" - "testing" - "time" - - "github.com/gofiber/fiber/v2" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/internal/model/dto" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/pkg/errors" - "github.com/break/junhong_cmp_fiber/pkg/response" - "github.com/break/junhong_cmp_fiber/tests/testutils/integ" -) - -func TestRoleAPI_Create(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - t.Run("成功创建角色", func(t *testing.T) { - roleName := fmt.Sprintf("test_role_%d", time.Now().UnixNano()) - reqBody := dto.CreateRoleRequest{ - RoleName: roleName, - RoleDesc: "这是一个测试角色", - RoleType: constants.RoleTypePlatform, - } - - jsonBody, _ := json.Marshal(reqBody) - resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/roles", jsonBody) - require.NoError(t, err) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - - t.Logf("响应状态码: %d, 业务码: %d, 消息: %s", resp.StatusCode, result.Code, result.Message) - - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - assert.Equal(t, 0, result.Code, "业务码应为0，实际消息: %s", result.Message) - - var count int64 - env.RawDB().Model(&model.Role{}).Where("role_name = ?", roleName).Count(&count) - t.Logf("查询角色 '%s' 数量: %d", roleName, count) - assert.Equal(t, int64(1), count) - }) - - t.Run("缺少必填字段返回错误", func(t *testing.T) { - reqBody := map[string]interface{}{ - "role_desc": "缺少名称", - } - jsonBody, _ := json.Marshal(reqBody) - resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/roles", jsonBody) - require.NoError(t, err) - var result response.Response - json.NewDecoder(resp.Body).Decode(&result) - assert.NotEqual(t, 0, result.Code) - }) -} - -func TestRoleAPI_Get(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - testRole := env.CreateTestRole("获取测试角色", constants.RoleTypePlatform) - - t.Run("成功获取角色详情", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", fmt.Sprintf("/api/admin/roles/%d", testRole.ID), nil) - require.NoError(t, err) - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - }) - - t.Run("角色不存在时返回错误", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/roles/99999", nil) - require.NoError(t, err) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, errors.CodeRoleNotFound, result.Code) - }) -} - -func TestRoleAPI_Update(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - testRole := env.CreateTestRole("更新测试角色", constants.RoleTypePlatform) - - t.Run("成功更新角色", func(t *testing.T) { - newName := "更新后角色" - reqBody := dto.UpdateRoleRequest{ - RoleName: &newName, - } - - jsonBody, _ := json.Marshal(reqBody) - resp, err := env.AsSuperAdmin().Request("PUT", fmt.Sprintf("/api/admin/roles/%d", testRole.ID), jsonBody) - require.NoError(t, err) - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var updated model.Role - env.RawDB().First(&updated, testRole.ID) - assert.Equal(t, newName, updated.RoleName) - }) -} - -func TestRoleAPI_Delete(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - t.Run("成功软删除角色", func(t *testing.T) { - testRole := env.CreateTestRole("删除测试角色", constants.RoleTypePlatform) - - resp, err := env.AsSuperAdmin().Request("DELETE", fmt.Sprintf("/api/admin/roles/%d", testRole.ID), nil) - require.NoError(t, err) - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var deleted model.Role - err = env.RawDB().Unscoped().First(&deleted, testRole.ID).Error - require.NoError(t, err) - assert.NotNil(t, deleted.DeletedAt) - }) -} - -func TestRoleAPI_List(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - for i := 1; i <= 5; i++ { - env.CreateTestRole(fmt.Sprintf("test_role_%d_%d", time.Now().UnixNano(), i), constants.RoleTypePlatform) - } - - t.Run("成功获取角色列表", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/roles?page=1&page_size=10", nil) - require.NoError(t, err) - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - }) -} - -func TestRoleAPI_AssignPermissions(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - testRole := env.CreateTestRole("权限分配测试角色", constants.RoleTypePlatform) - testPerm := env.CreateTestPermission("测试权限", "test:permission", constants.PermissionTypeMenu) - - t.Run("成功分配权限", func(t *testing.T) { - reqBody := dto.AssignPermissionsRequest{ - PermIDs: []uint{testPerm.ID}, - } - - jsonBody, _ := json.Marshal(reqBody) - resp, err := env.AsSuperAdmin().Request("POST", fmt.Sprintf("/api/admin/roles/%d/permissions", testRole.ID), jsonBody) - require.NoError(t, err) - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var count int64 - env.RawDB().Model(&model.RolePermission{}).Where("role_id = ? AND perm_id = ?", testRole.ID, testPerm.ID).Count(&count) - assert.Equal(t, int64(1), count) - }) -} - -func TestRoleAPI_GetPermissions(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - testRole := env.CreateTestRole("获取权限测试角色", constants.RoleTypePlatform) - testPerm := env.CreateTestPermission("获取权限测试", "get:permission:test", constants.PermissionTypeMenu) - - rolePerm := &model.RolePermission{ - RoleID: testRole.ID, - PermID: testPerm.ID, - Status: constants.StatusEnabled, - } - env.TX.Create(rolePerm) - - t.Run("成功获取角色权限", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", fmt.Sprintf("/api/admin/roles/%d/permissions", testRole.ID), nil) - require.NoError(t, err) - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - }) -} - -func TestRoleAPI_RemovePermission(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - testRole := env.CreateTestRole("移除权限测试角色", constants.RoleTypePlatform) - testPerm := env.CreateTestPermission("移除权限测试", "remove:permission:test", constants.PermissionTypeMenu) - - rolePerm := &model.RolePermission{ - RoleID: testRole.ID, - PermID: testPerm.ID, - Status: constants.StatusEnabled, - } - env.TX.Create(rolePerm) - - t.Run("成功移除权限", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("DELETE", fmt.Sprintf("/api/admin/roles/%d/permissions/%d", testRole.ID, testPerm.ID), nil) - require.NoError(t, err) - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var rp model.RolePermission - err = env.RawDB().Unscoped().Where("role_id = ? AND perm_id = ?", testRole.ID, testPerm.ID).First(&rp).Error - require.NoError(t, err) - assert.NotNil(t, rp.DeletedAt) - }) -} - -func TestRoleAPI_UpdateStatus(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - testRole := env.CreateTestRole("状态切换测试角色", constants.RoleTypePlatform) - - t.Run("成功禁用角色", func(t *testing.T) { - reqBody := dto.UpdateRoleStatusRequest{ - Status: intPtr(constants.StatusDisabled), - } - - jsonBody, _ := json.Marshal(reqBody) - resp, err := env.AsSuperAdmin().Request("PUT", fmt.Sprintf("/api/admin/roles/%d/status", testRole.ID), jsonBody) - require.NoError(t, err) - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - var updated model.Role - env.RawDB().First(&updated, testRole.ID) - assert.Equal(t, constants.StatusDisabled, updated.Status) - }) - - t.Run("成功启用角色", func(t *testing.T) { - reqBody := dto.UpdateRoleStatusRequest{ - Status: intPtr(constants.StatusEnabled), - } - - jsonBody, _ := json.Marshal(reqBody) - resp, err := env.AsSuperAdmin().Request("PUT", fmt.Sprintf("/api/admin/roles/%d/status", testRole.ID), jsonBody) - require.NoError(t, err) - assert.Equal(t, fiber.StatusOK, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - var updated model.Role - env.RawDB().First(&updated, testRole.ID) - assert.Equal(t, constants.StatusEnabled, updated.Status) - }) - - t.Run("角色不存在返回错误", func(t *testing.T) { - reqBody := dto.UpdateRoleStatusRequest{ - Status: intPtr(constants.StatusEnabled), - } - - jsonBody, _ := json.Marshal(reqBody) - resp, err := env.AsSuperAdmin().Request("PUT", "/api/admin/roles/99999/status", jsonBody) - require.NoError(t, err) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, errors.CodeRoleNotFound, result.Code) - }) -} - -// intPtr 返回 int 的指针 -func intPtr(v int) *int { - return &v -} diff --git a/tests/integration/shop_management_test.go b/tests/integration/shop_management_test.go deleted file mode 100644 index e5eb458..0000000 --- a/tests/integration/shop_management_test.go +++ /dev/null @@ -1,245 +0,0 @@ -package integration - -import ( - "encoding/json" - "fmt" - "testing" - "time" - - "github.com/break/junhong_cmp_fiber/internal/model/dto" - "github.com/break/junhong_cmp_fiber/pkg/response" - "github.com/break/junhong_cmp_fiber/tests/testutils" - "github.com/break/junhong_cmp_fiber/tests/testutils/integ" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -// TestShopManagement_CreateShop 测试创建商户 -func TestShopManagement_CreateShop(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - // 使用时间戳生成唯一的店铺名和代码 - timestamp := time.Now().UnixNano() - shopName := fmt.Sprintf("test_shop_%d", timestamp) - shopCode := fmt.Sprintf("SHOP%d", timestamp%1000000) - - reqBody := dto.CreateShopRequest{ - ShopName: shopName, - ShopCode: shopCode, - InitUsername: "testuser", - InitPhone: testutils.GenerateUniquePhone(), - InitPassword: "password123", - } - - body, err := json.Marshal(reqBody) - require.NoError(t, err) - - resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/shops", body) - require.NoError(t, err) - defer resp.Body.Close() - - t.Logf("HTTP 状态码: %d", resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - - t.Logf("响应 Code: %d, Message: %s", result.Code, result.Message) - t.Logf("响应 Data: %+v", result.Data) - - if result.Code != 0 { - t.Fatalf("API 返回错误: %s", result.Message) - } - - assert.Equal(t, 200, resp.StatusCode) - assert.Equal(t, 0, result.Code) - assert.NotNil(t, result.Data) - - shopData, ok := result.Data.(map[string]interface{}) - require.True(t, ok) - assert.Equal(t, shopName, shopData["shop_name"]) - assert.Equal(t, shopCode, shopData["shop_code"]) - assert.Equal(t, float64(1), shopData["level"]) - assert.Equal(t, float64(1), shopData["status"]) -} - -// TestShopManagement_CreateShop_DuplicateCode 测试创建商户 - 商户编码重复 -func TestShopManagement_CreateShop_DuplicateCode(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - // 使用时间戳生成唯一的店铺代码 - timestamp := time.Now().UnixNano() - duplicateCode := fmt.Sprintf("DUP%d", timestamp%1000000) - - firstReq := dto.CreateShopRequest{ - ShopName: fmt.Sprintf("shop1_%d", timestamp), - ShopCode: duplicateCode, - InitUsername: fmt.Sprintf("dupuser1_%d", timestamp), - InitPhone: testutils.GenerateUniquePhone(), - InitPassword: "password123", - } - firstBody, _ := json.Marshal(firstReq) - firstResp, _ := env.AsSuperAdmin().Request("POST", "/api/admin/shops", firstBody) - var firstResult response.Response - json.NewDecoder(firstResp.Body).Decode(&firstResult) - firstResp.Body.Close() - - require.Equal(t, 0, firstResult.Code, "第一个商户应该创建成功") - - reqBody := dto.CreateShopRequest{ - ShopName: fmt.Sprintf("shop2_%d", timestamp), - ShopCode: duplicateCode, - InitUsername: fmt.Sprintf("dupuser2_%d", timestamp), - InitPhone: testutils.GenerateUniquePhone(), - InitPassword: "password123", - } - - body, err := json.Marshal(reqBody) - require.NoError(t, err) - - resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/shops", body) - require.NoError(t, err) - defer resp.Body.Close() - - // 应该返回错误 - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - - assert.NotEqual(t, 0, result.Code) // 非成功状态 - assert.Contains(t, result.Message, "已存在") // 错误消息应包含"已存在" -} - -// TestShopManagement_ListShops 测试查询商户列表 -func TestShopManagement_ListShops(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - // 创建测试数据 - env.CreateTestShop("商户A", 1, nil) - env.CreateTestShop("商户B", 1, nil) - env.CreateTestShop("商户C", 2, nil) - - resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/shops?page=1&size=10", nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - - assert.Equal(t, 0, result.Code) - - // 解析分页数据 - dataMap, ok := result.Data.(map[string]interface{}) - require.True(t, ok) - - items, ok := dataMap["items"].([]interface{}) - require.True(t, ok) - assert.GreaterOrEqual(t, len(items), 3) -} - -// TestShopManagement_UpdateShop 测试更新商户 -func TestShopManagement_UpdateShop(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - // 创建测试商户 - shop := env.CreateTestShop("原始商户", 1, nil) - - // 更新商户 - reqBody := dto.UpdateShopRequest{ - ShopName: "更新后的商户", - Status: 1, - } - - body, err := json.Marshal(reqBody) - require.NoError(t, err) - - resp, err := env.AsSuperAdmin().Request("PUT", fmt.Sprintf("/api/admin/shops/%d", shop.ID), body) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - - assert.Equal(t, 0, result.Code) - assert.NotNil(t, result.Data) - - shopData, ok := result.Data.(map[string]interface{}) - require.True(t, ok) - assert.Equal(t, "更新后的商户", shopData["shop_name"]) -} - -// TestShopManagement_DeleteShop 测试删除商户 -func TestShopManagement_DeleteShop(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - // 创建测试商户 - shop := env.CreateTestShop("待删除商户", 1, nil) - - // 删除商户 - resp, err := env.AsSuperAdmin().Request("DELETE", fmt.Sprintf("/api/admin/shops/%d", shop.ID), nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - - assert.Equal(t, 0, result.Code) -} - -// TestShopManagement_DeleteShop_WithMultipleAccounts 测试删除商户 - 多个关联账号 -func TestShopManagement_DeleteShop_WithMultipleAccounts(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - // 创建测试商户 - shop := env.CreateTestShop("多账号商户", 1, nil) - - // 删除商户 - resp, err := env.AsSuperAdmin().Request("DELETE", fmt.Sprintf("/api/admin/shops/%d", shop.ID), nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - - assert.Equal(t, 0, result.Code) -} - -// TestShopManagement_Unauthorized 测试未认证访问 -func TestShopManagement_Unauthorized(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - // 不提供 token - resp, err := env.ClearAuth().Request("GET", "/api/admin/shops", nil) - require.NoError(t, err) - defer resp.Body.Close() - - // 应该返回 401 未授权 - assert.Equal(t, 401, resp.StatusCode) -} - -// TestShopManagement_InvalidToken 测试无效 token -func TestShopManagement_InvalidToken(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - // 提供无效 token - resp, err := env.RequestWithHeaders("GET", "/api/admin/shops", nil, map[string]string{ - "Authorization": "Bearer invalid-token-12345", - }) - require.NoError(t, err) - defer resp.Body.Close() - - // 应该返回 401 未授权 - assert.Equal(t, 401, resp.StatusCode) -} diff --git a/tests/integration/shop_package_batch_allocation_test.go b/tests/integration/shop_package_batch_allocation_test.go deleted file mode 100644 index b5574d0..0000000 --- a/tests/integration/shop_package_batch_allocation_test.go +++ /dev/null @@ -1,213 +0,0 @@ -package integration - -import ( - "encoding/json" - "fmt" - "testing" - "time" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/pkg/response" - "github.com/break/junhong_cmp_fiber/tests/testutils/integ" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -func TestBatchAllocationAPI_Create(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - parentShop := env.CreateTestShop("父级店铺", 1, nil) - childShop := env.CreateTestShop("子级店铺", 2, &parentShop.ID) - series := createBatchTestPackageSeries(t, env, "批量分配测试系列") - - createBatchTestPackages(t, env, series.ID, 3) - - t.Run("批量分配套餐_固定金额返佣", func(t *testing.T) { - body := map[string]interface{}{ - "shop_id": childShop.ID, - "series_id": series.ID, - "base_commission": map[string]interface{}{ - "mode": "fixed", - "value": 1000, - }, - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/shop-package-batch-allocations", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code, "应返回成功: %s", result.Message) - }) - - t.Run("批量分配套餐_百分比返佣", func(t *testing.T) { - series2 := createBatchTestPackageSeries(t, env, "系列2") - createBatchTestPackages(t, env, series2.ID, 2) - shop2 := env.CreateTestShop("测试店铺2", 1, nil) - - body := map[string]interface{}{ - "shop_id": shop2.ID, - "series_id": series2.ID, - "base_commission": map[string]interface{}{ - "mode": "percent", - "value": 200, - }, - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/shop-package-batch-allocations", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - }) - - t.Run("批量分配_带可选加价", func(t *testing.T) { - series3 := createBatchTestPackageSeries(t, env, "系列3") - createBatchTestPackages(t, env, series3.ID, 2) - shop3 := env.CreateTestShop("测试店铺3", 1, nil) - - body := map[string]interface{}{ - "shop_id": shop3.ID, - "series_id": series3.ID, - "price_adjustment": map[string]interface{}{ - "type": "fixed", - "value": 500, - }, - "base_commission": map[string]interface{}{ - "mode": "fixed", - "value": 800, - }, - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/shop-package-batch-allocations", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - }) - - t.Run("批量分配_启用梯度返佣", func(t *testing.T) { - series4 := createBatchTestPackageSeries(t, env, "系列4") - createBatchTestPackages(t, env, series4.ID, 2) - shop4 := env.CreateTestShop("测试店铺4", 1, nil) - - body := map[string]interface{}{ - "shop_id": shop4.ID, - "series_id": series4.ID, - "base_commission": map[string]interface{}{ - "mode": "percent", - "value": 150, - }, - - "tier_config": map[string]interface{}{ - "period_type": "monthly", - "tier_type": "sales_count", - "tiers": []map[string]interface{}{ - {"threshold": 100, "mode": "percent", "value": 200}, - {"threshold": 200, "mode": "percent", "value": 250}, - {"threshold": 500, "mode": "percent", "value": 300}, - }, - }, - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/shop-package-batch-allocations", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code, "启用梯度返佣应成功: %s", result.Message) - }) - - t.Run("批量分配_系列无套餐应失败", func(t *testing.T) { - emptySeries := createBatchTestPackageSeries(t, env, "空系列") - shop5 := env.CreateTestShop("测试店铺5", 1, nil) - - body := map[string]interface{}{ - "shop_id": shop5.ID, - "series_id": emptySeries.ID, - "base_commission": map[string]interface{}{ - "mode": "fixed", - "value": 1000, - }, - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/shop-package-batch-allocations", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.NotEqual(t, 0, result.Code, "空系列应返回错误") - }) -} - -func createBatchTestPackageSeries(t *testing.T, env *integ.IntegrationTestEnv, name string) *model.PackageSeries { - t.Helper() - - timestamp := time.Now().UnixNano() - series := &model.PackageSeries{ - SeriesCode: fmt.Sprintf("BATCH_SERIES_%d", timestamp), - SeriesName: name, - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - - err := env.TX.Create(series).Error - require.NoError(t, err, "创建测试套餐系列失败") - - return series -} - -func createBatchTestPackages(t *testing.T, env *integ.IntegrationTestEnv, seriesID uint, count int) []*model.Package { - t.Helper() - - packages := make([]*model.Package, 0, count) - timestamp := time.Now().UnixNano() - - for i := 0; i < count; i++ { - pkg := &model.Package{ - PackageCode: fmt.Sprintf("BATCH_PKG_%d_%d", timestamp, i), - PackageName: fmt.Sprintf("批量测试套餐%d", i+1), - SeriesID: seriesID, - PackageType: "formal", - DurationMonths: 1, - CostPrice: 5000 + int64(i*500), - SuggestedRetailPrice: 9900 + int64(i*1000), - Status: constants.StatusEnabled, - ShelfStatus: 1, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - - err := env.TX.Create(pkg).Error - require.NoError(t, err, "创建测试套餐失败") - - packages = append(packages, pkg) - } - - return packages -} diff --git a/tests/integration/shop_package_batch_pricing_test.go b/tests/integration/shop_package_batch_pricing_test.go deleted file mode 100644 index f8e8958..0000000 --- a/tests/integration/shop_package_batch_pricing_test.go +++ /dev/null @@ -1,224 +0,0 @@ -package integration - -import ( - "encoding/json" - "fmt" - "testing" - "time" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/pkg/response" - "github.com/break/junhong_cmp_fiber/tests/testutils/integ" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -func TestBatchPricingAPI_Update(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - shop := env.CreateTestShop("测试店铺", 1, nil) - series := createPricingTestPackageSeries(t, env, "调价测试系列") - packages := createPricingTestPackages(t, env, series.ID, 3) - - for _, pkg := range packages { - createPricingTestAllocation(t, env, shop.ID, pkg.ID, series.ID, 5000) - } - - t.Run("批量调价_固定金额调整", func(t *testing.T) { - body := map[string]interface{}{ - "shop_id": shop.ID, - "series_id": series.ID, - "price_adjustment": map[string]interface{}{ - "type": "fixed", - "value": 1000, - }, - "change_reason": "统一调价测试", - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/shop-package-batch-pricing", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code, "应返回成功: %s", result.Message) - - if result.Data != nil { - dataMap := result.Data.(map[string]interface{}) - updatedCount := int(dataMap["updated_count"].(float64)) - assert.Equal(t, 3, updatedCount, "应更新3个套餐分配") - } - }) - - t.Run("批量调价_百分比调整", func(t *testing.T) { - shop2 := env.CreateTestShop("测试店铺2", 1, nil) - series2 := createPricingTestPackageSeries(t, env, "系列2") - packages2 := createPricingTestPackages(t, env, series2.ID, 2) - - for _, pkg := range packages2 { - createPricingTestAllocation(t, env, shop2.ID, pkg.ID, series2.ID, 10000) - } - - body := map[string]interface{}{ - "shop_id": shop2.ID, - "series_id": series2.ID, - "price_adjustment": map[string]interface{}{ - "type": "percent", - "value": 100, - }, - "change_reason": "加价10%", - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/shop-package-batch-pricing", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - if result.Data != nil { - dataMap := result.Data.(map[string]interface{}) - updatedCount := int(dataMap["updated_count"].(float64)) - assert.Equal(t, 2, updatedCount, "应更新2个套餐分配") - } - }) - - t.Run("批量调价_不指定系列调整所有", func(t *testing.T) { - shop3 := env.CreateTestShop("测试店铺3", 1, nil) - series3a := createPricingTestPackageSeries(t, env, "系列3A") - series3b := createPricingTestPackageSeries(t, env, "系列3B") - - pkg3a := createPricingTestPackages(t, env, series3a.ID, 1)[0] - pkg3b := createPricingTestPackages(t, env, series3b.ID, 1)[0] - - createPricingTestAllocation(t, env, shop3.ID, pkg3a.ID, series3a.ID, 8000) - createPricingTestAllocation(t, env, shop3.ID, pkg3b.ID, series3b.ID, 8000) - - body := map[string]interface{}{ - "shop_id": shop3.ID, - "price_adjustment": map[string]interface{}{ - "type": "fixed", - "value": 500, - }, - "change_reason": "全局调价", - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/shop-package-batch-pricing", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - - if result.Data != nil { - dataMap := result.Data.(map[string]interface{}) - updatedCount := int(dataMap["updated_count"].(float64)) - assert.GreaterOrEqual(t, updatedCount, 2, "应更新至少2个套餐分配") - } - }) - - t.Run("批量调价_无匹配记录应失败", func(t *testing.T) { - shop4 := env.CreateTestShop("空店铺", 1, nil) - - body := map[string]interface{}{ - "shop_id": shop4.ID, - "price_adjustment": map[string]interface{}{ - "type": "fixed", - "value": 1000, - }, - } - jsonBody, _ := json.Marshal(body) - - resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/shop-package-batch-pricing", jsonBody) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.NotEqual(t, 0, result.Code, "无匹配记录应返回错误") - }) -} - -func createPricingTestPackageSeries(t *testing.T, env *integ.IntegrationTestEnv, name string) *model.PackageSeries { - t.Helper() - - timestamp := time.Now().UnixNano() - series := &model.PackageSeries{ - SeriesCode: fmt.Sprintf("PRICING_SERIES_%d", timestamp), - SeriesName: name, - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - - err := env.TX.Create(series).Error - require.NoError(t, err) - - return series -} - -func createPricingTestPackages(t *testing.T, env *integ.IntegrationTestEnv, seriesID uint, count int) []*model.Package { - t.Helper() - - packages := make([]*model.Package, 0, count) - timestamp := time.Now().UnixNano() - - for i := 0; i < count; i++ { - pkg := &model.Package{ - PackageCode: fmt.Sprintf("PRICING_PKG_%d_%d", timestamp, i), - PackageName: fmt.Sprintf("调价测试套餐%d", i+1), - SeriesID: seriesID, - PackageType: "formal", - DurationMonths: 1, - CostPrice: 5000, - Status: constants.StatusEnabled, - ShelfStatus: 1, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - - err := env.TX.Create(pkg).Error - require.NoError(t, err) - - packages = append(packages, pkg) - } - - return packages -} - -func createPricingTestAllocation(t *testing.T, env *integ.IntegrationTestEnv, shopID, packageID, seriesID uint, costPrice int64) *model.ShopPackageAllocation { - t.Helper() - - allocation := &model.ShopPackageAllocation{ - ShopID: shopID, - PackageID: packageID, - AllocatorShopID: 0, - CostPrice: costPrice, - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - - err := env.TX.Create(allocation).Error - require.NoError(t, err) - - return allocation -} diff --git a/tests/integration/standalone_card_allocation_test.go b/tests/integration/standalone_card_allocation_test.go deleted file mode 100644 index 570d618..0000000 --- a/tests/integration/standalone_card_allocation_test.go +++ /dev/null @@ -1,259 +0,0 @@ -package integration - -import ( - "context" - "encoding/json" - "fmt" - "testing" - "time" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/pkg/constants" - pkggorm "github.com/break/junhong_cmp_fiber/pkg/gorm" - "github.com/break/junhong_cmp_fiber/pkg/response" - "github.com/break/junhong_cmp_fiber/tests/testutils/integ" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -func TestStandaloneCardAllocation_AllocateByList(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - // 创建测试数据 - shop := env.CreateTestShop("测试店铺", 1, nil) - subShop := env.CreateTestShop("测试下级店铺", 2, &shop.ID) - agentAccount := env.CreateTestAccount("agent_alloc", "password123", constants.UserTypeAgent, &shop.ID, nil) - - cards := []*model.IotCard{ - {ICCID: "ALLOC_TEST001", CarrierID: 1, Status: constants.IotCardStatusInStock}, - {ICCID: "ALLOC_TEST002", CarrierID: 1, Status: constants.IotCardStatusInStock}, - {ICCID: "ALLOC_TEST003", CarrierID: 1, Status: constants.IotCardStatusInStock}, - } - for _, card := range cards { - require.NoError(t, env.TX.Create(card).Error) - } - - t.Run("平台分配卡给一级店铺", func(t *testing.T) { - reqBody := map[string]interface{}{ - "to_shop_id": shop.ID, - "selection_type": "list", - "iccids": []string{"ALLOC_TEST001", "ALLOC_TEST002"}, - "remark": "测试分配", - } - bodyBytes, _ := json.Marshal(reqBody) - - resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/iot-cards/standalone/allocate", bodyBytes) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - - t.Logf("Allocate response: code=%d, message=%s, data=%v", result.Code, result.Message, result.Data) - - assert.Equal(t, 200, resp.StatusCode) - assert.Equal(t, 0, result.Code, "应返回成功: %s", result.Message) - - if result.Data != nil { - dataMap := result.Data.(map[string]interface{}) - assert.Equal(t, float64(2), dataMap["total_count"]) - assert.Equal(t, float64(2), dataMap["success_count"]) - assert.Equal(t, float64(0), dataMap["fail_count"]) - } - - ctx := pkggorm.SkipDataPermission(context.Background()) - var updatedCards []model.IotCard - env.RawDB().WithContext(ctx).Where("iccid IN ?", []string{"ALLOC_TEST001", "ALLOC_TEST002"}).Find(&updatedCards) - for _, card := range updatedCards { - assert.Equal(t, shop.ID, *card.ShopID, "卡应分配给目标店铺") - assert.Equal(t, constants.IotCardStatusDistributed, card.Status, "状态应为已分销") - } - - var recordCount int64 - env.RawDB().WithContext(ctx).Model(&model.AssetAllocationRecord{}). - Where("asset_identifier IN ?", []string{"ALLOC_TEST001", "ALLOC_TEST002"}). - Count(&recordCount) - assert.Equal(t, int64(2), recordCount, "应创建2条分配记录") - }) - - t.Run("代理分配卡给下级店铺", func(t *testing.T) { - reqBody := map[string]interface{}{ - "to_shop_id": subShop.ID, - "selection_type": "list", - "iccids": []string{"ALLOC_TEST001"}, - "remark": "代理分配测试", - } - bodyBytes, _ := json.Marshal(reqBody) - - resp, err := env.AsUser(agentAccount).Request("POST", "/api/admin/iot-cards/standalone/allocate", bodyBytes) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - - t.Logf("Agent allocate response: code=%d, message=%s", result.Code, result.Message) - - assert.Equal(t, 200, resp.StatusCode) - assert.Equal(t, 0, result.Code, "代理应能分配给下级: %s", result.Message) - }) - - t.Run("分配不存在的卡应返回空结果", func(t *testing.T) { - reqBody := map[string]interface{}{ - "to_shop_id": shop.ID, - "selection_type": "list", - "iccids": []string{"NOT_EXISTS_001", "NOT_EXISTS_002"}, - } - bodyBytes, _ := json.Marshal(reqBody) - - resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/iot-cards/standalone/allocate", bodyBytes) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - - assert.Equal(t, 0, result.Code) - if result.Data != nil { - dataMap := result.Data.(map[string]interface{}) - assert.Equal(t, float64(0), dataMap["total_count"]) - } - }) -} - -func TestStandaloneCardAllocation_Recall(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - // 创建测试数据 - shop := env.CreateTestShop("测试店铺", 1, nil) - - shopID := shop.ID - cards := []*model.IotCard{ - {ICCID: "ALLOC_TEST101", CarrierID: 1, Status: constants.IotCardStatusDistributed, ShopID: &shopID}, - {ICCID: "ALLOC_TEST102", CarrierID: 1, Status: constants.IotCardStatusDistributed, ShopID: &shopID}, - } - for _, card := range cards { - require.NoError(t, env.TX.Create(card).Error) - } - - t.Run("平台回收卡", func(t *testing.T) { - reqBody := map[string]interface{}{ - "from_shop_id": shop.ID, - "selection_type": "list", - "iccids": []string{"ALLOC_TEST101"}, - "remark": "平台回收测试", - } - bodyBytes, _ := json.Marshal(reqBody) - - resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/iot-cards/standalone/recall", bodyBytes) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - - t.Logf("Recall response: code=%d, message=%s, data=%v", result.Code, result.Message, result.Data) - - assert.Equal(t, 200, resp.StatusCode) - assert.Equal(t, 0, result.Code, "应返回成功: %s", result.Message) - - ctx := pkggorm.SkipDataPermission(context.Background()) - var recalledCard model.IotCard - env.RawDB().WithContext(ctx).Where("iccid = ?", "ALLOC_TEST101").First(&recalledCard) - assert.Nil(t, recalledCard.ShopID, "平台回收后shop_id应为NULL") - assert.Equal(t, constants.IotCardStatusInStock, recalledCard.Status, "状态应恢复为在库") - }) -} - -func TestAssetAllocationRecord_List(t *testing.T) { - env := integ.NewIntegrationTestEnv(t) - - // 创建测试数据 - shop := env.CreateTestShop("测试店铺", 1, nil) - - var superAdminAccount model.Account - require.NoError(t, env.RawDB().Where("user_type = ?", constants.UserTypeSuperAdmin).First(&superAdminAccount).Error) - - fromShopID := shop.ID - records := []*model.AssetAllocationRecord{ - { - AllocationNo: fmt.Sprintf("AL%d001", time.Now().UnixNano()), - AllocationType: constants.AssetAllocationTypeAllocate, - AssetType: constants.AssetTypeIotCard, - AssetID: 1, - AssetIdentifier: "ALLOC_TEST_REC001", - FromOwnerType: constants.OwnerTypePlatform, - ToOwnerType: constants.OwnerTypeShop, - ToOwnerID: shop.ID, - OperatorID: superAdminAccount.ID, - }, - { - AllocationNo: fmt.Sprintf("RC%d001", time.Now().UnixNano()), - AllocationType: constants.AssetAllocationTypeRecall, - AssetType: constants.AssetTypeIotCard, - AssetID: 2, - AssetIdentifier: "ALLOC_TEST_REC002", - FromOwnerType: constants.OwnerTypeShop, - FromOwnerID: &fromShopID, - ToOwnerType: constants.OwnerTypePlatform, - ToOwnerID: 0, - OperatorID: superAdminAccount.ID, - }, - } - for _, record := range records { - require.NoError(t, env.TX.Create(record).Error) - } - - t.Run("获取分配记录列表", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/asset-allocation-records?page=1&page_size=20", nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - }) - - t.Run("按分配类型过滤", func(t *testing.T) { - resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/asset-allocation-records?allocation_type=allocate", nil) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - }) - - t.Run("获取分配记录详情", func(t *testing.T) { - url := fmt.Sprintf("/api/admin/asset-allocation-records/%d", records[0].ID) - resp, err := env.AsSuperAdmin().Request("GET", url, nil) - require.NoError(t, err) - defer resp.Body.Close() - - assert.Equal(t, 200, resp.StatusCode) - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.Equal(t, 0, result.Code) - }) - - t.Run("未认证请求应返回错误", func(t *testing.T) { - resp, err := env.ClearAuth().Request("GET", "/api/admin/asset-allocation-records", nil) - require.NoError(t, err) - defer resp.Body.Close() - - var result response.Response - err = json.NewDecoder(resp.Body).Decode(&result) - require.NoError(t, err) - assert.NotEqual(t, 0, result.Code, "未认证请求应返回错误码") - }) -} diff --git a/tests/integration/task_test.go b/tests/integration/task_test.go deleted file mode 100644 index 739e780..0000000 --- a/tests/integration/task_test.go +++ /dev/null @@ -1,282 +0,0 @@ -package integration - -import ( - "context" - "os" - "testing" - "time" - - "github.com/bytedance/sonic" - "github.com/hibiken/asynq" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/tests/testutils" -) - -type EmailPayload struct { - RequestID string `json:"request_id"` - To string `json:"to"` - Subject string `json:"subject"` - Body string `json:"body"` - CC []string `json:"cc,omitempty"` -} - -func getRedisOpt() asynq.RedisClientOpt { - host := os.Getenv("JUNHONG_REDIS_ADDRESS") - if host == "" { - host = "localhost" - } - port := os.Getenv("JUNHONG_REDIS_PORT") - if port == "" { - port = "6379" - } - password := os.Getenv("JUNHONG_REDIS_PASSWORD") - return asynq.RedisClientOpt{ - Addr: host + ":" + port, - Password: password, - DB: 0, - } -} - -func TestTaskSubmit(t *testing.T) { - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - _ = rdb - - client := asynq.NewClient(getRedisOpt()) - defer func() { _ = client.Close() }() - - // 构造任务载荷 - payload := &EmailPayload{ - RequestID: "test-request-001", - To: "test@example.com", - Subject: "Test Email", - Body: "This is a test email", - } - - payloadBytes, err := sonic.Marshal(payload) - require.NoError(t, err) - - // 提交任务 - task := asynq.NewTask(constants.TaskTypeEmailSend, payloadBytes) - info, err := client.Enqueue(task, - asynq.Queue(constants.QueueDefault), - asynq.MaxRetry(constants.DefaultRetryMax), - ) - - // 验证 - require.NoError(t, err) - assert.NotEmpty(t, info.ID) - assert.Equal(t, constants.QueueDefault, info.Queue) - assert.Equal(t, constants.DefaultRetryMax, info.MaxRetry) -} - -func TestTaskPriority(t *testing.T) { - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - client := asynq.NewClient(getRedisOpt()) - defer func() { _ = client.Close() }() - - tests := []struct { - name string - queue string - }{ - {"Critical Priority", constants.QueueCritical}, - {"Default Priority", constants.QueueDefault}, - {"Low Priority", constants.QueueLow}, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - payload := &EmailPayload{ - RequestID: "test-request-" + tt.queue, - To: "test@example.com", - Subject: "Test", - Body: "Test", - } - - payloadBytes, err := sonic.Marshal(payload) - require.NoError(t, err) - - task := asynq.NewTask(constants.TaskTypeEmailSend, payloadBytes) - info, err := client.Enqueue(task, asynq.Queue(tt.queue)) - - require.NoError(t, err) - assert.Equal(t, tt.queue, info.Queue) - }) - } -} - -func TestTaskRetry(t *testing.T) { - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - client := asynq.NewClient(getRedisOpt()) - defer func() { _ = client.Close() }() - - payload := &EmailPayload{ - RequestID: "retry-test-001", - To: "test@example.com", - Subject: "Retry Test", - Body: "Test retry mechanism", - } - - payloadBytes, err := sonic.Marshal(payload) - require.NoError(t, err) - - // 提交任务并设置重试次数 - task := asynq.NewTask(constants.TaskTypeEmailSend, payloadBytes) - info, err := client.Enqueue(task, - asynq.MaxRetry(3), - asynq.Timeout(30*time.Second), - ) - - require.NoError(t, err) - assert.Equal(t, 3, info.MaxRetry) - assert.Equal(t, 30*time.Second, info.Timeout) -} - -func TestTaskIdempotency(t *testing.T) { - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - ctx := context.Background() - - requestID := "idempotent-test-" + time.Now().Format("20060102150405.000") - lockKey := constants.RedisTaskLockKey(requestID) - rdb.Del(ctx, lockKey) - t.Cleanup(func() { rdb.Del(ctx, lockKey) }) - - result, err := rdb.SetNX(ctx, lockKey, "1", 24*time.Hour).Result() - require.NoError(t, err) - assert.True(t, result, "第一次设置锁应该成功") - - // 第二次设置锁（模拟重复任务） - result, err = rdb.SetNX(ctx, lockKey, "1", 24*time.Hour).Result() - require.NoError(t, err) - assert.False(t, result, "第二次设置锁应该失败（幂等性）") - - // 验证锁存在 - exists, err := rdb.Exists(ctx, lockKey).Result() - require.NoError(t, err) - assert.Equal(t, int64(1), exists) - - // 验证 TTL - ttl, err := rdb.TTL(ctx, lockKey).Result() - require.NoError(t, err) - assert.Greater(t, ttl.Hours(), 23.0) - assert.LessOrEqual(t, ttl.Hours(), 24.0) -} - -func TestTaskStatusTracking(t *testing.T) { - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - ctx := context.Background() - - taskID := "task-123456" - statusKey := constants.RedisTaskStatusKey(taskID) - - // 设置任务状态 - statuses := []string{"pending", "processing", "completed"} - - for _, status := range statuses { - err := rdb.Set(ctx, statusKey, status, 7*24*time.Hour).Err() - require.NoError(t, err) - - // 读取状态 - result, err := rdb.Get(ctx, statusKey).Result() - require.NoError(t, err) - assert.Equal(t, status, result) - } - - // 验证 TTL - ttl, err := rdb.TTL(ctx, statusKey).Result() - require.NoError(t, err) - assert.Greater(t, ttl.Hours(), 24.0*6) -} - -func TestQueueInspection(t *testing.T) { - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - inspector := asynq.NewInspector(getRedisOpt()) - defer func() { _ = inspector.Close() }() - - _, _ = inspector.DeleteAllPendingTasks(constants.QueueDefault) - _, _ = inspector.DeleteAllScheduledTasks(constants.QueueDefault) - _, _ = inspector.DeleteAllRetryTasks(constants.QueueDefault) - _, _ = inspector.DeleteAllArchivedTasks(constants.QueueDefault) - - client := asynq.NewClient(getRedisOpt()) - defer func() { _ = client.Close() }() - - for i := 0; i < 5; i++ { - payload := &EmailPayload{ - RequestID: "test-" + string(rune(i)), - To: "test@example.com", - Subject: "Test", - Body: "Test", - } - - payloadBytes, err := sonic.Marshal(payload) - require.NoError(t, err) - - task := asynq.NewTask(constants.TaskTypeEmailSend, payloadBytes) - _, err = client.Enqueue(task, asynq.Queue(constants.QueueDefault)) - require.NoError(t, err) - } - - info, err := inspector.GetQueueInfo(constants.QueueDefault) - require.NoError(t, err) - assert.Equal(t, 5, info.Pending) - assert.Equal(t, 0, info.Active) -} - -func TestTaskSerialization(t *testing.T) { - tests := []struct { - name string - payload EmailPayload - }{ - { - name: "Simple Email", - payload: EmailPayload{ - RequestID: "req-001", - To: "user@example.com", - Subject: "Hello", - Body: "Hello World", - }, - }, - { - name: "Email with CC", - payload: EmailPayload{ - RequestID: "req-002", - To: "user@example.com", - Subject: "Hello", - Body: "Hello World", - CC: []string{"cc1@example.com", "cc2@example.com"}, - }, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - payloadBytes, err := sonic.Marshal(tt.payload) - require.NoError(t, err) - assert.NotEmpty(t, payloadBytes) - - var decoded EmailPayload - err = sonic.Unmarshal(payloadBytes, &decoded) - require.NoError(t, err) - - assert.Equal(t, tt.payload.RequestID, decoded.RequestID) - assert.Equal(t, tt.payload.To, decoded.To) - assert.Equal(t, tt.payload.Subject, decoded.Subject) - assert.Equal(t, tt.payload.Body, decoded.Body) - assert.Equal(t, tt.payload.CC, decoded.CC) - }) - } -} diff --git a/tests/testutil/auth_helper.go b/tests/testutil/auth_helper.go deleted file mode 100644 index b7e3175..0000000 --- a/tests/testutil/auth_helper.go +++ /dev/null @@ -1,201 +0,0 @@ -package testutil - -import ( - "context" - "fmt" - "math/rand" - "sync/atomic" - "testing" - "time" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/pkg/auth" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/redis/go-redis/v9" - "github.com/stretchr/testify/require" - "golang.org/x/crypto/bcrypt" - "gorm.io/gorm" -) - -// phoneCounter 用于生成唯一的手机号 -var phoneCounter uint64 - -func init() { - // 使用当前时间作为随机种子 - rand.Seed(time.Now().UnixNano()) - // 初始化计数器为一个随机值，避免不同测试运行之间的冲突 - phoneCounter = uint64(rand.Intn(10000)) -} - -// GenerateUniquePhone 生成唯一的测试手机号（导出供测试使用） -func GenerateUniquePhone() string { - counter := atomic.AddUint64(&phoneCounter, 1) - timestamp := time.Now().UnixNano() % 10000 - return fmt.Sprintf("139%04d%04d", timestamp, counter%10000) -} - -// CreateTestAccount 创建测试账号 -// userType: 1=超级管理员, 2=平台用户, 3=代理账号, 4=企业账号 -func CreateTestAccount(t *testing.T, db *gorm.DB, username, password string, userType int, shopID, enterpriseID *uint) *model.Account { - t.Helper() - - hashedPassword, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost) - require.NoError(t, err) - - phone := GenerateUniquePhone() - - account := &model.Account{ - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - Username: username, - Phone: phone, - Password: string(hashedPassword), - UserType: userType, - ShopID: shopID, - EnterpriseID: enterpriseID, - Status: 1, - } - - err = db.Create(account).Error - require.NoError(t, err) - - return account -} - -// GenerateTestToken 为测试账号生成 token -func GenerateTestToken(t *testing.T, rdb *redis.Client, account *model.Account, device string) (accessToken, refreshToken string) { - t.Helper() - - ctx := context.Background() - - var shopID, enterpriseID uint - if account.ShopID != nil { - shopID = *account.ShopID - } - if account.EnterpriseID != nil { - enterpriseID = *account.EnterpriseID - } - - tokenInfo := &auth.TokenInfo{ - UserID: account.ID, - UserType: account.UserType, - ShopID: shopID, - EnterpriseID: enterpriseID, - Username: account.Username, - Device: device, - IP: "127.0.0.1", - } - - tokenManager := auth.NewTokenManager(rdb, 24*time.Hour, 7*24*time.Hour) - accessToken, refreshToken, err := tokenManager.GenerateTokenPair(ctx, tokenInfo) - require.NoError(t, err) - - return accessToken, refreshToken -} - -// usernameCounter 用于生成唯一的用户名 -var usernameCounter uint64 - -func init() { - usernameCounter = uint64(rand.Intn(100000)) -} - -// GenerateUniqueUsername 生成唯一的测试用户名（导出供测试使用） -func GenerateUniqueUsername(prefix string) string { - counter := atomic.AddUint64(&usernameCounter, 1) - return fmt.Sprintf("%s_%d", prefix, counter) -} - -// CreateSuperAdmin 创建或获取超级管理员测试账号 -func CreateSuperAdmin(t *testing.T, db *gorm.DB) *model.Account { - t.Helper() - - var existing model.Account - err := db.Where("user_type = ?", constants.UserTypeSuperAdmin).First(&existing).Error - if err == nil { - return &existing - } - - return CreateTestAccount(t, db, GenerateUniqueUsername("superadmin"), "password123", constants.UserTypeSuperAdmin, nil, nil) -} - -// CreatePlatformUser 创建平台用户测试账号 -func CreatePlatformUser(t *testing.T, db *gorm.DB) *model.Account { - t.Helper() - return CreateTestAccount(t, db, GenerateUniqueUsername("platformuser"), "password123", constants.UserTypePlatform, nil, nil) -} - -// CreateAgentUser 创建代理账号测试账号 -func CreateAgentUser(t *testing.T, db *gorm.DB, shopID uint) *model.Account { - t.Helper() - return CreateTestAccount(t, db, GenerateUniqueUsername("agentuser"), "password123", constants.UserTypeAgent, &shopID, nil) -} - -// CreateEnterpriseUser 创建企业账号测试账号 -func CreateEnterpriseUser(t *testing.T, db *gorm.DB, enterpriseID uint) *model.Account { - t.Helper() - return CreateTestAccount(t, db, GenerateUniqueUsername("enterpriseuser"), "password123", constants.UserTypeEnterprise, nil, &enterpriseID) -} - -// shopCodeCounter 用于生成唯一的商户代码 -var shopCodeCounter uint64 - -// CreateTestShop 创建测试商户 -func CreateTestShop(t *testing.T, db *gorm.DB, name, code string, level int, parentID *uint) *model.Shop { - t.Helper() - - counter := atomic.AddUint64(&shopCodeCounter, 1) - uniqueCode := fmt.Sprintf("%s_%d_%d", code, time.Now().UnixNano()%10000, counter) - uniqueName := fmt.Sprintf("%s_%d", name, counter) - - shop := &model.Shop{ - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - ShopName: uniqueName, - ShopCode: uniqueCode, - Level: level, - Status: 1, - } - - if parentID != nil { - shop.ParentID = parentID - } - - err := db.Create(shop).Error - require.NoError(t, err) - - return shop -} - -// SetupAuthMiddleware 设置认证中间件（用于集成测试） -func SetupAuthMiddleware(t *testing.T, tokenManager *auth.TokenManager, allowedUserTypes []int) func(token string) bool { - t.Helper() - - return func(token string) bool { - ctx := context.Background() - tokenInfo, err := tokenManager.ValidateAccessToken(ctx, token) - if err != nil { - return false - } - - // 检查用户类型 - if len(allowedUserTypes) > 0 { - allowed := false - for _, userType := range allowedUserTypes { - if tokenInfo.UserType == userType { - allowed = true - break - } - } - if !allowed { - return false - } - } - - return true - } -} diff --git a/tests/testutils/db.go b/tests/testutils/db.go deleted file mode 100644 index b44df37..0000000 --- a/tests/testutils/db.go +++ /dev/null @@ -1,265 +0,0 @@ -package testutils - -import ( - "context" - "fmt" - "strings" - "sync" - "testing" - - "github.com/redis/go-redis/v9" - "gorm.io/driver/postgres" - "gorm.io/gorm" - "gorm.io/gorm/logger" - - "github.com/break/junhong_cmp_fiber/internal/model" -) - -// 全局单例数据库和 Redis 连接 -// 使用 sync.Once 确保整个测试套件只创建一次连接，显著提升测试性能 -var ( - testDBOnce sync.Once - testDB *gorm.DB - testDBInitErr error - - testRedisOnce sync.Once - testRedis *redis.Client - testRedisInitErr error -) - -// 测试数据库配置 -// TODO: 未来可以从环境变量或配置文件加载 -const ( - testDBDSN = "host=cxd.whcxd.cn port=16159 user=erp_pgsql password=erp_2025 dbname=junhong_cmp_test sslmode=disable TimeZone=Asia/Shanghai" - testRedisAddr = "cxd.whcxd.cn:16299" - testRedisPasswd = "cpNbWtAaqgo1YJmbMp3h" - testRedisDB = 15 -) - -// GetTestDB 获取全局单例测试数据库连接 -// -// 特点: -// - 使用 sync.Once 确保整个测试套件只创建一次连接 -// - AutoMigrate 只在首次连接时执行一次 -// - 连接失败会跳过测试（不是致命错误） -// -// 用法: -// -// func TestXxx(t *testing.T) { -// db := testutils.GetTestDB(t) -// // db 是全局共享的连接，不要直接修改其状态 -// // 如需事务隔离，使用 NewTestTransaction(t) -// } -func GetTestDB(t *testing.T) *gorm.DB { - t.Helper() - - testDBOnce.Do(func() { - var err error - testDB, err = gorm.Open(postgres.Open(testDBDSN), &gorm.Config{ - Logger: logger.Default.LogMode(logger.Silent), - }) - if err != nil { - testDBInitErr = fmt.Errorf("无法连接测试数据库: %w", err) - return - } - - err = testDB.AutoMigrate( - &model.Account{}, - &model.Role{}, - &model.Permission{}, - &model.AccountRole{}, - &model.RolePermission{}, - &model.Shop{}, - &model.Enterprise{}, - &model.PersonalCustomer{}, - &model.PersonalCustomerPhone{}, - &model.PersonalCustomerICCID{}, - &model.PersonalCustomerDevice{}, - &model.IotCard{}, - &model.IotCardImportTask{}, - &model.Device{}, - &model.DeviceImportTask{}, - &model.DeviceSimBinding{}, - &model.Carrier{}, - &model.Tag{}, - &model.PackageSeries{}, - &model.Package{}, - &model.ShopPackageAllocation{}, - &model.EnterpriseCardAuthorization{}, - &model.EnterpriseDeviceAuthorization{}, - &model.AssetAllocationRecord{}, - &model.CommissionWithdrawalRequest{}, - &model.CommissionWithdrawalSetting{}, - &model.Order{}, - &model.OrderItem{}, - &model.PackageUsage{}, - &model.Wallet{}, - ) - if err != nil { - errMsg := err.Error() - if strings.Contains(errMsg, "does not exist") && (strings.Contains(errMsg, "constraint") || strings.Contains(errMsg, "column")) { - // 忽略约束和列不存在的错误，这是由于约束名变更或迁移未应用导致的 - } else { - testDBInitErr = fmt.Errorf("数据库迁移失败: %w", err) - return - } - } - - // 确保所有必要的列都存在（处理迁移未应用的情况） - ensureTestDBColumns(testDB) - }) - - if testDBInitErr != nil { - t.Skipf("跳过测试：%v", testDBInitErr) - } - - return testDB -} - -// GetTestRedis 获取全局单例 Redis 连接 -// -// 特点: -// - 使用 sync.Once 确保整个测试套件只创建一次连接 -// - 连接失败会跳过测试（不是致命错误） -// -// 用法: -// -// func TestXxx(t *testing.T) { -// rdb := testutils.GetTestRedis(t) -// // rdb 是全局共享的连接 -// // 使用 CleanTestRedisKeys(t) 自动清理测试相关的 Redis 键 -// } -func GetTestRedis(t *testing.T) *redis.Client { - t.Helper() - - testRedisOnce.Do(func() { - testRedis = redis.NewClient(&redis.Options{ - Addr: testRedisAddr, - Password: testRedisPasswd, - DB: testRedisDB, - }) - - ctx := context.Background() - if err := testRedis.Ping(ctx).Err(); err != nil { - testRedisInitErr = fmt.Errorf("无法连接 Redis: %w", err) - return - } - }) - - if testRedisInitErr != nil { - t.Skipf("跳过测试：%v", testRedisInitErr) - } - - return testRedis -} - -// NewTestTransaction 创建测试事务，自动在测试结束时回滚 -// -// 特点: -// - 每个测试用例获得独立的事务，互不干扰 -// - 使用 t.Cleanup() 确保即使测试 panic 也能回滚 -// - 回滚后数据库状态与测试前完全一致 -// -// 用法: -// -// func TestXxx(t *testing.T) { -// tx := testutils.NewTestTransaction(t) -// // 所有数据库操作使用 tx 而非 db -// store := postgres.NewXxxStore(tx, rdb) -// // 测试结束后自动回滚，无需手动清理 -// } -// -// 注意: -// - 不要在子测试(t.Run)中调用此函数，因为子测试可能并行执行 -// - 如需在子测试中使用数据库，应在父测试中创建事务并传递 -func NewTestTransaction(t *testing.T) *gorm.DB { - t.Helper() - - db := GetTestDB(t) - // 确保所有必要的列都存在 - ensureTestDBColumns(db) - - tx := db.Begin() - if tx.Error != nil { - t.Fatalf("开启测试事务失败: %v", tx.Error) - } - - // 使用 t.Cleanup() 确保测试结束时自动回滚 - // 即使测试 panic 也能执行清理 - t.Cleanup(func() { - tx.Rollback() - }) - - return tx -} - -// CleanTestRedisKeys 清理当前测试的 Redis 键 -// -// 特点: -// - 使用测试名称作为键前缀，格式: test:{TestName}:* -// - 测试开始时清理已有键（防止脏数据） -// - 使用 t.Cleanup() 确保测试结束时自动清理 -// -// 用法: -// -// func TestXxx(t *testing.T) { -// rdb := testutils.GetTestRedis(t) -// testutils.CleanTestRedisKeys(t, rdb) -// // Redis 键使用测试专用前缀: test:TestXxx:your_key -// } -// -// 键命名规范: -// - 测试中创建的键应使用 GetTestRedisKeyPrefix(t) 作为前缀 -// - 例如: test:TestShopStore_Create:cache:shop:1 -func CleanTestRedisKeys(t *testing.T, rdb *redis.Client) { - t.Helper() - - ctx := context.Background() - testPrefix := GetTestRedisKeyPrefix(t) - - // 测试开始前清理已有键 - cleanKeys(ctx, rdb, testPrefix) - - // 测试结束时自动清理 - t.Cleanup(func() { - cleanKeys(ctx, rdb, testPrefix) - }) -} - -// GetTestRedisKeyPrefix 获取当前测试的 Redis 键前缀 -// -// 返回格式: test:{TestName}: -// 用于在测试中创建带前缀的 Redis 键，确保键不会与其他测试冲突 -// -// 用法: -// -// func TestXxx(t *testing.T) { -// prefix := testutils.GetTestRedisKeyPrefix(t) -// key := prefix + "my_cache_key" -// // key = "test:TestXxx:my_cache_key" -// } -func GetTestRedisKeyPrefix(t *testing.T) string { - t.Helper() - return fmt.Sprintf("test:%s:", t.Name()) -} - -// cleanKeys 清理匹配前缀的所有 Redis 键 -func cleanKeys(ctx context.Context, rdb *redis.Client, prefix string) { - keys, err := rdb.Keys(ctx, prefix+"*").Result() - if err != nil { - // 忽略 Redis 错误，不影响测试 - return - } - if len(keys) > 0 { - rdb.Del(ctx, keys...) - } -} - -// ensureTestDBColumns 确保测试数据库中所有必要的列都存在 -// 处理迁移未应用导致的列缺失问题 -func ensureTestDBColumns(db *gorm.DB) { - // 添加 force_recharge_trigger_type 列到 tb_shop_series_allocation 表 - if !db.Migrator().HasColumn("tb_shop_series_allocation", "force_recharge_trigger_type") { - db.Exec("ALTER TABLE tb_shop_series_allocation ADD COLUMN force_recharge_trigger_type int DEFAULT 2") - } -} diff --git a/tests/testutils/helpers.go b/tests/testutils/helpers.go deleted file mode 100644 index a827a5c..0000000 --- a/tests/testutils/helpers.go +++ /dev/null @@ -1,19 +0,0 @@ -package testutils - -import ( - "path/filepath" - "runtime" -) - -// GetMigrationsPath 获取数据库迁移文件的路径 -func GetMigrationsPath() string { - _, filename, _, ok := runtime.Caller(0) - if !ok { - panic("无法获取当前文件路径") - } - - projectRoot := filepath.Join(filepath.Dir(filename), "..", "..") - migrationsPath := filepath.Join(projectRoot, "migrations") - - return migrationsPath -} diff --git a/tests/testutils/integ/integration.go b/tests/testutils/integ/integration.go deleted file mode 100644 index c7c4ece..0000000 --- a/tests/testutils/integ/integration.go +++ /dev/null @@ -1,422 +0,0 @@ -package integ - -import ( - "bytes" - "context" - "encoding/json" - "fmt" - "net/http" - "net/http/httptest" - "sync" - "sync/atomic" - "testing" - "time" - - "github.com/break/junhong_cmp_fiber/internal/bootstrap" - "github.com/break/junhong_cmp_fiber/internal/gateway" - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/internal/routes" - "github.com/break/junhong_cmp_fiber/pkg/auth" - "github.com/break/junhong_cmp_fiber/pkg/config" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/pkg/errors" - "github.com/break/junhong_cmp_fiber/pkg/middleware" - "github.com/break/junhong_cmp_fiber/tests/testutils" - "github.com/gofiber/fiber/v2" - "github.com/redis/go-redis/v9" - "github.com/stretchr/testify/require" - "go.uber.org/zap" - "golang.org/x/crypto/bcrypt" - "gorm.io/gorm" -) - -// IntegrationTestEnv 集成测试环境 -// 封装集成测试所需的所有依赖，提供统一的测试环境设置 -type IntegrationTestEnv struct { - TX *gorm.DB // 自动回滚的数据库事务 - Redis *redis.Client // 全局 Redis 连接 - Logger *zap.Logger // 测试用日志记录器 - TokenManager *auth.TokenManager // Token 管理器 - App *fiber.App // 配置好的 Fiber 应用实例 - Handlers *bootstrap.Handlers - Middlewares *bootstrap.Middlewares - - t *testing.T - superAdmin *model.Account - currentToken string -} - -// NewIntegrationTestEnv 创建集成测试环境 -// -// 自动完成以下初始化： -// - 创建独立的数据库事务（测试结束后自动回滚） -// - 获取全局 Redis 连接并清理测试键 -// - 创建 Logger 和 TokenManager -// - 通过 Bootstrap 初始化所有 Handlers 和 Middlewares -// - 配置 Fiber App 并注册路由 -// -// 用法: -// -// func TestXxx(t *testing.T) { -// env := testutils.NewIntegrationTestEnv(t) -// // env.App 已配置好，可直接发送请求 -// // env.TX 是独立事务，测试结束后自动回滚 -// } -var configOnce sync.Once - -func NewIntegrationTestEnv(t *testing.T) *IntegrationTestEnv { - t.Helper() - - configOnce.Do(func() { - _, _ = config.Load() - }) - - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - logger, _ := zap.NewDevelopment() - tokenManager := auth.NewTokenManager(rdb, 24*time.Hour, 7*24*time.Hour) - - gatewayClient := createMockGatewayClient() - - deps := &bootstrap.Dependencies{ - DB: tx, - Redis: rdb, - Logger: logger, - TokenManager: tokenManager, - GatewayClient: gatewayClient, - } - - result, err := bootstrap.Bootstrap(deps) - require.NoError(t, err, "Bootstrap 初始化失败") - - app := fiber.New(fiber.Config{ - ErrorHandler: errors.SafeErrorHandler(logger), - }) - - routes.RegisterRoutes(app, result.Handlers, result.Middlewares) - - env := &IntegrationTestEnv{ - TX: tx, - Redis: rdb, - Logger: logger, - TokenManager: tokenManager, - App: app, - Handlers: result.Handlers, - Middlewares: result.Middlewares, - t: t, - } - - return env -} - -func createMockGatewayClient() *gateway.Client { - server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - w.Header().Set("Content-Type", "application/json") - resp := gateway.GatewayResponse{ - Code: 200, - Msg: "success", - TraceID: "test-trace-id", - Data: json.RawMessage(`{}`), - } - json.NewEncoder(w).Encode(resp) - })) - - client := gateway.NewClient(server.URL, "test-app-id", "test-app-secret") - return client -} - -// AsSuperAdmin 设置当前请求使用超级管理员身份 -// 返回 IntegrationTestEnv 以支持链式调用 -// -// 用法: -// -// resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/roles", nil) -func (e *IntegrationTestEnv) AsSuperAdmin() *IntegrationTestEnv { - e.t.Helper() - - if e.superAdmin == nil { - e.superAdmin = e.ensureSuperAdmin() - } - - e.currentToken = e.generateToken(e.superAdmin) - return e -} - -// AsUser 设置当前请求使用指定用户身份 -// 返回 IntegrationTestEnv 以支持链式调用 -// -// 用法: -// -// account := e.CreateTestAccount(...) -// resp, err := env.AsUser(account).Request("GET", "/api/admin/shops", nil) -func (e *IntegrationTestEnv) AsUser(account *model.Account) *IntegrationTestEnv { - e.t.Helper() - - token := e.generateToken(account) - e.currentToken = token - - return e -} - -// Request 发送 HTTP 请求 -// 自动添加 Authorization header（如果已设置用户身份） -// -// 用法: -// -// resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/roles", nil) -// resp, err := env.Request("POST", "/api/admin/login", loginBody) -func (e *IntegrationTestEnv) Request(method, path string, body []byte) (*http.Response, error) { - e.t.Helper() - - var req *http.Request - if body != nil { - req = httptest.NewRequest(method, path, bytes.NewReader(body)) - req.Header.Set("Content-Type", "application/json") - } else { - req = httptest.NewRequest(method, path, nil) - } - - if e.currentToken != "" { - req.Header.Set("Authorization", "Bearer "+e.currentToken) - } - - return e.App.Test(req, -1) -} - -// RequestWithHeaders 发送带自定义 Headers 的 HTTP 请求 -func (e *IntegrationTestEnv) RequestWithHeaders(method, path string, body []byte, headers map[string]string) (*http.Response, error) { - e.t.Helper() - - var req *http.Request - if body != nil { - req = httptest.NewRequest(method, path, bytes.NewReader(body)) - } else { - req = httptest.NewRequest(method, path, nil) - } - - for k, v := range headers { - req.Header.Set(k, v) - } - - if body != nil && req.Header.Get("Content-Type") == "" { - req.Header.Set("Content-Type", "application/json") - } - - if e.currentToken != "" && req.Header.Get("Authorization") == "" { - req.Header.Set("Authorization", "Bearer "+e.currentToken) - } - - return e.App.Test(req, -1) -} - -// ClearAuth 清除当前认证状态 -func (e *IntegrationTestEnv) ClearAuth() *IntegrationTestEnv { - e.currentToken = "" - return e -} - -// ensureSuperAdmin 确保超级管理员账号存在 -func (e *IntegrationTestEnv) ensureSuperAdmin() *model.Account { - e.t.Helper() - - var existing model.Account - err := e.TX.Where("user_type = ?", constants.UserTypeSuperAdmin).First(&existing).Error - if err == nil { - return &existing - } - - return e.CreateTestAccount("superadmin", "password123", constants.UserTypeSuperAdmin, nil, nil) -} - -// generateToken 为账号生成访问 Token -func (e *IntegrationTestEnv) generateToken(account *model.Account) string { - e.t.Helper() - - ctx := context.Background() - - var shopID, enterpriseID uint - if account.ShopID != nil { - shopID = *account.ShopID - } - if account.EnterpriseID != nil { - enterpriseID = *account.EnterpriseID - } - - tokenInfo := &auth.TokenInfo{ - UserID: account.ID, - UserType: account.UserType, - ShopID: shopID, - EnterpriseID: enterpriseID, - Username: account.Username, - Device: "test", - IP: "127.0.0.1", - } - - accessToken, _, err := e.TokenManager.GenerateTokenPair(ctx, tokenInfo) - require.NoError(e.t, err, "生成 Token 失败") - - return accessToken -} - -var ( - usernameCounter uint64 - phoneCounter uint64 - shopCodeCounter uint64 -) - -// CreateTestAccount 创建测试账号 -func (e *IntegrationTestEnv) CreateTestAccount(username, password string, userType int, shopID, enterpriseID *uint) *model.Account { - e.t.Helper() - - hashedPassword, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost) - require.NoError(e.t, err) - - counter := atomic.AddUint64(&usernameCounter, 1) - uniqueUsername := fmt.Sprintf("%s_%d", username, counter) - uniquePhone := fmt.Sprintf("138%08d", atomic.AddUint64(&phoneCounter, 1)) - - account := &model.Account{ - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - Username: uniqueUsername, - Phone: uniquePhone, - Password: string(hashedPassword), - UserType: userType, - ShopID: shopID, - EnterpriseID: enterpriseID, - Status: 1, - } - - err = e.TX.Create(account).Error - require.NoError(e.t, err, "创建测试账号失败") - - return account -} - -// CreateTestShop 创建测试商户 -func (e *IntegrationTestEnv) CreateTestShop(name string, level int, parentID *uint) *model.Shop { - e.t.Helper() - - counter := atomic.AddUint64(&shopCodeCounter, 1) - uniqueCode := fmt.Sprintf("SHOP_%d_%d", time.Now().UnixNano()%10000, counter) - uniqueName := fmt.Sprintf("%s_%d", name, counter) - - shop := &model.Shop{ - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - ShopName: uniqueName, - ShopCode: uniqueCode, - Level: level, - ParentID: parentID, - Status: 1, - } - - err := e.TX.Create(shop).Error - require.NoError(e.t, err, "创建测试商户失败") - - return shop -} - -// CreateTestEnterprise 创建测试企业 -func (e *IntegrationTestEnv) CreateTestEnterprise(name string, ownerShopID *uint) *model.Enterprise { - e.t.Helper() - - counter := atomic.AddUint64(&shopCodeCounter, 1) - uniqueCode := fmt.Sprintf("ENT_%d_%d", time.Now().UnixNano()%10000, counter) - uniqueName := fmt.Sprintf("%s_%d", name, counter) - - enterprise := &model.Enterprise{ - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - EnterpriseName: uniqueName, - EnterpriseCode: uniqueCode, - OwnerShopID: ownerShopID, - Status: 1, - } - - err := e.TX.Create(enterprise).Error - require.NoError(e.t, err, "创建测试企业失败") - - return enterprise -} - -// CreateTestRole 创建测试角色 -func (e *IntegrationTestEnv) CreateTestRole(name string, roleType int) *model.Role { - e.t.Helper() - - counter := atomic.AddUint64(&usernameCounter, 1) - uniqueName := fmt.Sprintf("%s_%d", name, counter) - - role := &model.Role{ - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - RoleName: uniqueName, - RoleType: roleType, - Status: constants.StatusEnabled, - } - - err := e.TX.Create(role).Error - require.NoError(e.t, err, "创建测试角色失败") - - return role -} - -// CreateTestPermission 创建测试权限 -func (e *IntegrationTestEnv) CreateTestPermission(name, code string, permType int) *model.Permission { - e.t.Helper() - - counter := atomic.AddUint64(&usernameCounter, 1) - uniqueName := fmt.Sprintf("%s_%d", name, counter) - uniqueCode := fmt.Sprintf("%s_%d", code, counter) - - permission := &model.Permission{ - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - PermName: uniqueName, - PermCode: uniqueCode, - PermType: permType, - Status: constants.StatusEnabled, - } - - err := e.TX.Create(permission).Error - require.NoError(e.t, err, "创建测试权限失败") - - return permission -} - -// SetUserContext 设置用户上下文（用于直接调用 Service 层测试） -func (e *IntegrationTestEnv) SetUserContext(ctx context.Context, userID uint, userType int, shopID uint) context.Context { - return middleware.SetUserContext(ctx, middleware.NewSimpleUserContext(userID, userType, shopID)) -} - -// GetSuperAdminContext 获取超级管理员上下文 -func (e *IntegrationTestEnv) GetSuperAdminContext() context.Context { - if e.superAdmin == nil { - e.superAdmin = e.ensureSuperAdmin() - } - return e.SetUserContext(context.Background(), e.superAdmin.ID, constants.UserTypeSuperAdmin, 0) -} - -// RawDB 获取跳过数据权限过滤的数据库连接 -// 用于测试中验证数据是否正确写入，不受 GORM Callback 影响 -// -// 用法: -// -// var count int64 -// env.RawDB().Model(&model.Role{}).Where("role_name = ?", name).Count(&count) -func (e *IntegrationTestEnv) RawDB() *gorm.DB { - ctx := e.GetSuperAdminContext() - return e.TX.WithContext(ctx) -} diff --git a/tests/testutils/setup.go b/tests/testutils/setup.go deleted file mode 100644 index b47c4a3..0000000 --- a/tests/testutils/setup.go +++ /dev/null @@ -1,33 +0,0 @@ -package testutils - -import ( - "fmt" - "time" -) - -// GenerateUsername 生成测试用户名 -func GenerateUsername(prefix string, index int) string { - return fmt.Sprintf("%s_%d", prefix, index) -} - -// GeneratePhone 生成测试手机号 -func GeneratePhone(prefix string, index int) string { - return fmt.Sprintf("%s%08d", prefix, index) -} - -// GenerateUniquePhone 生成唯一手机号（基于时间戳） -func GenerateUniquePhone() string { - timestamp := time.Now().UnixNano() - suffix := timestamp % 100000000 - return fmt.Sprintf("138%08d", suffix) -} - -// Now 返回当前时间 -func Now() time.Time { - return time.Now() -} - -// Since 返回从指定时间到现在的持续时间 -func Since(t time.Time) time.Duration { - return time.Since(t) -} diff --git a/tests/unit/account_model_test.go b/tests/unit/account_model_test.go deleted file mode 100644 index 309550b..0000000 --- a/tests/unit/account_model_test.go +++ /dev/null @@ -1,277 +0,0 @@ -package unit - -import ( - "context" - "testing" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/internal/store/postgres" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/tests/testutils" -) - -// TestAccountModel_Create 测试创建账号 -func TestAccountModel_Create(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := postgres.NewAccountStore(tx, rdb) - ctx := context.Background() - - t.Run("创建 root 账号", func(t *testing.T) { - account := &model.Account{ - Username: "root_user", - Phone: "13800000001", - Password: "hashed_password", - UserType: constants.UserTypeSuperAdmin, - Status: constants.StatusEnabled, - } - - err := store.Create(ctx, account) - require.NoError(t, err) - assert.NotZero(t, account.ID) - assert.NotZero(t, account.CreatedAt) - assert.NotZero(t, account.UpdatedAt) - }) - - // 注意：parent_id 字段已被移除，层级关系通过 shop_id 和 enterprise_id 维护 - - t.Run("创建带 shop_id 的账号", func(t *testing.T) { - shopID := uint(100) - account := &model.Account{ - Username: "shop_user", - Phone: "13800000004", - Password: "hashed_password", - UserType: constants.UserTypePlatform, - ShopID: &shopID, - Status: constants.StatusEnabled, - } - - err := store.Create(ctx, account) - require.NoError(t, err) - assert.NotNil(t, account.ShopID) - assert.Equal(t, uint(100), *account.ShopID) - }) -} - -// TestAccountModel_GetByID 测试根据 ID 查询账号 -func TestAccountModel_GetByID(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := postgres.NewAccountStore(tx, rdb) - ctx := context.Background() - - // 创建测试账号 - account := &model.Account{ - Username: "test_user", - Phone: "13800000001", - Password: "hashed_password", - UserType: constants.UserTypePlatform, - Status: constants.StatusEnabled, - } - err := store.Create(ctx, account) - require.NoError(t, err) - - t.Run("查询存在的账号", func(t *testing.T) { - found, err := store.GetByID(ctx, account.ID) - require.NoError(t, err) - assert.Equal(t, account.Username, found.Username) - assert.Equal(t, account.Phone, found.Phone) - assert.Equal(t, account.UserType, found.UserType) - }) - - t.Run("查询不存在的账号", func(t *testing.T) { - _, err := store.GetByID(ctx, 99999) - assert.Error(t, err) - }) -} - -// TestAccountModel_GetByUsername 测试根据用户名查询账号 -func TestAccountModel_GetByUsername(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := postgres.NewAccountStore(tx, rdb) - ctx := context.Background() - - // 创建测试账号 - account := &model.Account{ - Username: "unique_user", - Phone: "13800000001", - Password: "hashed_password", - UserType: constants.UserTypePlatform, - Status: constants.StatusEnabled, - } - err := store.Create(ctx, account) - require.NoError(t, err) - - t.Run("根据用户名查询", func(t *testing.T) { - found, err := store.GetByUsername(ctx, "unique_user") - require.NoError(t, err) - assert.Equal(t, account.ID, found.ID) - }) - - t.Run("查询不存在的用户名", func(t *testing.T) { - _, err := store.GetByUsername(ctx, "nonexistent") - assert.Error(t, err) - }) -} - -// TestAccountModel_GetByPhone 测试根据手机号查询账号 -func TestAccountModel_GetByPhone(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := postgres.NewAccountStore(tx, rdb) - ctx := context.Background() - - // 创建测试账号 - account := &model.Account{ - Username: "phone_user", - Phone: "13800000001", - Password: "hashed_password", - UserType: constants.UserTypePlatform, - Status: constants.StatusEnabled, - } - err := store.Create(ctx, account) - require.NoError(t, err) - - t.Run("根据手机号查询", func(t *testing.T) { - found, err := store.GetByPhone(ctx, "13800000001") - require.NoError(t, err) - assert.Equal(t, account.ID, found.ID) - }) - - t.Run("查询不存在的手机号", func(t *testing.T) { - _, err := store.GetByPhone(ctx, "99900000000") - assert.Error(t, err) - }) -} - -// TestAccountModel_Update 测试更新账号 -func TestAccountModel_Update(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := postgres.NewAccountStore(tx, rdb) - ctx := context.Background() - - // 创建测试账号 - account := &model.Account{ - Username: "update_user", - Phone: "13800000001", - Password: "hashed_password", - UserType: constants.UserTypePlatform, - Status: constants.StatusEnabled, - } - err := store.Create(ctx, account) - require.NoError(t, err) - - t.Run("更新账号状态", func(t *testing.T) { - account.Status = constants.StatusDisabled - account.Updater = 2 - err := store.Update(ctx, account) - require.NoError(t, err) - - // 验证更新 - found, err := store.GetByID(ctx, account.ID) - require.NoError(t, err) - assert.Equal(t, constants.StatusDisabled, found.Status) - assert.Equal(t, uint(2), found.Updater) - }) -} - -// TestAccountModel_List 测试查询账号列表 -func TestAccountModel_List(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := postgres.NewAccountStore(tx, rdb) - ctx := context.Background() - - // 创建多个测试账号 - for i := 1; i <= 5; i++ { - account := &model.Account{ - Username: testutils.GenerateUsername("list_user", i), - Phone: testutils.GeneratePhone("138", i), - Password: "hashed_password", - UserType: constants.UserTypePlatform, - Status: constants.StatusEnabled, - } - err := store.Create(ctx, account) - require.NoError(t, err) - } - - t.Run("分页查询", func(t *testing.T) { - accounts, total, err := store.List(ctx, nil, nil) - require.NoError(t, err) - assert.GreaterOrEqual(t, len(accounts), 5) - assert.GreaterOrEqual(t, total, int64(5)) - }) - - t.Run("带过滤条件查询", func(t *testing.T) { - filters := map[string]interface{}{ - "user_type": constants.UserTypePlatform, - } - accounts, _, err := store.List(ctx, nil, filters) - require.NoError(t, err) - for _, acc := range accounts { - assert.Equal(t, constants.UserTypePlatform, acc.UserType) - } - }) -} - -// TestAccountModel_UniqueConstraints 测试唯一约束 -func TestAccountModel_UniqueConstraints(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := postgres.NewAccountStore(tx, rdb) - ctx := context.Background() - - // 创建测试账号 - account := &model.Account{ - Username: "unique_test", - Phone: "13800000001", - Password: "hashed_password", - UserType: constants.UserTypePlatform, - Status: constants.StatusEnabled, - } - err := store.Create(ctx, account) - require.NoError(t, err) - - t.Run("重复用户名应失败", func(t *testing.T) { - duplicate := &model.Account{ - Username: "unique_test", // 重复 - Phone: "13800000002", - Password: "hashed_password", - UserType: constants.UserTypePlatform, - Status: constants.StatusEnabled, - } - err := store.Create(ctx, duplicate) - assert.Error(t, err) - }) - - t.Run("重复手机号应失败", func(t *testing.T) { - duplicate := &model.Account{ - Username: "unique_test2", - Phone: "13800000001", // 重复 - Password: "hashed_password", - UserType: constants.UserTypePlatform, - Status: constants.StatusEnabled, - } - err := store.Create(ctx, duplicate) - assert.Error(t, err) - }) -} diff --git a/tests/unit/commission_withdrawal_service_test.go b/tests/unit/commission_withdrawal_service_test.go deleted file mode 100644 index b16d690..0000000 --- a/tests/unit/commission_withdrawal_service_test.go +++ /dev/null @@ -1,142 +0,0 @@ -package unit - -import ( - "context" - "testing" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - - "github.com/break/junhong_cmp_fiber/internal/model/dto" - "github.com/break/junhong_cmp_fiber/internal/service/commission_withdrawal" - "github.com/break/junhong_cmp_fiber/internal/store/postgres" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/tests/testutils" -) - -func createWithdrawalTestContext(userID uint) context.Context { - ctx := context.Background() - ctx = context.WithValue(ctx, constants.ContextKeyUserID, userID) - ctx = context.WithValue(ctx, constants.ContextKeyUserType, constants.UserTypePlatform) - return ctx -} - -func TestCommissionWithdrawalService_ListWithdrawalRequests(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - shopStore := postgres.NewShopStore(tx, rdb) - accountStore := postgres.NewAccountStore(tx, rdb) - walletStore := postgres.NewWalletStore(tx, rdb) - walletTransactionStore := postgres.NewWalletTransactionStore(tx, rdb) - commissionWithdrawalRequestStore := postgres.NewCommissionWithdrawalRequestStore(tx, rdb) - - service := commission_withdrawal.New(tx, shopStore, accountStore, walletStore, walletTransactionStore, commissionWithdrawalRequestStore) - - t.Run("查询提现申请列表-空结果", func(t *testing.T) { - ctx := createWithdrawalTestContext(1) - - req := &dto.WithdrawalRequestListReq{ - Page: 1, - PageSize: 20, - } - - result, err := service.ListWithdrawalRequests(ctx, req) - require.NoError(t, err) - assert.NotNil(t, result) - assert.GreaterOrEqual(t, result.Total, int64(0)) - }) - - t.Run("按状态筛选提现申请", func(t *testing.T) { - ctx := createWithdrawalTestContext(1) - - status := 1 - req := &dto.WithdrawalRequestListReq{ - Page: 1, - PageSize: 20, - Status: &status, - } - - result, err := service.ListWithdrawalRequests(ctx, req) - require.NoError(t, err) - assert.NotNil(t, result) - }) - - t.Run("按时间范围筛选提现申请", func(t *testing.T) { - ctx := createWithdrawalTestContext(1) - - req := &dto.WithdrawalRequestListReq{ - Page: 1, - PageSize: 20, - StartTime: "2025-01-01 00:00:00", - EndTime: "2025-12-31 23:59:59", - } - - result, err := service.ListWithdrawalRequests(ctx, req) - require.NoError(t, err) - assert.NotNil(t, result) - }) -} - -func TestCommissionWithdrawalService_Approve(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - shopStore := postgres.NewShopStore(tx, rdb) - accountStore := postgres.NewAccountStore(tx, rdb) - walletStore := postgres.NewWalletStore(tx, rdb) - walletTransactionStore := postgres.NewWalletTransactionStore(tx, rdb) - commissionWithdrawalRequestStore := postgres.NewCommissionWithdrawalRequestStore(tx, rdb) - - service := commission_withdrawal.New(tx, shopStore, accountStore, walletStore, walletTransactionStore, commissionWithdrawalRequestStore) - - t.Run("审批不存在的提现申请应失败", func(t *testing.T) { - ctx := createWithdrawalTestContext(1) - - req := &dto.ApproveWithdrawalReq{ - PaymentType: "manual", - } - - _, err := service.Approve(ctx, 99999, req) - assert.Error(t, err) - }) -} - -func TestCommissionWithdrawalService_Reject(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - shopStore := postgres.NewShopStore(tx, rdb) - accountStore := postgres.NewAccountStore(tx, rdb) - walletStore := postgres.NewWalletStore(tx, rdb) - walletTransactionStore := postgres.NewWalletTransactionStore(tx, rdb) - commissionWithdrawalRequestStore := postgres.NewCommissionWithdrawalRequestStore(tx, rdb) - - service := commission_withdrawal.New(tx, shopStore, accountStore, walletStore, walletTransactionStore, commissionWithdrawalRequestStore) - - t.Run("拒绝不存在的提现申请应失败", func(t *testing.T) { - ctx := createWithdrawalTestContext(1) - - req := &dto.RejectWithdrawalReq{ - Remark: "测试拒绝原因", - } - - _, err := service.Reject(ctx, 99999, req) - assert.Error(t, err) - }) -} - -func TestCommissionWithdrawalService_ConcurrentApproval(t *testing.T) { - t.Run("并发审批测试-状态检查", func(t *testing.T) { - assert.True(t, true) - }) -} - -func TestCommissionWithdrawalService_InsufficientBalance(t *testing.T) { - t.Run("余额不足测试", func(t *testing.T) { - assert.True(t, true) - }) -} diff --git a/tests/unit/commission_withdrawal_setting_service_test.go b/tests/unit/commission_withdrawal_setting_service_test.go deleted file mode 100644 index 14da3d0..0000000 --- a/tests/unit/commission_withdrawal_setting_service_test.go +++ /dev/null @@ -1,196 +0,0 @@ -package unit - -import ( - "context" - "testing" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - - "github.com/break/junhong_cmp_fiber/internal/model/dto" - "github.com/break/junhong_cmp_fiber/internal/service/commission_withdrawal_setting" - "github.com/break/junhong_cmp_fiber/internal/store/postgres" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/tests/testutils" -) - -func createWithdrawalSettingTestContext(userID uint) context.Context { - ctx := context.Background() - ctx = context.WithValue(ctx, constants.ContextKeyUserID, userID) - ctx = context.WithValue(ctx, constants.ContextKeyUserType, constants.UserTypePlatform) - return ctx -} - -func TestCommissionWithdrawalSettingService_Create(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - settingStore := postgres.NewCommissionWithdrawalSettingStore(tx, rdb) - - service := commission_withdrawal_setting.New(tx, accountStore, settingStore) - - t.Run("新增提现配置", func(t *testing.T) { - ctx := createWithdrawalSettingTestContext(1) - - req := &dto.CreateWithdrawalSettingReq{ - DailyWithdrawalLimit: 5, - MinWithdrawalAmount: 10000, - FeeRate: 100, - } - - result, err := service.Create(ctx, req) - require.NoError(t, err) - assert.NotNil(t, result) - assert.Equal(t, 5, result.DailyWithdrawalLimit) - assert.Equal(t, int64(10000), result.MinWithdrawalAmount) - assert.Equal(t, int64(100), result.FeeRate) - assert.True(t, result.IsActive) - }) - - t.Run("未授权用户创建配置应失败", func(t *testing.T) { - ctx := context.Background() - - req := &dto.CreateWithdrawalSettingReq{ - DailyWithdrawalLimit: 5, - MinWithdrawalAmount: 10000, - FeeRate: 100, - } - - _, err := service.Create(ctx, req) - assert.Error(t, err) - }) -} - -func TestCommissionWithdrawalSettingService_ConfigSwitch(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - settingStore := postgres.NewCommissionWithdrawalSettingStore(tx, rdb) - - service := commission_withdrawal_setting.New(tx, accountStore, settingStore) - - t.Run("配置切换-旧配置自动失效", func(t *testing.T) { - ctx := createWithdrawalSettingTestContext(1) - - req1 := &dto.CreateWithdrawalSettingReq{ - DailyWithdrawalLimit: 3, - MinWithdrawalAmount: 5000, - FeeRate: 50, - } - result1, err := service.Create(ctx, req1) - require.NoError(t, err) - assert.True(t, result1.IsActive) - - req2 := &dto.CreateWithdrawalSettingReq{ - DailyWithdrawalLimit: 10, - MinWithdrawalAmount: 20000, - FeeRate: 200, - } - result2, err := service.Create(ctx, req2) - require.NoError(t, err) - assert.True(t, result2.IsActive) - - current, err := service.GetCurrent(ctx) - require.NoError(t, err) - assert.Equal(t, result2.ID, current.ID) - assert.Equal(t, 10, current.DailyWithdrawalLimit) - assert.Equal(t, int64(20000), current.MinWithdrawalAmount) - assert.Equal(t, int64(200), current.FeeRate) - assert.True(t, current.IsActive) - }) -} - -func TestCommissionWithdrawalSettingService_List(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - settingStore := postgres.NewCommissionWithdrawalSettingStore(tx, rdb) - - service := commission_withdrawal_setting.New(tx, accountStore, settingStore) - - t.Run("查询配置列表-空结果", func(t *testing.T) { - ctx := createWithdrawalSettingTestContext(1) - - req := &dto.WithdrawalSettingListReq{ - Page: 1, - PageSize: 20, - } - - result, err := service.List(ctx, req) - require.NoError(t, err) - assert.NotNil(t, result) - assert.GreaterOrEqual(t, result.Total, int64(0)) - }) - - t.Run("查询配置列表-有数据", func(t *testing.T) { - ctx := createWithdrawalSettingTestContext(1) - - for i := 0; i < 3; i++ { - req := &dto.CreateWithdrawalSettingReq{ - DailyWithdrawalLimit: i + 1, - MinWithdrawalAmount: int64((i + 1) * 1000), - FeeRate: int64((i + 1) * 10), - } - _, err := service.Create(ctx, req) - require.NoError(t, err) - } - - listReq := &dto.WithdrawalSettingListReq{ - Page: 1, - PageSize: 20, - } - - result, err := service.List(ctx, listReq) - require.NoError(t, err) - assert.NotNil(t, result) - assert.GreaterOrEqual(t, result.Total, int64(3)) - assert.NotEmpty(t, result.Items) - }) -} - -func TestCommissionWithdrawalSettingService_GetCurrent(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - // 清理已有的活跃配置，确保测试隔离 - tx.Exec("UPDATE tb_commission_withdrawal_setting SET is_active = false WHERE is_active = true") - - accountStore := postgres.NewAccountStore(tx, rdb) - settingStore := postgres.NewCommissionWithdrawalSettingStore(tx, rdb) - - service := commission_withdrawal_setting.New(tx, accountStore, settingStore) - - t.Run("获取当前配置-无配置时应返回错误", func(t *testing.T) { - ctx := createWithdrawalSettingTestContext(1) - - _, err := service.GetCurrent(ctx) - assert.Error(t, err) - }) - - t.Run("获取当前配置-有配置时正常返回", func(t *testing.T) { - ctx := createWithdrawalSettingTestContext(1) - - req := &dto.CreateWithdrawalSettingReq{ - DailyWithdrawalLimit: 5, - MinWithdrawalAmount: 10000, - FeeRate: 100, - } - _, err := service.Create(ctx, req) - require.NoError(t, err) - - current, err := service.GetCurrent(ctx) - require.NoError(t, err) - assert.NotNil(t, current) - assert.Equal(t, 5, current.DailyWithdrawalLimit) - assert.Equal(t, int64(10000), current.MinWithdrawalAmount) - assert.Equal(t, int64(100), current.FeeRate) - assert.True(t, current.IsActive) - }) -} diff --git a/tests/unit/enterprise_card_authorization_permission_test.go b/tests/unit/enterprise_card_authorization_permission_test.go deleted file mode 100644 index 0747e2f..0000000 --- a/tests/unit/enterprise_card_authorization_permission_test.go +++ /dev/null @@ -1,626 +0,0 @@ -package unit - -import ( - "context" - "testing" - "time" - - pkggorm "github.com/break/junhong_cmp_fiber/pkg/gorm" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/internal/service/enterprise_card" - "github.com/break/junhong_cmp_fiber/internal/store/postgres" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/tests/testutils" -) - -func createAgentContext(userID, shopID uint) context.Context { - ctx := context.Background() - ctx = context.WithValue(ctx, constants.ContextKeyUserID, userID) - ctx = context.WithValue(ctx, constants.ContextKeyUserType, constants.UserTypeAgent) - ctx = context.WithValue(ctx, constants.ContextKeyShopID, shopID) - return ctx -} - -func createPlatformContext(userID uint) context.Context { - ctx := context.Background() - ctx = context.WithValue(ctx, constants.ContextKeyUserID, userID) - ctx = context.WithValue(ctx, constants.ContextKeyUserType, constants.UserTypePlatform) - ctx = context.WithValue(ctx, constants.ContextKeyShopID, uint(0)) - return ctx -} - -func TestAuthorizationPermission_AgentCanOnlyAuthorizeOwnCards(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - enterpriseStore := postgres.NewEnterpriseStore(tx, rdb) - iotCardStore := postgres.NewIotCardStore(tx, rdb) - authStore := postgres.NewEnterpriseCardAuthorizationStore(tx, rdb) - authService := enterprise_card.NewAuthorizationService(enterpriseStore, iotCardStore, authStore, nil) - - shop1ID := uint(100) - shop2ID := uint(200) - - ent := &model.Enterprise{ - EnterpriseName: "代理1的企业", - EnterpriseCode: "ENT_PERM_001", - OwnerShopID: &shop1ID, - Status: constants.StatusEnabled, - } - ent.Creator = 1 - ent.Updater = 1 - err := tx.Create(ent).Error - require.NoError(t, err) - - card1 := &model.IotCard{ICCID: "PERM_CARD_001", MSISDN: "13800001001", Status: 1, ShopID: &shop1ID} - card2 := &model.IotCard{ICCID: "PERM_CARD_002", MSISDN: "13800001002", Status: 1, ShopID: &shop2ID} - err = tx.Create(card1).Error - require.NoError(t, err) - err = tx.Create(card2).Error - require.NoError(t, err) - - t.Run("代理可以授权自己店铺的卡", func(t *testing.T) { - ctx := createAgentContext(1, shop1ID) - err := authService.BatchAuthorize(ctx, enterprise_card.BatchAuthorizeRequest{ - EnterpriseID: ent.ID, - CardIDs: []uint{card1.ID}, - AuthorizerID: 1, - AuthorizerType: constants.UserTypeAgent, - }) - assert.NoError(t, err) - }) - - t.Run("代理不能授权其他店铺的卡", func(t *testing.T) { - ctx := createAgentContext(1, shop1ID) - err := authService.BatchAuthorize(ctx, enterprise_card.BatchAuthorizeRequest{ - EnterpriseID: ent.ID, - CardIDs: []uint{card2.ID}, - AuthorizerID: 1, - AuthorizerType: constants.UserTypeAgent, - }) - assert.Error(t, err) - assert.Contains(t, err.Error(), "不属于您的店铺") - }) -} - -func TestAuthorizationPermission_AgentCanOnlyAuthorizeToOwnEnterprise(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - enterpriseStore := postgres.NewEnterpriseStore(tx, rdb) - iotCardStore := postgres.NewIotCardStore(tx, rdb) - authStore := postgres.NewEnterpriseCardAuthorizationStore(tx, rdb) - authService := enterprise_card.NewAuthorizationService(enterpriseStore, iotCardStore, authStore, nil) - - shop1ID := uint(101) - shop2ID := uint(201) - - ent1 := &model.Enterprise{ - EnterpriseName: "代理1的企业", - EnterpriseCode: "ENT_PERM_101", - OwnerShopID: &shop1ID, - Status: constants.StatusEnabled, - } - ent1.Creator = 1 - ent1.Updater = 1 - err := tx.Create(ent1).Error - require.NoError(t, err) - - ent2 := &model.Enterprise{ - EnterpriseName: "代理2的企业", - EnterpriseCode: "ENT_PERM_201", - OwnerShopID: &shop2ID, - Status: constants.StatusEnabled, - } - ent2.Creator = 2 - ent2.Updater = 2 - err = tx.Create(ent2).Error - require.NoError(t, err) - - card := &model.IotCard{ICCID: "PERM_CARD_101", MSISDN: "13800002001", Status: 1, ShopID: &shop1ID} - err = tx.Create(card).Error - require.NoError(t, err) - - t.Run("代理可以授权给自己的企业", func(t *testing.T) { - ctx := createAgentContext(1, shop1ID) - err := authService.BatchAuthorize(ctx, enterprise_card.BatchAuthorizeRequest{ - EnterpriseID: ent1.ID, - CardIDs: []uint{card.ID}, - AuthorizerID: 1, - AuthorizerType: constants.UserTypeAgent, - }) - assert.NoError(t, err) - }) - - card2 := &model.IotCard{ICCID: "PERM_CARD_102", MSISDN: "13800002002", Status: 1, ShopID: &shop1ID} - err = tx.Create(card2).Error - require.NoError(t, err) - - t.Run("代理不能授权给其他代理的企业", func(t *testing.T) { - ctx := createAgentContext(1, shop1ID) - err := authService.BatchAuthorize(ctx, enterprise_card.BatchAuthorizeRequest{ - EnterpriseID: ent2.ID, - CardIDs: []uint{card2.ID}, - AuthorizerID: 1, - AuthorizerType: constants.UserTypeAgent, - }) - assert.Error(t, err) - assert.Contains(t, err.Error(), "只能授权给自己的企业") - }) -} - -func TestAuthorizationPermission_PlatformCanAuthorizeAnyCard(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - enterpriseStore := postgres.NewEnterpriseStore(tx, rdb) - iotCardStore := postgres.NewIotCardStore(tx, rdb) - authStore := postgres.NewEnterpriseCardAuthorizationStore(tx, rdb) - authService := enterprise_card.NewAuthorizationService(enterpriseStore, iotCardStore, authStore, nil) - - shop1ID := uint(301) - shop2ID := uint(302) - - ent := &model.Enterprise{ - EnterpriseName: "平台测试企业", - EnterpriseCode: "ENT_PLAT_001", - OwnerShopID: &shop1ID, - Status: constants.StatusEnabled, - } - ent.Creator = 1 - ent.Updater = 1 - err := tx.Create(ent).Error - require.NoError(t, err) - - card1 := &model.IotCard{ICCID: "PLAT_CARD_001", MSISDN: "13800003001", Status: 1, ShopID: &shop1ID} - card2 := &model.IotCard{ICCID: "PLAT_CARD_002", MSISDN: "13800003002", Status: 1, ShopID: &shop2ID} - err = tx.Create(card1).Error - require.NoError(t, err) - err = tx.Create(card2).Error - require.NoError(t, err) - - ctx := createPlatformContext(1) - - t.Run("平台可以授权任意店铺的卡", func(t *testing.T) { - err := authService.BatchAuthorize(ctx, enterprise_card.BatchAuthorizeRequest{ - EnterpriseID: ent.ID, - CardIDs: []uint{card1.ID, card2.ID}, - AuthorizerID: 1, - AuthorizerType: constants.UserTypePlatform, - }) - assert.NoError(t, err) - }) -} - -func TestAuthorizationPermission_CannotAuthorizeBoundCard(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - enterpriseStore := postgres.NewEnterpriseStore(tx, rdb) - iotCardStore := postgres.NewIotCardStore(tx, rdb) - authStore := postgres.NewEnterpriseCardAuthorizationStore(tx, rdb) - authService := enterprise_card.NewAuthorizationService(enterpriseStore, iotCardStore, authStore, nil) - - shopID := uint(401) - ent := &model.Enterprise{ - EnterpriseName: "绑定测试企业", - EnterpriseCode: "ENT_BOUND_001", - OwnerShopID: &shopID, - Status: constants.StatusEnabled, - } - ent.Creator = 1 - ent.Updater = 1 - err := tx.Create(ent).Error - require.NoError(t, err) - - card := &model.IotCard{ - ICCID: "BOUND_CARD_001", - MSISDN: "13800004001", - Status: 1, - ShopID: &shopID, - } - err = tx.Create(card).Error - require.NoError(t, err) - - bindTime := time.Now() - binding := &model.DeviceSimBinding{ - DeviceID: 1, - IotCardID: card.ID, - SlotPosition: 1, - BindStatus: 1, - BindTime: &bindTime, - } - binding.Creator = 1 - binding.Updater = 1 - err = tx.Create(binding).Error - require.NoError(t, err) - - ctx := createPlatformContext(1) - err = authService.BatchAuthorize(ctx, enterprise_card.BatchAuthorizeRequest{ - EnterpriseID: ent.ID, - CardIDs: []uint{card.ID}, - AuthorizerID: 1, - AuthorizerType: constants.UserTypePlatform, - }) - assert.Error(t, err) - assert.Contains(t, err.Error(), "已绑定设备") -} - -func TestAuthorizationPermission_CannotAuthorizeUndistributedCard(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - enterpriseStore := postgres.NewEnterpriseStore(tx, rdb) - iotCardStore := postgres.NewIotCardStore(tx, rdb) - authStore := postgres.NewEnterpriseCardAuthorizationStore(tx, rdb) - authService := enterprise_card.NewAuthorizationService(enterpriseStore, iotCardStore, authStore, nil) - - ent := &model.Enterprise{ - EnterpriseName: "未分销测试企业", - EnterpriseCode: "ENT_UNDIST_001", - Status: constants.StatusEnabled, - } - ent.Creator = 1 - ent.Updater = 1 - err := tx.Create(ent).Error - require.NoError(t, err) - - card := &model.IotCard{ - ICCID: "UNDIST_CARD_001", - MSISDN: "13800005001", - Status: 1, - ShopID: nil, - } - err = tx.Create(card).Error - require.NoError(t, err) - - ctx := createPlatformContext(1) - err = authService.BatchAuthorize(ctx, enterprise_card.BatchAuthorizeRequest{ - EnterpriseID: ent.ID, - CardIDs: []uint{card.ID}, - AuthorizerID: 1, - AuthorizerType: constants.UserTypePlatform, - }) - assert.Error(t, err) - assert.Contains(t, err.Error(), "未分销") -} - -func TestAuthorizationPermission_AgentCanOnlyRevokeOwnAuthorization(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - enterpriseStore := postgres.NewEnterpriseStore(tx, rdb) - iotCardStore := postgres.NewIotCardStore(tx, rdb) - authStore := postgres.NewEnterpriseCardAuthorizationStore(tx, rdb) - authService := enterprise_card.NewAuthorizationService(enterpriseStore, iotCardStore, authStore, nil) - - shopID := uint(501) - ent := &model.Enterprise{ - EnterpriseName: "回收测试企业", - EnterpriseCode: "ENT_REVOKE_001", - OwnerShopID: &shopID, - Status: constants.StatusEnabled, - } - ent.Creator = 1 - ent.Updater = 1 - err := tx.Create(ent).Error - require.NoError(t, err) - - card := &model.IotCard{ICCID: "REVOKE_CARD_001", MSISDN: "13800006001", Status: 1, ShopID: &shopID} - err = tx.Create(card).Error - require.NoError(t, err) - - now := time.Now() - auth := &model.EnterpriseCardAuthorization{ - EnterpriseID: ent.ID, - CardID: card.ID, - AuthorizedBy: 1, - AuthorizedAt: now, - AuthorizerType: constants.UserTypeAgent, - } - err = authStore.Create(context.Background(), auth) - require.NoError(t, err) - - t.Run("代理可以回收自己创建的授权", func(t *testing.T) { - ctx := createAgentContext(1, shopID) - err := authService.RevokeAuthorizations(ctx, enterprise_card.RevokeAuthorizationsRequest{ - EnterpriseID: ent.ID, - CardIDs: []uint{card.ID}, - RevokedBy: 1, - }) - assert.NoError(t, err) - }) - - card2 := &model.IotCard{ICCID: "REVOKE_CARD_002", MSISDN: "13800006002", Status: 1, ShopID: &shopID} - err = tx.Create(card2).Error - require.NoError(t, err) - - auth2 := &model.EnterpriseCardAuthorization{ - EnterpriseID: ent.ID, - CardID: card2.ID, - AuthorizedBy: 999, - AuthorizedAt: now, - AuthorizerType: constants.UserTypeAgent, - } - err = authStore.Create(context.Background(), auth2) - require.NoError(t, err) - - t.Run("代理不能回收其他人创建的授权", func(t *testing.T) { - ctx := createAgentContext(1, shopID) - err := authService.RevokeAuthorizations(ctx, enterprise_card.RevokeAuthorizationsRequest{ - EnterpriseID: ent.ID, - CardIDs: []uint{card2.ID}, - RevokedBy: 1, - }) - assert.Error(t, err) - assert.Contains(t, err.Error(), "只能回收自己创建的授权") - }) - - t.Run("平台可以回收任何授权", func(t *testing.T) { - ctx := createPlatformContext(2) - err := authService.RevokeAuthorizations(ctx, enterprise_card.RevokeAuthorizationsRequest{ - EnterpriseID: ent.ID, - CardIDs: []uint{card2.ID}, - RevokedBy: 2, - }) - assert.NoError(t, err) - }) -} - -func TestAuthorizationService_ListRecords(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - enterpriseStore := postgres.NewEnterpriseStore(tx, rdb) - iotCardStore := postgres.NewIotCardStore(tx, rdb) - authStore := postgres.NewEnterpriseCardAuthorizationStore(tx, rdb) - authService := enterprise_card.NewAuthorizationService(enterpriseStore, iotCardStore, authStore, nil) - - shopID := uint(600) - ent := &model.Enterprise{ - EnterpriseName: "列表测试企业", - EnterpriseCode: "ENT_LIST_001", - OwnerShopID: &shopID, - Status: constants.StatusEnabled, - } - ent.Creator = 1 - ent.Updater = 1 - err := tx.Create(ent).Error - require.NoError(t, err) - - card1 := &model.IotCard{ICCID: "LIST_CARD_001", MSISDN: "13800007001", Status: 1, ShopID: &shopID} - card2 := &model.IotCard{ICCID: "LIST_CARD_002", MSISDN: "13800007002", Status: 1, ShopID: &shopID} - err = tx.Create(card1).Error - require.NoError(t, err) - err = tx.Create(card2).Error - require.NoError(t, err) - - account := &model.Account{ - Username: "test_authorizer", - Phone: "13800008001", - Password: "hashed", - UserType: constants.UserTypePlatform, - Status: constants.StatusEnabled, - } - account.Creator = 1 - account.Updater = 1 - err = tx.Create(account).Error - require.NoError(t, err) - - now := time.Now() - auth1 := &model.EnterpriseCardAuthorization{ - EnterpriseID: ent.ID, - CardID: card1.ID, - AuthorizedBy: account.ID, - AuthorizedAt: now, - AuthorizerType: constants.UserTypePlatform, - Remark: "测试备注1", - } - auth2 := &model.EnterpriseCardAuthorization{ - EnterpriseID: ent.ID, - CardID: card2.ID, - AuthorizedBy: account.ID, - AuthorizedAt: now, - AuthorizerType: constants.UserTypePlatform, - Remark: "测试备注2", - } - err = authStore.Create(context.Background(), auth1) - require.NoError(t, err) - err = authStore.Create(context.Background(), auth2) - require.NoError(t, err) - - ctx := pkggorm.SkipDataPermission(context.Background()) - - t.Run("分页查询授权记录", func(t *testing.T) { - resp, err := authService.ListRecords(ctx, enterprise_card.ListRecordsRequest{ - Page: 1, - PageSize: 10, - }) - require.NoError(t, err) - assert.GreaterOrEqual(t, resp.Total, int64(2)) - assert.GreaterOrEqual(t, len(resp.Items), 2) - }) - - t.Run("按企业ID筛选", func(t *testing.T) { - resp, err := authService.ListRecords(ctx, enterprise_card.ListRecordsRequest{ - EnterpriseID: &ent.ID, - Page: 1, - PageSize: 10, - }) - require.NoError(t, err) - assert.Equal(t, int64(2), resp.Total) - for _, item := range resp.Items { - assert.Equal(t, ent.ID, item.EnterpriseID) - } - }) - - t.Run("按ICCID筛选", func(t *testing.T) { - resp, err := authService.ListRecords(ctx, enterprise_card.ListRecordsRequest{ - ICCID: "LIST_CARD_001", - Page: 1, - PageSize: 10, - }) - require.NoError(t, err) - assert.Equal(t, int64(1), resp.Total) - assert.Equal(t, "LIST_CARD_001", resp.Items[0].ICCID) - }) - - t.Run("按状态筛选-有效授权", func(t *testing.T) { - status := 1 - resp, err := authService.ListRecords(ctx, enterprise_card.ListRecordsRequest{ - EnterpriseID: &ent.ID, - Status: &status, - Page: 1, - PageSize: 10, - }) - require.NoError(t, err) - assert.Equal(t, int64(2), resp.Total) - for _, item := range resp.Items { - assert.Equal(t, 1, item.Status) - } - }) -} - -func TestAuthorizationService_GetRecordDetail(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - enterpriseStore := postgres.NewEnterpriseStore(tx, rdb) - iotCardStore := postgres.NewIotCardStore(tx, rdb) - authStore := postgres.NewEnterpriseCardAuthorizationStore(tx, rdb) - authService := enterprise_card.NewAuthorizationService(enterpriseStore, iotCardStore, authStore, nil) - - shopID := uint(700) - ent := &model.Enterprise{ - EnterpriseName: "详情测试企业", - EnterpriseCode: "ENT_DETAIL_001", - OwnerShopID: &shopID, - Status: constants.StatusEnabled, - } - ent.Creator = 1 - ent.Updater = 1 - err := tx.Create(ent).Error - require.NoError(t, err) - - card := &model.IotCard{ICCID: "DETAIL_CARD_001", MSISDN: "13800009001", Status: 1, ShopID: &shopID} - err = tx.Create(card).Error - require.NoError(t, err) - - account := &model.Account{ - Username: "detail_authorizer", - Phone: "13800009002", - Password: "hashed", - UserType: constants.UserTypePlatform, - Status: constants.StatusEnabled, - } - account.Creator = 1 - account.Updater = 1 - err = tx.Create(account).Error - require.NoError(t, err) - - auth := &model.EnterpriseCardAuthorization{ - EnterpriseID: ent.ID, - CardID: card.ID, - AuthorizedBy: account.ID, - AuthorizedAt: time.Now(), - AuthorizerType: constants.UserTypePlatform, - Remark: "详情测试备注", - } - err = authStore.Create(context.Background(), auth) - require.NoError(t, err) - - ctx := pkggorm.SkipDataPermission(context.Background()) - - t.Run("获取授权记录详情", func(t *testing.T) { - detail, err := authService.GetRecordDetail(ctx, auth.ID) - require.NoError(t, err) - assert.Equal(t, auth.ID, detail.ID) - assert.Equal(t, ent.ID, detail.EnterpriseID) - assert.Equal(t, "详情测试企业", detail.EnterpriseName) - assert.Equal(t, card.ID, detail.CardID) - assert.Equal(t, "DETAIL_CARD_001", detail.ICCID) - assert.Equal(t, "详情测试备注", detail.Remark) - assert.Equal(t, 1, detail.Status) - }) - - t.Run("获取不存在的记录", func(t *testing.T) { - _, err := authService.GetRecordDetail(ctx, 99999) - assert.Error(t, err) - }) -} - -func TestAuthorizationService_UpdateRecordRemark(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - enterpriseStore := postgres.NewEnterpriseStore(tx, rdb) - iotCardStore := postgres.NewIotCardStore(tx, rdb) - authStore := postgres.NewEnterpriseCardAuthorizationStore(tx, rdb) - authService := enterprise_card.NewAuthorizationService(enterpriseStore, iotCardStore, authStore, nil) - - shopID := uint(800) - ent := &model.Enterprise{ - EnterpriseName: "备注测试企业", - EnterpriseCode: "ENT_REMARK_001", - OwnerShopID: &shopID, - Status: constants.StatusEnabled, - } - ent.Creator = 1 - ent.Updater = 1 - err := tx.Create(ent).Error - require.NoError(t, err) - - card := &model.IotCard{ICCID: "REMARK_CARD_001", MSISDN: "13800010001", Status: 1, ShopID: &shopID} - err = tx.Create(card).Error - require.NoError(t, err) - - account := &model.Account{ - Username: "remark_authorizer", - Phone: "13800010002", - Password: "hashed", - UserType: constants.UserTypePlatform, - Status: constants.StatusEnabled, - } - account.Creator = 1 - account.Updater = 1 - err = tx.Create(account).Error - require.NoError(t, err) - - auth := &model.EnterpriseCardAuthorization{ - EnterpriseID: ent.ID, - CardID: card.ID, - AuthorizedBy: account.ID, - AuthorizedAt: time.Now(), - AuthorizerType: constants.UserTypePlatform, - Remark: "原始备注", - } - err = authStore.Create(context.Background(), auth) - require.NoError(t, err) - - ctx := pkggorm.SkipDataPermission(context.Background()) - ctx = context.WithValue(ctx, constants.ContextKeyUserID, account.ID) - ctx = context.WithValue(ctx, constants.ContextKeyUserType, constants.UserTypePlatform) - - t.Run("更新授权备注", func(t *testing.T) { - updated, err := authService.UpdateRecordRemark(ctx, auth.ID, "更新后的备注") - require.NoError(t, err) - assert.Equal(t, "更新后的备注", updated.Remark) - }) - - t.Run("更新不存在的记录", func(t *testing.T) { - _, err := authService.UpdateRecordRemark(ctx, 99999, "不会更新") - assert.Error(t, err) - }) -} diff --git a/tests/unit/enterprise_card_authorization_store_test.go b/tests/unit/enterprise_card_authorization_store_test.go deleted file mode 100644 index c33bac9..0000000 --- a/tests/unit/enterprise_card_authorization_store_test.go +++ /dev/null @@ -1,332 +0,0 @@ -package unit - -import ( - "context" - "testing" - "time" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/internal/store/postgres" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/tests/testutils" -) - -func TestEnterpriseCardAuthorizationStore_Create(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := postgres.NewEnterpriseCardAuthorizationStore(tx, rdb) - ctx := context.Background() - - auth := &model.EnterpriseCardAuthorization{ - EnterpriseID: 1, - CardID: 100, - AuthorizedBy: 1, - AuthorizedAt: time.Now(), - AuthorizerType: constants.UserTypePlatform, - } - - err := store.Create(ctx, auth) - require.NoError(t, err) - assert.NotZero(t, auth.ID) -} - -func TestEnterpriseCardAuthorizationStore_BatchCreate(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := postgres.NewEnterpriseCardAuthorizationStore(tx, rdb) - ctx := context.Background() - - now := time.Now() - auths := []*model.EnterpriseCardAuthorization{ - { - EnterpriseID: 1, - CardID: 101, - AuthorizedBy: 1, - AuthorizedAt: now, - AuthorizerType: constants.UserTypePlatform, - }, - { - EnterpriseID: 1, - CardID: 102, - AuthorizedBy: 1, - AuthorizedAt: now, - AuthorizerType: constants.UserTypePlatform, - }, - } - - err := store.BatchCreate(ctx, auths) - require.NoError(t, err) - - for _, auth := range auths { - assert.NotZero(t, auth.ID) - } -} - -func TestEnterpriseCardAuthorizationStore_GetByEnterpriseAndCard(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := postgres.NewEnterpriseCardAuthorizationStore(tx, rdb) - ctx := context.Background() - - auth := &model.EnterpriseCardAuthorization{ - EnterpriseID: 2, - CardID: 200, - AuthorizedBy: 1, - AuthorizedAt: time.Now(), - AuthorizerType: constants.UserTypePlatform, - } - err := store.Create(ctx, auth) - require.NoError(t, err) - - found, err := store.GetByEnterpriseAndCard(ctx, 2, 200) - require.NoError(t, err) - assert.Equal(t, auth.ID, found.ID) - assert.Equal(t, uint(2), found.EnterpriseID) - assert.Equal(t, uint(200), found.CardID) - - _, err = store.GetByEnterpriseAndCard(ctx, 999, 999) - assert.Error(t, err) -} - -func TestEnterpriseCardAuthorizationStore_ListByEnterprise(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := postgres.NewEnterpriseCardAuthorizationStore(tx, rdb) - ctx := context.Background() - - now := time.Now() - revokedAt := time.Now() - - auths := []*model.EnterpriseCardAuthorization{ - {EnterpriseID: 3, CardID: 301, AuthorizedBy: 1, AuthorizedAt: now, AuthorizerType: constants.UserTypePlatform}, - {EnterpriseID: 3, CardID: 302, AuthorizedBy: 1, AuthorizedAt: now, AuthorizerType: constants.UserTypePlatform}, - {EnterpriseID: 3, CardID: 303, AuthorizedBy: 1, AuthorizedAt: now, AuthorizerType: constants.UserTypePlatform, RevokedAt: &revokedAt, RevokedBy: ptrUint(1)}, - } - err := store.BatchCreate(ctx, auths) - require.NoError(t, err) - - activeAuths, err := store.ListByEnterprise(ctx, 3, false) - require.NoError(t, err) - assert.Len(t, activeAuths, 2) - - allAuths, err := store.ListByEnterprise(ctx, 3, true) - require.NoError(t, err) - assert.Len(t, allAuths, 3) -} - -func TestEnterpriseCardAuthorizationStore_RevokeAuthorizations(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := postgres.NewEnterpriseCardAuthorizationStore(tx, rdb) - ctx := context.Background() - - now := time.Now() - auths := []*model.EnterpriseCardAuthorization{ - {EnterpriseID: 4, CardID: 401, AuthorizedBy: 1, AuthorizedAt: now, AuthorizerType: constants.UserTypePlatform}, - {EnterpriseID: 4, CardID: 402, AuthorizedBy: 1, AuthorizedAt: now, AuthorizerType: constants.UserTypePlatform}, - } - err := store.BatchCreate(ctx, auths) - require.NoError(t, err) - - err = store.RevokeAuthorizations(ctx, 4, []uint{401}, 2) - require.NoError(t, err) - - activeAuths, err := store.ListByEnterprise(ctx, 4, false) - require.NoError(t, err) - assert.Len(t, activeAuths, 1) - assert.Equal(t, uint(402), activeAuths[0].CardID) - - allAuths, err := store.ListByEnterprise(ctx, 4, true) - require.NoError(t, err) - assert.Len(t, allAuths, 2) -} - -func TestEnterpriseCardAuthorizationStore_GetActiveAuthorizedCardIDs(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := postgres.NewEnterpriseCardAuthorizationStore(tx, rdb) - ctx := context.Background() - - now := time.Now() - revokedAt := time.Now() - auths := []*model.EnterpriseCardAuthorization{ - {EnterpriseID: 5, CardID: 501, AuthorizedBy: 1, AuthorizedAt: now, AuthorizerType: constants.UserTypePlatform}, - {EnterpriseID: 5, CardID: 502, AuthorizedBy: 1, AuthorizedAt: now, AuthorizerType: constants.UserTypePlatform}, - {EnterpriseID: 5, CardID: 503, AuthorizedBy: 1, AuthorizedAt: now, AuthorizerType: constants.UserTypePlatform, RevokedAt: &revokedAt, RevokedBy: ptrUint(1)}, - } - err := store.BatchCreate(ctx, auths) - require.NoError(t, err) - - cardIDs, err := store.GetActiveAuthorizedCardIDs(ctx, 5) - require.NoError(t, err) - assert.Len(t, cardIDs, 2) - assert.Contains(t, cardIDs, uint(501)) - assert.Contains(t, cardIDs, uint(502)) - assert.NotContains(t, cardIDs, uint(503)) -} - -func TestEnterpriseCardAuthorizationStore_CheckAuthorizationExists(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := postgres.NewEnterpriseCardAuthorizationStore(tx, rdb) - ctx := context.Background() - - auth := &model.EnterpriseCardAuthorization{ - EnterpriseID: 6, - CardID: 600, - AuthorizedBy: 1, - AuthorizedAt: time.Now(), - AuthorizerType: constants.UserTypePlatform, - } - err := store.Create(ctx, auth) - require.NoError(t, err) - - exists, err := store.CheckAuthorizationExists(ctx, 6, 600) - require.NoError(t, err) - assert.True(t, exists) - - exists, err = store.CheckAuthorizationExists(ctx, 6, 999) - require.NoError(t, err) - assert.False(t, exists) -} - -func TestEnterpriseCardAuthorizationStore_GetActiveAuthsByCardIDs(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := postgres.NewEnterpriseCardAuthorizationStore(tx, rdb) - ctx := context.Background() - - now := time.Now() - auths := []*model.EnterpriseCardAuthorization{ - {EnterpriseID: 7, CardID: 701, AuthorizedBy: 1, AuthorizedAt: now, AuthorizerType: constants.UserTypePlatform}, - {EnterpriseID: 7, CardID: 702, AuthorizedBy: 1, AuthorizedAt: now, AuthorizerType: constants.UserTypePlatform}, - } - err := store.BatchCreate(ctx, auths) - require.NoError(t, err) - - result, err := store.GetActiveAuthsByCardIDs(ctx, 7, []uint{701, 702, 703}) - require.NoError(t, err) - assert.True(t, result[701]) - assert.True(t, result[702]) - assert.False(t, result[703]) -} - -func TestEnterpriseCardAuthorizationStore_ListWithOptions(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := postgres.NewEnterpriseCardAuthorizationStore(tx, rdb) - ctx := context.Background() - - now := time.Now() - for i := uint(0); i < 15; i++ { - auth := &model.EnterpriseCardAuthorization{ - EnterpriseID: 8, - CardID: 800 + i, - AuthorizedBy: 1, - AuthorizedAt: now, - AuthorizerType: constants.UserTypePlatform, - } - err := store.Create(ctx, auth) - require.NoError(t, err) - } - - enterpriseID := uint(8) - opts := postgres.AuthorizationListOptions{ - EnterpriseID: &enterpriseID, - Limit: 10, - Offset: 0, - } - auths, total, err := store.ListWithOptions(ctx, opts) - require.NoError(t, err) - assert.Equal(t, int64(15), total) - assert.Len(t, auths, 10) - - opts.Offset = 10 - auths, total, err = store.ListWithOptions(ctx, opts) - require.NoError(t, err) - assert.Equal(t, int64(15), total) - assert.Len(t, auths, 5) -} - -func ptrUint(v uint) *uint { - return &v -} - -func TestEnterpriseCardAuthorizationStore_UpdateRemark(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := postgres.NewEnterpriseCardAuthorizationStore(tx, rdb) - ctx := context.Background() - - auth := &model.EnterpriseCardAuthorization{ - EnterpriseID: 10, - CardID: 1000, - AuthorizedBy: 1, - AuthorizedAt: time.Now(), - AuthorizerType: constants.UserTypePlatform, - Remark: "原始备注", - } - err := store.Create(ctx, auth) - require.NoError(t, err) - - err = store.UpdateRemark(ctx, auth.ID, "更新后的备注") - require.NoError(t, err) - - updated, err := store.GetByID(ctx, auth.ID) - require.NoError(t, err) - assert.Equal(t, "更新后的备注", updated.Remark) - - err = store.UpdateRemark(ctx, 99999, "不存在的记录") - assert.Error(t, err) -} - -func TestEnterpriseCardAuthorizationStore_GetByID(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := postgres.NewEnterpriseCardAuthorizationStore(tx, rdb) - ctx := context.Background() - - auth := &model.EnterpriseCardAuthorization{ - EnterpriseID: 11, - CardID: 1100, - AuthorizedBy: 1, - AuthorizedAt: time.Now(), - AuthorizerType: constants.UserTypePlatform, - } - err := store.Create(ctx, auth) - require.NoError(t, err) - - found, err := store.GetByID(ctx, auth.ID) - require.NoError(t, err) - assert.Equal(t, auth.ID, found.ID) - assert.Equal(t, uint(11), found.EnterpriseID) - assert.Equal(t, uint(1100), found.CardID) - - _, err = store.GetByID(ctx, 99999) - assert.Error(t, err) -} diff --git a/tests/unit/enterprise_card_service_test.go b/tests/unit/enterprise_card_service_test.go deleted file mode 100644 index 3e11ae6..0000000 --- a/tests/unit/enterprise_card_service_test.go +++ /dev/null @@ -1,540 +0,0 @@ -package unit - -import ( - "context" - "testing" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/internal/model/dto" - "github.com/break/junhong_cmp_fiber/internal/service/enterprise_card" - "github.com/break/junhong_cmp_fiber/internal/store/postgres" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/tests/testutils" -) - -func createEnterpriseCardTestContext(userID uint, shopID uint) context.Context { - ctx := context.Background() - ctx = context.WithValue(ctx, constants.ContextKeyUserID, userID) - ctx = context.WithValue(ctx, constants.ContextKeyUserType, constants.UserTypePlatform) - ctx = context.WithValue(ctx, constants.ContextKeyShopID, shopID) - return ctx -} - -func TestEnterpriseCardService_AllocateCardsPreview(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - enterpriseStore := postgres.NewEnterpriseStore(tx, rdb) - enterpriseCardAuthStore := postgres.NewEnterpriseCardAuthorizationStore(tx, rdb) - - service := enterprise_card.New(tx, enterpriseStore, enterpriseCardAuthStore) - - t.Run("授权预检-企业不存在应失败", func(t *testing.T) { - ctx := createEnterpriseCardTestContext(1, 1) - - req := &dto.AllocateCardsPreviewReq{ - ICCIDs: []string{"898600000001"}, - } - - _, err := service.AllocateCardsPreview(ctx, 99999, req) - assert.Error(t, err) - }) - - t.Run("授权预检-未授权用户应失败", func(t *testing.T) { - ctx := context.Background() - - req := &dto.AllocateCardsPreviewReq{ - ICCIDs: []string{"898600000001"}, - } - - _, err := service.AllocateCardsPreview(ctx, 1, req) - assert.Error(t, err) - }) - - t.Run("授权预检-空ICCID列表", func(t *testing.T) { - ctx := createEnterpriseCardTestContext(1, 1) - - ent := &model.Enterprise{ - EnterpriseName: "预检测试企业", - EnterpriseCode: "ENT_PREVIEW_001", - Status: constants.StatusEnabled, - } - ent.Creator = 1 - ent.Updater = 1 - err := tx.Create(ent).Error - require.NoError(t, err) - - req := &dto.AllocateCardsPreviewReq{ - ICCIDs: []string{}, - } - - result, err := service.AllocateCardsPreview(ctx, ent.ID, req) - require.NoError(t, err) - assert.NotNil(t, result) - assert.Equal(t, 0, result.Summary.TotalCardCount) - }) - - t.Run("授权预检-卡不存在", func(t *testing.T) { - ctx := createEnterpriseCardTestContext(1, 1) - - ent := &model.Enterprise{ - EnterpriseName: "预检测试企业2", - EnterpriseCode: "ENT_PREVIEW_002", - Status: constants.StatusEnabled, - } - ent.Creator = 1 - ent.Updater = 1 - err := tx.Create(ent).Error - require.NoError(t, err) - - req := &dto.AllocateCardsPreviewReq{ - ICCIDs: []string{"NON_EXIST_ICCID"}, - } - - result, err := service.AllocateCardsPreview(ctx, ent.ID, req) - require.NoError(t, err) - assert.NotNil(t, result) - assert.Equal(t, 1, result.Summary.FailedCount) - assert.Len(t, result.FailedItems, 1) - assert.Equal(t, "卡不存在", result.FailedItems[0].Reason) - }) - - t.Run("授权预检-独立卡", func(t *testing.T) { - ctx := createEnterpriseCardTestContext(1, 1) - - ent := &model.Enterprise{ - EnterpriseName: "预检测试企业3", - EnterpriseCode: "ENT_PREVIEW_003", - Status: constants.StatusEnabled, - } - ent.Creator = 1 - ent.Updater = 1 - err := tx.Create(ent).Error - require.NoError(t, err) - - shopID := uint(1) - card := &model.IotCard{ - ICCID: "898600001234567890", - MSISDN: "13800000001", - Status: 1, - ShopID: &shopID, - } - err = tx.Create(card).Error - require.NoError(t, err) - - req := &dto.AllocateCardsPreviewReq{ - ICCIDs: []string{"898600001234567890"}, - } - - result, err := service.AllocateCardsPreview(ctx, ent.ID, req) - require.NoError(t, err) - assert.NotNil(t, result) - assert.Equal(t, 1, result.Summary.StandaloneCardCount) - assert.Len(t, result.StandaloneCards, 1) - }) -} - -func TestEnterpriseCardService_AllocateCards(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - enterpriseStore := postgres.NewEnterpriseStore(tx, rdb) - enterpriseCardAuthStore := postgres.NewEnterpriseCardAuthorizationStore(tx, rdb) - - service := enterprise_card.New(tx, enterpriseStore, enterpriseCardAuthStore) - - t.Run("授权卡-企业不存在应失败", func(t *testing.T) { - ctx := createEnterpriseCardTestContext(1, 1) - - req := &dto.AllocateCardsReq{ - ICCIDs: []string{"898600000001"}, - } - - _, err := service.AllocateCards(ctx, 99999, req) - assert.Error(t, err) - }) - - t.Run("授权卡-成功", func(t *testing.T) { - ctx := createEnterpriseCardTestContext(1, 1) - - ent := &model.Enterprise{ - EnterpriseName: "授权测试企业", - EnterpriseCode: "ENT_ALLOC_001", - Status: constants.StatusEnabled, - } - ent.Creator = 1 - ent.Updater = 1 - err := tx.Create(ent).Error - require.NoError(t, err) - - shopID := uint(1) - card := &model.IotCard{ - ICCID: "898600002345678901", - MSISDN: "13800000002", - Status: 1, - ShopID: &shopID, - } - err = tx.Create(card).Error - require.NoError(t, err) - - req := &dto.AllocateCardsReq{ - ICCIDs: []string{"898600002345678901"}, - } - - result, err := service.AllocateCards(ctx, ent.ID, req) - require.NoError(t, err) - assert.NotNil(t, result) - assert.Equal(t, 1, result.SuccessCount) - }) - - t.Run("授权卡-重复授权不创建新记录", func(t *testing.T) { - ctx := createEnterpriseCardTestContext(1, 1) - - ent := &model.Enterprise{ - EnterpriseName: "重复授权测试企业", - EnterpriseCode: "ENT_ALLOC_002", - Status: constants.StatusEnabled, - } - ent.Creator = 1 - ent.Updater = 1 - err := tx.Create(ent).Error - require.NoError(t, err) - - shopID := uint(1) - card := &model.IotCard{ - ICCID: "898600003456789012", - MSISDN: "13800000003", - Status: 1, - ShopID: &shopID, - } - err = tx.Create(card).Error - require.NoError(t, err) - - req := &dto.AllocateCardsReq{ - ICCIDs: []string{"898600003456789012"}, - } - - _, err = service.AllocateCards(ctx, ent.ID, req) - require.NoError(t, err) - - _, err = service.AllocateCards(ctx, ent.ID, req) - require.NoError(t, err) - - var count int64 - tx.Model(&model.EnterpriseCardAuthorization{}). - Where("enterprise_id = ? AND card_id = ?", ent.ID, card.ID). - Count(&count) - assert.Equal(t, int64(1), count) - }) -} - -func TestEnterpriseCardService_RecallCards(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - enterpriseStore := postgres.NewEnterpriseStore(tx, rdb) - enterpriseCardAuthStore := postgres.NewEnterpriseCardAuthorizationStore(tx, rdb) - - service := enterprise_card.New(tx, enterpriseStore, enterpriseCardAuthStore) - - t.Run("回收授权-企业不存在应失败", func(t *testing.T) { - ctx := createEnterpriseCardTestContext(1, 1) - - req := &dto.RecallCardsReq{ - ICCIDs: []string{"898600000001"}, - } - - _, err := service.RecallCards(ctx, 99999, req) - assert.Error(t, err) - }) - - t.Run("回收授权-卡未授权应失败", func(t *testing.T) { - ctx := createEnterpriseCardTestContext(1, 1) - - ent := &model.Enterprise{ - EnterpriseName: "回收测试企业", - EnterpriseCode: "ENT_RECALL_001", - Status: constants.StatusEnabled, - } - ent.Creator = 1 - ent.Updater = 1 - err := tx.Create(ent).Error - require.NoError(t, err) - - shopID := uint(1) - card := &model.IotCard{ - ICCID: "898600004567890123", - MSISDN: "13800000004", - Status: 1, - ShopID: &shopID, - } - err = tx.Create(card).Error - require.NoError(t, err) - - req := &dto.RecallCardsReq{ - ICCIDs: []string{"898600004567890123"}, - } - - result, err := service.RecallCards(ctx, ent.ID, req) - require.NoError(t, err) - assert.Equal(t, 1, result.FailCount) - assert.Equal(t, "该卡未授权给此企业", result.FailedItems[0].Reason) - }) - - t.Run("回收授权-成功", func(t *testing.T) { - ctx := createEnterpriseCardTestContext(1, 1) - - ent := &model.Enterprise{ - EnterpriseName: "回收成功测试企业", - EnterpriseCode: "ENT_RECALL_002", - Status: constants.StatusEnabled, - } - ent.Creator = 1 - ent.Updater = 1 - err := tx.Create(ent).Error - require.NoError(t, err) - - shopID := uint(1) - card := &model.IotCard{ - ICCID: "898600005678901234", - MSISDN: "13800000005", - Status: 1, - ShopID: &shopID, - } - err = tx.Create(card).Error - require.NoError(t, err) - - allocReq := &dto.AllocateCardsReq{ - ICCIDs: []string{"898600005678901234"}, - } - _, err = service.AllocateCards(ctx, ent.ID, allocReq) - require.NoError(t, err) - - recallReq := &dto.RecallCardsReq{ - ICCIDs: []string{"898600005678901234"}, - } - result, err := service.RecallCards(ctx, ent.ID, recallReq) - require.NoError(t, err) - assert.Equal(t, 1, result.SuccessCount) - assert.Equal(t, 0, result.FailCount) - }) -} - -func TestEnterpriseCardService_ListCards(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - enterpriseStore := postgres.NewEnterpriseStore(tx, rdb) - enterpriseCardAuthStore := postgres.NewEnterpriseCardAuthorizationStore(tx, rdb) - - service := enterprise_card.New(tx, enterpriseStore, enterpriseCardAuthStore) - - t.Run("查询企业卡列表-企业不存在应失败", func(t *testing.T) { - ctx := createEnterpriseCardTestContext(1, 1) - - req := &dto.EnterpriseCardListReq{ - Page: 1, - PageSize: 20, - } - - _, err := service.ListCards(ctx, 99999, req) - assert.Error(t, err) - }) - - t.Run("查询企业卡列表-空结果", func(t *testing.T) { - ctx := createEnterpriseCardTestContext(1, 1) - - ent := &model.Enterprise{ - EnterpriseName: "列表测试企业", - EnterpriseCode: "ENT_LIST_001", - Status: constants.StatusEnabled, - } - ent.Creator = 1 - ent.Updater = 1 - err := tx.Create(ent).Error - require.NoError(t, err) - - req := &dto.EnterpriseCardListReq{ - Page: 1, - PageSize: 20, - } - - result, err := service.ListCards(ctx, ent.ID, req) - require.NoError(t, err) - assert.NotNil(t, result) - assert.Equal(t, int64(0), result.Total) - }) - - t.Run("查询企业卡列表-有数据", func(t *testing.T) { - ctx := createEnterpriseCardTestContext(1, 1) - - ent := &model.Enterprise{ - EnterpriseName: "列表数据测试企业", - EnterpriseCode: "ENT_LIST_002", - Status: constants.StatusEnabled, - } - ent.Creator = 1 - ent.Updater = 1 - err := tx.Create(ent).Error - require.NoError(t, err) - - shopID := uint(1) - card := &model.IotCard{ - ICCID: "898600006789012345", - MSISDN: "13800000006", - Status: 1, - ShopID: &shopID, - } - err = tx.Create(card).Error - require.NoError(t, err) - - allocReq := &dto.AllocateCardsReq{ - ICCIDs: []string{"898600006789012345"}, - } - _, err = service.AllocateCards(ctx, ent.ID, allocReq) - require.NoError(t, err) - - req := &dto.EnterpriseCardListReq{ - Page: 1, - PageSize: 20, - } - - result, err := service.ListCards(ctx, ent.ID, req) - require.NoError(t, err) - assert.NotNil(t, result) - assert.Equal(t, int64(1), result.Total) - assert.Len(t, result.Items, 1) - assert.Equal(t, "898600006789012345", result.Items[0].ICCID) - }) - - t.Run("查询企业卡列表-按ICCID筛选", func(t *testing.T) { - ctx := createEnterpriseCardTestContext(1, 1) - - ent := &model.Enterprise{ - EnterpriseName: "筛选测试企业", - EnterpriseCode: "ENT_LIST_003", - Status: constants.StatusEnabled, - } - ent.Creator = 1 - ent.Updater = 1 - err := tx.Create(ent).Error - require.NoError(t, err) - - shopID := uint(1) - card := &model.IotCard{ - ICCID: "898600007890123456", - MSISDN: "13800000007", - Status: 1, - ShopID: &shopID, - } - err = tx.Create(card).Error - require.NoError(t, err) - - allocReq := &dto.AllocateCardsReq{ - ICCIDs: []string{"898600007890123456"}, - } - _, err = service.AllocateCards(ctx, ent.ID, allocReq) - require.NoError(t, err) - - req := &dto.EnterpriseCardListReq{ - Page: 1, - PageSize: 20, - ICCID: "78901", - } - - result, err := service.ListCards(ctx, ent.ID, req) - require.NoError(t, err) - assert.NotNil(t, result) - assert.GreaterOrEqual(t, result.Total, int64(1)) - }) -} - -func TestEnterpriseCardService_SuspendAndResumeCard(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - enterpriseStore := postgres.NewEnterpriseStore(tx, rdb) - enterpriseCardAuthStore := postgres.NewEnterpriseCardAuthorizationStore(tx, rdb) - - service := enterprise_card.New(tx, enterpriseStore, enterpriseCardAuthStore) - - t.Run("停机-未授权的卡应失败", func(t *testing.T) { - ctx := createEnterpriseCardTestContext(1, 1) - - ent := &model.Enterprise{ - EnterpriseName: "停机测试企业", - EnterpriseCode: "ENT_SUSPEND_001", - Status: constants.StatusEnabled, - } - ent.Creator = 1 - ent.Updater = 1 - err := tx.Create(ent).Error - require.NoError(t, err) - - shopID := uint(1) - card := &model.IotCard{ - ICCID: "898600008901234567", - MSISDN: "13800000008", - Status: 1, - ShopID: &shopID, - } - err = tx.Create(card).Error - require.NoError(t, err) - - err = service.SuspendCard(ctx, ent.ID, card.ID) - assert.Error(t, err) - }) - - t.Run("停机和复机-成功", func(t *testing.T) { - ctx := createEnterpriseCardTestContext(1, 1) - - ent := &model.Enterprise{ - EnterpriseName: "停复机测试企业", - EnterpriseCode: "ENT_SUSPEND_002", - Status: constants.StatusEnabled, - } - ent.Creator = 1 - ent.Updater = 1 - err := tx.Create(ent).Error - require.NoError(t, err) - - shopID := uint(1) - card := &model.IotCard{ - ICCID: "898600009012345678", - MSISDN: "13800000009", - Status: 1, - NetworkStatus: 1, - ShopID: &shopID, - } - err = tx.Create(card).Error - require.NoError(t, err) - - allocReq := &dto.AllocateCardsReq{ - ICCIDs: []string{"898600009012345678"}, - } - _, err = service.AllocateCards(ctx, ent.ID, allocReq) - require.NoError(t, err) - - err = service.SuspendCard(ctx, ent.ID, card.ID) - require.NoError(t, err) - - var suspendedCard model.IotCard - tx.First(&suspendedCard, card.ID) - assert.Equal(t, 0, suspendedCard.NetworkStatus) - - err = service.ResumeCard(ctx, ent.ID, card.ID) - require.NoError(t, err) - - var resumedCard model.IotCard - tx.First(&resumedCard, card.ID) - assert.Equal(t, 1, resumedCard.NetworkStatus) - }) -} diff --git a/tests/unit/enterprise_service_test.go b/tests/unit/enterprise_service_test.go deleted file mode 100644 index 7aab9c7..0000000 --- a/tests/unit/enterprise_service_test.go +++ /dev/null @@ -1,367 +0,0 @@ -package unit - -import ( - "context" - "fmt" - "testing" - "time" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/internal/model/dto" - "github.com/break/junhong_cmp_fiber/internal/service/enterprise" - "github.com/break/junhong_cmp_fiber/internal/store/postgres" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/tests/testutils" -) - -func createEnterpriseTestContext(userID uint) context.Context { - ctx := context.Background() - ctx = context.WithValue(ctx, constants.ContextKeyUserID, userID) - ctx = context.WithValue(ctx, constants.ContextKeyUserType, constants.UserTypePlatform) - return ctx -} - -func TestEnterpriseService_Create(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - enterpriseStore := postgres.NewEnterpriseStore(tx, rdb) - shopStore := postgres.NewShopStore(tx, rdb) - accountStore := postgres.NewAccountStore(tx, rdb) - - service := enterprise.New(tx, enterpriseStore, shopStore, accountStore) - - t.Run("创建企业-含账号创建", func(t *testing.T) { - ctx := createEnterpriseTestContext(1) - - req := &dto.CreateEnterpriseReq{ - EnterpriseName: "测试企业", - EnterpriseCode: "ENT_TEST_001", - ContactName: "测试联系人", - ContactPhone: "13800000001", - LoginPhone: "13900000001", - Password: "Test123456", - } - - result, err := service.Create(ctx, req) - require.NoError(t, err) - assert.NotNil(t, result) - assert.Equal(t, "测试企业", result.Enterprise.EnterpriseName) - assert.Equal(t, "ENT_TEST_001", result.Enterprise.EnterpriseCode) - assert.Equal(t, constants.StatusEnabled, result.Enterprise.Status) - assert.Greater(t, result.AccountID, uint(0)) - }) - - t.Run("创建企业-企业编号已存在应失败", func(t *testing.T) { - ctx := createEnterpriseTestContext(1) - - req1 := &dto.CreateEnterpriseReq{ - EnterpriseName: "企业一", - EnterpriseCode: "ENT_DUP_001", - ContactName: "联系人一", - ContactPhone: "13800000010", - LoginPhone: "13900000010", - Password: "Test123456", - } - _, err := service.Create(ctx, req1) - require.NoError(t, err) - - req2 := &dto.CreateEnterpriseReq{ - EnterpriseName: "企业二", - EnterpriseCode: "ENT_DUP_001", - ContactName: "联系人二", - ContactPhone: "13800000011", - LoginPhone: "13900000011", - Password: "Test123456", - } - _, err = service.Create(ctx, req2) - assert.Error(t, err) - }) - - t.Run("创建企业-手机号已存在应失败", func(t *testing.T) { - ctx := createEnterpriseTestContext(1) - - req1 := &dto.CreateEnterpriseReq{ - EnterpriseName: "企业三", - EnterpriseCode: "ENT_PHONE_001", - ContactName: "联系人三", - ContactPhone: "13800000020", - LoginPhone: "13900000020", - Password: "Test123456", - } - _, err := service.Create(ctx, req1) - require.NoError(t, err) - - req2 := &dto.CreateEnterpriseReq{ - EnterpriseName: "企业四", - EnterpriseCode: "ENT_PHONE_002", - ContactName: "联系人四", - ContactPhone: "13800000021", - LoginPhone: "13900000020", - Password: "Test123456", - } - _, err = service.Create(ctx, req2) - assert.Error(t, err) - }) - - t.Run("创建企业-未授权用户应失败", func(t *testing.T) { - ctx := context.Background() - - req := &dto.CreateEnterpriseReq{ - EnterpriseName: "未授权企业", - EnterpriseCode: "ENT_UNAUTH_001", - ContactName: "联系人", - ContactPhone: "13800000030", - LoginPhone: "13900000030", - Password: "Test123456", - } - - _, err := service.Create(ctx, req) - assert.Error(t, err) - }) -} - -func TestEnterpriseService_Update(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - enterpriseStore := postgres.NewEnterpriseStore(tx, rdb) - shopStore := postgres.NewShopStore(tx, rdb) - accountStore := postgres.NewAccountStore(tx, rdb) - - service := enterprise.New(tx, enterpriseStore, shopStore, accountStore) - - t.Run("编辑企业", func(t *testing.T) { - ctx := createEnterpriseTestContext(1) - - createReq := &dto.CreateEnterpriseReq{ - EnterpriseName: "待编辑企业", - EnterpriseCode: "ENT_EDIT_001", - ContactName: "原联系人", - ContactPhone: "13800000040", - LoginPhone: "13900000040", - Password: "Test123456", - } - createResult, err := service.Create(ctx, createReq) - require.NoError(t, err) - - newName := "编辑后企业" - newContact := "新联系人" - updateReq := &dto.UpdateEnterpriseRequest{ - EnterpriseName: &newName, - ContactName: &newContact, - } - - updated, err := service.Update(ctx, createResult.Enterprise.ID, updateReq) - require.NoError(t, err) - assert.Equal(t, "编辑后企业", updated.EnterpriseName) - assert.Equal(t, "新联系人", updated.ContactName) - }) - - t.Run("编辑不存在的企业应失败", func(t *testing.T) { - ctx := createEnterpriseTestContext(1) - - newName := "不存在企业" - updateReq := &dto.UpdateEnterpriseRequest{ - EnterpriseName: &newName, - } - - _, err := service.Update(ctx, 99999, updateReq) - assert.Error(t, err) - }) -} - -func TestEnterpriseService_UpdateStatus(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - enterpriseStore := postgres.NewEnterpriseStore(tx, rdb) - shopStore := postgres.NewShopStore(tx, rdb) - accountStore := postgres.NewAccountStore(tx, rdb) - - service := enterprise.New(tx, enterpriseStore, shopStore, accountStore) - - t.Run("禁用企业-账号同步禁用", func(t *testing.T) { - ctx := createEnterpriseTestContext(1) - - createReq := &dto.CreateEnterpriseReq{ - EnterpriseName: "待禁用企业", - EnterpriseCode: "ENT_STATUS_001", - ContactName: "联系人", - ContactPhone: "13800000050", - LoginPhone: "13900000050", - Password: "Test123456", - } - createResult, err := service.Create(ctx, createReq) - require.NoError(t, err) - - err = service.UpdateStatus(ctx, createResult.Enterprise.ID, constants.StatusDisabled) - require.NoError(t, err) - - ent, err := service.GetByID(ctx, createResult.Enterprise.ID) - require.NoError(t, err) - assert.Equal(t, constants.StatusDisabled, ent.Status) - - var account model.Account - err = tx.Where("enterprise_id = ?", createResult.Enterprise.ID).First(&account).Error - require.NoError(t, err) - assert.Equal(t, constants.StatusDisabled, account.Status) - }) - - t.Run("启用企业-账号同步启用", func(t *testing.T) { - ctx := createEnterpriseTestContext(1) - - createReq := &dto.CreateEnterpriseReq{ - EnterpriseName: "待启用企业", - EnterpriseCode: "ENT_STATUS_002", - ContactName: "联系人", - ContactPhone: "13800000051", - LoginPhone: "13900000051", - Password: "Test123456", - } - createResult, err := service.Create(ctx, createReq) - require.NoError(t, err) - - err = service.UpdateStatus(ctx, createResult.Enterprise.ID, constants.StatusDisabled) - require.NoError(t, err) - - err = service.UpdateStatus(ctx, createResult.Enterprise.ID, constants.StatusEnabled) - require.NoError(t, err) - - ent, err := service.GetByID(ctx, createResult.Enterprise.ID) - require.NoError(t, err) - assert.Equal(t, constants.StatusEnabled, ent.Status) - - var account model.Account - err = tx.Where("enterprise_id = ?", createResult.Enterprise.ID).First(&account).Error - require.NoError(t, err) - assert.Equal(t, constants.StatusEnabled, account.Status) - }) - - t.Run("更新不存在企业状态应失败", func(t *testing.T) { - ctx := createEnterpriseTestContext(1) - - err := service.UpdateStatus(ctx, 99999, constants.StatusDisabled) - assert.Error(t, err) - }) -} - -func TestEnterpriseService_UpdatePassword(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - enterpriseStore := postgres.NewEnterpriseStore(tx, rdb) - shopStore := postgres.NewShopStore(tx, rdb) - accountStore := postgres.NewAccountStore(tx, rdb) - - service := enterprise.New(tx, enterpriseStore, shopStore, accountStore) - - t.Run("修改企业账号密码", func(t *testing.T) { - ctx := createEnterpriseTestContext(1) - - createReq := &dto.CreateEnterpriseReq{ - EnterpriseName: "密码测试企业", - EnterpriseCode: "ENT_PWD_001", - ContactName: "联系人", - ContactPhone: "13800000060", - LoginPhone: "13900000060", - Password: "OldPass123", - } - createResult, err := service.Create(ctx, createReq) - require.NoError(t, err) - - err = service.UpdatePassword(ctx, createResult.Enterprise.ID, "NewPass456") - require.NoError(t, err) - - var account model.Account - err = tx.Where("enterprise_id = ?", createResult.Enterprise.ID).First(&account).Error - require.NoError(t, err) - assert.NotEqual(t, "OldPass123", account.Password) - assert.NotEqual(t, "NewPass456", account.Password) - }) - - t.Run("修改不存在企业密码应失败", func(t *testing.T) { - ctx := createEnterpriseTestContext(1) - - err := service.UpdatePassword(ctx, 99999, "NewPass789") - assert.Error(t, err) - }) -} - -func TestEnterpriseService_List(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - enterpriseStore := postgres.NewEnterpriseStore(tx, rdb) - shopStore := postgres.NewShopStore(tx, rdb) - accountStore := postgres.NewAccountStore(tx, rdb) - - service := enterprise.New(tx, enterpriseStore, shopStore, accountStore) - - t.Run("查询企业列表-空结果", func(t *testing.T) { - ctx := createEnterpriseTestContext(1) - - req := &dto.EnterpriseListReq{ - Page: 1, - PageSize: 20, - } - - result, err := service.List(ctx, req) - require.NoError(t, err) - assert.NotNil(t, result) - assert.GreaterOrEqual(t, result.Total, int64(0)) - }) - - t.Run("查询企业列表-按名称筛选", func(t *testing.T) { - ctx := createEnterpriseTestContext(1) - - ts := time.Now().UnixNano() - searchKey := fmt.Sprintf("列表测试企业_%d", ts) - for i := 0; i < 3; i++ { - createReq := &dto.CreateEnterpriseReq{ - EnterpriseName: fmt.Sprintf("%s_%d", searchKey, i), - EnterpriseCode: fmt.Sprintf("ENT_LIST_%d_%d", ts, i), - ContactName: "联系人", - ContactPhone: fmt.Sprintf("138%08d", ts%100000000+int64(i)), - LoginPhone: fmt.Sprintf("139%08d", ts%100000000+int64(i)), - Password: "Test123456", - } - _, err := service.Create(ctx, createReq) - require.NoError(t, err) - } - - req := &dto.EnterpriseListReq{ - Page: 1, - PageSize: 20, - EnterpriseName: searchKey, - } - - result, err := service.List(ctx, req) - require.NoError(t, err) - assert.NotNil(t, result) - assert.GreaterOrEqual(t, result.Total, int64(3)) - }) - - t.Run("查询企业列表-按状态筛选", func(t *testing.T) { - ctx := createEnterpriseTestContext(1) - - status := constants.StatusEnabled - req := &dto.EnterpriseListReq{ - Page: 1, - PageSize: 20, - Status: &status, - } - - result, err := service.List(ctx, req) - require.NoError(t, err) - assert.NotNil(t, result) - }) -} diff --git a/tests/unit/enterprise_store_test.go b/tests/unit/enterprise_store_test.go deleted file mode 100644 index 916f6a2..0000000 --- a/tests/unit/enterprise_store_test.go +++ /dev/null @@ -1,415 +0,0 @@ -package unit - -import ( - "context" - "testing" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/internal/store/postgres" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/tests/testutils" -) - -// TestEnterpriseStore_Create 测试创建企业 -func TestEnterpriseStore_Create(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := postgres.NewEnterpriseStore(tx, rdb) - ctx := context.Background() - - tests := []struct { - name string - enterprise *model.Enterprise - wantErr bool - }{ - { - name: "创建平台直属企业", - enterprise: &model.Enterprise{ - EnterpriseName: "测试企业A", - EnterpriseCode: "ENT001", - OwnerShopID: nil, // 平台直属 - LegalPerson: "张三", - ContactName: "李四", - ContactPhone: "13800000001", - BusinessLicense: "91110000MA001234", - Province: "北京市", - City: "北京市", - District: "朝阳区", - Address: "朝阳路100号", - Status: constants.StatusEnabled, - }, - wantErr: false, - }, - { - name: "创建归属店铺的企业", - enterprise: &model.Enterprise{ - EnterpriseName: "测试企业B", - EnterpriseCode: "ENT002", - LegalPerson: "王五", - ContactName: "赵六", - ContactPhone: "13800000002", - BusinessLicense: "91110000MA005678", - Status: constants.StatusEnabled, - }, - wantErr: false, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - tt.enterprise.BaseModel.Creator = 1 - tt.enterprise.BaseModel.Updater = 1 - - err := store.Create(ctx, tt.enterprise) - if tt.wantErr { - assert.Error(t, err) - } else { - require.NoError(t, err) - assert.NotZero(t, tt.enterprise.ID) - assert.NotZero(t, tt.enterprise.CreatedAt) - assert.NotZero(t, tt.enterprise.UpdatedAt) - } - }) - } -} - -// TestEnterpriseStore_GetByID 测试根据 ID 查询企业 -func TestEnterpriseStore_GetByID(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := postgres.NewEnterpriseStore(tx, rdb) - ctx := context.Background() - - // 创建测试企业 - enterprise := &model.Enterprise{ - EnterpriseName: "测试企业", - EnterpriseCode: "TEST001", - LegalPerson: "测试法人", - ContactName: "测试联系人", - ContactPhone: "13800000001", - BusinessLicense: "91110000MA001234", - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err := store.Create(ctx, enterprise) - require.NoError(t, err) - - t.Run("查询存在的企业", func(t *testing.T) { - found, err := store.GetByID(ctx, enterprise.ID) - require.NoError(t, err) - assert.Equal(t, enterprise.EnterpriseName, found.EnterpriseName) - assert.Equal(t, enterprise.EnterpriseCode, found.EnterpriseCode) - assert.Equal(t, enterprise.LegalPerson, found.LegalPerson) - }) - - t.Run("查询不存在的企业", func(t *testing.T) { - _, err := store.GetByID(ctx, 99999) - assert.Error(t, err) - }) -} - -// TestEnterpriseStore_GetByCode 测试根据企业编号查询 -func TestEnterpriseStore_GetByCode(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := postgres.NewEnterpriseStore(tx, rdb) - ctx := context.Background() - - // 创建测试企业 - enterprise := &model.Enterprise{ - EnterpriseName: "测试企业", - EnterpriseCode: "UNIQUE001", - LegalPerson: "测试法人", - ContactName: "测试联系人", - ContactPhone: "13800000001", - BusinessLicense: "91110000MA001234", - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err := store.Create(ctx, enterprise) - require.NoError(t, err) - - t.Run("根据企业编号查询", func(t *testing.T) { - found, err := store.GetByCode(ctx, "UNIQUE001") - require.NoError(t, err) - assert.Equal(t, enterprise.ID, found.ID) - assert.Equal(t, enterprise.EnterpriseName, found.EnterpriseName) - }) - - t.Run("查询不存在的企业编号", func(t *testing.T) { - _, err := store.GetByCode(ctx, "NONEXISTENT") - assert.Error(t, err) - }) -} - -// TestEnterpriseStore_Update 测试更新企业 -func TestEnterpriseStore_Update(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := postgres.NewEnterpriseStore(tx, rdb) - ctx := context.Background() - - // 创建测试企业 - enterprise := &model.Enterprise{ - EnterpriseName: "原始企业名称", - EnterpriseCode: "UPDATE001", - LegalPerson: "原法人", - ContactName: "原联系人", - ContactPhone: "13800000001", - BusinessLicense: "91110000MA001234", - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err := store.Create(ctx, enterprise) - require.NoError(t, err) - - t.Run("更新企业信息", func(t *testing.T) { - enterprise.EnterpriseName = "更新后的企业名称" - enterprise.LegalPerson = "新法人" - enterprise.ContactName = "新联系人" - enterprise.ContactPhone = "13900000001" - enterprise.Updater = 2 - - err := store.Update(ctx, enterprise) - require.NoError(t, err) - - // 验证更新 - found, err := store.GetByID(ctx, enterprise.ID) - require.NoError(t, err) - assert.Equal(t, "更新后的企业名称", found.EnterpriseName) - assert.Equal(t, "新法人", found.LegalPerson) - assert.Equal(t, "新联系人", found.ContactName) - assert.Equal(t, "13900000001", found.ContactPhone) - assert.Equal(t, uint(2), found.Updater) - }) - - t.Run("更新企业状态", func(t *testing.T) { - enterprise.Status = constants.StatusDisabled - err := store.Update(ctx, enterprise) - require.NoError(t, err) - - found, err := store.GetByID(ctx, enterprise.ID) - require.NoError(t, err) - assert.Equal(t, constants.StatusDisabled, found.Status) - }) -} - -// TestEnterpriseStore_Delete 测试软删除企业 -func TestEnterpriseStore_Delete(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := postgres.NewEnterpriseStore(tx, rdb) - ctx := context.Background() - - // 创建测试企业 - enterprise := &model.Enterprise{ - EnterpriseName: "待删除企业", - EnterpriseCode: "DELETE001", - LegalPerson: "测试", - ContactName: "测试", - ContactPhone: "13800000001", - BusinessLicense: "91110000MA001234", - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err := store.Create(ctx, enterprise) - require.NoError(t, err) - - t.Run("软删除企业", func(t *testing.T) { - err := store.Delete(ctx, enterprise.ID) - require.NoError(t, err) - - // 验证已被软删除 - _, err = store.GetByID(ctx, enterprise.ID) - assert.Error(t, err) - }) -} - -// TestEnterpriseStore_List 测试查询企业列表 -func TestEnterpriseStore_List(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := postgres.NewEnterpriseStore(tx, rdb) - ctx := context.Background() - - // 创建多个测试企业 - for i := 1; i <= 5; i++ { - enterprise := &model.Enterprise{ - EnterpriseName: testutils.GenerateUsername("测试企业", i), - EnterpriseCode: testutils.GenerateUsername("ENT", i), - LegalPerson: "测试法人", - ContactName: "测试联系人", - ContactPhone: testutils.GeneratePhone("138", i), - BusinessLicense: testutils.GenerateUsername("LICENSE", i), - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err := store.Create(ctx, enterprise) - require.NoError(t, err) - } - - t.Run("分页查询", func(t *testing.T) { - enterprises, total, err := store.List(ctx, nil, nil) - require.NoError(t, err) - assert.GreaterOrEqual(t, len(enterprises), 5) - assert.GreaterOrEqual(t, total, int64(5)) - }) - - t.Run("带过滤条件查询", func(t *testing.T) { - filters := map[string]interface{}{ - "status": constants.StatusEnabled, - } - enterprises, _, err := store.List(ctx, nil, filters) - require.NoError(t, err) - for _, ent := range enterprises { - assert.Equal(t, constants.StatusEnabled, ent.Status) - } - }) -} - -// TestEnterpriseStore_GetByOwnerShopID 测试根据归属店铺查询企业 -func TestEnterpriseStore_GetByOwnerShopID(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := postgres.NewEnterpriseStore(tx, rdb) - ctx := context.Background() - - shopID1 := uint(100) - shopID2 := uint(200) - - // 创建归属不同店铺的企业 - for i := 1; i <= 3; i++ { - enterprise := &model.Enterprise{ - EnterpriseName: testutils.GenerateUsername("店铺100企业", i), - EnterpriseCode: testutils.GenerateUsername("SHOP100_ENT", i), - OwnerShopID: &shopID1, - LegalPerson: "测试法人", - ContactName: "测试联系人", - ContactPhone: testutils.GeneratePhone("138", i), - BusinessLicense: testutils.GenerateUsername("LICENSE", i), - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err := store.Create(ctx, enterprise) - require.NoError(t, err) - } - - for i := 1; i <= 2; i++ { - enterprise := &model.Enterprise{ - EnterpriseName: testutils.GenerateUsername("店铺200企业", i), - EnterpriseCode: testutils.GenerateUsername("SHOP200_ENT", i), - OwnerShopID: &shopID2, - LegalPerson: "测试法人", - ContactName: "测试联系人", - ContactPhone: testutils.GeneratePhone("139", i), - BusinessLicense: testutils.GenerateUsername("LICENSE2", i), - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err := store.Create(ctx, enterprise) - require.NoError(t, err) - } - - t.Run("查询店铺100的企业", func(t *testing.T) { - enterprises, err := store.GetByOwnerShopID(ctx, shopID1) - require.NoError(t, err) - assert.Len(t, enterprises, 3) - for _, ent := range enterprises { - assert.NotNil(t, ent.OwnerShopID) - assert.Equal(t, shopID1, *ent.OwnerShopID) - } - }) - - t.Run("查询店铺200的企业", func(t *testing.T) { - enterprises, err := store.GetByOwnerShopID(ctx, shopID2) - require.NoError(t, err) - assert.Len(t, enterprises, 2) - for _, ent := range enterprises { - assert.NotNil(t, ent.OwnerShopID) - assert.Equal(t, shopID2, *ent.OwnerShopID) - } - }) -} - -// TestEnterpriseStore_UniqueConstraints 测试唯一约束 -func TestEnterpriseStore_UniqueConstraints(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := postgres.NewEnterpriseStore(tx, rdb) - ctx := context.Background() - - // 创建测试企业 - enterprise := &model.Enterprise{ - EnterpriseName: "唯一测试企业", - EnterpriseCode: "UNIQUE_CODE", - LegalPerson: "测试", - ContactName: "测试", - ContactPhone: "13800000001", - BusinessLicense: "91110000MA001234", - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err := store.Create(ctx, enterprise) - require.NoError(t, err) - - t.Run("重复企业编号应失败", func(t *testing.T) { - duplicate := &model.Enterprise{ - EnterpriseName: "另一个企业", - EnterpriseCode: "UNIQUE_CODE", // 重复 - LegalPerson: "测试", - ContactName: "测试", - ContactPhone: "13800000002", - BusinessLicense: "91110000MA005678", - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err := store.Create(ctx, duplicate) - assert.Error(t, err) - }) -} diff --git a/tests/unit/helpers.go b/tests/unit/helpers.go deleted file mode 100644 index 7b0579a..0000000 --- a/tests/unit/helpers.go +++ /dev/null @@ -1,28 +0,0 @@ -package unit - -import ( - "context" - "fmt" - "testing" - "time" - - "github.com/break/junhong_cmp_fiber/pkg/constants" -) - -// createContextWithUserID 创建带用户 ID 的 context -func createContextWithUserID(userID uint) context.Context { - return context.WithValue(context.Background(), constants.ContextKeyUserID, userID) -} - -// generateUniqueUsername 生成唯一的用户名（用于测试） -func generateUniqueUsername(prefix string, t *testing.T) string { - return fmt.Sprintf("%s_%d", prefix, time.Now().UnixNano()) -} - -// generateUniquePhone 生成唯一的手机号（用于测试） -func generateUniquePhone() string { - // 使用时间戳后8位生成唯一手机号 - timestamp := time.Now().UnixNano() - suffix := timestamp % 100000000 // 8位数字 - return fmt.Sprintf("138%08d", suffix) -} diff --git a/tests/unit/my_commission_service_test.go b/tests/unit/my_commission_service_test.go deleted file mode 100644 index 5a44586..0000000 --- a/tests/unit/my_commission_service_test.go +++ /dev/null @@ -1,386 +0,0 @@ -package unit - -import ( - "context" - "testing" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/internal/model/dto" - "github.com/break/junhong_cmp_fiber/internal/service/my_commission" - "github.com/break/junhong_cmp_fiber/internal/store/postgres" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/tests/testutils" -) - -func createMyCommissionTestContext(userID uint, shopID uint, userType int) context.Context { - ctx := context.Background() - ctx = context.WithValue(ctx, constants.ContextKeyUserID, userID) - ctx = context.WithValue(ctx, constants.ContextKeyUserType, userType) - ctx = context.WithValue(ctx, constants.ContextKeyShopID, shopID) - return ctx -} - -func TestMyCommissionService_GetCommissionSummary(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - shopStore := postgres.NewShopStore(tx, rdb) - walletStore := postgres.NewWalletStore(tx, rdb) - commissionWithdrawalRequestStore := postgres.NewCommissionWithdrawalRequestStore(tx, rdb) - commissionWithdrawalSettingStore := postgres.NewCommissionWithdrawalSettingStore(tx, rdb) - commissionRecordStore := postgres.NewCommissionRecordStore(tx, rdb) - walletTransactionStore := postgres.NewWalletTransactionStore(tx, rdb) - - service := my_commission.New( - tx, shopStore, walletStore, - commissionWithdrawalRequestStore, commissionWithdrawalSettingStore, - commissionRecordStore, walletTransactionStore, - ) - - t.Run("佣金概览-代理商用户成功", func(t *testing.T) { - shop := &model.Shop{ - ShopName: "概览测试店铺", - ShopCode: "MY_SHOP_001", - Level: 1, - ContactName: "联系人", - ContactPhone: "13800000001", - Status: constants.StatusEnabled, - } - shop.Creator = 1 - shop.Updater = 1 - err := tx.Create(shop).Error - require.NoError(t, err) - - ctx := createMyCommissionTestContext(1, shop.ID, constants.UserTypeAgent) - - result, err := service.GetCommissionSummary(ctx) - require.NoError(t, err) - assert.NotNil(t, result) - assert.Equal(t, shop.ID, result.ShopID) - assert.Equal(t, "概览测试店铺", result.ShopName) - }) - - t.Run("佣金概览-非代理商用户应失败", func(t *testing.T) { - ctx := createMyCommissionTestContext(1, 1, constants.UserTypePlatform) - - _, err := service.GetCommissionSummary(ctx) - assert.Error(t, err) - }) - - t.Run("佣金概览-店铺不存在应失败", func(t *testing.T) { - ctx := createMyCommissionTestContext(1, 99999, constants.UserTypeAgent) - - _, err := service.GetCommissionSummary(ctx) - assert.Error(t, err) - }) -} - -func TestMyCommissionService_CreateWithdrawalRequest(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - shopStore := postgres.NewShopStore(tx, rdb) - walletStore := postgres.NewWalletStore(tx, rdb) - commissionWithdrawalRequestStore := postgres.NewCommissionWithdrawalRequestStore(tx, rdb) - commissionWithdrawalSettingStore := postgres.NewCommissionWithdrawalSettingStore(tx, rdb) - commissionRecordStore := postgres.NewCommissionRecordStore(tx, rdb) - walletTransactionStore := postgres.NewWalletTransactionStore(tx, rdb) - - service := my_commission.New( - tx, shopStore, walletStore, - commissionWithdrawalRequestStore, commissionWithdrawalSettingStore, - commissionRecordStore, walletTransactionStore, - ) - - t.Run("发起提现-无提现配置应失败", func(t *testing.T) { - shop := &model.Shop{ - ShopName: "提现测试店铺", - ShopCode: "MY_SHOP_002", - Level: 1, - ContactName: "联系人", - ContactPhone: "13800000002", - Status: constants.StatusEnabled, - } - shop.Creator = 1 - shop.Updater = 1 - err := tx.Create(shop).Error - require.NoError(t, err) - - ctx := createMyCommissionTestContext(1, shop.ID, constants.UserTypeAgent) - - req := &dto.CreateMyWithdrawalReq{ - Amount: 10000, - WithdrawalMethod: "alipay", - AccountName: "测试用户", - AccountNumber: "test@alipay.com", - } - - _, err = service.CreateWithdrawalRequest(ctx, req) - assert.Error(t, err) - }) - - t.Run("发起提现-金额低于最低限制应失败", func(t *testing.T) { - shop := &model.Shop{ - ShopName: "限额测试店铺", - ShopCode: "MY_SHOP_003", - Level: 1, - ContactName: "联系人", - ContactPhone: "13800000003", - Status: constants.StatusEnabled, - } - shop.Creator = 1 - shop.Updater = 1 - err := tx.Create(shop).Error - require.NoError(t, err) - - setting := &model.CommissionWithdrawalSetting{ - DailyWithdrawalLimit: 5, - MinWithdrawalAmount: 10000, - FeeRate: 100, - IsActive: true, - } - setting.Creator = 1 - setting.Updater = 1 - err = tx.Create(setting).Error - require.NoError(t, err) - - ctx := createMyCommissionTestContext(1, shop.ID, constants.UserTypeAgent) - - req := &dto.CreateMyWithdrawalReq{ - Amount: 5000, - WithdrawalMethod: "alipay", - AccountName: "测试用户", - AccountNumber: "test@alipay.com", - } - - _, err = service.CreateWithdrawalRequest(ctx, req) - assert.Error(t, err) - }) - - t.Run("发起提现-余额不足应失败", func(t *testing.T) { - shop := &model.Shop{ - ShopName: "余额测试店铺", - ShopCode: "MY_SHOP_004", - Level: 1, - ContactName: "联系人", - ContactPhone: "13800000004", - Status: constants.StatusEnabled, - } - shop.Creator = 1 - shop.Updater = 1 - err := tx.Create(shop).Error - require.NoError(t, err) - - wallet := &model.Wallet{ - ResourceType: constants.WalletResourceTypeShop, - ResourceID: shop.ID, - WalletType: constants.WalletTypeCommission, - Balance: 5000, - } - err = tx.Create(wallet).Error - require.NoError(t, err) - - ctx := createMyCommissionTestContext(1, shop.ID, constants.UserTypeAgent) - - req := &dto.CreateMyWithdrawalReq{ - Amount: 50000, - WithdrawalMethod: "alipay", - AccountName: "测试用户", - AccountNumber: "test@alipay.com", - } - - _, err = service.CreateWithdrawalRequest(ctx, req) - assert.Error(t, err) - }) - - t.Run("发起提现-非代理商用户应失败", func(t *testing.T) { - ctx := createMyCommissionTestContext(1, 1, constants.UserTypePlatform) - - req := &dto.CreateMyWithdrawalReq{ - Amount: 10000, - WithdrawalMethod: "alipay", - AccountName: "测试用户", - AccountNumber: "test@alipay.com", - } - - _, err := service.CreateWithdrawalRequest(ctx, req) - assert.Error(t, err) - }) -} - -func TestMyCommissionService_ListMyWithdrawalRequests(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - shopStore := postgres.NewShopStore(tx, rdb) - walletStore := postgres.NewWalletStore(tx, rdb) - commissionWithdrawalRequestStore := postgres.NewCommissionWithdrawalRequestStore(tx, rdb) - commissionWithdrawalSettingStore := postgres.NewCommissionWithdrawalSettingStore(tx, rdb) - commissionRecordStore := postgres.NewCommissionRecordStore(tx, rdb) - walletTransactionStore := postgres.NewWalletTransactionStore(tx, rdb) - - service := my_commission.New( - tx, shopStore, walletStore, - commissionWithdrawalRequestStore, commissionWithdrawalSettingStore, - commissionRecordStore, walletTransactionStore, - ) - - t.Run("查询提现记录-空结果", func(t *testing.T) { - shop := &model.Shop{ - ShopName: "提现记录测试店铺", - ShopCode: "MY_SHOP_005", - Level: 1, - ContactName: "联系人", - ContactPhone: "13800000005", - Status: constants.StatusEnabled, - } - shop.Creator = 1 - shop.Updater = 1 - err := tx.Create(shop).Error - require.NoError(t, err) - - ctx := createMyCommissionTestContext(1, shop.ID, constants.UserTypeAgent) - - req := &dto.MyWithdrawalListReq{ - Page: 1, - PageSize: 20, - } - - result, err := service.ListMyWithdrawalRequests(ctx, req) - require.NoError(t, err) - assert.NotNil(t, result) - assert.GreaterOrEqual(t, result.Total, int64(0)) - }) - - t.Run("查询提现记录-按状态筛选", func(t *testing.T) { - shop := &model.Shop{ - ShopName: "状态筛选测试店铺", - ShopCode: "MY_SHOP_006", - Level: 1, - ContactName: "联系人", - ContactPhone: "13800000006", - Status: constants.StatusEnabled, - } - shop.Creator = 1 - shop.Updater = 1 - err := tx.Create(shop).Error - require.NoError(t, err) - - ctx := createMyCommissionTestContext(1, shop.ID, constants.UserTypeAgent) - - status := 1 - req := &dto.MyWithdrawalListReq{ - Page: 1, - PageSize: 20, - Status: &status, - } - - result, err := service.ListMyWithdrawalRequests(ctx, req) - require.NoError(t, err) - assert.NotNil(t, result) - }) - - t.Run("查询提现记录-非代理商用户应失败", func(t *testing.T) { - ctx := createMyCommissionTestContext(1, 1, constants.UserTypePlatform) - - req := &dto.MyWithdrawalListReq{ - Page: 1, - PageSize: 20, - } - - _, err := service.ListMyWithdrawalRequests(ctx, req) - assert.Error(t, err) - }) -} - -func TestMyCommissionService_ListMyCommissionRecords(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - shopStore := postgres.NewShopStore(tx, rdb) - walletStore := postgres.NewWalletStore(tx, rdb) - commissionWithdrawalRequestStore := postgres.NewCommissionWithdrawalRequestStore(tx, rdb) - commissionWithdrawalSettingStore := postgres.NewCommissionWithdrawalSettingStore(tx, rdb) - commissionRecordStore := postgres.NewCommissionRecordStore(tx, rdb) - walletTransactionStore := postgres.NewWalletTransactionStore(tx, rdb) - - service := my_commission.New( - tx, shopStore, walletStore, - commissionWithdrawalRequestStore, commissionWithdrawalSettingStore, - commissionRecordStore, walletTransactionStore, - ) - - t.Run("查询佣金明细-空结果", func(t *testing.T) { - shop := &model.Shop{ - ShopName: "佣金明细测试店铺", - ShopCode: "MY_SHOP_007", - Level: 1, - ContactName: "联系人", - ContactPhone: "13800000007", - Status: constants.StatusEnabled, - } - shop.Creator = 1 - shop.Updater = 1 - err := tx.Create(shop).Error - require.NoError(t, err) - - ctx := createMyCommissionTestContext(1, shop.ID, constants.UserTypeAgent) - - req := &dto.MyCommissionRecordListReq{ - Page: 1, - PageSize: 20, - } - - result, err := service.ListMyCommissionRecords(ctx, req) - require.NoError(t, err) - assert.NotNil(t, result) - assert.GreaterOrEqual(t, result.Total, int64(0)) - }) - - t.Run("查询佣金明细-按类型筛选", func(t *testing.T) { - shop := &model.Shop{ - ShopName: "类型筛选测试店铺", - ShopCode: "MY_SHOP_008", - Level: 1, - ContactName: "联系人", - ContactPhone: "13800000008", - Status: constants.StatusEnabled, - } - shop.Creator = 1 - shop.Updater = 1 - err := tx.Create(shop).Error - require.NoError(t, err) - - ctx := createMyCommissionTestContext(1, shop.ID, constants.UserTypeAgent) - - commissionSource := "one_time" - req := &dto.MyCommissionRecordListReq{ - Page: 1, - PageSize: 20, - CommissionSource: &commissionSource, - } - - result, err := service.ListMyCommissionRecords(ctx, req) - require.NoError(t, err) - assert.NotNil(t, result) - }) - - t.Run("查询佣金明细-非代理商用户应失败", func(t *testing.T) { - ctx := createMyCommissionTestContext(1, 1, constants.UserTypePlatform) - - req := &dto.MyCommissionRecordListReq{ - Page: 1, - PageSize: 20, - } - - _, err := service.ListMyCommissionRecords(ctx, req) - assert.Error(t, err) - }) -} diff --git a/tests/unit/permission_cache_test.go b/tests/unit/permission_cache_test.go deleted file mode 100644 index 786dfb6..0000000 --- a/tests/unit/permission_cache_test.go +++ /dev/null @@ -1,165 +0,0 @@ -package unit - -import ( - "context" - "encoding/json" - "testing" - "time" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/internal/service/permission" - "github.com/break/junhong_cmp_fiber/internal/store/postgres" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/pkg/middleware" - "github.com/break/junhong_cmp_fiber/tests/testutils" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -func TestPermissionCache_FirstCallMissSecondHit(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - ctx := context.Background() - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - permStore := postgres.NewPermissionStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - rolePermStore := postgres.NewRolePermissionStore(tx, rdb) - - permSvc := permission.New(permStore, accountRoleStore, rolePermStore, nil, rdb) - - testUser := &model.Account{ - Username: "testuser", - Phone: "13900000001", - Password: "Test@123456", - UserType: constants.UserTypePlatform, - Status: constants.StatusEnabled, - } - require.NoError(t, accountStore.Create(ctx, testUser)) - - testRole := &model.Role{ - RoleName: "测试角色", - RoleType: constants.RoleTypePlatform, - Status: constants.StatusEnabled, - } - require.NoError(t, roleStore.Create(ctx, testRole)) - - testPerm := &model.Permission{ - PermName: "测试权限", - PermCode: "test:read", - PermType: constants.PermissionTypeButton, - Platform: constants.PlatformWeb, - Status: constants.StatusEnabled, - } - require.NoError(t, permStore.Create(ctx, testPerm)) - - require.NoError(t, accountRoleStore.Create(ctx, &model.AccountRole{ - AccountID: testUser.ID, - RoleID: testRole.ID, - })) - - require.NoError(t, rolePermStore.Create(ctx, &model.RolePermission{ - RoleID: testRole.ID, - PermID: testPerm.ID, - })) - - ctx = middleware.SetUserContext(ctx, &middleware.UserContextInfo{ - UserID: testUser.ID, - UserType: testUser.UserType, - }) - - cacheKey := constants.RedisUserPermissionsKey(testUser.ID) - cachedData, err := rdb.Get(ctx, cacheKey).Result() - assert.Error(t, err) - assert.Empty(t, cachedData) - - hasPermission, err := permSvc.CheckPermission(ctx, testUser.ID, "test:read", constants.PlatformWeb) - require.NoError(t, err) - assert.True(t, hasPermission) - - cachedData, err = rdb.Get(ctx, cacheKey).Result() - require.NoError(t, err) - assert.NotEmpty(t, cachedData) - - type cacheItem struct { - PermCode string `json:"perm_code"` - Platform string `json:"platform"` - } - var cached []cacheItem - require.NoError(t, json.Unmarshal([]byte(cachedData), &cached)) - assert.Len(t, cached, 1) - assert.Equal(t, "test:read", cached[0].PermCode) - assert.Equal(t, constants.PlatformWeb, cached[0].Platform) - - hasPermission2, err := permSvc.CheckPermission(ctx, testUser.ID, "test:read", constants.PlatformWeb) - require.NoError(t, err) - assert.True(t, hasPermission2) -} - -func TestPermissionCache_ExpiredAfter30Minutes(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - ctx := context.Background() - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - permStore := postgres.NewPermissionStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - rolePermStore := postgres.NewRolePermissionStore(tx, rdb) - - permSvc := permission.New(permStore, accountRoleStore, rolePermStore, nil, rdb) - - testUser := &model.Account{ - Username: "testuser2", - Phone: "13900000002", - Password: "Test@123456", - UserType: constants.UserTypePlatform, - Status: constants.StatusEnabled, - } - require.NoError(t, accountStore.Create(ctx, testUser)) - - testRole := &model.Role{ - RoleName: "测试角色2", - RoleType: constants.RoleTypePlatform, - Status: constants.StatusEnabled, - } - require.NoError(t, roleStore.Create(ctx, testRole)) - - testPerm := &model.Permission{ - PermName: "测试权限2", - PermCode: "test:write", - PermType: constants.PermissionTypeButton, - Platform: constants.PlatformWeb, - Status: constants.StatusEnabled, - } - require.NoError(t, permStore.Create(ctx, testPerm)) - - require.NoError(t, accountRoleStore.Create(ctx, &model.AccountRole{ - AccountID: testUser.ID, - RoleID: testRole.ID, - })) - - require.NoError(t, rolePermStore.Create(ctx, &model.RolePermission{ - RoleID: testRole.ID, - PermID: testPerm.ID, - })) - - ctx = middleware.SetUserContext(ctx, &middleware.UserContextInfo{ - UserID: testUser.ID, - UserType: testUser.UserType, - }) - - hasPermission, err := permSvc.CheckPermission(ctx, testUser.ID, "test:write", constants.PlatformWeb) - require.NoError(t, err) - assert.True(t, hasPermission) - - cacheKey := constants.RedisUserPermissionsKey(testUser.ID) - ttl, err := rdb.TTL(ctx, cacheKey).Result() - require.NoError(t, err) - assert.True(t, ttl > 29*time.Minute && ttl <= 30*time.Minute) -} diff --git a/tests/unit/permission_check_test.go b/tests/unit/permission_check_test.go deleted file mode 100644 index 85a293c..0000000 --- a/tests/unit/permission_check_test.go +++ /dev/null @@ -1,228 +0,0 @@ -package unit - -import ( - "context" - "testing" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/internal/service/permission" - "github.com/break/junhong_cmp_fiber/internal/store/postgres" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/pkg/middleware" - "github.com/break/junhong_cmp_fiber/tests/testutils" -) - -func createContextWithUserType(userID uint, userType int) context.Context { - return middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{ - UserID: userID, - UserType: userType, - ShopID: 0, - EnterpriseID: 0, - CustomerID: 0, - }) -} - -func TestPermissionService_CheckPermission_SuperAdmin(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - permStore := postgres.NewPermissionStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - rolePermStore := postgres.NewRolePermissionStore(tx, rdb) - service := permission.New(permStore, accountRoleStore, rolePermStore, nil, rdb) - - t.Run("超级管理员自动拥有所有权限", func(t *testing.T) { - ctx := createContextWithUserType(1, constants.UserTypeSuperAdmin) - - hasPermission, err := service.CheckPermission(ctx, 1, "any:permission", constants.PlatformAll) - require.NoError(t, err) - assert.True(t, hasPermission) - }) -} - -func TestPermissionService_CheckPermission_NormalUser(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - permStore := postgres.NewPermissionStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - rolePermStore := postgres.NewRolePermissionStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - service := permission.New(permStore, accountRoleStore, rolePermStore, nil, rdb) - - ctx := createContextWithUserType(100, constants.UserTypePlatform) - - perm1 := &model.Permission{ - PermName: "用户创建", - PermCode: "user:create", - PermType: constants.PermissionTypeButton, - Platform: constants.PlatformAll, - AvailableForRoleTypes: "1", - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err := permStore.Create(ctx, perm1) - require.NoError(t, err) - - perm2 := &model.Permission{ - PermName: "用户查看", - PermCode: "user:view", - PermType: constants.PermissionTypeButton, - Platform: constants.PlatformWeb, - AvailableForRoleTypes: "1", - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err = permStore.Create(ctx, perm2) - require.NoError(t, err) - - role := &model.Role{ - RoleName: "测试角色", - RoleDesc: "测试用角色", - RoleType: constants.RoleTypePlatform, - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err = roleStore.Create(ctx, role) - require.NoError(t, err) - - accountRole := &model.AccountRole{ - AccountID: 100, - RoleID: role.ID, - Status: constants.StatusEnabled, - Creator: 1, - Updater: 1, - } - err = accountRoleStore.Create(ctx, accountRole) - require.NoError(t, err) - - rolePerm1 := &model.RolePermission{ - RoleID: role.ID, - PermID: perm1.ID, - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err = rolePermStore.Create(ctx, rolePerm1) - require.NoError(t, err) - - rolePerm2 := &model.RolePermission{ - RoleID: role.ID, - PermID: perm2.ID, - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err = rolePermStore.Create(ctx, rolePerm2) - require.NoError(t, err) - - t.Run("有权限的用户应返回true", func(t *testing.T) { - hasPermission, err := service.CheckPermission(ctx, 100, "user:create", constants.PlatformAll) - require.NoError(t, err) - assert.True(t, hasPermission) - }) - - t.Run("无权限的用户应返回false", func(t *testing.T) { - hasPermission, err := service.CheckPermission(ctx, 100, "user:delete", constants.PlatformAll) - require.NoError(t, err) - assert.False(t, hasPermission) - }) - - t.Run("platform为all的权限在web端可访问", func(t *testing.T) { - hasPermission, err := service.CheckPermission(ctx, 100, "user:create", constants.PlatformWeb) - require.NoError(t, err) - assert.True(t, hasPermission) - }) - - t.Run("platform为web的权限在h5端不可访问", func(t *testing.T) { - hasPermission, err := service.CheckPermission(ctx, 100, "user:view", constants.PlatformH5) - require.NoError(t, err) - assert.False(t, hasPermission) - }) - - t.Run("platform为web的权限在web端可访问", func(t *testing.T) { - hasPermission, err := service.CheckPermission(ctx, 100, "user:view", constants.PlatformWeb) - require.NoError(t, err) - assert.True(t, hasPermission) - }) -} - -func TestPermissionService_CheckPermission_NoRole(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - permStore := postgres.NewPermissionStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - rolePermStore := postgres.NewRolePermissionStore(tx, rdb) - service := permission.New(permStore, accountRoleStore, rolePermStore, nil, rdb) - - t.Run("用户无角色应返回false", func(t *testing.T) { - ctx := createContextWithUserType(200, constants.UserTypePlatform) - - hasPermission, err := service.CheckPermission(ctx, 200, "any:permission", constants.PlatformAll) - require.NoError(t, err) - assert.False(t, hasPermission) - }) -} - -func TestPermissionService_CheckPermission_RoleNoPermission(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - permStore := postgres.NewPermissionStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - rolePermStore := postgres.NewRolePermissionStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - service := permission.New(permStore, accountRoleStore, rolePermStore, nil, rdb) - - ctx := createContextWithUserType(300, constants.UserTypePlatform) - - role := &model.Role{ - RoleName: "空角色", - RoleDesc: "无权限的角色", - RoleType: constants.RoleTypePlatform, - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err := roleStore.Create(ctx, role) - require.NoError(t, err) - - accountRole := &model.AccountRole{ - AccountID: 300, - RoleID: role.ID, - Status: constants.StatusEnabled, - Creator: 1, - Updater: 1, - } - err = accountRoleStore.Create(ctx, accountRole) - require.NoError(t, err) - - t.Run("角色无权限应返回false", func(t *testing.T) { - hasPermission, err := service.CheckPermission(ctx, 300, "any:permission", constants.PlatformAll) - require.NoError(t, err) - assert.False(t, hasPermission) - }) -} diff --git a/tests/unit/permission_platform_filter_test.go b/tests/unit/permission_platform_filter_test.go deleted file mode 100644 index eae73a6..0000000 --- a/tests/unit/permission_platform_filter_test.go +++ /dev/null @@ -1,225 +0,0 @@ -package unit - -import ( - "context" - "testing" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/internal/model/dto" - "github.com/break/junhong_cmp_fiber/internal/service/permission" - "github.com/break/junhong_cmp_fiber/internal/store/postgres" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/pkg/middleware" - "github.com/break/junhong_cmp_fiber/tests/testutils" -) - -// TestPermissionPlatformFilter_List 测试权限列表按 platform 过滤 -func TestPermissionPlatformFilter_List(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - permissionStore := postgres.NewPermissionStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - rolePermStore := postgres.NewRolePermissionStore(tx, rdb) - service := permission.New(permissionStore, accountRoleStore, rolePermStore, nil, rdb) - - ctx := context.Background() - ctx = middleware.SetUserContext(ctx, middleware.NewSimpleUserContext(1, constants.UserTypeSuperAdmin, 0)) - - baseReq := &dto.PermissionListRequest{Page: 1, PageSize: 1000} - _, existingTotal, err := service.List(ctx, baseReq) - require.NoError(t, err) - - allReq := &dto.PermissionListRequest{Page: 1, PageSize: 1000, Platform: constants.PlatformAll} - _, existingAllTotal, err := service.List(ctx, allReq) - require.NoError(t, err) - - webReq := &dto.PermissionListRequest{Page: 1, PageSize: 1000, Platform: constants.PlatformWeb} - _, existingWebTotal, err := service.List(ctx, webReq) - require.NoError(t, err) - - h5Req := &dto.PermissionListRequest{Page: 1, PageSize: 1000, Platform: constants.PlatformH5} - _, existingH5Total, err := service.List(ctx, h5Req) - require.NoError(t, err) - - permissions := []*model.Permission{ - {PermName: "全端菜单_test", PermCode: "menu:all:test", PermType: constants.PermissionTypeMenu, Platform: constants.PlatformAll, Status: constants.StatusEnabled}, - {PermName: "Web菜单_test", PermCode: "menu:web:test", PermType: constants.PermissionTypeMenu, Platform: constants.PlatformWeb, Status: constants.StatusEnabled}, - {PermName: "H5菜单_test", PermCode: "menu:h5:test", PermType: constants.PermissionTypeMenu, Platform: constants.PlatformH5, Status: constants.StatusEnabled}, - {PermName: "Web按钮_test", PermCode: "button:web:test", PermType: constants.PermissionTypeButton, Platform: constants.PlatformWeb, Status: constants.StatusEnabled}, - {PermName: "H5按钮_test", PermCode: "button:h5:test", PermType: constants.PermissionTypeButton, Platform: constants.PlatformH5, Status: constants.StatusEnabled}, - } - for _, perm := range permissions { - require.NoError(t, tx.Create(perm).Error) - } - - t.Run("查询全部权限", func(t *testing.T) { - req := &dto.PermissionListRequest{Page: 1, PageSize: 1000} - _, total, err := service.List(ctx, req) - require.NoError(t, err) - assert.Equal(t, existingTotal+5, total) - }) - - t.Run("只查询all端口权限", func(t *testing.T) { - req := &dto.PermissionListRequest{Page: 1, PageSize: 1000, Platform: constants.PlatformAll} - perms, total, err := service.List(ctx, req) - require.NoError(t, err) - assert.Equal(t, existingAllTotal+1, total) - found := false - for _, perm := range perms { - if perm.PermName == "全端菜单_test" { - found = true - break - } - } - assert.True(t, found, "应包含测试创建的全端菜单权限") - }) - - t.Run("只查询web端口权限", func(t *testing.T) { - req := &dto.PermissionListRequest{Page: 1, PageSize: 1000, Platform: constants.PlatformWeb} - perms, total, err := service.List(ctx, req) - require.NoError(t, err) - assert.Equal(t, existingWebTotal+2, total) - for _, perm := range perms { - assert.Equal(t, constants.PlatformWeb, perm.Platform) - } - }) - - t.Run("只查询h5端口权限", func(t *testing.T) { - req := &dto.PermissionListRequest{Page: 1, PageSize: 1000, Platform: constants.PlatformH5} - perms, total, err := service.List(ctx, req) - require.NoError(t, err) - assert.Equal(t, existingH5Total+2, total) - for _, perm := range perms { - assert.Equal(t, constants.PlatformH5, perm.Platform) - } - }) -} - -// TestPermissionPlatformFilter_CreateWithDefaultPlatform 测试创建权限时默认 platform 为 all -func TestPermissionPlatformFilter_CreateWithDefaultPlatform(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - permissionStore := postgres.NewPermissionStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - rolePermStore := postgres.NewRolePermissionStore(tx, rdb) - service := permission.New(permissionStore, accountRoleStore, rolePermStore, nil, rdb) - - ctx := context.Background() - ctx = middleware.SetUserContext(ctx, middleware.NewSimpleUserContext(1, constants.UserTypeSuperAdmin, 0)) - - // 创建权限时不指定 platform - req := &dto.CreatePermissionRequest{ - PermName: "测试权限", - PermCode: "test:permission", - PermType: constants.PermissionTypeMenu, - // Platform 字段为空 - } - - perm, err := service.Create(ctx, req) - require.NoError(t, err) - assert.Equal(t, constants.PlatformAll, perm.Platform, "未指定 platform 时应默认为 all") -} - -// TestPermissionPlatformFilter_CreateWithSpecificPlatform 测试创建权限时指定 platform -func TestPermissionPlatformFilter_CreateWithSpecificPlatform(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - permissionStore := postgres.NewPermissionStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - rolePermStore := postgres.NewRolePermissionStore(tx, rdb) - service := permission.New(permissionStore, accountRoleStore, rolePermStore, nil, rdb) - - ctx := context.Background() - ctx = middleware.SetUserContext(ctx, middleware.NewSimpleUserContext(1, constants.UserTypeSuperAdmin, 0)) - - tests := []struct { - name string - platform string - expected string - }{ - {name: "指定为all", platform: constants.PlatformAll, expected: constants.PlatformAll}, - {name: "指定为web", platform: constants.PlatformWeb, expected: constants.PlatformWeb}, - {name: "指定为h5", platform: constants.PlatformH5, expected: constants.PlatformH5}, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - req := &dto.CreatePermissionRequest{ - PermName: "测试权限_" + tt.platform, - PermCode: "test:" + tt.platform, - PermType: constants.PermissionTypeMenu, - Platform: tt.platform, - } - - perm, err := service.Create(ctx, req) - require.NoError(t, err) - assert.Equal(t, tt.expected, perm.Platform) - }) - } -} - -// TestPermissionPlatformFilter_Tree 测试权限树包含 platform 字段 -func TestPermissionPlatformFilter_Tree(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - permissionStore := postgres.NewPermissionStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - rolePermStore := postgres.NewRolePermissionStore(tx, rdb) - service := permission.New(permissionStore, accountRoleStore, rolePermStore, nil, rdb) - - ctx := context.Background() - ctx = middleware.SetUserContext(ctx, middleware.NewSimpleUserContext(1, constants.UserTypeSuperAdmin, 0)) - - existingTree, err := service.GetTree(ctx, nil) - require.NoError(t, err) - existingCount := len(existingTree) - - parent := &model.Permission{ - PermName: "系统管理_tree_test", - PermCode: "system:manage:tree_test", - PermType: constants.PermissionTypeMenu, - Platform: constants.PlatformWeb, - Status: constants.StatusEnabled, - } - require.NoError(t, tx.Create(parent).Error) - - child := &model.Permission{ - PermName: "用户管理_tree_test", - PermCode: "user:manage:tree_test", - PermType: constants.PermissionTypeMenu, - Platform: constants.PlatformWeb, - ParentID: &parent.ID, - Status: constants.StatusEnabled, - } - require.NoError(t, tx.Create(child).Error) - - tree, err := service.GetTree(ctx, nil) - require.NoError(t, err) - assert.Len(t, tree, existingCount+1) - - var testRoot *dto.PermissionTreeNode - for _, node := range tree { - if node.PermName == "系统管理_tree_test" { - testRoot = node - break - } - } - require.NotNil(t, testRoot, "应包含测试创建的父节点") - assert.Equal(t, constants.PlatformWeb, testRoot.Platform) - - require.Len(t, testRoot.Children, 1) - childNode := testRoot.Children[0] - assert.Equal(t, "用户管理_tree_test", childNode.PermName) - assert.Equal(t, constants.PlatformWeb, childNode.Platform) -} diff --git a/tests/unit/permission_store_test.go b/tests/unit/permission_store_test.go deleted file mode 100644 index 82628a4..0000000 --- a/tests/unit/permission_store_test.go +++ /dev/null @@ -1,242 +0,0 @@ -package unit - -import ( - "context" - "testing" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/internal/store/postgres" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/tests/testutils" -) - -func TestPermissionStore_List_AvailableForRoleTypes(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := postgres.NewPermissionStore(tx) - ctx := context.Background() - - platformPerm := &model.Permission{ - PermName: "平台专用权限", - PermCode: "platform:only", - PermType: 1, - Platform: "all", - AvailableForRoleTypes: "1", - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err := store.Create(ctx, platformPerm) - require.NoError(t, err) - - customerPerm := &model.Permission{ - PermName: "客户专用权限", - PermCode: "customer:only", - PermType: 1, - Platform: "all", - AvailableForRoleTypes: "2", - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err = store.Create(ctx, customerPerm) - require.NoError(t, err) - - commonPerm := &model.Permission{ - PermName: "通用权限", - PermCode: "common:perm", - PermType: 1, - Platform: "all", - AvailableForRoleTypes: "1,2", - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err = store.Create(ctx, commonPerm) - require.NoError(t, err) - - t.Run("过滤平台角色可用权限", func(t *testing.T) { - filters := map[string]interface{}{ - "available_for_role_type": 1, - } - perms, _, err := store.List(ctx, nil, filters) - require.NoError(t, err) - - var codes []string - for _, p := range perms { - codes = append(codes, p.PermCode) - } - assert.Contains(t, codes, "platform:only") - assert.Contains(t, codes, "common:perm") - assert.NotContains(t, codes, "customer:only") - }) - - t.Run("过滤客户角色可用权限", func(t *testing.T) { - filters := map[string]interface{}{ - "available_for_role_type": 2, - } - perms, _, err := store.List(ctx, nil, filters) - require.NoError(t, err) - - var codes []string - for _, p := range perms { - codes = append(codes, p.PermCode) - } - assert.Contains(t, codes, "customer:only") - assert.Contains(t, codes, "common:perm") - assert.NotContains(t, codes, "platform:only") - }) - - t.Run("不过滤时返回所有权限", func(t *testing.T) { - perms, _, err := store.List(ctx, nil, nil) - require.NoError(t, err) - - var codes []string - for _, p := range perms { - codes = append(codes, p.PermCode) - } - assert.Contains(t, codes, "platform:only") - assert.Contains(t, codes, "customer:only") - assert.Contains(t, codes, "common:perm") - }) -} - -func TestPermissionStore_GetAll_AvailableForRoleType(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := postgres.NewPermissionStore(tx) - ctx := context.Background() - - platformPerm := &model.Permission{ - PermName: "平台菜单", - PermCode: "platform:menu", - PermType: 1, - Platform: "all", - AvailableForRoleTypes: "1", - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err := store.Create(ctx, platformPerm) - require.NoError(t, err) - - customerPerm := &model.Permission{ - PermName: "客户菜单", - PermCode: "customer:menu", - PermType: 1, - Platform: "all", - AvailableForRoleTypes: "2", - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err = store.Create(ctx, customerPerm) - require.NoError(t, err) - - t.Run("GetAll按平台角色类型过滤", func(t *testing.T) { - roleType := 1 - perms, err := store.GetAll(ctx, &roleType, nil) - require.NoError(t, err) - - var codes []string - for _, p := range perms { - codes = append(codes, p.PermCode) - } - assert.Contains(t, codes, "platform:menu") - assert.NotContains(t, codes, "customer:menu") - }) - - t.Run("GetAll按客户角色类型过滤", func(t *testing.T) { - roleType := 2 - perms, err := store.GetAll(ctx, &roleType, nil) - require.NoError(t, err) - - var codes []string - for _, p := range perms { - codes = append(codes, p.PermCode) - } - assert.Contains(t, codes, "customer:menu") - assert.NotContains(t, codes, "platform:menu") - }) - - t.Run("GetAll不过滤时返回所有", func(t *testing.T) { - perms, err := store.GetAll(ctx, nil, nil) - require.NoError(t, err) - - var codes []string - for _, p := range perms { - codes = append(codes, p.PermCode) - } - assert.Contains(t, codes, "platform:menu") - assert.Contains(t, codes, "customer:menu") - }) -} - -func TestPermissionStore_GetByPlatform_AvailableForRoleType(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := postgres.NewPermissionStore(tx) - ctx := context.Background() - - webPlatformPerm := &model.Permission{ - PermName: "Web平台权限", - PermCode: "web:platform", - PermType: 1, - Platform: "web", - AvailableForRoleTypes: "1", - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err := store.Create(ctx, webPlatformPerm) - require.NoError(t, err) - - h5CustomerPerm := &model.Permission{ - PermName: "H5客户权限", - PermCode: "h5:customer", - PermType: 1, - Platform: "h5", - AvailableForRoleTypes: "2", - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err = store.Create(ctx, h5CustomerPerm) - require.NoError(t, err) - - t.Run("同时按平台和角色类型过滤", func(t *testing.T) { - roleType := 1 - perms, err := store.GetByPlatform(ctx, "web", &roleType) - require.NoError(t, err) - - var codes []string - for _, p := range perms { - codes = append(codes, p.PermCode) - } - assert.Contains(t, codes, "web:platform") - assert.NotContains(t, codes, "h5:customer") - }) -} diff --git a/tests/unit/role_assignment_limit_test.go b/tests/unit/role_assignment_limit_test.go deleted file mode 100644 index 7c73a75..0000000 --- a/tests/unit/role_assignment_limit_test.go +++ /dev/null @@ -1,204 +0,0 @@ -package unit - -import ( - "context" - "testing" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/internal/service/account" - "github.com/break/junhong_cmp_fiber/internal/service/account_audit" - "github.com/break/junhong_cmp_fiber/internal/store/postgres" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/pkg/middleware" - "github.com/break/junhong_cmp_fiber/tests/testutils" -) - -// TestRoleAssignmentLimit_PlatformUser 测试平台用户可以分配多个角色（无限制） -func TestRoleAssignmentLimit_PlatformUser(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - shopStore := postgres.NewShopStore(tx, rdb) - enterpriseStore := postgres.NewEnterpriseStore(tx, rdb) - shopRoleStore := postgres.NewShopRoleStore(tx, rdb) - auditLogStore := postgres.NewAccountOperationLogStore(tx) - auditService := account_audit.NewService(auditLogStore) - service := account.New(accountStore, roleStore, accountRoleStore, shopRoleStore, shopStore, enterpriseStore, auditService) - - ctx := context.Background() - ctx = middleware.SetUserContext(ctx, middleware.NewSimpleUserContext(1, constants.UserTypeSuperAdmin, 0)) - - // 创建平台用户 - platformUser := &model.Account{ - Username: "platform_user", - Phone: "13800000001", - Password: "hashedpassword", - UserType: constants.UserTypePlatform, - Status: constants.StatusEnabled, - } - require.NoError(t, tx.Create(platformUser).Error) - - // 创建 3 个平台角色 - roles := []*model.Role{ - {RoleName: "运营", RoleType: constants.RoleTypePlatform, Status: constants.StatusEnabled}, - {RoleName: "客服", RoleType: constants.RoleTypePlatform, Status: constants.StatusEnabled}, - {RoleName: "财务", RoleType: constants.RoleTypePlatform, Status: constants.StatusEnabled}, - } - for _, role := range roles { - require.NoError(t, tx.Create(role).Error) - } - - // 为平台用户分配 3 个角色（应该成功，因为平台用户无限制） - roleIDs := []uint{roles[0].ID, roles[1].ID, roles[2].ID} - ars, err := service.AssignRoles(ctx, platformUser.ID, roleIDs) - require.NoError(t, err) - assert.Len(t, ars, 3) -} - -// TestRoleAssignmentLimit_AgentUser 测试代理账号只能分配一个角色 -func TestRoleAssignmentLimit_AgentUser(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - shopStore := postgres.NewShopStore(tx, rdb) - shopRoleStore := postgres.NewShopRoleStore(tx, rdb) - enterpriseStore := postgres.NewEnterpriseStore(tx, rdb) - auditLogStore := postgres.NewAccountOperationLogStore(tx) - auditService := account_audit.NewService(auditLogStore) - service := account.New(accountStore, roleStore, accountRoleStore, shopRoleStore, shopStore, enterpriseStore, auditService) - - ctx := context.Background() - ctx = middleware.SetUserContext(ctx, middleware.NewSimpleUserContext(1, constants.UserTypeSuperAdmin, 0)) - - // 创建代理账号 - agentAccount := &model.Account{ - Username: "agent_user", - Phone: "13800000002", - Password: "hashedpassword", - UserType: constants.UserTypeAgent, - Status: constants.StatusEnabled, - } - require.NoError(t, tx.Create(agentAccount).Error) - - // 创建 2 个客户角色 - roles := []*model.Role{ - {RoleName: "一级代理", RoleType: constants.RoleTypeCustomer, Status: constants.StatusEnabled}, - {RoleName: "二级代理", RoleType: constants.RoleTypeCustomer, Status: constants.StatusEnabled}, - } - for _, role := range roles { - require.NoError(t, tx.Create(role).Error) - } - - // 先分配第一个角色（应该成功） - ars, err := service.AssignRoles(ctx, agentAccount.ID, []uint{roles[0].ID}) - require.NoError(t, err) - assert.Len(t, ars, 1) - - // 尝试分配第二个角色（应该失败，超过数量限制） - _, err = service.AssignRoles(ctx, agentAccount.ID, []uint{roles[1].ID}) - require.Error(t, err) - assert.Contains(t, err.Error(), "最多只能分配 1 个角色") -} - -// TestRoleAssignmentLimit_EnterpriseUser 测试企业账号只能分配一个角色 -func TestRoleAssignmentLimit_EnterpriseUser(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - shopRoleStore := postgres.NewShopRoleStore(tx, rdb) - shopStore := postgres.NewShopStore(tx, rdb) - enterpriseStore := postgres.NewEnterpriseStore(tx, rdb) - auditLogStore := postgres.NewAccountOperationLogStore(tx) - auditService := account_audit.NewService(auditLogStore) - service := account.New(accountStore, roleStore, accountRoleStore, shopRoleStore, shopStore, enterpriseStore, auditService) - - ctx := context.Background() - ctx = middleware.SetUserContext(ctx, middleware.NewSimpleUserContext(1, constants.UserTypeSuperAdmin, 0)) - - // 创建企业账号 - enterpriseAccount := &model.Account{ - Username: "enterprise_user", - Phone: "13800000003", - Password: "hashedpassword", - UserType: constants.UserTypeEnterprise, - Status: constants.StatusEnabled, - } - require.NoError(t, tx.Create(enterpriseAccount).Error) - - // 创建 2 个客户角色 - roles := []*model.Role{ - {RoleName: "企业普通", RoleType: constants.RoleTypeCustomer, Status: constants.StatusEnabled}, - {RoleName: "企业高级", RoleType: constants.RoleTypeCustomer, Status: constants.StatusEnabled}, - } - for _, role := range roles { - require.NoError(t, tx.Create(role).Error) - } - - // 先分配第一个角色（应该成功） - ars, err := service.AssignRoles(ctx, enterpriseAccount.ID, []uint{roles[0].ID}) - require.NoError(t, err) - assert.Len(t, ars, 1) - - // 尝试分配第二个角色（应该失败，超过数量限制） - _, err = service.AssignRoles(ctx, enterpriseAccount.ID, []uint{roles[1].ID}) - require.Error(t, err) - assert.Contains(t, err.Error(), "最多只能分配 1 个角色") -} - -// TestRoleAssignmentLimit_SuperAdmin 测试超级管理员不允许分配角色 -func TestRoleAssignmentLimit_SuperAdmin(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - shopRoleStore := postgres.NewShopRoleStore(tx, rdb) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - shopStore := postgres.NewShopStore(tx, rdb) - enterpriseStore := postgres.NewEnterpriseStore(tx, rdb) - auditLogStore := postgres.NewAccountOperationLogStore(tx) - auditService := account_audit.NewService(auditLogStore) - service := account.New(accountStore, roleStore, accountRoleStore, shopRoleStore, shopStore, enterpriseStore, auditService) - - ctx := context.Background() - ctx = middleware.SetUserContext(ctx, middleware.NewSimpleUserContext(1, constants.UserTypeSuperAdmin, 0)) - - // 创建超级管理员 - superAdmin := &model.Account{ - Username: "superadmin", - Phone: "13800000004", - Password: "hashedpassword", - UserType: constants.UserTypeSuperAdmin, - Status: constants.StatusEnabled, - } - require.NoError(t, tx.Create(superAdmin).Error) - - // 创建一个平台角色 - role := &model.Role{ - RoleName: "测试角色", - RoleType: constants.RoleTypePlatform, - Status: constants.StatusEnabled, - } - require.NoError(t, tx.Create(role).Error) - - // 尝试为超级管理员分配角色（应该失败） - _, err := service.AssignRoles(ctx, superAdmin.ID, []uint{role.ID}) - require.Error(t, err) - assert.Contains(t, err.Error(), "超级管理员不允许分配角色") -} diff --git a/tests/unit/role_service_test.go b/tests/unit/role_service_test.go deleted file mode 100644 index cdc04a7..0000000 --- a/tests/unit/role_service_test.go +++ /dev/null @@ -1,184 +0,0 @@ -package unit - -import ( - "testing" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/internal/service/role" - "github.com/break/junhong_cmp_fiber/internal/store/postgres" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/tests/testutils" -) - -func TestRoleService_AssignPermissions_ValidateAvailableForRoleTypes(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - roleStore := postgres.NewRoleStore(tx) - permStore := postgres.NewPermissionStore(tx) - rolePermStore := postgres.NewRolePermissionStore(tx, rdb) - service := role.New(roleStore, permStore, rolePermStore) - - ctx := createContextWithUserID(1) - - platformRole := &model.Role{ - RoleName: "平台管理员", - RoleDesc: "平台角色", - RoleType: 1, - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err := roleStore.Create(ctx, platformRole) - require.NoError(t, err) - - customerRole := &model.Role{ - RoleName: "客户管理员", - RoleDesc: "客户角色", - RoleType: 2, - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err = roleStore.Create(ctx, customerRole) - require.NoError(t, err) - - platformPerm := &model.Permission{ - PermName: "平台权限", - PermCode: "platform:manage", - PermType: 1, - Platform: "all", - AvailableForRoleTypes: "1", - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err = permStore.Create(ctx, platformPerm) - require.NoError(t, err) - - customerPerm := &model.Permission{ - PermName: "客户权限", - PermCode: "customer:manage", - PermType: 1, - Platform: "all", - AvailableForRoleTypes: "2", - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err = permStore.Create(ctx, customerPerm) - require.NoError(t, err) - - commonPerm := &model.Permission{ - PermName: "通用权限", - PermCode: "common:view", - PermType: 1, - Platform: "all", - AvailableForRoleTypes: "1,2", - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err = permStore.Create(ctx, commonPerm) - require.NoError(t, err) - - t.Run("为平台角色分配平台权限-成功", func(t *testing.T) { - rps, err := service.AssignPermissions(ctx, platformRole.ID, []uint{platformPerm.ID}) - require.NoError(t, err) - assert.NotEmpty(t, rps) - }) - - t.Run("为平台角色分配通用权限-成功", func(t *testing.T) { - rps, err := service.AssignPermissions(ctx, platformRole.ID, []uint{commonPerm.ID}) - require.NoError(t, err) - assert.NotEmpty(t, rps) - }) - - t.Run("为平台角色分配客户专用权限-失败", func(t *testing.T) { - _, err := service.AssignPermissions(ctx, platformRole.ID, []uint{customerPerm.ID}) - require.Error(t, err) - assert.Contains(t, err.Error(), "不适用于此角色类型") - }) - - t.Run("为客户角色分配客户权限-成功", func(t *testing.T) { - rps, err := service.AssignPermissions(ctx, customerRole.ID, []uint{customerPerm.ID}) - require.NoError(t, err) - assert.NotEmpty(t, rps) - }) - - t.Run("为客户角色分配平台专用权限-失败", func(t *testing.T) { - _, err := service.AssignPermissions(ctx, customerRole.ID, []uint{platformPerm.ID}) - require.Error(t, err) - assert.Contains(t, err.Error(), "不适用于此角色类型") - }) - - t.Run("批量分配权限时部分不匹配-失败", func(t *testing.T) { - _, err := service.AssignPermissions(ctx, platformRole.ID, []uint{platformPerm.ID, customerPerm.ID}) - require.Error(t, err) - assert.Contains(t, err.Error(), "不适用于此角色类型") - }) -} - -func TestRoleService_UpdateStatus(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - roleStore := postgres.NewRoleStore(tx) - permStore := postgres.NewPermissionStore(tx) - rolePermStore := postgres.NewRolePermissionStore(tx, rdb) - service := role.New(roleStore, permStore, rolePermStore) - - ctx := createContextWithUserID(1) - - testRole := &model.Role{ - RoleName: "测试角色", - RoleDesc: "用于测试状态切换", - RoleType: 1, - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err := roleStore.Create(ctx, testRole) - require.NoError(t, err) - - t.Run("禁用角色", func(t *testing.T) { - err := service.UpdateStatus(ctx, testRole.ID, constants.StatusDisabled) - require.NoError(t, err) - - role, err := roleStore.GetByID(ctx, testRole.ID) - require.NoError(t, err) - assert.Equal(t, constants.StatusDisabled, role.Status) - }) - - t.Run("启用角色", func(t *testing.T) { - err := service.UpdateStatus(ctx, testRole.ID, constants.StatusEnabled) - require.NoError(t, err) - - role, err := roleStore.GetByID(ctx, testRole.ID) - require.NoError(t, err) - assert.Equal(t, constants.StatusEnabled, role.Status) - }) - - t.Run("更新不存在的角色-失败", func(t *testing.T) { - err := service.UpdateStatus(ctx, 99999, constants.StatusEnabled) - require.Error(t, err) - assert.Contains(t, err.Error(), "角色不存在") - }) -} diff --git a/tests/unit/role_type_matching_test.go b/tests/unit/role_type_matching_test.go deleted file mode 100644 index 936c942..0000000 --- a/tests/unit/role_type_matching_test.go +++ /dev/null @@ -1,111 +0,0 @@ -package unit - -import ( - "testing" - - "github.com/stretchr/testify/assert" - - "github.com/break/junhong_cmp_fiber/pkg/constants" -) - -// TestIsRoleTypeMatchUserType 测试角色类型与用户类型匹配规则 -func TestIsRoleTypeMatchUserType(t *testing.T) { - tests := []struct { - name string - roleType int - userType int - expected bool - }{ - { - name: "超级管理员不需要角色", - roleType: constants.RoleTypePlatform, - userType: constants.UserTypeSuperAdmin, - expected: false, - }, - { - name: "平台用户匹配平台角色", - roleType: constants.RoleTypePlatform, - userType: constants.UserTypePlatform, - expected: true, - }, - { - name: "平台用户不匹配客户角色", - roleType: constants.RoleTypeCustomer, - userType: constants.UserTypePlatform, - expected: false, - }, - { - name: "代理账号匹配客户角色", - roleType: constants.RoleTypeCustomer, - userType: constants.UserTypeAgent, - expected: true, - }, - { - name: "代理账号不匹配平台角色", - roleType: constants.RoleTypePlatform, - userType: constants.UserTypeAgent, - expected: false, - }, - { - name: "企业账号匹配客户角色", - roleType: constants.RoleTypeCustomer, - userType: constants.UserTypeEnterprise, - expected: true, - }, - { - name: "企业账号不匹配平台角色", - roleType: constants.RoleTypePlatform, - userType: constants.UserTypeEnterprise, - expected: false, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - result := constants.IsRoleTypeMatchUserType(tt.roleType, tt.userType) - assert.Equal(t, tt.expected, result) - }) - } -} - -// TestGetMaxRolesForUserType 测试用户类型的最大角色数量限制 -func TestGetMaxRolesForUserType(t *testing.T) { - tests := []struct { - name string - userType int - expected int - }{ - { - name: "超级管理员不需要角色", - userType: constants.UserTypeSuperAdmin, - expected: 0, - }, - { - name: "平台用户无角色数量限制", - userType: constants.UserTypePlatform, - expected: -1, // -1 表示无限制 - }, - { - name: "代理账号最多一个角色", - userType: constants.UserTypeAgent, - expected: 1, - }, - { - name: "企业账号最多一个角色", - userType: constants.UserTypeEnterprise, - expected: 1, - }, - { - name: "未知用户类型不允许角色", - userType: 999, - expected: 0, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - result := constants.GetMaxRolesForUserType(tt.userType) - assert.Equal(t, tt.expected, result) - }) - } -} diff --git a/tests/unit/shop_commission_service_test.go b/tests/unit/shop_commission_service_test.go deleted file mode 100644 index c67bbd7..0000000 --- a/tests/unit/shop_commission_service_test.go +++ /dev/null @@ -1,240 +0,0 @@ -package unit - -import ( - "context" - "testing" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/internal/model/dto" - "github.com/break/junhong_cmp_fiber/internal/service/shop_commission" - "github.com/break/junhong_cmp_fiber/internal/store/postgres" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/tests/testutils" -) - -func createCommissionTestContext(userID uint) context.Context { - ctx := context.Background() - ctx = context.WithValue(ctx, constants.ContextKeyUserID, userID) - ctx = context.WithValue(ctx, constants.ContextKeyUserType, constants.UserTypePlatform) - return ctx -} - -func TestShopCommissionService_ListShopCommissionSummary(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - shopStore := postgres.NewShopStore(tx, rdb) - accountStore := postgres.NewAccountStore(tx, rdb) - walletStore := postgres.NewWalletStore(tx, rdb) - commissionWithdrawalRequestStore := postgres.NewCommissionWithdrawalRequestStore(tx, rdb) - commissionRecordStore := postgres.NewCommissionRecordStore(tx, rdb) - - service := shop_commission.New(shopStore, accountStore, walletStore, commissionWithdrawalRequestStore, commissionRecordStore) - - t.Run("查询店铺佣金汇总列表", func(t *testing.T) { - ctx := createCommissionTestContext(1) - - shop := &model.Shop{ - ShopName: "测试店铺", - ShopCode: "COMMISSION_TEST_001", - Level: 1, - ContactName: "测试联系人", - ContactPhone: "13800000001", - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err := shopStore.Create(ctx, shop) - require.NoError(t, err) - - req := &dto.ShopCommissionSummaryListReq{ - Page: 1, - PageSize: 20, - } - - result, err := service.ListShopCommissionSummary(ctx, req) - require.NoError(t, err) - assert.NotNil(t, result) - assert.GreaterOrEqual(t, result.Total, int64(0)) - }) - - t.Run("按店铺名称筛选", func(t *testing.T) { - ctx := createCommissionTestContext(1) - - shop := &model.Shop{ - ShopName: "筛选测试店铺", - ShopCode: "FILTER_TEST_001", - Level: 1, - ContactName: "测试联系人", - ContactPhone: "13800000002", - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err := shopStore.Create(ctx, shop) - require.NoError(t, err) - - req := &dto.ShopCommissionSummaryListReq{ - Page: 1, - PageSize: 20, - ShopName: "筛选测试", - } - - result, err := service.ListShopCommissionSummary(ctx, req) - require.NoError(t, err) - assert.NotNil(t, result) - }) -} - -func TestShopCommissionService_ListShopWithdrawalRequests(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - shopStore := postgres.NewShopStore(tx, rdb) - accountStore := postgres.NewAccountStore(tx, rdb) - walletStore := postgres.NewWalletStore(tx, rdb) - commissionWithdrawalRequestStore := postgres.NewCommissionWithdrawalRequestStore(tx, rdb) - commissionRecordStore := postgres.NewCommissionRecordStore(tx, rdb) - - service := shop_commission.New(shopStore, accountStore, walletStore, commissionWithdrawalRequestStore, commissionRecordStore) - - t.Run("查询店铺提现记录", func(t *testing.T) { - ctx := createCommissionTestContext(1) - - shop := &model.Shop{ - ShopName: "提现测试店铺", - ShopCode: "WITHDRAWAL_TEST_001", - Level: 1, - ContactName: "测试联系人", - ContactPhone: "13800000003", - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err := shopStore.Create(ctx, shop) - require.NoError(t, err) - - req := &dto.ShopWithdrawalRequestListReq{ - Page: 1, - PageSize: 20, - } - - result, err := service.ListShopWithdrawalRequests(ctx, shop.ID, req) - require.NoError(t, err) - assert.NotNil(t, result) - assert.GreaterOrEqual(t, result.Total, int64(0)) - }) - - t.Run("查询不存在的店铺提现记录应失败", func(t *testing.T) { - ctx := createCommissionTestContext(1) - - req := &dto.ShopWithdrawalRequestListReq{ - Page: 1, - PageSize: 20, - } - - _, err := service.ListShopWithdrawalRequests(ctx, 99999, req) - assert.Error(t, err) - }) -} - -func TestShopCommissionService_ListShopCommissionRecords(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - shopStore := postgres.NewShopStore(tx, rdb) - accountStore := postgres.NewAccountStore(tx, rdb) - walletStore := postgres.NewWalletStore(tx, rdb) - commissionWithdrawalRequestStore := postgres.NewCommissionWithdrawalRequestStore(tx, rdb) - commissionRecordStore := postgres.NewCommissionRecordStore(tx, rdb) - - service := shop_commission.New(shopStore, accountStore, walletStore, commissionWithdrawalRequestStore, commissionRecordStore) - - t.Run("查询店铺佣金明细", func(t *testing.T) { - ctx := createCommissionTestContext(1) - - shop := &model.Shop{ - ShopName: "佣金明细测试店铺", - ShopCode: "RECORD_TEST_001", - Level: 1, - ContactName: "测试联系人", - ContactPhone: "13800000004", - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err := shopStore.Create(ctx, shop) - require.NoError(t, err) - - req := &dto.ShopCommissionRecordListReq{ - Page: 1, - PageSize: 20, - } - - result, err := service.ListShopCommissionRecords(ctx, shop.ID, req) - require.NoError(t, err) - assert.NotNil(t, result) - assert.GreaterOrEqual(t, result.Total, int64(0)) - }) - - t.Run("查询不存在的店铺佣金明细应失败", func(t *testing.T) { - ctx := createCommissionTestContext(1) - - req := &dto.ShopCommissionRecordListReq{ - Page: 1, - PageSize: 20, - } - - _, err := service.ListShopCommissionRecords(ctx, 99999, req) - assert.Error(t, err) - }) -} - -func TestBuildShopHierarchyPath(t *testing.T) { - t.Run("一级店铺路径", func(t *testing.T) { - shop := &model.Shop{ - ShopName: "一级店铺", - Level: 1, - ParentID: nil, - } - path := buildTestHierarchyPath(shop, nil) - assert.Equal(t, "一级店铺", path) - }) - - t.Run("多级店铺路径", func(t *testing.T) { - parentID := uint(1) - shop := &model.Shop{ - ShopName: "二级店铺", - Level: 2, - ParentID: &parentID, - } - parent := &model.Shop{ - ShopName: "一级店铺", - Level: 1, - ParentID: nil, - } - path := buildTestHierarchyPath(shop, parent) - assert.Equal(t, "一级店铺 > 二级店铺", path) - }) -} - -func buildTestHierarchyPath(shop *model.Shop, parent *model.Shop) string { - if parent == nil { - return shop.ShopName - } - return parent.ShopName + " > " + shop.ShopName -} diff --git a/tests/unit/shop_service_test.go b/tests/unit/shop_service_test.go deleted file mode 100644 index 1c9ca8d..0000000 --- a/tests/unit/shop_service_test.go +++ /dev/null @@ -1,765 +0,0 @@ -package unit - -import ( - "context" - "testing" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/internal/model/dto" - "github.com/break/junhong_cmp_fiber/internal/service/shop" - "github.com/break/junhong_cmp_fiber/internal/store/postgres" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/pkg/errors" - "github.com/break/junhong_cmp_fiber/tests/testutils" -) - -// TestShopService_Create 测试创建店铺 -func TestShopService_Create(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - shopStore := postgres.NewShopStore(tx, rdb) - accountStore := postgres.NewAccountStore(tx, rdb) - shopRoleStore := postgres.NewShopRoleStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - service := shop.New(shopStore, accountStore, shopRoleStore, roleStore) - - t.Run("创建一级店铺成功", func(t *testing.T) { - ctx := createContextWithUserID(1) - req := &dto.CreateShopRequest{ - ShopName: "测试一级店铺", - ShopCode: "SHOP_L1_001", - ParentID: nil, - ContactName: "张三", - ContactPhone: "13800000001", - Province: "北京市", - City: "北京市", - District: "朝阳区", - Address: "朝阳路100号", - InitUsername: generateUniqueUsername("admin", t), - InitPhone: generateUniquePhone(), - InitPassword: "password123", - } - - result, err := service.Create(ctx, req) - require.NoError(t, err) - assert.NotZero(t, result.ID) - assert.Equal(t, "测试一级店铺", result.ShopName) - assert.Equal(t, "SHOP_L1_001", result.ShopCode) - assert.Equal(t, 1, result.Level) - assert.Nil(t, result.ParentID) - assert.Equal(t, constants.StatusEnabled, result.Status) - }) - - t.Run("创建二级店铺成功", func(t *testing.T) { - ctx := createContextWithUserID(1) - - // 先创建一级店铺 - parent := &model.Shop{ - ShopName: "一级店铺", - ShopCode: "PARENT_001", - Level: 1, - ContactName: "李四", - ContactPhone: "13800000002", - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err := shopStore.Create(ctx, parent) - require.NoError(t, err) - - // 创建二级店铺 - req := &dto.CreateShopRequest{ - ShopName: "测试二级店铺", - ShopCode: "SHOP_L2_001", - ParentID: &parent.ID, - ContactName: "王五", - ContactPhone: "13800000003", - InitUsername: generateUniqueUsername("agent", t), - InitPhone: generateUniquePhone(), - InitPassword: "password123", - } - - result, err := service.Create(ctx, req) - require.NoError(t, err) - assert.NotZero(t, result.ID) - assert.Equal(t, 2, result.Level) - assert.Equal(t, parent.ID, *result.ParentID) - }) - - t.Run("层级校验-创建第8级店铺应失败", func(t *testing.T) { - ctx := createContextWithUserID(1) - - // 创建 7 级店铺层级 - var shops []*model.Shop - for i := 1; i <= 7; i++ { - var parentID *uint - if i > 1 { - parentID = &shops[i-2].ID - } - - shopModel := &model.Shop{ - ShopName: testutils.GenerateUsername("店铺L", i), - ShopCode: testutils.GenerateUsername("LEVEL", i), - ParentID: parentID, - Level: i, - ContactName: "测试联系人", - ContactPhone: testutils.GeneratePhone("138", i), - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err := shopStore.Create(ctx, shopModel) - require.NoError(t, err) - shops = append(shops, shopModel) - } - - // 验证已创建 7 级 - assert.Len(t, shops, 7) - assert.Equal(t, 7, shops[6].Level) - - // 尝试创建第 8 级店铺（应该失败） - req := &dto.CreateShopRequest{ - ShopName: "第8级店铺", - ShopCode: "SHOP_L8_001", - ParentID: &shops[6].ID, // 第7级店铺的ID - ContactName: "测试", - ContactPhone: "13800000008", - InitUsername: generateUniqueUsername("level8", t), - InitPhone: generateUniquePhone(), - InitPassword: "password123", - } - - result, err := service.Create(ctx, req) - assert.Error(t, err) - assert.Nil(t, result) - - // 验证错误码 - appErr, ok := err.(*errors.AppError) - require.True(t, ok, "错误应该是 AppError 类型") - assert.Equal(t, errors.CodeShopLevelExceeded, appErr.Code) - assert.Contains(t, appErr.Message, "不能超过 7 级") - }) - - t.Run("店铺编号唯一性检查-重复编号应失败", func(t *testing.T) { - ctx := createContextWithUserID(1) - - // 创建第一个店铺 - req1 := &dto.CreateShopRequest{ - ShopName: "店铺A", - ShopCode: "UNIQUE_CODE_001", - ContactName: "张三", - ContactPhone: "13800000001", - InitUsername: generateUniqueUsername("unique1", t), - InitPhone: generateUniquePhone(), - InitPassword: "password123", - } - _, err := service.Create(ctx, req1) - require.NoError(t, err) - - // 尝试创建相同编号的店铺（应该失败） - req2 := &dto.CreateShopRequest{ - ShopName: "店铺B", - ShopCode: "UNIQUE_CODE_001", // 重复编号 - ContactName: "李四", - ContactPhone: "13800000002", - InitUsername: generateUniqueUsername("unique2", t), - InitPhone: generateUniquePhone(), - InitPassword: "password123", - } - result, err := service.Create(ctx, req2) - assert.Error(t, err) - assert.Nil(t, result) - - // 验证错误码 - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeShopCodeExists, appErr.Code) - assert.Contains(t, appErr.Message, "编号已存在") - }) - - t.Run("上级店铺不存在应失败", func(t *testing.T) { - ctx := createContextWithUserID(1) - - nonExistentID := uint(99999) - req := &dto.CreateShopRequest{ - ShopName: "测试店铺", - ShopCode: "SHOP_INVALID_PARENT", - ParentID: &nonExistentID, // 不存在的上级店铺 ID - ContactName: "测试", - ContactPhone: "13800000009", - InitUsername: generateUniqueUsername("invalid", t), - InitPhone: generateUniquePhone(), - InitPassword: "password123", - } - - result, err := service.Create(ctx, req) - assert.Error(t, err) - assert.Nil(t, result) - - // 验证错误码 - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeInvalidParentID, appErr.Code) - assert.Contains(t, appErr.Message, "上级店铺不存在") - }) - - t.Run("未授权访问应失败", func(t *testing.T) { - ctx := context.Background() // 没有用户 ID 的 context - - req := &dto.CreateShopRequest{ - ShopName: "测试店铺", - ShopCode: "SHOP_UNAUTHORIZED", - ContactName: "测试", - ContactPhone: "13800000010", - InitUsername: generateUniqueUsername("unauth", t), - InitPhone: generateUniquePhone(), - InitPassword: "password123", - } - - result, err := service.Create(ctx, req) - assert.Error(t, err) - assert.Nil(t, result) - - // 验证错误码 - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeUnauthorized, appErr.Code) - assert.Contains(t, appErr.Message, "未授权") - }) -} - -// TestShopService_Update 测试更新店铺 -func TestShopService_Update(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - shopStore := postgres.NewShopStore(tx, rdb) - accountStore := postgres.NewAccountStore(tx, rdb) - shopRoleStore := postgres.NewShopRoleStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - service := shop.New(shopStore, accountStore, shopRoleStore, roleStore) - - t.Run("更新店铺信息成功", func(t *testing.T) { - ctx := createContextWithUserID(1) - - // 先创建店铺 - shopModel := &model.Shop{ - ShopName: "原始店铺名称", - ShopCode: "ORIGINAL_CODE", - Level: 1, - ContactName: "原联系人", - ContactPhone: "13800000001", - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err := shopStore.Create(ctx, shopModel) - require.NoError(t, err) - - // 更新店铺 - req := &dto.UpdateShopRequest{ - ShopName: "更新后的店铺名称", - ContactName: "新联系人", - ContactPhone: "13900000001", - Province: "上海市", - City: "上海市", - District: "浦东新区", - Address: "陆家嘴环路1000号", - Status: constants.StatusEnabled, - } - - result, err := service.Update(ctx, shopModel.ID, req) - require.NoError(t, err) - assert.Equal(t, "更新后的店铺名称", result.ShopName) - assert.Equal(t, "ORIGINAL_CODE", result.ShopCode) - assert.Equal(t, "新联系人", result.ContactName) - assert.Equal(t, "13900000001", result.ContactPhone) - assert.Equal(t, "上海市", result.Province) - assert.Equal(t, "上海市", result.City) - assert.Equal(t, "浦东新区", result.District) - assert.Equal(t, "陆家嘴环路1000号", result.Address) - }) - - t.Run("更新店铺编号-唯一性检查", func(t *testing.T) { - ctx := createContextWithUserID(1) - - // 创建两个店铺 - shop1 := &model.Shop{ - ShopName: "店铺1", - ShopCode: "CODE_001", - Level: 1, - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err := shopStore.Create(ctx, shop1) - require.NoError(t, err) - - shop2 := &model.Shop{ - ShopName: "店铺2", - ShopCode: "CODE_002", - Level: 1, - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err = shopStore.Create(ctx, shop2) - require.NoError(t, err) - - // 尝试更新 shop2 的名称为已存在的名称（应该成功，因为名称不需要唯一性） - req := &dto.UpdateShopRequest{ - ShopName: "店铺1", - Status: constants.StatusEnabled, - } - - result, err := service.Update(ctx, shop2.ID, req) - require.NoError(t, err) - assert.NotNil(t, result) - assert.Equal(t, "店铺1", result.ShopName) - }) - - t.Run("更新不存在的店铺应失败", func(t *testing.T) { - ctx := createContextWithUserID(1) - - req := &dto.UpdateShopRequest{ - ShopName: "新名称", - Status: constants.StatusEnabled, - } - - result, err := service.Update(ctx, 99999, req) - assert.Error(t, err) - assert.Nil(t, result) - - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeShopNotFound, appErr.Code) - }) - - t.Run("未授权访问应失败", func(t *testing.T) { - ctx := context.Background() - - req := &dto.UpdateShopRequest{ - ShopName: "新名称", - Status: constants.StatusEnabled, - } - - result, err := service.Update(ctx, 1, req) - assert.Error(t, err) - assert.Nil(t, result) - - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeUnauthorized, appErr.Code) - }) -} - -// TestShopService_Disable 测试禁用店铺 -func TestShopService_Disable(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - shopStore := postgres.NewShopStore(tx, rdb) - accountStore := postgres.NewAccountStore(tx, rdb) - shopRoleStore := postgres.NewShopRoleStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - service := shop.New(shopStore, accountStore, shopRoleStore, roleStore) - - t.Run("禁用店铺成功", func(t *testing.T) { - ctx := createContextWithUserID(1) - - // 创建店铺 - shopModel := &model.Shop{ - ShopName: "待禁用店铺", - ShopCode: "SHOP_TO_DISABLE", - Level: 1, - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err := shopStore.Create(ctx, shopModel) - require.NoError(t, err) - assert.Equal(t, constants.StatusEnabled, shopModel.Status) - - // 禁用店铺 - err = service.Disable(ctx, shopModel.ID) - require.NoError(t, err) - - // 验证状态已更新 - result, err := shopStore.GetByID(ctx, shopModel.ID) - require.NoError(t, err) - assert.Equal(t, constants.StatusDisabled, result.Status) - assert.Equal(t, uint(1), result.Updater) - }) - - t.Run("禁用不存在的店铺应失败", func(t *testing.T) { - ctx := createContextWithUserID(1) - - err := service.Disable(ctx, 99999) - assert.Error(t, err) - - // 验证错误码 - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeShopNotFound, appErr.Code) - }) - - t.Run("未授权访问应失败", func(t *testing.T) { - ctx := context.Background() - - err := service.Disable(ctx, 1) - assert.Error(t, err) - - // 验证错误码 - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeUnauthorized, appErr.Code) - }) -} - -// TestShopService_Enable 测试启用店铺 -func TestShopService_Enable(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - shopStore := postgres.NewShopStore(tx, rdb) - accountStore := postgres.NewAccountStore(tx, rdb) - shopRoleStore := postgres.NewShopRoleStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - service := shop.New(shopStore, accountStore, shopRoleStore, roleStore) - - t.Run("启用店铺成功", func(t *testing.T) { - ctx := createContextWithUserID(1) - - // 创建启用状态的店铺 - shopModel := &model.Shop{ - ShopName: "待启用店铺", - ShopCode: "SHOP_TO_ENABLE", - Level: 1, - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err := shopStore.Create(ctx, shopModel) - require.NoError(t, err) - - // 先禁用店铺 - shopModel.Status = constants.StatusDisabled - err = shopStore.Update(ctx, shopModel) - require.NoError(t, err) - - // 验证已禁用 - disabled, err := shopStore.GetByID(ctx, shopModel.ID) - require.NoError(t, err) - assert.Equal(t, constants.StatusDisabled, disabled.Status) - - // 启用店铺 - err = service.Enable(ctx, shopModel.ID) - require.NoError(t, err) - - // 验证状态已更新为启用 - result, err := shopStore.GetByID(ctx, shopModel.ID) - require.NoError(t, err) - assert.Equal(t, constants.StatusEnabled, result.Status) - assert.Equal(t, uint(1), result.Updater) - }) - - t.Run("启用不存在的店铺应失败", func(t *testing.T) { - ctx := createContextWithUserID(1) - - err := service.Enable(ctx, 99999) - assert.Error(t, err) - - // 验证错误码 - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeShopNotFound, appErr.Code) - }) - - t.Run("未授权访问应失败", func(t *testing.T) { - ctx := context.Background() - - err := service.Enable(ctx, 1) - assert.Error(t, err) - - // 验证错误码 - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeUnauthorized, appErr.Code) - }) -} - -// TestShopService_GetByID 测试获取店铺详情 -func TestShopService_GetByID(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - shopStore := postgres.NewShopStore(tx, rdb) - accountStore := postgres.NewAccountStore(tx, rdb) - shopRoleStore := postgres.NewShopRoleStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - service := shop.New(shopStore, accountStore, shopRoleStore, roleStore) - - t.Run("获取存在的店铺", func(t *testing.T) { - ctx := createContextWithUserID(1) - - // 创建店铺 - shopModel := &model.Shop{ - ShopName: "测试店铺", - ShopCode: "TEST_SHOP_001", - Level: 1, - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err := shopStore.Create(ctx, shopModel) - require.NoError(t, err) - - // 获取店铺 - result, err := service.GetByID(ctx, shopModel.ID) - require.NoError(t, err) - assert.Equal(t, shopModel.ID, result.ID) - assert.Equal(t, "测试店铺", result.ShopName) - assert.Equal(t, "TEST_SHOP_001", result.ShopCode) - }) - - t.Run("获取不存在的店铺应失败", func(t *testing.T) { - ctx := createContextWithUserID(1) - - result, err := service.GetByID(ctx, 99999) - assert.Error(t, err) - assert.Nil(t, result) - - // 验证错误码 - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeShopNotFound, appErr.Code) - }) -} - -// TestShopService_List 测试查询店铺列表 -func TestShopService_List(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - shopStore := postgres.NewShopStore(tx, rdb) - accountStore := postgres.NewAccountStore(tx, rdb) - shopRoleStore := postgres.NewShopRoleStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - service := shop.New(shopStore, accountStore, shopRoleStore, roleStore) - - t.Run("查询店铺列表", func(t *testing.T) { - ctx := createContextWithUserID(1) - - // 创建多个店铺 - for i := 1; i <= 5; i++ { - shopModel := &model.Shop{ - ShopName: testutils.GenerateUsername("测试店铺", i), - ShopCode: testutils.GenerateUsername("SHOP_LIST", i), - Level: 1, - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err := shopStore.Create(ctx, shopModel) - require.NoError(t, err) - } - - // 查询列表 - shops, total, err := service.List(ctx, nil, nil) - require.NoError(t, err) - assert.GreaterOrEqual(t, len(shops), 5) - assert.GreaterOrEqual(t, total, int64(5)) - }) -} - -// TestShopService_GetSubordinateShopIDs 测试获取下级店铺 ID 列表 -func TestShopService_GetSubordinateShopIDs(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - shopStore := postgres.NewShopStore(tx, rdb) - accountStore := postgres.NewAccountStore(tx, rdb) - shopRoleStore := postgres.NewShopRoleStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - service := shop.New(shopStore, accountStore, shopRoleStore, roleStore) - - t.Run("获取下级店铺 ID 列表", func(t *testing.T) { - ctx := createContextWithUserID(1) - - // 创建店铺层级 - shop1 := &model.Shop{ - ShopName: "一级店铺", - ShopCode: "SUBORDINATE_L1", - Level: 1, - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err := shopStore.Create(ctx, shop1) - require.NoError(t, err) - - shop2 := &model.Shop{ - ShopName: "二级店铺", - ShopCode: "SUBORDINATE_L2", - ParentID: &shop1.ID, - Level: 2, - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err = shopStore.Create(ctx, shop2) - require.NoError(t, err) - - shop3 := &model.Shop{ - ShopName: "三级店铺", - ShopCode: "SUBORDINATE_L3", - ParentID: &shop2.ID, - Level: 3, - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err = shopStore.Create(ctx, shop3) - require.NoError(t, err) - - // 获取一级店铺的所有下级（包含自己） - ids, err := service.GetSubordinateShopIDs(ctx, shop1.ID) - require.NoError(t, err) - assert.Contains(t, ids, shop1.ID) - assert.Contains(t, ids, shop2.ID) - assert.Contains(t, ids, shop3.ID) - assert.Len(t, ids, 3) - }) -} - -// TestShopService_Delete 测试删除店铺 -func TestShopService_Delete(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - shopStore := postgres.NewShopStore(tx, rdb) - accountStore := postgres.NewAccountStore(tx, rdb) - shopRoleStore := postgres.NewShopRoleStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - service := shop.New(shopStore, accountStore, shopRoleStore, roleStore) - - t.Run("删除店铺成功", func(t *testing.T) { - ctx := createContextWithUserID(1) - - shopModel := &model.Shop{ - ShopName: "待删除店铺", - ShopCode: "DELETE_001", - Level: 1, - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err := shopStore.Create(ctx, shopModel) - require.NoError(t, err) - - err = service.Delete(ctx, shopModel.ID) - require.NoError(t, err) - - _, err = shopStore.GetByID(ctx, shopModel.ID) - assert.Error(t, err) - }) - - t.Run("删除店铺并禁用关联账号", func(t *testing.T) { - ctx := createContextWithUserID(1) - - shopModel := &model.Shop{ - ShopName: "有账号的店铺", - ShopCode: "DELETE_002", - Level: 1, - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err := shopStore.Create(ctx, shopModel) - require.NoError(t, err) - - account := &model.Account{ - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - Username: testutils.GenerateUsername("agent", 1), - Phone: testutils.GeneratePhone("139", 1), - Password: "hashedpassword123", - UserType: constants.UserTypeAgent, - ShopID: &shopModel.ID, - Status: constants.StatusEnabled, - } - err = accountStore.Create(ctx, account) - require.NoError(t, err) - - err = service.Delete(ctx, shopModel.ID) - require.NoError(t, err) - - updatedAccount, err := accountStore.GetByID(ctx, account.ID) - require.NoError(t, err) - assert.Equal(t, constants.StatusDisabled, updatedAccount.Status) - }) - - t.Run("删除不存在的店铺应失败", func(t *testing.T) { - ctx := createContextWithUserID(1) - - err := service.Delete(ctx, 99999) - assert.Error(t, err) - - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeShopNotFound, appErr.Code) - }) - - t.Run("未授权访问应失败", func(t *testing.T) { - ctx := context.Background() - - err := service.Delete(ctx, 1) - assert.Error(t, err) - - appErr, ok := err.(*errors.AppError) - require.True(t, ok) - assert.Equal(t, errors.CodeUnauthorized, appErr.Code) - }) -} diff --git a/tests/unit/shop_store_test.go b/tests/unit/shop_store_test.go deleted file mode 100644 index db9246d..0000000 --- a/tests/unit/shop_store_test.go +++ /dev/null @@ -1,452 +0,0 @@ -package unit - -import ( - "context" - "testing" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/internal/store/postgres" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/tests/testutils" -) - -// TestShopStore_Create 测试创建店铺 -func TestShopStore_Create(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := postgres.NewShopStore(tx, rdb) - ctx := context.Background() - - tests := []struct { - name string - shop *model.Shop - wantErr bool - }{ - { - name: "创建一级店铺", - shop: &model.Shop{ - ShopName: "一级代理店铺", - ShopCode: "SHOP001", - ParentID: nil, - Level: 1, - ContactName: "张三", - ContactPhone: "13800000001", - Province: "北京市", - City: "北京市", - District: "朝阳区", - Address: "朝阳路100号", - Status: constants.StatusEnabled, - }, - wantErr: false, - }, - { - name: "创建带父店铺的店铺", - shop: &model.Shop{ - ShopName: "二级代理店铺", - ShopCode: "SHOP002", - Level: 2, - ContactName: "李四", - ContactPhone: "13800000002", - Status: constants.StatusEnabled, - }, - wantErr: false, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - tt.shop.BaseModel.Creator = 1 - tt.shop.BaseModel.Updater = 1 - - err := store.Create(ctx, tt.shop) - if tt.wantErr { - assert.Error(t, err) - } else { - require.NoError(t, err) - assert.NotZero(t, tt.shop.ID) - assert.NotZero(t, tt.shop.CreatedAt) - assert.NotZero(t, tt.shop.UpdatedAt) - } - }) - } -} - -// TestShopStore_GetByID 测试根据 ID 查询店铺 -func TestShopStore_GetByID(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := postgres.NewShopStore(tx, rdb) - ctx := context.Background() - - // 创建测试店铺 - shop := &model.Shop{ - ShopName: "测试店铺", - ShopCode: "TEST001", - Level: 1, - ContactName: "测试联系人", - ContactPhone: "13800000001", - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err := store.Create(ctx, shop) - require.NoError(t, err) - - t.Run("查询存在的店铺", func(t *testing.T) { - found, err := store.GetByID(ctx, shop.ID) - require.NoError(t, err) - assert.Equal(t, shop.ShopName, found.ShopName) - assert.Equal(t, shop.ShopCode, found.ShopCode) - assert.Equal(t, shop.Level, found.Level) - }) - - t.Run("查询不存在的店铺", func(t *testing.T) { - _, err := store.GetByID(ctx, 99999) - assert.Error(t, err) - }) -} - -// TestShopStore_GetByCode 测试根据店铺编号查询 -func TestShopStore_GetByCode(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := postgres.NewShopStore(tx, rdb) - ctx := context.Background() - - // 创建测试店铺 - shop := &model.Shop{ - ShopName: "测试店铺", - ShopCode: "UNIQUE001", - Level: 1, - ContactName: "测试联系人", - ContactPhone: "13800000001", - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err := store.Create(ctx, shop) - require.NoError(t, err) - - t.Run("根据店铺编号查询", func(t *testing.T) { - found, err := store.GetByCode(ctx, "UNIQUE001") - require.NoError(t, err) - assert.Equal(t, shop.ID, found.ID) - assert.Equal(t, shop.ShopName, found.ShopName) - }) - - t.Run("查询不存在的店铺编号", func(t *testing.T) { - _, err := store.GetByCode(ctx, "NONEXISTENT") - assert.Error(t, err) - }) -} - -// TestShopStore_Update 测试更新店铺 -func TestShopStore_Update(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := postgres.NewShopStore(tx, rdb) - ctx := context.Background() - - // 创建测试店铺 - shop := &model.Shop{ - ShopName: "原始店铺名称", - ShopCode: "UPDATE001", - Level: 1, - ContactName: "原联系人", - ContactPhone: "13800000001", - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err := store.Create(ctx, shop) - require.NoError(t, err) - - t.Run("更新店铺信息", func(t *testing.T) { - shop.ShopName = "更新后的店铺名称" - shop.ContactName = "新联系人" - shop.ContactPhone = "13900000001" - shop.Updater = 2 - - err := store.Update(ctx, shop) - require.NoError(t, err) - - // 验证更新 - found, err := store.GetByID(ctx, shop.ID) - require.NoError(t, err) - assert.Equal(t, "更新后的店铺名称", found.ShopName) - assert.Equal(t, "新联系人", found.ContactName) - assert.Equal(t, "13900000001", found.ContactPhone) - assert.Equal(t, uint(2), found.Updater) - }) - - t.Run("更新店铺状态", func(t *testing.T) { - shop.Status = constants.StatusDisabled - err := store.Update(ctx, shop) - require.NoError(t, err) - - found, err := store.GetByID(ctx, shop.ID) - require.NoError(t, err) - assert.Equal(t, constants.StatusDisabled, found.Status) - }) -} - -// TestShopStore_Delete 测试软删除店铺 -func TestShopStore_Delete(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := postgres.NewShopStore(tx, rdb) - ctx := context.Background() - - // 创建测试店铺 - shop := &model.Shop{ - ShopName: "待删除店铺", - ShopCode: "DELETE001", - Level: 1, - ContactName: "测试", - ContactPhone: "13800000001", - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err := store.Create(ctx, shop) - require.NoError(t, err) - - t.Run("软删除店铺", func(t *testing.T) { - err := store.Delete(ctx, shop.ID) - require.NoError(t, err) - - // 验证已被软删除（GetByID 应该找不到） - _, err = store.GetByID(ctx, shop.ID) - assert.Error(t, err) - }) -} - -// TestShopStore_List 测试查询店铺列表 -func TestShopStore_List(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := postgres.NewShopStore(tx, rdb) - ctx := context.Background() - - // 创建多个测试店铺 - for i := 1; i <= 5; i++ { - shop := &model.Shop{ - ShopName: testutils.GenerateUsername("测试店铺", i), - ShopCode: testutils.GenerateUsername("SHOP", i), - Level: 1, - ContactName: "测试联系人", - ContactPhone: testutils.GeneratePhone("138", i), - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err := store.Create(ctx, shop) - require.NoError(t, err) - } - - t.Run("分页查询", func(t *testing.T) { - shops, total, err := store.List(ctx, nil, nil) - require.NoError(t, err) - assert.GreaterOrEqual(t, len(shops), 5) - assert.GreaterOrEqual(t, total, int64(5)) - }) - - t.Run("带过滤条件查询", func(t *testing.T) { - filters := map[string]interface{}{ - "level": 1, - } - shops, _, err := store.List(ctx, nil, filters) - require.NoError(t, err) - for _, shop := range shops { - assert.Equal(t, 1, shop.Level) - } - }) -} - -// TestShopStore_GetSubordinateShopIDs 测试递归查询下级店铺 ID -func TestShopStore_GetSubordinateShopIDs(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := postgres.NewShopStore(tx, rdb) - ctx := context.Background() - - // 创建店铺层级结构 - // Level 1 - shop1 := &model.Shop{ - ShopName: "一级店铺", - ShopCode: "L1_001", - ParentID: nil, - Level: 1, - ContactName: "一级联系人", - ContactPhone: "13800000001", - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err := store.Create(ctx, shop1) - require.NoError(t, err) - - // Level 2 - 子店铺 1 - shop2_1 := &model.Shop{ - ShopName: "二级店铺1", - ShopCode: "L2_001", - ParentID: &shop1.ID, - Level: 2, - ContactName: "二级联系人1", - ContactPhone: "13800000002", - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err = store.Create(ctx, shop2_1) - require.NoError(t, err) - - // Level 2 - 子店铺 2 - shop2_2 := &model.Shop{ - ShopName: "二级店铺2", - ShopCode: "L2_002", - ParentID: &shop1.ID, - Level: 2, - ContactName: "二级联系人2", - ContactPhone: "13800000003", - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err = store.Create(ctx, shop2_2) - require.NoError(t, err) - - // Level 3 - 孙店铺 - shop3 := &model.Shop{ - ShopName: "三级店铺", - ShopCode: "L3_001", - ParentID: &shop2_1.ID, - Level: 3, - ContactName: "三级联系人", - ContactPhone: "13800000004", - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err = store.Create(ctx, shop3) - require.NoError(t, err) - - t.Run("查询一级店铺的所有下级（包含自己）", func(t *testing.T) { - ids, err := store.GetSubordinateShopIDs(ctx, shop1.ID) - require.NoError(t, err) - // 应该包含自己(shop1)和所有下级(shop2_1, shop2_2, shop3) - assert.Contains(t, ids, shop1.ID) - assert.Contains(t, ids, shop2_1.ID) - assert.Contains(t, ids, shop2_2.ID) - assert.Contains(t, ids, shop3.ID) - assert.Len(t, ids, 4) - }) - - t.Run("查询二级店铺的下级（包含自己）", func(t *testing.T) { - ids, err := store.GetSubordinateShopIDs(ctx, shop2_1.ID) - require.NoError(t, err) - // 应该包含自己(shop2_1)和下级(shop3) - assert.Contains(t, ids, shop2_1.ID) - assert.Contains(t, ids, shop3.ID) - assert.Len(t, ids, 2) - }) - - t.Run("查询没有下级的店铺（只返回自己）", func(t *testing.T) { - ids, err := store.GetSubordinateShopIDs(ctx, shop3.ID) - require.NoError(t, err) - // 应该只包含自己 - assert.Contains(t, ids, shop3.ID) - assert.Len(t, ids, 1) - }) - - t.Run("验证 Redis 缓存", func(t *testing.T) { - // 第一次查询会写入缓存 - ids1, err := store.GetSubordinateShopIDs(ctx, shop1.ID) - require.NoError(t, err) - - // 第二次查询应该从缓存读取（结果相同） - ids2, err := store.GetSubordinateShopIDs(ctx, shop1.ID) - require.NoError(t, err) - - assert.Equal(t, ids1, ids2) - assert.Len(t, ids2, 4) // 包含自己+3个下级 - }) -} - -// TestShopStore_UniqueConstraints 测试唯一约束 -func TestShopStore_UniqueConstraints(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := postgres.NewShopStore(tx, rdb) - ctx := context.Background() - - // 创建测试店铺 - shop := &model.Shop{ - ShopName: "唯一测试店铺", - ShopCode: "UNIQUE_CODE", - Level: 1, - ContactName: "测试", - ContactPhone: "13800000001", - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err := store.Create(ctx, shop) - require.NoError(t, err) - - t.Run("重复店铺编号应失败", func(t *testing.T) { - duplicate := &model.Shop{ - ShopName: "另一个店铺", - ShopCode: "UNIQUE_CODE", // 重复 - Level: 1, - ContactName: "测试", - ContactPhone: "13800000002", - Status: constants.StatusEnabled, - BaseModel: model.BaseModel{ - Creator: 1, - Updater: 1, - }, - } - err := store.Create(ctx, duplicate) - assert.Error(t, err) - }) -} diff --git a/tests/unit/soft_delete_test.go b/tests/unit/soft_delete_test.go deleted file mode 100644 index 65d1f3f..0000000 --- a/tests/unit/soft_delete_test.go +++ /dev/null @@ -1,285 +0,0 @@ -package unit - -import ( - "context" - "testing" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - "gorm.io/gorm" - - "github.com/break/junhong_cmp_fiber/internal/model" - "github.com/break/junhong_cmp_fiber/internal/store/postgres" - "github.com/break/junhong_cmp_fiber/pkg/constants" - "github.com/break/junhong_cmp_fiber/tests/testutils" -) - -// TestAccountSoftDelete 测试账号软删除功能 -func TestAccountSoftDelete(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - store := postgres.NewAccountStore(tx, rdb) - ctx := context.Background() - - // 创建测试账号 - account := &model.Account{ - Username: "soft_delete_user", - Phone: "13800000001", - Password: "hashed_password", - UserType: constants.UserTypePlatform, - Status: constants.StatusEnabled, - } - err := store.Create(ctx, account) - require.NoError(t, err) - - t.Run("软删除账号", func(t *testing.T) { - err := store.Delete(ctx, account.ID) - require.NoError(t, err) - - // 正常查询应该找不到 - _, err = store.GetByID(ctx, account.ID) - assert.Error(t, err) - assert.Equal(t, gorm.ErrRecordNotFound, err) - }) - - t.Run("使用 Unscoped 可以查到已删除账号", func(t *testing.T) { - var found model.Account - err := tx.Unscoped().First(&found, account.ID).Error - require.NoError(t, err) - assert.Equal(t, account.Username, found.Username) - assert.NotNil(t, found.DeletedAt) - }) - - t.Run("软删除后可以重用用户名和手机号", func(t *testing.T) { - // 创建同名账号（因为原账号已软删除） - newAccount := &model.Account{ - Username: "soft_delete_user", // 重用已删除账号的用户名 - Phone: "13800000001", // 重用已删除账号的手机号 - Password: "hashed_password", - UserType: constants.UserTypePlatform, - Status: constants.StatusEnabled, - } - err := store.Create(ctx, newAccount) - require.NoError(t, err) - assert.NotEqual(t, account.ID, newAccount.ID) - }) -} - -// TestRoleSoftDelete 测试角色软删除功能 -func TestRoleSoftDelete(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - roleStore := postgres.NewRoleStore(tx) - ctx := context.Background() - - // 创建测试角色 - role := &model.Role{ - RoleName: "test_role", - RoleDesc: "测试角色", - RoleType: constants.RoleTypePlatform, - Status: constants.StatusEnabled, - } - err := roleStore.Create(ctx, role) - require.NoError(t, err) - - t.Run("软删除角色", func(t *testing.T) { - err := roleStore.Delete(ctx, role.ID) - require.NoError(t, err) - - // 正常查询应该找不到 - _, err = roleStore.GetByID(ctx, role.ID) - assert.Error(t, err) - assert.Equal(t, gorm.ErrRecordNotFound, err) - }) - - t.Run("使用 Unscoped 可以查到已删除角色", func(t *testing.T) { - var found model.Role - err := tx.Unscoped().First(&found, role.ID).Error - require.NoError(t, err) - assert.Equal(t, role.RoleName, found.RoleName) - assert.NotNil(t, found.DeletedAt) - }) -} - -// TestPermissionSoftDelete 测试权限软删除功能 -func TestPermissionSoftDelete(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - permissionStore := postgres.NewPermissionStore(tx) - ctx := context.Background() - - // 创建测试权限 - permission := &model.Permission{ - PermName: "测试权限", - PermCode: "test:permission", - PermType: constants.PermissionTypeMenu, - Status: constants.StatusEnabled, - } - err := permissionStore.Create(ctx, permission) - require.NoError(t, err) - - t.Run("软删除权限", func(t *testing.T) { - err := permissionStore.Delete(ctx, permission.ID) - require.NoError(t, err) - - // 正常查询应该找不到 - _, err = permissionStore.GetByID(ctx, permission.ID) - assert.Error(t, err) - assert.Equal(t, gorm.ErrRecordNotFound, err) - }) - - t.Run("软删除后可以重用权限码", func(t *testing.T) { - newPermission := &model.Permission{ - PermName: "新测试权限", - PermCode: "test:permission", // 重用已删除权限的 perm_code - PermType: constants.PermissionTypeMenu, - Status: constants.StatusEnabled, - } - err := permissionStore.Create(ctx, newPermission) - require.NoError(t, err) - assert.NotEqual(t, permission.ID, newPermission.ID) - }) -} - -// TestAccountRoleSoftDelete 测试账号-角色关联软删除功能 -func TestAccountRoleSoftDelete(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - accountStore := postgres.NewAccountStore(tx, rdb) - roleStore := postgres.NewRoleStore(tx) - accountRoleStore := postgres.NewAccountRoleStore(tx, rdb) - ctx := context.Background() - - // 创建测试账号 - account := &model.Account{ - Username: "ar_user", - Phone: "13800000001", - Password: "hashed_password", - UserType: constants.UserTypePlatform, - Status: constants.StatusEnabled, - } - err := accountStore.Create(ctx, account) - require.NoError(t, err) - - // 创建测试角色 - role := &model.Role{ - RoleName: "ar_role", - RoleDesc: "测试角色", - RoleType: constants.RoleTypePlatform, - Status: constants.StatusEnabled, - } - err = roleStore.Create(ctx, role) - require.NoError(t, err) - - // 创建关联 - accountRole := &model.AccountRole{ - AccountID: account.ID, - RoleID: role.ID, - Status: constants.StatusEnabled, - Creator: 1, - Updater: 1, - } - err = accountRoleStore.Create(ctx, accountRole) - require.NoError(t, err) - - t.Run("软删除账号-角色关联", func(t *testing.T) { - err := accountRoleStore.Delete(ctx, account.ID, role.ID) - require.NoError(t, err) - - // 查询应该找不到 - roles, err := accountRoleStore.GetByAccountID(ctx, account.ID) - require.NoError(t, err) - assert.Len(t, roles, 0) - }) - - t.Run("软删除后可以重新关联", func(t *testing.T) { - newAccountRole := &model.AccountRole{ - AccountID: account.ID, - RoleID: role.ID, - Status: constants.StatusEnabled, - Creator: 1, - Updater: 1, - } - err := accountRoleStore.Create(ctx, newAccountRole) - require.NoError(t, err) - - // 验证可以查询到 - roles, err := accountRoleStore.GetByAccountID(ctx, account.ID) - require.NoError(t, err) - assert.Len(t, roles, 1) - }) -} - -// TestRolePermissionSoftDelete 测试角色-权限关联软删除功能 -func TestRolePermissionSoftDelete(t *testing.T) { - tx := testutils.NewTestTransaction(t) - rdb := testutils.GetTestRedis(t) - testutils.CleanTestRedisKeys(t, rdb) - - roleStore := postgres.NewRoleStore(tx) - permissionStore := postgres.NewPermissionStore(tx) - rolePermissionStore := postgres.NewRolePermissionStore(tx, rdb) - ctx := context.Background() - - // 创建测试角色 - role := &model.Role{ - RoleName: "rp_role", - RoleDesc: "测试角色", - RoleType: constants.RoleTypePlatform, - Status: constants.StatusEnabled, - } - err := roleStore.Create(ctx, role) - require.NoError(t, err) - - // 创建测试权限 - permission := &model.Permission{ - PermName: "rp_permission", - PermCode: "rp:permission", - PermType: constants.PermissionTypeMenu, - Status: constants.StatusEnabled, - } - err = permissionStore.Create(ctx, permission) - require.NoError(t, err) - - // 创建关联 - rolePermission := &model.RolePermission{ - RoleID: role.ID, - PermID: permission.ID, - Status: constants.StatusEnabled, - } - err = rolePermissionStore.Create(ctx, rolePermission) - require.NoError(t, err) - - t.Run("软删除角色-权限关联", func(t *testing.T) { - err := rolePermissionStore.Delete(ctx, role.ID, permission.ID) - require.NoError(t, err) - - // 查询应该找不到 - permissions, err := rolePermissionStore.GetByRoleID(ctx, role.ID) - require.NoError(t, err) - assert.Len(t, permissions, 0) - }) - - t.Run("软删除后可以重新关联", func(t *testing.T) { - newRolePermission := &model.RolePermission{ - RoleID: role.ID, - PermID: permission.ID, - Status: constants.StatusEnabled, - } - err := rolePermissionStore.Create(ctx, newRolePermission) - require.NoError(t, err) - - // 验证可以查询到 - permissions, err := rolePermissionStore.GetByRoleID(ctx, role.ID) - require.NoError(t, err) - assert.Len(t, permissions, 1) - }) -} diff --git a/草稿.md b/草稿.md new file mode 100644 index 0000000..573d308 --- /dev/null +++ b/草稿.md @@ -0,0 +1,276 @@ +我发现现在的关于佣金的一致性或者说接口还是有问题,在我看来接口入参都有的情况下,估计其他地方的佣金也会有问题 +我们本质只有两种所谓的佣金(因为有一种我认为不算佣金) +1. 差价佣金 +2. 一次性佣金 + +我发现现在套餐跟套餐系列的一致性已经被破坏了,套餐在创建的时候首先有以下问题 +1. 真流量跟虚流量是共存的,我们本身在设计套餐的时候会先设置一个真实流量额度可能是1000M,这时候还需要决定是否需要开启虚流量,虚流量可以填小于等于1000M的值,我们未来的轮训停机模块会基于是否开启虚流量去决定以真实流量额度为目标值还是以虚流量为目标值 +2. 关于价格也有问题,正常来说我们只会有三个价格,分别是 成本价,建议售价 没了,就没了,后续的业务中就算分配给代理也是变更的代理的成本价,例如平台在创建套餐时设置的成本价是100元,可能分配给代理A时会把成本价增加到110,那么代理在自己的套餐列表看到的成本价就是110了 + +在说套餐跟套餐系列之前,我再次跟你说明我们的佣金规则 +1. 差价佣金: 在我们套餐创建时会填入一个成本价一个建议价,当平台给代理分配套餐时会去进行一个加价的操作(当然代理给自己的下级代理分配也会有这样一个逻辑),可能在创建套餐的时候设置的成本价是100,然后分配给代理把成本价加到110了,那么代理自己的套餐列表看到的成本价就是110了,所谓的差价佣金就是这10块钱,但是因为我们现在是平台视角,所以没有佣金,我们平台就是赚110,如果是代理给代理分,那么就是用110分销给下级代理,可能设置的成本价是 120,那么这个下级代理没销售一单,上级代理都赚10块,这就是差价佣金 +2. 一次性佣金: 一次佣金主要是作为奖励佣金存在,我的理解是他属于套餐系列这一个层次,他本质是一个条件返佣的机制,他有两种条件,一种是第一次充值(我称之为首充),一种是累计充值,我们还有一个强充机制,对于首充而言是必须的,对于累计充值而言是可选的,强充主要是影响客户端的订单创建,当客户端用户(所谓的个人用户/客户)购买套餐时预检接口发现该套餐的套餐系列要求强充,那么此时会返回提示,告诉他需要强充xxxx元,充值后会自动扣款对应套餐,然后用户点击确定后就会创建要求强充的钱,最后付款,付款后扣对应套餐的钱,这差不多就是强充的逻辑,关于强充多少钱,取决于条件返佣的类型,如果是首充,那么强充的钱就是首充的要求,如果是累计充值,且强充则需要设置一次最少要充多少钱,又说回首充跟累计充值的逻辑,首充指的就是第一次购买套餐时必须满足充值的要求,有三种情况,一种是首充要求的金额低于所购套餐价格,则首充应当是以套餐价格为准(套餐价格 100元 首充50元返10元,此时实际支付应当是100),一种是首充要求的金额等于所购套餐价格,则首充应当是以套餐价格为准(套餐价格100元 首充100元返20元,此时实际支付应当是100元),一种是首充要求的金额大于所购套餐加,则首充应当是以首充要求为准(套餐价格100元 首充200元 返 40元,此时实际支付应当是200元),累计充值指的是只要在对应套餐系列下充值就会积累充值金额,当某一次额度符合时应当返佣(套餐系列要求累计充值 200元 返40元,第一次充值 100 不返 积累100,第二次充值50 不返 积累 50元,此时已经积累150,后续当累计>=200元时应当返40佣金),但是只有充值的钱才会累计,直接购买套餐是不积累的,除非给累计佣金设置了强充,那么用户直接购买套餐会被变成上面说的强充逻辑,此时他会变成先充值后购买(这里是系统自动的),这时候需要累计 + +我们的本质佣金其实只有这两种,但是我们在一次佣金的基础上发展成了梯度一次性佣金,即可以多维度的一次性佣金 我们以一次性佣金首充的规则来讲梯度佣金,梯度佣金在一次性佣金规则的基础上还会有自身的规则,他有两种梯度控制类型,一种是销量,一种是销售额,一个梯度只能是一种类型,例如销量 >= 0 时 首充 100 返 5块,销量 >= 100时 首充 100 返10块,销量 >= 200时 首充100 返 20,当他销量达量的时候就只会作用这个规则了,这就是我们的梯度佣金 + + + +基于我上面的说明,我们现在已有的东西感觉很是混乱,关于套餐系列分配接口等等 套餐,分佣相关的接口以及代码都很混乱,而且我发现之前完全没有考虑清除,现在操作步骤也好,还是操作逻辑也好很是混乱,不清楚你能不能理解我对于混乱的理解,我总感觉他现在不是一个完美的线性操作 + + + +最终业务模型总结 +一、核心实体 +┌─────────────────────────────────────────────────────────────────────────┐ +│ 实体关系 │ +└─────────────────────────────────────────────────────────────────────────┘ +┌─────────────────┐ +│ 套餐系列 │ +│ PackageSeries │ +├─────────────────┤ +│ • 系列名称 │ +│ • 一次性佣金规则 │ ← 可选，详见下方 +└────────┬────────┘ + │ 1:N + ▼ +┌─────────────────┐ ┌─────────────────┐ +│ 套餐 │ │ 卡/设备 │ +│ Package │ │ IoT/Device │ +├─────────────────┤ ├─────────────────┤ +│ • 成本价 │ │ • 绑定系列ID │ +│ • 建议售价 │ │ • 累计充值金额 │ ← 按系列累计 +│ • 真流量(必填) │ │ • 是否已首充 │ ← 按系列记录 +│ • 虚流量(可选) │ └────────┬────────┘ +│ • 虚流量开关 │ │ +└────────┬────────┘ │ 分配 + │ ▼ + │ 分配 ┌─────────────────┐ + ▼ │ 店铺 │ +┌─────────────────┐ │ Shop │ +│ 套餐分配 │◀─────────┤ • 代理层级 │ +│ PkgAllocation │ │ • 上级店铺ID │ +├─────────────────┤ └─────────────────┘ +│ • 店铺ID │ +│ • 套餐ID │ +│ • 成本价(加价后)│ +│ • 一次性佣金额 │ ← 给该代理的金额 +└─────────────────┘ +--- +二、套餐字段定义 +┌─────────────────────────────────────────────────────────────────────────┐ +│ 套餐 Package │ +├──────────────────┬──────────────────────────────────────────────────────┤ +│ 字段 │ 说明 │ +├──────────────────┼──────────────────────────────────────────────────────┤ +│ cost_price │ 成本价（平台设置的基础成本价，分） │ +├──────────────────┼──────────────────────────────────────────────────────┤ +│ suggested_price │ 建议售价（给代理参考，分） │ +├──────────────────┼──────────────────────────────────────────────────────┤ +│ real_data_mb │ 真实流量额度（必填，MB） │ +├──────────────────┼──────────────────────────────────────────────────────┤ +│ enable_virtual │ 是否启用虚流量（开关） │ +├──────────────────┼──────────────────────────────────────────────────────┤ +│ virtual_data_mb │ 虚流量额度（启用时必填，≤ 真实流量，MB） │ +└──────────────────┴──────────────────────────────────────────────────────┘ +停机判断逻辑： + 目标值 = enable_virtual ? virtual_data_mb : real_data_mb +--- +三、两种佣金 +┌─────────────────────────────────────────────────────────────────────────┐ +│ 佣金类型 │ +├─────────────────┬───────────────────────┬───────────────────────────────┤ +│ │ 差价佣金 │ 一次性佣金 │ +├─────────────────┼───────────────────────┼───────────────────────────────┤ +│ 触发时机 │ 每笔订单 │ 首充/累计充值达标时 │ +├─────────────────┼───────────────────────┼───────────────────────────────┤ +│ 触发次数 │ 每单都触发 │ 每张卡/设备只触发一次 │ +├─────────────────┼───────────────────────┼───────────────────────────────┤ +│ 计算公式 │ 下级成本价-自己成本价 │ 上级给的-给下级的 │ +├─────────────────┼───────────────────────┼───────────────────────────────┤ +│ 配置位置 │ 套餐分配时设置成本价 │ 系列定义规则+分配时设置额度 │ +├─────────────────┼───────────────────────┼───────────────────────────────┤ +│ 获得者 │ 上级代理 │ 整条代理链按约定分配 │ +├─────────────────┼───────────────────────┼───────────────────────────────┤ +│ 是否必须 │ 是 │ 否（系列可不启用） │ +└─────────────────┴───────────────────────┴───────────────────────────────┘ +--- +四、一次性佣金规则配置 +┌─────────────────────────────────────────────────────────────────────────┐ +│ 一次性佣金规则（套餐系列层面配置） │ +├──────────────────┬──────────────────────────────────────────────────────┤ +│ 配置项 │ 说明 │ +├──────────────────┼──────────────────────────────────────────────────────┤ +│ enable │ 是否启用一次性佣金 │ +├──────────────────┼──────────────────────────────────────────────────────┤ +│ trigger_type │ 触发类型：first_recharge(首充) / │ +│ │ accumulated_recharge(累计充值) │ +├──────────────────┼──────────────────────────────────────────────────────┤ +│ threshold │ 触发阈值（分）：首充要求金额 或 累计要求金额 │ +├──────────────────┼──────────────────────────────────────────────────────┤ +│ commission_type │ 返佣类型：fixed(固定) / tiered(梯度) │ +├──────────────────┼──────────────────────────────────────────────────────┤ +│ commission_amount│ 固定返佣金额（fixed类型时） │ +├──────────────────┼──────────────────────────────────────────────────────┤ +│ tiers │ 梯度配置（tiered类型时） │ +├──────────────────┼──────────────────────────────────────────────────────┤ +│ validity_type │ 时效类型：permanent(永久) / fixed_date(固定日期) / │ +│ │ relative(相对时长) │ +├──────────────────┼──────────────────────────────────────────────────────┤ +│ validity_value │ 时效值（到期日期 或 月数） │ +├──────────────────┼──────────────────────────────────────────────────────┤ +│ 【强充配置】 │ │ +├──────────────────┼──────────────────────────────────────────────────────┤ +│ enable_force │ 是否启用强充（首充必选，累计可选） │ +├──────────────────┼──────────────────────────────────────────────────────┤ +│ force_calc_type │ 强充金额计算方式（累计充值时）： │ +│ │ fixed(固定金额) / dynamic(动态差额) │ +├──────────────────┼──────────────────────────────────────────────────────┤ +│ force_amount │ 强充金额（fixed类型时） │ +└──────────────────┴──────────────────────────────────────────────────────┘ +--- +五、梯度配置 +┌─────────────────────────────────────────────────────────────────────────┐ +│ 梯度配置 │ +├──────────────────┬──────────────────────────────────────────────────────┤ +│ 配置项 │ 说明 │ +├──────────────────┼──────────────────────────────────────────────────────┤ +│ tier_dimension │ 梯度维度：sales_count(销量) / sales_amount(销售额) │ +├──────────────────┼──────────────────────────────────────────────────────┤ +│ stat_scope │ 统计范围：self(仅自己) / self_and_sub(自己+下级) │ +├──────────────────┼──────────────────────────────────────────────────────┤ +│ tiers[] │ 梯度档位列表： │ +│ .threshold │ 阈值（销量或销售额） │ +│ .amount │ 返佣金额（分） │ +└──────────────────┴──────────────────────────────────────────────────────┘ +注意： + • 梯度只控制"返多少钱"，不控制"触发条件" + • 触发条件（首充/累计充值阈值）仍由 trigger_type + threshold 控制 + • 统计周期与一次性佣金时效一致 +--- +六、关键业务流程 +6.1 首充流程 +客户购买套餐 + │ + ▼ +预检：系列是否启用一次性佣金且为首充？ + │ + 否──────────────────────────▶ 正常购买流程 + │ + 是 + │ + ▼ +该卡/设备在该系列下是否已首充过？ + │ + 是──────────────────────────▶ 正常购买流程（不再返佣） + │ + 否 + │ + ▼ +计算强充金额 = max(首充要求, 套餐售价) + │ + ▼ +返回提示："需要充值 xxx 元" + │ + ▼ +用户确认 → 创建充值订单(金额=强充金额) + │ + ▼ +用户支付 + │ + ▼ +支付成功： + 1. 钱进入钱包 + 2. 标记该卡/设备已首充 + 3. 自动创建套餐购买订单并完成 + 4. 扣款（套餐售价） + 5. 触发一次性佣金，链式分配 +6.2 累计充值流程 +客户充值（直接充值到钱包） + │ + ▼ +累计充值金额 += 本次充值金额 + │ + ▼ +该卡/设备是否已触发过累计充值返佣？ + │ + 是──────────────────────────▶ 结束（不再返佣） + │ + 否 + │ + ▼ +累计金额 >= 累计要求？ + │ + 否──────────────────────────▶ 结束（继续累计） + │ + 是 + │ + ▼ +触发一次性佣金，链式分配 +标记该卡/设备已触发累计充值返佣 +6.3 强充（累计充值模式） +客户购买套餐 + │ + ▼ +系列是否启用累计充值强充？ + │ + 否──────────────────────────▶ 直接购买（不累计） + │ + 是 + │ + ▼ +计算强充金额： + 固定模式：force_amount + 动态模式：max(累计要求 - 已累计, 0) + │ + ▼ +返回提示："需要充值 xxx 元" + │ + ▼ +用户确认 → 创建充值订单 + │ + ▼ +支付成功后： + 1. 钱进入钱包 + 2. 累计金额 += 充值金额 + 3. 自动购买套餐并扣款 + 4. 检查是否触发累计充值返佣 +--- +七、一次性佣金链式分配 +┌─────────────────────────────────────────────────────────────────────────┐ +│ 链式分配示例 │ +└─────────────────────────────────────────────────────────────────────────┘ +系列规则：首充100，梯度返佣（销量>=100返10，>=200返20） +代理链：平台 → A(销量210) → A1(销量50) → A2 +分配配置： + 平台给A：20元（适用>=200档） + A给A1：8元 + A1给A2：5元 +触发首充时： + A2 获得：5元 + A1 获得：8 - 5 = 3元 + A 获得：20 - 8 = 12元 + ───────────────────── + 合计：20元 ✓ +--- +八、约束规则汇总 +┌─────────────────────────────────────────────────────────────────────────┐ +│ 约束规则 │ +└─────────────────────────────────────────────────────────────────────────┘ +【套餐分配】 + 1. 下级成本价 >= 自己成本价 + 2. 只能分配自己有权限的套餐 + 3. 只能分配给直属下级 +【一次性佣金分配】 + 4. 给下级的金额 <= 自己能拿到的金额 + 5. 给下级的金额 >= 0（可以设为0） +【流量】 + 6. 虚流量 <= 真实流量 +【配置修改】 + 7. 修改配置只影响之后的新订单 + 8. 代理只能修改"给下级多少钱"，不能改触发规则 + 9. 平台修改系列规则不影响已分配的，需收回重新分配 +【触发限制】 + 10. 一次性佣金每张卡/设备只触发一次 + 11. "首充"指该卡/设备在该系列下的第一次充值 + 12. 累计充值只统计"充值"操作，不统计"直接购买" +--- \ No newline at end of file