meida_backend

13 Commits 1 Branch 0 Tags

3 Commits

Include renames

Author	SHA1	Message	Date
xsl	ecdfbb64c3	feat(billing): task bonus claim endpoint with idempotency and cap POST /quota/tasks/{task_key}/claim：配置驱动任务注册表、 grant_bonus 纯域函数、ledger 幂等键防重、task_bonus_max 封顶（FR-BILL-03/04）。实现：packages/domain/billing/quota.py 新增 BonusDecision/grant_bonus（mypy strict，恰好到顶允许、超一格整体拒绝）、grant_idempotency_key、PERIOD_TYPES； packages/billing/service.py 新增 claim_task_bonus（幂等快捷路径 → 行锁 → 封顶判定 → 同事务更新 bonus_granted 并写 system_grant 流水，delta=0 且 balance_after 按 remaining 口径；IntegrityError 并发兜底回滚为 40910）；响应模型 TaskBonusClaimResponse 放新建的 packages/billing/schemas.py；路由挂在 apps/api/routers/quota.py， rules 由 settings.task_bonus_rules 注入（amount 为占位值，产品定稿后改 env）。测试：新增单测 11 个（封顶边界、amount<=0、不动 used、hard_cap 独立生效、默认规则形状与 env 覆盖通路）；新增集成 4 个（领取+重复 40910+纯 DB 流水断言、五类任务全部到账、未知任务 40410、amount=11>max=10 → 40310 且无新流水）。门禁全绿：ruff check / ruff format --check / mypy 两段 / lint-imports；单测 180 passed，集成 7 passed。偏差说明：1) 任务文档提到的 BillingService._load_rule 实际名为 _require_rule，直接复用现有助手；2) packages/billing/repo.py 无需新增函数（现有 get_ledger_by_idempotency_key/lock_or_create_quota/add_ledger 已覆盖本任务）； 3) 文档设想的「TASK_BONUS_RULES_JSON 空值容错」经 env 源实测不成立—— pydantic-settings 对 dict 字段先做 JSON 解码，空白字符串在 Settings 构造时即报错（共享校验器/config.py 属禁改，未动）；单测改为覆盖受支持的空配置形态 "{}"。	2026-08-14 16:23:14 +08:00
xsl	2009aa938c	fix(billing): make quota seed and column names match the product SSOT The product plan is the only source for quota numbers, but the 0001 seed used a second set (agent_chat 20/50, tryon hard 10) and omitted hairstyle, hd_export and report regen. Migration 0003 replaces the seed and renames points_reserved → quota_reserved and bonus_value → bonus_granted so the docs and the schema stop contradicting each other. Effective limit now clips at hard_cap. CI runs the integration slice against the Postgres/Redis services it already starts.	2026-08-14 11:28:35 +08:00
xsl	12583e9739	feat(shared): cross-cutting plumbing and pure domain layer Typed pydantic-settings config, structlog JSON logging with request/trace id propagation and redaction of phone numbers, tokens and face keys, the unified response envelope and error-code table from 架构文档 §9.2, async SQLAlchemy session management, ORM models for the eight foundation tables, and the OpenTelemetry/Prometheus wiring. packages/domain stays pure logic -- snowflake ids, the quota three-phase protocol and the tk_task state machine -- so it can be tested without a database and is held to mypy strict.	2026-08-14 00:26:39 +08:00

Author

SHA1

Message

Date

xsl

ecdfbb64c3

feat(billing): task bonus claim endpoint with idempotency and cap

POST /quota/tasks/{task_key}/claim：配置驱动任务注册表、
grant_bonus 纯域函数、ledger 幂等键防重、task_bonus_max 封顶（FR-BILL-03/04）。

实现：packages/domain/billing/quota.py 新增 BonusDecision/grant_bonus（mypy strict，
恰好到顶允许、超一格整体拒绝）、grant_idempotency_key、PERIOD_TYPES；
packages/billing/service.py 新增 claim_task_bonus（幂等快捷路径 → 行锁 → 封顶判定
→ 同事务更新 bonus_granted 并写 system_grant 流水，delta=0 且 balance_after 按
remaining 口径；IntegrityError 并发兜底回滚为 40910）；响应模型 TaskBonusClaimResponse
放新建的 packages/billing/schemas.py；路由挂在 apps/api/routers/quota.py，
rules 由 settings.task_bonus_rules 注入（amount 为占位值，产品定稿后改 env）。
测试：新增单测 11 个（封顶边界、amount<=0、不动 used、hard_cap 独立生效、
默认规则形状与 env 覆盖通路）；新增集成 4 个（领取+重复 40910+纯 DB 流水断言、
五类任务全部到账、未知任务 40410、amount=11>max=10 → 40310 且无新流水）。
门禁全绿：ruff check / ruff format --check / mypy 两段 / lint-imports；
单测 180 passed，集成 7 passed。

偏差说明：1) 任务文档提到的 BillingService._load_rule 实际名为 _require_rule，
   直接复用现有助手；2) packages/billing/repo.py 无需新增函数（现有
   get_ledger_by_idempotency_key/lock_or_create_quota/add_ledger 已覆盖本任务）；
   3) 文档设想的「TASK_BONUS_RULES_JSON 空值容错」经 env 源实测不成立——
   pydantic-settings 对 dict 字段先做 JSON 解码，空白字符串在 Settings 构造时即
   报错（共享校验器/config.py 属禁改，未动）；单测改为覆盖受支持的空配置形态 "{}"。

2026-08-14 16:23:14 +08:00

xsl

2009aa938c

fix(billing): make quota seed and column names match the product SSOT

The product plan is the only source for quota numbers, but the 0001 seed
used a second set (agent_chat 20/50, tryon hard 10) and omitted hairstyle,
hd_export and report regen. Migration 0003 replaces the seed and renames
points_reserved → quota_reserved and bonus_value → bonus_granted so the
docs and the schema stop contradicting each other.

Effective limit now clips at hard_cap. CI runs the integration slice
against the Postgres/Redis services it already starts.

2026-08-14 11:28:35 +08:00

xsl

12583e9739

feat(shared): cross-cutting plumbing and pure domain layer

Typed pydantic-settings config, structlog JSON logging with request/trace id
propagation and redaction of phone numbers, tokens and face keys, the unified
response envelope and error-code table from 架构文档 §9.2, async SQLAlchemy
session management, ORM models for the eight foundation tables, and the
OpenTelemetry/Prometheus wiring.

packages/domain stays pure logic -- snowflake ids, the quota three-phase
protocol and the tk_task state machine -- so it can be tested without a
database and is held to mypy strict.

2026-08-14 00:26:39 +08:00