mirror of
https://github.com/Wei-Shaw/sub2api.git
synced 2026-11-20 07:05:24 +00:00
修复 PR #3768 批量图像 MVP 合并后审计报告中的全部问题: 结算与计费(高危): - 所有 SETTLEMENT_* 失败(超冻结/计数非法/manifest 冲突/定价缺失/扣费失败) 统一计入 retry_count 并在耗尽时释放冻结转 failed,消灭 settling 无限 requeue 导致的冻结余额永久锁死 - 耗尽出口的释放指纹统一为 RequestHash,与 processor/Cancel/recovery 一致; release 遇同 request id 指纹冲突视为幂等成功,治愈历史毒消息 - 管理端校验 hold_multiplier >= discount_multiplier,定价快照对存量脏数据钳制 - 释放前校验 per-job hold claim(dedup+归档表),杜绝幻影释放 索引对账(高危): - provider 输出与提交 custom_id 集对账:未知条目丢弃并记事件, 漏项补 PROVIDER_RESULT_MISSING 失败行,保证 success+fail == item_count 提交与恢复(高危): - 提交前转 uploading 并在 provider.Submit 期间心跳刷新 updated_at; 恢复扫描改为原子复核(FailStaleUnsubmittedBatchImageJob), 消灭慢提交被误杀退款而上游任务照常计费的孤儿场景 - 上游任务创建成功但本地状态推进失败时,尽力取消上游并清理输入 - recovery 释放失败时入队交由 worker releaseTerminalHold 兜底重试 队列与并发(中危): - Enqueue(SetNX+LPush)与 Reserve(BRPop+ZAdd)均改为 Lua 原子脚本, 消灭崩溃窗口导致 job 脱离队列、被 7 天 inflight 键锁死 - 锁冲突按 LockConflictDelay 重新入队(原直接丢弃需等 10 分钟 stale 恢复) - 处理期间心跳:active zset 续期(ZAddXX 防幽灵成员)+ 锁 TTL 续期 - ReplaceBatchImageItemsForJob 增加 indexing 状态守卫,防掉队 worker 重写账目 存量回归(中危): - image-only 定价条目(仅图片价无 token 价)恢复 token 计费 fail-closed, 不再按 $0 计费;图片计费路径不受影响 - 鉴权余额门槛恢复 balance <= 0 语义,MinimumBalanceReserve 不再作硬 403 加固: - ZIP max_items 钳制到管理员上限;Submit 补齐 Platform==Gemini 校验; gemini downloadUri 跟随前做 host 白名单校验 - 批量客户端改用共享 httpclient(拨号/TLS/响应头超时有界) - 审计点名的忽略错误(MarkDownloaded/SettlementFailed/AppendEvent 等)改为记日志
262 lines
10 KiB
Go
262 lines
10 KiB
Go
//go:build unit
|
|
|
|
package repository
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
"testing"
|
|
|
|
"github.com/DATA-DOG/go-sqlmock"
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/Wei-Shaw/sub2api/internal/service"
|
|
)
|
|
|
|
const (
|
|
conditionalBalanceDeductSQL = `(?s)UPDATE users\s+SET balance = balance - \$1,\s+updated_at = NOW\(\)\s+WHERE id = \$2 AND deleted_at IS NULL AND balance >= \$1\s+RETURNING balance`
|
|
overdraftBalanceDeductSQL = `(?s)UPDATE users\s+SET balance = balance - \$1,\s+updated_at = NOW\(\)\s+WHERE id = \$2 AND deleted_at IS NULL\s+RETURNING balance`
|
|
reserveBatchImageHoldSQL = `(?s)UPDATE users\s+SET balance = balance - \$1,\s+frozen_balance = COALESCE\(frozen_balance, 0\) \+ \$1,\s+updated_at = NOW\(\)\s+WHERE id = \$2 AND deleted_at IS NULL AND balance >= \$1\s+RETURNING balance, frozen_balance`
|
|
captureBatchImageHoldSQL = `(?s)UPDATE users\s+SET balance = balance\s+\+ CASE WHEN \$1 > \$2 THEN \$1 - \$2 ELSE 0 END\s+- CASE WHEN \$2 > \$1 THEN \$2 - \$1 ELSE 0 END,\s+frozen_balance = COALESCE\(frozen_balance, 0\) - \$1,\s+updated_at = NOW\(\)\s+WHERE id = \$3 AND deleted_at IS NULL AND COALESCE\(frozen_balance, 0\) >= \$1\s+RETURNING balance, frozen_balance`
|
|
releaseBatchImageHoldSQL = `(?s)UPDATE users\s+SET balance = balance \+ \$1,\s+frozen_balance = COALESCE\(frozen_balance, 0\) - \$1,\s+updated_at = NOW\(\)\s+WHERE id = \$2 AND deleted_at IS NULL AND COALESCE\(frozen_balance, 0\) >= \$1\s+RETURNING balance, frozen_balance`
|
|
userExistsForBillingSQL = `(?s)SELECT 1\s+FROM users\s+WHERE id = \$1 AND deleted_at IS NULL`
|
|
)
|
|
|
|
func TestDeductUsageBillingBalance_UsesSufficientBalanceGuard(t *testing.T) {
|
|
ctx := context.Background()
|
|
db, mock, err := sqlmock.New()
|
|
require.NoError(t, err)
|
|
defer func() { _ = db.Close() }()
|
|
|
|
mock.ExpectBegin()
|
|
tx, err := db.BeginTx(ctx, nil)
|
|
require.NoError(t, err)
|
|
mock.ExpectQuery(conditionalBalanceDeductSQL).
|
|
WithArgs(2.5, int64(42)).
|
|
WillReturnRows(sqlmock.NewRows([]string{"balance"}).AddRow(7.5))
|
|
mock.ExpectCommit()
|
|
|
|
newBalance, sufficient, err := deductUsageBillingBalance(ctx, tx, 42, 2.5)
|
|
require.NoError(t, err)
|
|
require.True(t, sufficient)
|
|
require.InDelta(t, 7.5, newBalance, 0.000001)
|
|
require.NoError(t, tx.Commit())
|
|
require.NoError(t, mock.ExpectationsWereMet())
|
|
}
|
|
|
|
func TestDeductUsageBillingBalance_RecordsOverdraftWhenGuardMisses(t *testing.T) {
|
|
ctx := context.Background()
|
|
db, mock, err := sqlmock.New()
|
|
require.NoError(t, err)
|
|
defer func() { _ = db.Close() }()
|
|
|
|
mock.ExpectBegin()
|
|
tx, err := db.BeginTx(ctx, nil)
|
|
require.NoError(t, err)
|
|
mock.ExpectQuery(conditionalBalanceDeductSQL).
|
|
WithArgs(10.0, int64(42)).
|
|
WillReturnError(sql.ErrNoRows)
|
|
mock.ExpectQuery(overdraftBalanceDeductSQL).
|
|
WithArgs(10.0, int64(42)).
|
|
WillReturnRows(sqlmock.NewRows([]string{"balance"}).AddRow(-5.0))
|
|
mock.ExpectCommit()
|
|
|
|
newBalance, sufficient, err := deductUsageBillingBalance(ctx, tx, 42, 10)
|
|
require.NoError(t, err)
|
|
require.False(t, sufficient)
|
|
require.InDelta(t, -5.0, newBalance, 0.000001)
|
|
require.NoError(t, tx.Commit())
|
|
require.NoError(t, mock.ExpectationsWereMet())
|
|
}
|
|
|
|
func TestApplyUsageBillingEffects_FlagsBalanceOverdraft(t *testing.T) {
|
|
ctx := context.Background()
|
|
db, mock, err := sqlmock.New()
|
|
require.NoError(t, err)
|
|
defer func() { _ = db.Close() }()
|
|
|
|
mock.ExpectBegin()
|
|
tx, err := db.BeginTx(ctx, nil)
|
|
require.NoError(t, err)
|
|
mock.ExpectQuery(conditionalBalanceDeductSQL).
|
|
WithArgs(10.0, int64(42)).
|
|
WillReturnError(sql.ErrNoRows)
|
|
mock.ExpectQuery(overdraftBalanceDeductSQL).
|
|
WithArgs(10.0, int64(42)).
|
|
WillReturnRows(sqlmock.NewRows([]string{"balance"}).AddRow(-5.0))
|
|
mock.ExpectCommit()
|
|
|
|
result := &service.UsageBillingApplyResult{Applied: true}
|
|
err = (&usageBillingRepository{}).applyUsageBillingEffects(ctx, tx, &service.UsageBillingCommand{
|
|
UserID: 42,
|
|
BalanceCost: 10,
|
|
}, result)
|
|
require.NoError(t, err)
|
|
require.NotNil(t, result.NewBalance)
|
|
require.InDelta(t, -5.0, *result.NewBalance, 0.000001)
|
|
require.True(t, result.BalanceOverdrafted)
|
|
require.NoError(t, tx.Commit())
|
|
require.NoError(t, mock.ExpectationsWereMet())
|
|
}
|
|
|
|
func TestDeductUsageBillingBalance_ReturnsUserNotFoundWhenNoUserUpdated(t *testing.T) {
|
|
ctx := context.Background()
|
|
db, mock, err := sqlmock.New()
|
|
require.NoError(t, err)
|
|
defer func() { _ = db.Close() }()
|
|
|
|
mock.ExpectBegin()
|
|
tx, err := db.BeginTx(ctx, nil)
|
|
require.NoError(t, err)
|
|
mock.ExpectQuery(conditionalBalanceDeductSQL).
|
|
WithArgs(10.0, int64(42)).
|
|
WillReturnError(sql.ErrNoRows)
|
|
mock.ExpectQuery(overdraftBalanceDeductSQL).
|
|
WithArgs(10.0, int64(42)).
|
|
WillReturnError(sql.ErrNoRows)
|
|
mock.ExpectRollback()
|
|
|
|
_, _, err = deductUsageBillingBalance(ctx, tx, 42, 10)
|
|
require.ErrorIs(t, err, service.ErrUserNotFound)
|
|
require.NoError(t, tx.Rollback())
|
|
require.NoError(t, mock.ExpectationsWereMet())
|
|
}
|
|
|
|
func TestReserveUsageBillingBatchImageBalance_MovesAvailableToFrozen(t *testing.T) {
|
|
ctx := context.Background()
|
|
db, mock, err := sqlmock.New()
|
|
require.NoError(t, err)
|
|
defer func() { _ = db.Close() }()
|
|
|
|
mock.ExpectBegin()
|
|
tx, err := db.BeginTx(ctx, nil)
|
|
require.NoError(t, err)
|
|
mock.ExpectQuery(reserveBatchImageHoldSQL).
|
|
WithArgs(2.5, int64(42)).
|
|
WillReturnRows(sqlmock.NewRows([]string{"balance", "frozen_balance"}).AddRow(7.5, 2.5))
|
|
mock.ExpectCommit()
|
|
|
|
result, err := reserveUsageBillingBatchImageBalance(ctx, tx, &service.BatchImageBalanceHoldCommand{UserID: 42, HoldAmount: 2.5})
|
|
require.NoError(t, err)
|
|
require.NotNil(t, result.NewBalance)
|
|
require.NotNil(t, result.FrozenBalance)
|
|
require.InDelta(t, 7.5, *result.NewBalance, 0.000001)
|
|
require.InDelta(t, 2.5, *result.FrozenBalance, 0.000001)
|
|
require.NoError(t, tx.Commit())
|
|
require.NoError(t, mock.ExpectationsWereMet())
|
|
}
|
|
|
|
func TestReserveUsageBillingBatchImageBalance_InsufficientBalance(t *testing.T) {
|
|
ctx := context.Background()
|
|
db, mock, err := sqlmock.New()
|
|
require.NoError(t, err)
|
|
defer func() { _ = db.Close() }()
|
|
|
|
mock.ExpectBegin()
|
|
tx, err := db.BeginTx(ctx, nil)
|
|
require.NoError(t, err)
|
|
mock.ExpectQuery(reserveBatchImageHoldSQL).
|
|
WithArgs(10.0, int64(42)).
|
|
WillReturnError(sql.ErrNoRows)
|
|
mock.ExpectQuery(userExistsForBillingSQL).
|
|
WithArgs(int64(42)).
|
|
WillReturnRows(sqlmock.NewRows([]string{"?column?"}).AddRow(1))
|
|
mock.ExpectRollback()
|
|
|
|
_, err = reserveUsageBillingBatchImageBalance(ctx, tx, &service.BatchImageBalanceHoldCommand{UserID: 42, HoldAmount: 10})
|
|
require.ErrorIs(t, err, service.ErrBatchImageInsufficientBalance)
|
|
require.NoError(t, tx.Rollback())
|
|
require.NoError(t, mock.ExpectationsWereMet())
|
|
}
|
|
|
|
func TestCaptureUsageBillingBatchImageBalance_ReleasesRemainder(t *testing.T) {
|
|
ctx := context.Background()
|
|
db, mock, err := sqlmock.New()
|
|
require.NoError(t, err)
|
|
defer func() { _ = db.Close() }()
|
|
|
|
mock.ExpectBegin()
|
|
tx, err := db.BeginTx(ctx, nil)
|
|
require.NoError(t, err)
|
|
mock.ExpectQuery(captureBatchImageHoldSQL).
|
|
WithArgs(1.0, 0.25, int64(42)).
|
|
WillReturnRows(sqlmock.NewRows([]string{"balance", "frozen_balance"}).AddRow(9.75, 0.0))
|
|
mock.ExpectCommit()
|
|
|
|
result, err := captureUsageBillingBatchImageBalance(ctx, tx, &service.BatchImageBalanceHoldCommand{UserID: 42, HoldAmount: 1, ActualAmount: 0.25})
|
|
require.NoError(t, err)
|
|
require.InDelta(t, 9.75, *result.NewBalance, 0.000001)
|
|
require.InDelta(t, 0.0, *result.FrozenBalance, 0.000001)
|
|
require.NoError(t, tx.Commit())
|
|
require.NoError(t, mock.ExpectationsWereMet())
|
|
}
|
|
|
|
func TestCaptureUsageBillingBatchImageBalance_RejectsActualCostOverHold(t *testing.T) {
|
|
ctx := context.Background()
|
|
db, mock, err := sqlmock.New()
|
|
require.NoError(t, err)
|
|
defer func() { _ = db.Close() }()
|
|
|
|
mock.ExpectBegin()
|
|
tx, err := db.BeginTx(ctx, nil)
|
|
require.NoError(t, err)
|
|
mock.ExpectRollback()
|
|
|
|
_, err = captureUsageBillingBatchImageBalance(ctx, tx, &service.BatchImageBalanceHoldCommand{UserID: 42, HoldAmount: 0.5, ActualAmount: 1})
|
|
require.ErrorIs(t, err, service.ErrBatchImageSettlementCostExceedsHold)
|
|
require.NoError(t, tx.Rollback())
|
|
require.NoError(t, mock.ExpectationsWereMet())
|
|
}
|
|
|
|
func TestReleaseUsageBillingBatchImageBalance_ReturnsFrozenToAvailable(t *testing.T) {
|
|
ctx := context.Background()
|
|
db, mock, err := sqlmock.New()
|
|
require.NoError(t, err)
|
|
defer func() { _ = db.Close() }()
|
|
|
|
mock.ExpectBegin()
|
|
tx, err := db.BeginTx(ctx, nil)
|
|
require.NoError(t, err)
|
|
mock.ExpectQuery(`SELECT 1\s+FROM usage_billing_dedup\s+WHERE request_id = \$1 AND api_key_id = \$2`).
|
|
WithArgs(service.BatchImageHoldRequestID("imgbatch_release"), int64(7)).
|
|
WillReturnRows(sqlmock.NewRows([]string{"?column?"}).AddRow(1))
|
|
mock.ExpectQuery(releaseBatchImageHoldSQL).
|
|
WithArgs(1.0, int64(42)).
|
|
WillReturnRows(sqlmock.NewRows([]string{"balance", "frozen_balance"}).AddRow(10.0, 0.0))
|
|
mock.ExpectCommit()
|
|
|
|
result, err := releaseUsageBillingBatchImageBalance(ctx, tx, &service.BatchImageBalanceHoldCommand{UserID: 42, APIKeyID: 7, BatchID: "imgbatch_release", HoldAmount: 1})
|
|
require.NoError(t, err)
|
|
require.InDelta(t, 10.0, *result.NewBalance, 0.000001)
|
|
require.InDelta(t, 0.0, *result.FrozenBalance, 0.000001)
|
|
require.NoError(t, tx.Commit())
|
|
require.NoError(t, mock.ExpectationsWereMet())
|
|
}
|
|
|
|
func TestReleaseUsageBillingBatchImageBalance_SkipsWhenHoldNeverReserved(t *testing.T) {
|
|
ctx := context.Background()
|
|
db, mock, err := sqlmock.New()
|
|
require.NoError(t, err)
|
|
defer func() { _ = db.Close() }()
|
|
|
|
mock.ExpectBegin()
|
|
tx, err := db.BeginTx(ctx, nil)
|
|
require.NoError(t, err)
|
|
// dedup 与归档表均无 hold claim:说明该 job 从未成功冻结,
|
|
// 释放必须跳过,不得从他人冻结资金池中凭空生成余额。
|
|
mock.ExpectQuery(`SELECT 1\s+FROM usage_billing_dedup\s+WHERE request_id = \$1 AND api_key_id = \$2`).
|
|
WithArgs(service.BatchImageHoldRequestID("imgbatch_phantom"), int64(7)).
|
|
WillReturnError(sql.ErrNoRows)
|
|
mock.ExpectQuery(`SELECT 1\s+FROM usage_billing_dedup_archive\s+WHERE request_id = \$1 AND api_key_id = \$2`).
|
|
WithArgs(service.BatchImageHoldRequestID("imgbatch_phantom"), int64(7)).
|
|
WillReturnError(sql.ErrNoRows)
|
|
mock.ExpectCommit()
|
|
|
|
result, err := releaseUsageBillingBatchImageBalance(ctx, tx, &service.BatchImageBalanceHoldCommand{UserID: 42, APIKeyID: 7, BatchID: "imgbatch_phantom", HoldAmount: 1})
|
|
require.NoError(t, err)
|
|
require.Nil(t, result.NewBalance)
|
|
require.Nil(t, result.FrozenBalance)
|
|
require.NoError(t, tx.Commit())
|
|
require.NoError(t, mock.ExpectationsWereMet())
|
|
}
|