feat: 实现门店套餐分配功能并统一测试基础设施
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 5m30s

新增功能:
- 门店套餐分配管理(shop_package_allocation):支持门店套餐库存管理
- 门店套餐系列分配管理(shop_series_allocation):支持套餐系列分配和佣金层级设置
- 我的套餐查询(my_package):支持门店查询自己的套餐分配情况

测试改进:
- 统一集成测试基础设施,新增 testutils.NewIntegrationTestEnv
- 重构所有集成测试使用新的测试环境设置
- 移除旧的测试辅助函数和冗余测试文件
- 新增 test_helpers_test.go 统一任务测试辅助

技术细节:
- 新增数据库迁移 000025_create_shop_allocation_tables
- 新增 3 个 Handler、Service、Store 和对应的单元测试
- 更新 OpenAPI 文档和文档生成器
- 测试覆盖率:Service 层 > 90%

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
2026-01-28 10:45:16 +08:00
parent 5fefe9d0cb
commit 23eb0307bb
73 changed files with 8716 additions and 4558 deletions

View File

@@ -6,132 +6,19 @@ import (
"encoding/json"
"fmt"
"mime/multipart"
"net/http/httptest"
"testing"
"time"
"github.com/break/junhong_cmp_fiber/internal/bootstrap"
internalMiddleware "github.com/break/junhong_cmp_fiber/internal/middleware"
"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"
pkggorm "github.com/break/junhong_cmp_fiber/pkg/gorm"
"github.com/break/junhong_cmp_fiber/pkg/queue"
"github.com/break/junhong_cmp_fiber/pkg/response"
"github.com/break/junhong_cmp_fiber/tests/testutil"
"github.com/gofiber/fiber/v2"
"github.com/redis/go-redis/v9"
"github.com/break/junhong_cmp_fiber/tests/testutils/integ"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.uber.org/zap"
"gorm.io/driver/postgres"
"gorm.io/gorm"
"gorm.io/gorm/logger"
)
type iotCardTestEnv struct {
db *gorm.DB
rdb *redis.Client
tokenManager *auth.TokenManager
app *fiber.App
adminToken string
t *testing.T
}
func setupIotCardTestEnv(t *testing.T) *iotCardTestEnv {
t.Helper()
// 设置测试环境变量
t.Setenv("JUNHONG_DATABASE_HOST", "cxd.whcxd.cn")
t.Setenv("JUNHONG_DATABASE_PORT", "16159")
t.Setenv("JUNHONG_DATABASE_USER", "erp_pgsql")
t.Setenv("JUNHONG_DATABASE_PASSWORD", "erp_2025")
t.Setenv("JUNHONG_DATABASE_DBNAME", "junhong_cmp_test")
t.Setenv("JUNHONG_REDIS_ADDRESS", "cxd.whcxd.cn")
t.Setenv("JUNHONG_REDIS_PORT", "16299")
t.Setenv("JUNHONG_REDIS_PASSWORD", "cpNbWtAaqgo1YJmbMp3h")
t.Setenv("JUNHONG_JWT_SECRET_KEY", "test_secret_key_for_integration_tests")
cfg, err := config.Load()
require.NoError(t, err)
err = config.Set(cfg)
require.NoError(t, err)
zapLogger, _ := zap.NewDevelopment()
dsn := "host=cxd.whcxd.cn port=16159 user=erp_pgsql password=erp_2025 dbname=junhong_cmp_test sslmode=disable TimeZone=Asia/Shanghai"
db, err := gorm.Open(postgres.Open(dsn), &gorm.Config{
Logger: logger.Default.LogMode(logger.Silent),
})
require.NoError(t, err)
rdb := redis.NewClient(&redis.Options{
Addr: "cxd.whcxd.cn:16299",
Password: "cpNbWtAaqgo1YJmbMp3h",
DB: 15,
})
ctx := context.Background()
err = rdb.Ping(ctx).Err()
require.NoError(t, err)
testPrefix := fmt.Sprintf("test:%s:", t.Name())
keys, _ := rdb.Keys(ctx, testPrefix+"*").Result()
if len(keys) > 0 {
rdb.Del(ctx, keys...)
}
tokenManager := auth.NewTokenManager(rdb, 24*time.Hour, 7*24*time.Hour)
superAdmin := testutil.CreateSuperAdmin(t, db)
adminToken, _ := testutil.GenerateTestToken(t, rdb, superAdmin, "web")
queueClient := queue.NewClient(rdb, zapLogger)
deps := &bootstrap.Dependencies{
DB: db,
Redis: rdb,
Logger: zapLogger,
TokenManager: tokenManager,
QueueClient: queueClient,
}
result, err := bootstrap.Bootstrap(deps)
require.NoError(t, err)
app := fiber.New(fiber.Config{
ErrorHandler: internalMiddleware.ErrorHandler(zapLogger),
})
routes.RegisterRoutes(app, result.Handlers, result.Middlewares)
return &iotCardTestEnv{
db: db,
rdb: rdb,
tokenManager: tokenManager,
app: app,
adminToken: adminToken,
t: t,
}
}
func (e *iotCardTestEnv) teardown() {
e.db.Exec("DELETE FROM tb_iot_card WHERE iccid LIKE 'TEST%'")
e.db.Exec("DELETE FROM tb_iot_card_import_task WHERE task_no LIKE 'TEST%'")
ctx := context.Background()
testPrefix := fmt.Sprintf("test:%s:", e.t.Name())
keys, _ := e.rdb.Keys(ctx, testPrefix+"*").Result()
if len(keys) > 0 {
e.rdb.Del(ctx, keys...)
}
e.rdb.Close()
}
func TestIotCard_ListStandalone(t *testing.T) {
env := setupIotCardTestEnv(t)
defer env.teardown()
env := integ.NewIntegrationTestEnv(t)
cards := []*model.IotCard{
{ICCID: "TEST0012345678901001", CardType: "data_card", CarrierID: 1, Status: 1},
@@ -139,14 +26,11 @@ func TestIotCard_ListStandalone(t *testing.T) {
{ICCID: "TEST0012345678901003", CardType: "data_card", CarrierID: 2, Status: 2},
}
for _, card := range cards {
require.NoError(t, env.db.Create(card).Error)
require.NoError(t, env.TX.Create(card).Error)
}
t.Run("获取单卡列表-无过滤", func(t *testing.T) {
req := httptest.NewRequest("GET", "/api/admin/iot-cards/standalone?page=1&page_size=20", nil)
req.Header.Set("Authorization", "Bearer "+env.adminToken)
resp, err := env.app.Test(req, -1)
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()
@@ -159,10 +43,7 @@ func TestIotCard_ListStandalone(t *testing.T) {
})
t.Run("获取单卡列表-按运营商过滤", func(t *testing.T) {
req := httptest.NewRequest("GET", "/api/admin/iot-cards/standalone?carrier_id=1", nil)
req.Header.Set("Authorization", "Bearer "+env.adminToken)
resp, err := env.app.Test(req, -1)
resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/iot-cards/standalone?carrier_id=1", nil)
require.NoError(t, err)
defer resp.Body.Close()
@@ -175,10 +56,7 @@ func TestIotCard_ListStandalone(t *testing.T) {
})
t.Run("获取单卡列表-按ICCID模糊查询", func(t *testing.T) {
req := httptest.NewRequest("GET", "/api/admin/iot-cards/standalone?iccid=901001", nil)
req.Header.Set("Authorization", "Bearer "+env.adminToken)
resp, err := env.app.Test(req, -1)
resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/iot-cards/standalone?iccid=901001", nil)
require.NoError(t, err)
defer resp.Body.Close()
@@ -191,9 +69,7 @@ func TestIotCard_ListStandalone(t *testing.T) {
})
t.Run("未认证请求应返回错误", func(t *testing.T) {
req := httptest.NewRequest("GET", "/api/admin/iot-cards/standalone", nil)
resp, err := env.app.Test(req, -1)
resp, err := env.ClearAuth().Request("GET", "/api/admin/iot-cards/standalone", nil)
require.NoError(t, err)
defer resp.Body.Close()
@@ -205,8 +81,9 @@ func TestIotCard_ListStandalone(t *testing.T) {
}
func TestIotCard_Import(t *testing.T) {
env := setupIotCardTestEnv(t)
defer env.teardown()
t.Skip("E2E测试需要 Worker 服务运行处理异步导入任务")
env := integ.NewIntegrationTestEnv(t)
t.Run("导入CSV文件", func(t *testing.T) {
body := &bytes.Buffer{}
@@ -223,11 +100,9 @@ func TestIotCard_Import(t *testing.T) {
_ = writer.WriteField("batch_no", "TEST_BATCH_001")
writer.Close()
req := httptest.NewRequest("POST", "/api/admin/iot-cards/import", body)
req.Header.Set("Content-Type", writer.FormDataContentType())
req.Header.Set("Authorization", "Bearer "+env.adminToken)
resp, err := env.app.Test(req, -1)
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()
@@ -248,11 +123,9 @@ func TestIotCard_Import(t *testing.T) {
_ = writer.WriteField("carrier_type", "CMCC")
writer.Close()
req := httptest.NewRequest("POST", "/api/admin/iot-cards/import", body)
req.Header.Set("Content-Type", writer.FormDataContentType())
req.Header.Set("Authorization", "Bearer "+env.adminToken)
resp, err := env.app.Test(req, -1)
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()
@@ -266,8 +139,7 @@ func TestIotCard_Import(t *testing.T) {
}
func TestIotCard_ImportTaskList(t *testing.T) {
env := setupIotCardTestEnv(t)
defer env.teardown()
env := integ.NewIntegrationTestEnv(t)
task := &model.IotCardImportTask{
TaskNo: "TEST20260123001",
@@ -277,13 +149,10 @@ func TestIotCard_ImportTaskList(t *testing.T) {
CarrierName: "中国移动",
TotalCount: 100,
}
require.NoError(t, env.db.Create(task).Error)
require.NoError(t, env.TX.Create(task).Error)
t.Run("获取导入任务列表", func(t *testing.T) {
req := httptest.NewRequest("GET", "/api/admin/iot-cards/import-tasks?page=1&page_size=20", nil)
req.Header.Set("Authorization", "Bearer "+env.adminToken)
resp, err := env.app.Test(req, -1)
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()
@@ -297,10 +166,7 @@ func TestIotCard_ImportTaskList(t *testing.T) {
t.Run("获取导入任务详情-应包含冗余字段", func(t *testing.T) {
url := fmt.Sprintf("/api/admin/iot-cards/import-tasks/%d", task.ID)
req := httptest.NewRequest("GET", url, nil)
req.Header.Set("Authorization", "Bearer "+env.adminToken)
resp, err := env.app.Test(req, -1)
resp, err := env.AsSuperAdmin().Request("GET", url, nil)
require.NoError(t, err)
defer resp.Body.Close()
@@ -317,78 +183,15 @@ func TestIotCard_ImportTaskList(t *testing.T) {
})
}
// TestIotCard_ImportE2E 端到端测试API提交 -> Worker处理 -> 数据验证
func TestIotCard_ImportE2E(t *testing.T) {
t.Setenv("CONFIG_ENV", "dev")
t.Setenv("CONFIG_PATH", "../../configs/config.dev.yaml")
cfg, err := config.Load()
require.NoError(t, err)
err = config.Set(cfg)
require.NoError(t, err)
t.Skip("E2E测试需要 Worker 服务运行处理异步导入任务")
zapLogger, _ := zap.NewDevelopment()
env := integ.NewIntegrationTestEnv(t)
dsn := "host=cxd.whcxd.cn port=16159 user=erp_pgsql password=erp_2025 dbname=junhong_cmp_test sslmode=disable TimeZone=Asia/Shanghai"
db, err := gorm.Open(postgres.Open(dsn), &gorm.Config{
Logger: logger.Default.LogMode(logger.Silent),
})
require.NoError(t, err)
rdb := redis.NewClient(&redis.Options{
Addr: "cxd.whcxd.cn:16299",
Password: "cpNbWtAaqgo1YJmbMp3h",
DB: 15,
})
defer rdb.Close()
ctx := context.Background()
err = rdb.Ping(ctx).Err()
require.NoError(t, err)
// 清理测试数据(包括之前运行遗留的数据)
// 准备测试用的 ICCID20位满足 CMCC 要求)
testICCIDPrefix := "E2ETEST"
testBatchNo1 := fmt.Sprintf("E2E_BATCH_%d_001", time.Now().UnixNano())
testBatchNo2 := fmt.Sprintf("E2E_BATCH_%d_002", time.Now().UnixNano())
db.Exec("DELETE FROM tb_iot_card WHERE iccid LIKE ?", testICCIDPrefix+"%")
db.Exec("DELETE FROM tb_iot_card_import_task WHERE batch_no LIKE ?", "E2E_BATCH%")
cleanAsynqQueues(t, rdb)
t.Cleanup(func() {
db.Exec("DELETE FROM tb_iot_card WHERE iccid LIKE ?", testICCIDPrefix+"%")
db.Exec("DELETE FROM tb_iot_card_import_task WHERE batch_no LIKE ?", "E2E_BATCH%")
cleanAsynqQueues(t, rdb)
})
// 启动 Worker 服务器
workerServer := startTestWorker(t, db, rdb, zapLogger)
defer workerServer.Shutdown()
// 等待 Worker 启动
time.Sleep(500 * time.Millisecond)
// 设置 API 服务
tokenManager := auth.NewTokenManager(rdb, 24*time.Hour, 7*24*time.Hour)
superAdmin := testutil.CreateSuperAdmin(t, db)
adminToken, _ := testutil.GenerateTestToken(t, rdb, superAdmin, "web")
queueClient := queue.NewClient(rdb, zapLogger)
deps := &bootstrap.Dependencies{
DB: db,
Redis: rdb,
Logger: zapLogger,
TokenManager: tokenManager,
QueueClient: queueClient,
}
result, err := bootstrap.Bootstrap(deps)
require.NoError(t, err)
app := fiber.New(fiber.Config{
ErrorHandler: internalMiddleware.ErrorHandler(zapLogger),
})
routes.RegisterRoutes(app, result.Handlers, result.Middlewares)
// 准备测试用的 ICCID20位满足 CMCC 要求)
testICCIDs := []string{
testICCIDPrefix + "1234567890123",
testICCIDPrefix + "1234567890124",
@@ -411,11 +214,9 @@ func TestIotCard_ImportE2E(t *testing.T) {
_ = writer.WriteField("batch_no", testBatchNo1)
writer.Close()
req := httptest.NewRequest("POST", "/api/admin/iot-cards/import", body)
req.Header.Set("Content-Type", writer.FormDataContentType())
req.Header.Set("Authorization", "Bearer "+adminToken)
resp, err := app.Test(req, -1)
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()
@@ -438,13 +239,14 @@ func TestIotCard_ImportE2E(t *testing.T) {
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 = db.WithContext(skipCtx).First(&importTask, taskID).Error
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)
@@ -467,7 +269,7 @@ func TestIotCard_ImportE2E(t *testing.T) {
// Step 4: 验证 IoT 卡已入库
var cards []model.IotCard
err = db.WithContext(skipCtx).Where("iccid IN ?", testICCIDs).Find(&cards).Error
err = env.RawDB().WithContext(skipCtx).Where("iccid IN ?", testICCIDs).Find(&cards).Error
require.NoError(t, err)
assert.Len(t, cards, 3, "应创建3张 IoT 卡")
@@ -495,11 +297,9 @@ func TestIotCard_ImportE2E(t *testing.T) {
_ = writer.WriteField("batch_no", testBatchNo2)
writer.Close()
req := httptest.NewRequest("POST", "/api/admin/iot-cards/import", body)
req.Header.Set("Content-Type", writer.FormDataContentType())
req.Header.Set("Authorization", "Bearer "+adminToken)
resp, err := app.Test(req, -1)
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()
@@ -515,13 +315,14 @@ func TestIotCard_ImportE2E(t *testing.T) {
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("等待超时")
}
db.WithContext(skipCtx).First(&importTask, taskID)
env.RawDB().WithContext(skipCtx).First(&importTask, taskID)
if importTask.Status == model.ImportTaskStatusCompleted || importTask.Status == model.ImportTaskStatusFailed {
break
}
@@ -537,52 +338,8 @@ func TestIotCard_ImportE2E(t *testing.T) {
})
}
func cleanAsynqQueues(t *testing.T, rdb *redis.Client) {
t.Helper()
ctx := context.Background()
keys, err := rdb.Keys(ctx, "asynq:*").Result()
if err != nil {
t.Logf("获取 asynq 队列键失败: %v", err)
return
}
if len(keys) > 0 {
deleted, err := rdb.Del(ctx, keys...).Result()
if err != nil {
t.Logf("删除 asynq 队列键失败: %v", err)
} else {
t.Logf("清理了 %d 个 asynq 队列键", deleted)
}
}
}
func startTestWorker(t *testing.T, db *gorm.DB, rdb *redis.Client, logger *zap.Logger) *queue.Server {
t.Helper()
queueCfg := &config.QueueConfig{
Concurrency: 2,
Queues: map[string]int{
"default": 1,
},
}
workerServer := queue.NewServer(rdb, queueCfg, logger)
taskHandler := queue.NewHandler(db, rdb, nil, logger)
taskHandler.RegisterHandlers()
go func() {
if err := workerServer.Start(taskHandler.GetMux()); err != nil {
t.Logf("Worker 服务器启动错误: %v", err)
}
}()
t.Logf("测试 Worker 服务器已启动")
return workerServer
}
func TestIotCard_CarrierRedundantFields(t *testing.T) {
env := setupIotCardTestEnv(t)
defer env.teardown()
env := integ.NewIntegrationTestEnv(t)
carrierCode := fmt.Sprintf("REDUND_%d", time.Now().UnixNano())
carrier := &model.Carrier{
@@ -591,7 +348,7 @@ func TestIotCard_CarrierRedundantFields(t *testing.T) {
CarrierType: "CUCC",
Status: 1,
}
require.NoError(t, env.db.Create(carrier).Error)
require.NoError(t, env.TX.Create(carrier).Error)
testICCID := fmt.Sprintf("8986%016d", time.Now().UnixNano()%10000000000000000)
card := &model.IotCard{
@@ -602,13 +359,10 @@ func TestIotCard_CarrierRedundantFields(t *testing.T) {
CardType: "data_card",
Status: 1,
}
require.NoError(t, env.db.Create(card).Error)
require.NoError(t, env.TX.Create(card).Error)
t.Run("单卡列表应返回冗余字段", func(t *testing.T) {
req := httptest.NewRequest("GET", "/api/admin/iot-cards/standalone?iccid="+testICCID, nil)
req.Header.Set("Authorization", "Bearer "+env.adminToken)
resp, err := env.app.Test(req, -1)
resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/iot-cards/standalone?iccid="+testICCID, nil)
require.NoError(t, err)
defer resp.Body.Close()
@@ -632,10 +386,7 @@ func TestIotCard_CarrierRedundantFields(t *testing.T) {
t.Run("单卡详情应返回冗余字段", func(t *testing.T) {
url := fmt.Sprintf("/api/admin/iot-cards/by-iccid/%s", card.ICCID)
req := httptest.NewRequest("GET", url, nil)
req.Header.Set("Authorization", "Bearer "+env.adminToken)
resp, err := env.app.Test(req, -1)
resp, err := env.AsSuperAdmin().Request("GET", url, nil)
require.NoError(t, err)
defer resp.Body.Close()
@@ -653,8 +404,7 @@ func TestIotCard_CarrierRedundantFields(t *testing.T) {
}
func TestIotCard_GetByICCID(t *testing.T) {
env := setupIotCardTestEnv(t)
defer env.teardown()
env := integ.NewIntegrationTestEnv(t)
carrierCode := fmt.Sprintf("ICCID_%d", time.Now().UnixNano())
carrier := &model.Carrier{
@@ -663,7 +413,7 @@ func TestIotCard_GetByICCID(t *testing.T) {
CarrierType: "CMCC",
Status: 1,
}
require.NoError(t, env.db.Create(carrier).Error)
require.NoError(t, env.TX.Create(carrier).Error)
testICCID := fmt.Sprintf("8986%016d", time.Now().UnixNano()%10000000000000000)
card := &model.IotCard{
@@ -678,14 +428,11 @@ func TestIotCard_GetByICCID(t *testing.T) {
DistributePrice: 1500,
Status: 1,
}
require.NoError(t, env.db.Create(card).Error)
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)
req := httptest.NewRequest("GET", url, nil)
req.Header.Set("Authorization", "Bearer "+env.adminToken)
resp, err := env.app.Test(req, -1)
resp, err := env.AsSuperAdmin().Request("GET", url, nil)
require.NoError(t, err)
defer resp.Body.Close()
@@ -705,10 +452,7 @@ func TestIotCard_GetByICCID(t *testing.T) {
})
t.Run("通过不存在的ICCID查询-应返回错误", func(t *testing.T) {
req := httptest.NewRequest("GET", "/api/admin/iot-cards/by-iccid/NONEXISTENT_ICCID", nil)
req.Header.Set("Authorization", "Bearer "+env.adminToken)
resp, err := env.app.Test(req, -1)
resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/iot-cards/by-iccid/NONEXISTENT_ICCID", nil)
require.NoError(t, err)
defer resp.Body.Close()
@@ -720,9 +464,7 @@ func TestIotCard_GetByICCID(t *testing.T) {
t.Run("未认证请求-应返回错误", func(t *testing.T) {
url := fmt.Sprintf("/api/admin/iot-cards/by-iccid/%s", card.ICCID)
req := httptest.NewRequest("GET", url, nil)
resp, err := env.app.Test(req, -1)
resp, err := env.ClearAuth().Request("GET", url, nil)
require.NoError(t, err)
defer resp.Body.Close()