csxj2026/junhong_cmp_fiber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

修复 UR#55 代码审查问题：事务隔离、错误包装、重复辅助函数

Browse Source 
- resolvePackageTerms 接受 tx 参数并使用事务绑定的 Store，确保快照与写入同库
- auto_purchase.go 错误包装改用 pkgerrors.Wrap 而非标准库 errors
- shop_package_batch_allocation 去除 fmt 依赖改用 strconv 拼接
- shop_series_grant 提取 effectiveBase 局部变量避免重复调用
- 测试辅助函数统一迁移至 testutil.StringPointer，删除各文件本地重复定义
- 新增 testutil.NewRedisClient 和 testutil.StringPointer

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
break
2026-07-23 11:09:08 +09:00
parent f7e0f07692
commit 147f3eb775
7 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
internal/handler/admin/shop_package_expiry_base_integration_test.go
View File

@@ -32,8 +32,8 @@ func TestBatchAllocatePackagesHTTPRequiresExplicitExpiryBase(t *testing.T) {
expected *string
}{
{name: "跟随默认", field: "null"},
{name: "购买即生效", field: `"from_purchase"`, expected: stringPointer(constants.PackageExpiryBaseFromPurchase)},
{name: "实名即生效", field: `"from_activation"`, expected: stringPointer(constants.PackageExpiryBaseFromActivation)},
{name: "购买即生效", field: `"from_purchase"`, expected: testutil.StringPointer(constants.PackageExpiryBaseFromPurchase)},
{name: "实名即生效", field: `"from_activation"`, expected: testutil.StringPointer(constants.PackageExpiryBaseFromActivation)},
}
for _, testCase := range testCases {
t.Run(testCase.name, func(t *testing.T) {
@@ -204,8 +204,6 @@ func completeExpiryBaseTestUsage(packageID uint) *model.PackageUsage {
return &model.PackageUsage{OrderID: unique, OrderNo: "UR55-PATCH-USAGE", PackageID: packageID, UsageType: constants.AssetWalletResourceTypeIotCard, IotCardID: unique, DataLimitMB: 1, Status: constants.PackageUsageStatusPending, Priority: 1, PackageName: "UR55测试套餐", Generation: 1, ExpiryBaseSnapshot: constants.PackageExpiryBaseFromPurchase, CalendarTypeSnapshot: constants.PackageCalendarTypeByDay, DurationDaysSnapshot: 30}
}
func stringPointer(value string) *string { return &value }
func nullableStringEqual(left, right *string) bool {
return left == nil && right == nil || left != nil && right != nil && *left == *right
}
@@ -218,8 +216,8 @@ func TestSeriesGrantCreateHTTPRequiresExplicitExpiryBase(t *testing.T) {
expected *string
}{
{name: "跟随默认", field: "null"},
{name: "购买即生效", field: `"from_purchase"`, expected: stringPointer(constants.PackageExpiryBaseFromPurchase)},
{name: "实名即生效", field: `"from_activation"`, expected: stringPointer(constants.PackageExpiryBaseFromActivation)},
{name: "购买即生效", field: `"from_purchase"`, expected: testutil.StringPointer(constants.PackageExpiryBaseFromPurchase)},
{name: "实名即生效", field: `"from_activation"`, expected: testutil.StringPointer(constants.PackageExpiryBaseFromActivation)},
}
for _, testCase := range testCases {
t.Run(testCase.name, func(t *testing.T) {